Fixed some styling bugs in the plugin manager

1 files changed, 34 insertions, 26 deletions

diff --git a/etherpad/src/templates/admin/pluginmanager.ejs b/etherpad/src/templates/admin/pluginmanager.ejs
index 33b04bf..8a3d0bf 100644
--- a/etherpad/src/templates/admin/pluginmanager.ejs
+++ b/etherpad/src/templates/admin/pluginmanager.ejs
@@ -12,15 +12,35 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */ %>
 <%
- helpers.setHtmlTitle("Browse tags");
+ helpers.setHtmlTitle("EtherPad: Manage plugins");
+/*
+ helpers.includeCss("plugins/twitterStyleTags/tagBrowser.css");
+ helpers.includeCss("plugins/twitterStyleTags/pad.css"); */
  helpers.setBodyId("padbody");
  helpers.addBodyClass("limwidth nonpropad nonprouser");
  helpers.includeCss("pad2_ejs.css");
- helpers.setRobotsPolicy({index: false, follow: false})
- helpers.includeJQuery();
+ helpers.includeJs("undo-xpopup.js");
  helpers.includeCometJs();
+ helpers.includeJQuery();
  helpers.includeJs("json2.js");
- helpers.addToHead('\n<style type="text/css" title="dynamicsyntax"></style>\n');
+ helpers.includeJs("colorutils.js");
+ helpers.includeJs("ace.js");
+ helpers.includeJs("collab_client.js");
+ helpers.includeJs("draggable.js");
+ helpers.includeJs("pad_utils.js");
+ helpers.includeJs("pad_cookie.js");
+ helpers.includeJs("pad_editor.js");
+ helpers.includeJs("pad_userlist.js");
+ helpers.includeJs("pad_editbar.js");
+ helpers.includeJs("pad_chat.js");
+ helpers.includeJs("pad_docbar.js");
+ helpers.includeJs("pad_impexp.js");
+ helpers.includeJs("pad_savedrevs.js");
+ helpers.includeJs("pad_connectionstatus.js");
+ helpers.includeJs("pad_modals.js");
+ helpers.includeJs("pad2.js");
+ helpers.suppressGA();
+ helpers.setRobotsPolicy({index: false, follow: false});
 
  function inArray(item, arr) {
    for (var i = 0; i < arr.length; i++)
@@ -34,18 +54,17 @@ limitations under the License. */ %>
  <div id="padtop">
   <div id="topbar" style="margin: 7px; margin-top: 0px;">
    <div id="topbarleft"><!-- --></div>
-    <div id="topbarright"><!-- --></div>
-    <div id="topbarcenter"><a href="/" id="topbaretherpad">EtherPad</a></div>
-    <% if (isProAccountHolder) { %>
-     <div id="accountnav"><%= toHTML(account.email) %><a href="/ep/account/sign-out">(sign out)</a></div>
-    <% } else if (isPro) { %>
-     <div id="accountnav"><a href="<%= signinUrl %>">sign in</a></div>
-    <% } %>
-   </div>
+   <div id="topbarright"><!-- --></div>
+   <div id="topbarcenter"><a href="/" id="topbaretherpad">EtherPad</a></div>
+   <% if (isProAccountHolder) { %>
+    <div id="accountnav"><%= toHTML(account.email) %><a href="/ep/account/sign-out">(sign out)</a></div>
+   <% } else if (isPro) { %>
+    <div id="accountnav"><a href="<%= signinUrl %>">sign in</a></div>
+   <% } %>
   </div>
   <div id="docbar" class="docbar-public">
    <div id="docbarleft"><!-- --></div>
-   <div title="Browse pads by tag" id="docbarpadtitle"><span>Browse tags</span></div>
+   <div title="Manage plugins" id="docbarpadtitle"><span>Manage plugins</span></div>
 
    <div id="docbaroptions-outer"><a href="javascript:void(0)" id="docbaroptions">Pad Options</a></div>
    <div id="docbarsavedrevs-outer"><a href="javascript:void(0)" id="docbarsavedrevs">Saved revisions</a></div>
@@ -71,21 +90,10 @@ limitations under the License. */ %>
       <div id="editbarright"><!-- --></div>      
       
       <div id="editbarinner">
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('bold'));" class="editbarbutton bold" title="Bold (ctrl-B)">&nbsp;</a>
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('italic'));" class="editbarbutton italic" title="Italics (ctrl-I)">&nbsp;</a>
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('underline'));" class="editbarbutton underline" title="Underline (ctrl-U)">&nbsp;</a>
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('strikethrough'));" class="editbarbutton strikethrough" title="Strikethrough">&nbsp;</a>
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('clearauthorship'));" class="editbarbutton clearauthorship" title="Clear Authorship Colors">&nbsp;</a>
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('undo'));" class="editbarbutton undo" title="Undo (ctrl-Z)">&nbsp;</a>
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('redo'));" class="editbarbutton redo" title="Redo (ctrl-Y)">&nbsp;</a>
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('insertunorderedlist'));" class="editbarbutton insertunorderedlist" title="Toggle Bullet List">&nbsp;</a>
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('indent'));" class="editbarbutton indent" title="Indent List">&nbsp;</a>
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('outdent'));" class="editbarbutton outdent" title="Unindent List">&nbsp;</a>
-        <a unselectable="on" href="javascript:void (window.pad&amp;&amp;pad.editbarClick('save'));" class="editbarbutton save" title="Save Revision">&nbsp;</a>
       </div>
     </div>
-    <div style="height: 268px;" id="editorcontainerbox">
-      <div id="editorcontainer" style="padding:5pt; height: 600pt;">
+    <div id="editorcontainerbox">
+      <div id="editorcontainer">
        <h1>Plugin manager</h1>
        <table>
         <tr>