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

Merge branch 'master' of github.com:Pita/etherpad-lite into HEAD

Browse source
This commit is contained in:
Pita Poison 2011-07-05 16:51:29 +02:00
commit 7a10e1783a
11 changed files with 209 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

7
static/timeslider.html
View file

@ -11,7 +11,7 @@
<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>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script type="text/javascript" src="/static/js/jquery.min.js"></script>
<script type="text/javascript">
// <![CDATA[
var clientVars = {};
@ -274,7 +274,10 @@
<div id="editbarright" class="editbarright">
<!-- termporary place holder-->
<a id = "returnbutton" href="javascript:document.location=document.location.href.substring(0,document.location.href.lastIndexOf('/timeslider'))">Return to pad</a>
<a id = "returnbutton">Return to pad</a>
<script>
$("#returnbutton").attr("href", document.location.href.substring(0,document.location.href.lastIndexOf('/timeslider')));
</script>
</div>
<div id="editbarinner" class="editbarinner">