diff options
| -rw-r--r-- | etherpad/src/etherpad/control/admin/pluginmanager.js | 7 | ||||
| -rw-r--r-- | etherpad/src/themes/default/templates/admin/pluginmanager.ejs | 163 |
2 files changed, 52 insertions, 118 deletions
diff --git a/etherpad/src/etherpad/control/admin/pluginmanager.js b/etherpad/src/etherpad/control/admin/pluginmanager.js index 39edc4a..c4bee5b 100644 --- a/etherpad/src/etherpad/control/admin/pluginmanager.js +++ b/etherpad/src/etherpad/control/admin/pluginmanager.js @@ -26,6 +26,7 @@ import("etherpad.pro.pro_utils"); import("etherpad.helpers"); import("etherpad.pro.pro_accounts.getSessionProAccount"); import("etherpad.admin.plugins"); +import("etherpad.pad.padutils"); function onRequest() { @@ -52,8 +53,14 @@ function onRequest() { userId: padusers.getUserId(), }); + + padutils.setOptsAndCookiePrefs(request); + var prefs = helpers.getClientVar('cookiePrefsToSet'); + var bodyClass = (prefs.isFullWidth ? "fullwidth" : "limwidth") + renderHtml("admin/pluginmanager.ejs", { + prefs: prefs, config: appjet.config, bodyClass: 'nonpropad', isPro: pro_utils.isProDomainRequest(), diff --git a/etherpad/src/themes/default/templates/admin/pluginmanager.ejs b/etherpad/src/themes/default/templates/admin/pluginmanager.ejs index 077d10a..cc47928 100644 --- a/etherpad/src/themes/default/templates/admin/pluginmanager.ejs +++ b/etherpad/src/themes/default/templates/admin/pluginmanager.ejs @@ -12,36 +12,9 @@ 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. */ %> <% + template.inherit('page.ejs'); 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.includeCss("admin/pluginmanager.css"); - helpers.includeJs("undo-xpopup.js"); - helpers.includeCometJs(); - helpers.includeJQuery(); - helpers.includeJs("json2.js"); - 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++) @@ -51,97 +24,51 @@ limitations under the License. */ %> } %> -<div id="padpage"> - <div id="padtop"> - <div id="topbar"> - <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="docbar" class="docbar-public"> - <div id="docbar"> - <table border="0" cellpadding="0" cellspacing="0" width="100%" id="docbartable"> - <tr> - <td><img src="/static/img/jun09/pad/roundcorner_left.gif"></td> - <td id="docbarpadtitle"><span>Plugin manager</span></td> - <td width="100%"> </td> - <% - plugins.callHookStr('docbarItemsAll', {}, '', '<td class="docbarbutton" nowrap>', '</td>'); - plugins.callHookStr('docbarItemsPluginManager', {}, '', '<td class="docbarbutton" nowrap>', '</td>'); - %> - <td><img src="/static/img/jun09/pad/roundcorner_right.gif"></td> - </tr> - </table> - - </div> - </div> - <div id="padmain"> - - <div id="padsidebar"> - <div id="padusers"> - </div> +<% template.define('docBarTitle', function() { var ejs_data=''; %> + <td id="docbarpadtitle"><span>Plugin manager</span></td> +<% return ejs_data; }); %> - <div id="hdraggie"><!-- --></div> - <div id="padchat"></div> - </div> <!-- /padsidebar --> - - <div id="padeditor"> - <div id="editbar" class="enabledtoolbar"> - <div id="editbarleft"><!-- --></div> - <div id="editbarright"><!-- --></div> - - <div id="editbarinner"></div> - </div> - <div id="editorcontainerbox"> - <div id="editorcontainer"> - <table> - <tr> - <th>Module name</th> - <th>Status</th> - <th></th> - </tr> - <% for (var plugin in plugins.pluginModules) { %> - <tr> - <td class="mousover_parent"> - <%= plugin %> - <div class="mouseover_child"> - <%= plugins.pluginModules[plugin].description %> - </div> - </td> - <td> - <% if (plugins.plugins[plugin] !== undefined) { %> - Installed - <% } else { %> - Not installed - <% } %> - </td> - <td> - <% if (plugins.plugins[plugin] !== undefined) { %> - <a href="/ep/admin/pluginmanager/?plugin=<%= plugin %>&action=uninstall">Uninstall</a> - <a href="/ep/admin/pluginmanager/?plugin=<%= plugin %>&action=reinstall">Reinstall</a> - <% if (plugins.plugins[plugin].configLink !== undefined) { %> - <a href="<%= plugins.plugins[plugin].configLink %>">Configure</a> - <% } %> - <% } else { %> - <a href="/ep/admin/pluginmanager/?plugin=<%= plugin %>&action=install">Install</a> - <% } %> - </td> - </tr> - <% } %> - </table> - </div> - </div> - </div><!-- /padeditor --> +<% template.define('docBarItems', function() { var ejs_data=''; %> + <%: plugins.callHookStr('docbarItemsPluginManager', {}, '', '<td class="docbarbutton">', '</td>'); %> +<% return ejs_data; }); %> - <div id="bottomarea"> - <div id="widthprefcheck" class="widthprefunchecked"><!-- --></div> - <div id="sidebarcheck" class="sidebarchecked"><!-- --></div> +<% template.define('contentArea', function() { var ejs_data=''; %> + <div id="editorcontainer"> + <table> + <tr> + <th>Module name</th> + <th>Status</th> + <th></th> + </tr> + <% for (var plugin in plugins.pluginModules) { %> + <tr> + <td class="mousover_parent"> + <%= plugin %> + <div class="mouseover_child"> + <%= plugins.pluginModules[plugin].description %> + </div> + </td> + <td> + <% if (plugins.plugins[plugin] !== undefined) { %> + Installed + <% } else { %> + Not installed + <% } %> + </td> + <td> + <% if (plugins.plugins[plugin] !== undefined) { %> + <a href="/ep/admin/pluginmanager/?plugin=<%= plugin %>&action=uninstall">Uninstall</a> + <a href="/ep/admin/pluginmanager/?plugin=<%= plugin %>&action=reinstall">Reinstall</a> + <% if (plugins.plugins[plugin].configLink !== undefined) { %> + <a href="<%= plugins.plugins[plugin].configLink %>">Configure</a> + <% } %> + <% } else { %> + <a href="/ep/admin/pluginmanager/?plugin=<%= plugin %>&action=install">Install</a> + <% } %> + </td> + </tr> + <% } %> + </table> </div> - </div> -</div> +<% return ejs_data; }); %> |