diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 95d19505..dec32b46 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -182,7 +182,7 @@ var padeditbar = (function() //hide all modules if(moduleName == "none") { - $("#editbar ul#menu_right > li").removeClass("selected"); + $(".toolbar ul.menu_right li").removeClass("selected"); for(var i=0;i 0 && nth_child <= (modules.length-1)) { - $("#editbar ul#menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected"); - $("#editbar ul#menu_right li:nth-child(" + nth_child + ")").toggleClass("selected"); - } - if(modules[modules.length-1] === moduleName) $("#editbar ul#menu_right li").removeClass("selected"); + if (nth_child > 0 && nth_child <= (modules.length-1)) { + $(".toolbar ul.menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected"); + $(".toolbar ul.menu_right li:nth-child(" + nth_child + ")").toggleClass("selected"); + } + if(modules[modules.length-1] === moduleName) $(".toolbar ul.menu_right li").removeClass("selected"); //hide all modules that are not selected and show the selected one for(var i=0;i <% e.begin_block("styles"); %> - - - + + + <% e.end_block(); %>
    - <% e.begin_block("editbarMenuLeft"); %> -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • -
  • - -
    • -
  • - -
    • -
  • -
  • - -
    • - <% e.end_block(); %> -
+ <% e.begin_block("editbarMenuLeft"); %> +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • +
  • + +
    • +
  • + +
    • +
  • +
  • + +
    • + <% e.end_block(); %> +
      - <% e.begin_block("editbarMenuRight"); %> -
    • - -
      -       -
      • - - - -
    • - -
    • - - 1 -
      • - <% e.end_block(); %> + <% e.begin_block("editbarMenuRight"); %> + + + + +
    • + +
    • + + 1 +
      • + <% e.end_block(); %>
    @@ -95,17 +93,17 @@ - +
    -
    +
    -
    +
    @@ -150,20 +148,20 @@

    Import from text file, HTML, PDF, Word, ODT or RTF


    -
    - -
    -
    +
    + +
    +
    -
    Successful!
    -
    - - - - - - -
    +
    Successful!
    +
    + + + + + + +
    @@ -223,79 +221,79 @@
    - +
    <% e.begin_block("modals"); %> -
    -
    -
    Connecting...
    -
    Reestablishing connection...
    -
    -

    Disconnected.

    -

    Opened in another window.

    -

    No Authorization.

    -
    -

    We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

    -
    -
    -

    We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

    -
    -
    -

    You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

    -
    -
    -

    Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

    -
    -
    -

    Server not responding. This may be due to network connectivity issues or high load on the server.

    -
    -
    -

    Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

    -
    -
    -

    This pad was deleted.

    -
    -
    -

    If this continues to happen, please let us know

    -
    -
    - -
    +
    +
    +
    Connecting...
    +
    Reestablishing connection...
    +
    +

    Disconnected.

    +

    Opened in another window.

    +

    No Authorization.

    +
    +

    We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

    +
    +
    +

    We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

    +
    +
    +

    You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

    +
    +
    +

    Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

    +
    +
    +

    Server not responding. This may be due to network connectivity issues or high load on the server.

    +
    +
    +

    Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

    +
    +
    +

    This pad was deleted.

    +
    +
    +

    If this continues to happen, please let us know

    +
    +
    +
    -
    + +
    <% e.end_block(); %>
    - + <% e.begin_block("scripts"); %> - - - - - + + + + + /* TODO: These globals shouldn't exist. */ + pad = require('ep_etherpad-lite/static/js/pad').pad; + chat = require('ep_etherpad-lite/static/js/chat').chat; + padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar; + padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp; + }()); + <% e.end_block(); %>