fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix timeslider.

This commit is contained in:
Marcel Klehr 2012-07-14 15:54:44 +02:00
parent 1466fa03a4
commit 4901adeac7
3 changed files with 63 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/static/css/timeslider.css
View File

@ -150,6 +150,13 @@
margin-top: 0; margin-top: 0;
padding-right: 6px; padding-right: 6px;
} }
#settings,
#importexport,
#embed,
#connectivity,
#users {
top: 62px;
}
#importexport .popup { #importexport .popup {
width: 185px width: 185px
} }

4
src/static/js/broadcast_slider.js
View File

@ -155,9 +155,7 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
function showReconnectUI() function showReconnectUI()
{ {
var cls = 'modaldialog cboxdisconnected cboxdisconnected_unknown'; padmodals.showModal("disconnected");
$("#connectionbox").get(0).className = cls;
padmodals.showModal("#connectionbox", 500);
} }
var fixPadHeight = _.throttle(function(){ var fixPadHeight = _.throttle(function(){

103
src/templates/timeslider.html
View File

@ -33,6 +33,12 @@
<div class="stepper" id="rightstep"></div> <div class="stepper" id="rightstep"></div>
</div> </div>
</div> </div>
<div id="overlay">
<div id="overlay-inner">
<!-- -->
</div>
</div>
</div> </div>
<div class="timeslider-bar"> <div class="timeslider-bar">
@ -70,54 +76,55 @@
</div><!-- /padmain --> </div><!-- /padmain -->
</div><!-- /padpage --> </div><!-- /padpage -->
<div id="modaloverlay"> <div id="connectivity" class="popup">
<div id="modaloverlay-inner"> <% e.begin_block("modals"); %>
<!-- --> <div class="connected visible">
</div> <h2>Connected.</h2>
</div> </div>
<div class="reconnecting">
<div id="mainmodals"> <h2>Reestablishing connection...</h2>
<% e.begin_block("modals"); %> <p><img alt="" border="0" src="/static/img/connectingbar.gif" /></p>
<div id="connectionbox" class="modaldialog"> </div>
<div id="connectionboxinner" class="modaldialog-inner"> <div class="userdup">
<div class="connecting">Connecting...</div> <h2>Opened in another window.</h2>
<div class="reconnecting">Reestablishing connection...</div> <p><b>You seem to have opened this pad in another browser window.</b> If you'd like to use this window instead, you can reconnect.</p>
<div class="disconnected"> <button id="forcereconnect">Reconnect Now</button>
<h2 class="h2_disconnect">Disconnected.</h2> </div>
<h2 class="h2_userdup">Opened in another window.</h2> <div class="unauth">
<h2 class="h2_unauth">No Authorization.</h2> <h2>No Authorization.</h2>
<div id="disconnected_looping"> <p>Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.</p>
<p><b>We're having trouble talking to the EtherPad lite synchronization server.</b> You may be connecting through an incompatible firewall or proxy server.</p> <button id="forcereconnect">Reconnect Now</button>
</div> </div>
<div id="disconnected_initsocketfail"> <div class="looping">
<p><b>We were unable to connect to the EtherPad lite synchronization server.</b> This may be due to an incompatibility with your web browser or internet connection.</p> <h2>Disconnected.</h2>
</div> <p><b>We're having trouble talking to the EtherPad lite synchronization server.</b> You may be connecting through an incompatible firewall or proxy server.</p>
<div id="disconnected_userdup"> </div>
<p><b>You seem to have opened this pad in another browser window.</b> If you'd like to use this window instead, you can reconnect.</p> <div class="initsocketfail">
</div> <h2>Disconnected.</h2>
<div id="disconnected_unknown"> <p><b>We were unable to connect to the EtherPad lite synchronization server.</b> This may be due to an incompatibility with your web browser or internet connection.</p>
<p><b>Lost connection with the EtherPad lite synchronization server.</b> This may be due to a loss of network connectivity.</p> </div>
</div> <div class="slowcommit">
<div id="disconnected_slowcommit"> <h2>Disconnected.</h2>
<p><b>Server not responding.</b> This may be due to network connectivity issues or high load on the server.</p> <p><b>Server not responding.</b> This may be due to network connectivity issues or high load on the server.</p>
</div> <button id="forcereconnect">Reconnect Now</button>
<div id="disconnected_unauth"> </div>
<p>Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.</p> <div class="deleted">
</div> <h2>Disconnected.</h2>
<div id="disconnected_deleted"> <p>This pad was deleted.</p>
<p>This pad was deleted.</p> </div>
</div> <div class="disconnected">
<div id="reconnect_advise"> <h2>Disconnected.</h2>
<p>If this continues to happen, please let us know</p> <p><b>Lost connection with the EtherPad lite synchronization server.</b> This may be due to a loss of network connectivity.</p>
</div> <p>If this continues to happen, please let us know</p>
<div id="reconnect_form"> <button id="forcereconnect">Reconnect Now</button>
<button id="forcereconnect">Reconnect Now</button> </div>
</div> <form id="reconnectform" method="post" action="/ep/pad/reconnect" accept-charset="UTF-8" style="display: none;">
</div> <input type="hidden" class="padId" name="padId">
</div> <input type="hidden" class="diagnosticInfo" name="diagnosticInfo">
</div> <input type="hidden" class="missedChanges" name="missedChanges">
<% e.end_block(); %> </form>
</div> <% e.end_block(); %>
</div>
<!-- export code --> <!-- export code -->
<div id="importexport"> <div id="importexport">