mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 09:26:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Buttons to the timeslider and back are working now

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-06-21 17:02:03 +01:00 • committed by Pita Poison
parent 247462e2f8
commit 6e09517d55
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
static/css/broadcast.css
View file

@ -4,6 +4,7 @@
#padcontent { #padcontent {
padding: 10px; padding: 10px;
font-size: 12px;
} }
#timeslider-wrapper { #timeslider-wrapper {
@ -15,7 +16,7 @@
#timeslider-left { #timeslider-left {
position: absolute; position: absolute;
left:-2px; left:0px;
background-image: url(/static/img/timeslider_left.png); background-image: url(/static/img/timeslider_left.png);
width: 134px; width: 134px;
height: 63px; height: 63px;
@ -24,7 +25,7 @@
#timeslider-right { #timeslider-right {
position: absolute; position: absolute;
top:0px; top:0px;
right:0px; right:-2px;
background-image: url(/static/img/timeslider_right.png); background-image: url(/static/img/timeslider_right.png);
width: 155px; width: 155px;
height: 63px; height: 63px;
@ -266,9 +267,10 @@ top:30px;
float:right; float:right;
} }
#returnbutton{ #returnbutton
width:100px; {
height:28px; font-size: 16px;
margin-right:4px; line-height: 29px;
background:url("/static/img/timeslider_right.png"); /* im so lazy */ margin-top: 0;
padding-right: 6pt;
} }

2
static/pad.html
View file

@ -100,7 +100,7 @@ var clientVars = {}; // ]]>
</li> </li>
<li> <li>
<a href="javascript:void (window.pad&&pad.editbarClick('timeslider'));" title="Show the history of this pad"> <a href="javascript:document.location = document.location+ '/timeslider'" title="Show the history of this pad">
<img src="/static/img/editbar_timeslider.gif" /> <img src="/static/img/editbar_timeslider.gif" />
</a> </a>
</li> </li>

8
static/timeslider.html
View file

@ -8,9 +8,8 @@
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" /> <meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
<title>Etherpad Lite Timeslider</title> <title>Etherpad Lite Timeslider</title>
<link href="/static/css/broadcast.css" rel="stylesheet" type="text/css" />
<!-- javascript -->
<link href="/static/css/pad_lite.css" rel="stylesheet" type="text/css" /> <link href="/static/css/pad_lite.css" rel="stylesheet" type="text/css" />
<link href="/static/css/broadcast.css" rel="stylesheet" type="text/css" />
<style type="text/css" title="dynamicsyntax"></style> <style type="text/css" title="dynamicsyntax"></style>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -182,7 +181,6 @@
<!-- --> <!-- -->
</div> </div>
</div> </div>
<div id="alertbar"> <div id="alertbar">
<div id="servermsg"> <div id="servermsg">
<h3>Server Notice<span id="servermsgdate"><!-- --></span>:</h3><a id= <h3>Server Notice<span id="servermsgdate"><!-- --></span>:</h3><a id=
@ -277,7 +275,7 @@
<div id="editbarright" class="editbarright"> <div id="editbarright" class="editbarright">
<!-- termporary place holder--> <!-- termporary place holder-->
<button id="returnbutton">Return to pad</button> <a id = "returnbutton" href="javascript:document.location=document.location.href.substring(0,document.location.href.lastIndexOf('/timeslider'))">Return to pad</a>
</div> </div>
<div id="editbarinner" class="editbarinner"> <div id="editbarinner" class="editbarinner">
@ -285,7 +283,7 @@
"editbartable"> "editbartable">
<tr> <tr>
<td> <td>
<h1>Public Pad <span id="revision_label">Latest text of pad <h1><span id="revision_label">Latest text of pad
test</span> <span id="revision_date">Saved June 14, 2011</span></h1> test</span> <span id="revision_date">Saved June 14, 2011</span></h1>
</td> </td>