From 631235e269a0e913207cf17f38855eb156e21f75 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 10 Apr 2010 23:15:43 +0200 Subject: Generalized the page.ejs a bit more so that it can be used by all pages for real --- etherpad/src/themes/default/templates/pad/pad_body2.ejs | 10 ++++++++-- etherpad/src/themes/default/templates/page.ejs | 8 ++------ 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'etherpad/src/themes/default/templates') diff --git a/etherpad/src/themes/default/templates/pad/pad_body2.ejs b/etherpad/src/themes/default/templates/pad/pad_body2.ejs index a19e685..5c886fb 100644 --- a/etherpad/src/themes/default/templates/pad/pad_body2.ejs +++ b/etherpad/src/themes/default/templates/pad/pad_body2.ejs @@ -14,9 +14,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') %> - <% + template.inherit('page.ejs'); + helpers.setHtmlTitle("EtherPad: "+pageTitle); helpers.includeJs("ace.js"); helpers.includeJs("collab_client.js"); @@ -54,6 +54,11 @@ limitations under the License. */ %> %> +<% template.define('docBarTitle', function() { var ejs_data=''; %> + <%= initialTitle %> +<% return ejs_data; }); %> + + <% template.define('docBarTitleEditor', function() { var ejs_data=''; %> <% if (isProAccountHolder) { %>
- <%: template.use('docBarTitle'); %> - + <%: template.use('docBarTitle'); %> - <% - plugins.callHookStr('docbarItemsAll', {}, '', ''); - plugins.callHookStr('docbarItemsPad', {}, '', ''); - %> + <%: plugins.callHookStr('docbarItemsAll', {}, '', ''); %> <%: template.use('docBarItems'); %> -- cgit v1.2.3 From 57b352fec217de33e5b00e32e566a0eb44edfe3d Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 10 Apr 2010 23:16:12 +0200 Subject: Made the plugin manager use page.ejs --- .../default/templates/admin/pluginmanager.ejs | 163 ++++++--------------- 1 file changed, 45 insertions(+), 118 deletions(-) (limited to 'etherpad/src/themes/default/templates') 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. */ %> } %> -
-
-
-
-
- - <% if (isProAccountHolder) { %> -
<%= toHTML(account.email) %>(sign out)
- <% } else if (isPro) { %> - - <% } %> -
-
-
-
<%= initialTitle %> ', '', '', '
- - - - - <% - plugins.callHookStr('docbarItemsAll', {}, '', ''); - plugins.callHookStr('docbarItemsPluginManager', {}, '', ''); - %> - - -
Plugin manager ', '', '
- -
- -
- -
-
-
+<% template.define('docBarTitle', function() { var ejs_data=''; %> + Plugin manager +<% return ejs_data; }); %> -
-
-
- -
-
-
-
- -
-
-
-
- - - - - - - <% for (var plugin in plugins.pluginModules) { %> - - - - - - <% } %> -
Module nameStatus
- <%= plugin %> -
- <%= plugins.pluginModules[plugin].description %> -
- 		- <% if (plugins.plugins[plugin] !== undefined) { %> - Installed - <% } else { %> - Not installed - <% } %> - - <% if (plugins.plugins[plugin] !== undefined) { %> - Uninstall - Reinstall - <% if (plugins.plugins[plugin].configLink !== undefined) { %> - Configure - <% } %> - <% } else { %> - Install - <% } %> -
-
-
-
+<% template.define('docBarItems', function() { var ejs_data=''; %> + <%: plugins.callHookStr('docbarItemsPluginManager', {}, '', '', ''); %> +<% return ejs_data; }); %> -
-
-
+<% template.define('contentArea', function() { var ejs_data=''; %> +
+ + + + + + + <% for (var plugin in plugins.pluginModules) { %> + + + + + + <% } %> +
Module nameStatus
+ <%= plugin %> +
+ <%= plugins.pluginModules[plugin].description %> +
+ 		+ <% if (plugins.plugins[plugin] !== undefined) { %> + Installed + <% } else { %> + Not installed + <% } %> + + <% if (plugins.plugins[plugin] !== undefined) { %> + Uninstall + Reinstall + <% if (plugins.plugins[plugin].configLink !== undefined) { %> + Configure + <% } %> + <% } else { %> + Install + <% } %> +
-
-
+<% return ejs_data; }); %> -- cgit v1.2.3