From 631235e269a0e913207cf17f38855eb156e21f75 Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
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')

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=''; %>
+  <td id="docbarpadtitle"><span><%= initialTitle %></span></td>
+<% return ejs_data; }); %>
+
+
 <% template.define('docBarTitleEditor', function() { var ejs_data=''; %>
   <% if (isProAccountHolder) { %>          
     <div id="docbarrenamelink">
@@ -69,6 +74,7 @@ limitations under the License. */ %>
 
 
 <% template.define('docBarItems', function() { var ejs_data=''; %>
+  <%: plugins.callHookStr('docbarItemsPad', {}, '', '<td class="docbarbutton">', '</td>'); %>
   <% if (isProAccountHolder) { %> 
     <td id="docbarsecurity-outer" class="docbarbutton">
       <a href="javascript:void(0)" id="docbarsecurity">
diff --git a/etherpad/src/themes/default/templates/page.ejs b/etherpad/src/themes/default/templates/page.ejs
index 7dd36ad..f28a75d 100644
--- a/etherpad/src/themes/default/templates/page.ejs
+++ b/etherpad/src/themes/default/templates/page.ejs
@@ -70,16 +70,12 @@ limitations under the License. */ %>
       </div>
 
       <div id="docbar">
-        <%: template.use('docBarTitle'); %>
 	<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><%= initialTitle %></span></td>
+            <%: template.use('docBarTitle'); %>
 	    <td width="100%">&nbsp;</td>
-	    <%
-	      plugins.callHookStr('docbarItemsAll', {}, '', '<td class="docbarbutton">', '</td>');
-	      plugins.callHookStr('docbarItemsPad', {}, '', '<td class="docbarbutton">', '</td>');
-	    %>
+	    <%: plugins.callHookStr('docbarItemsAll', {}, '', '<td class="docbarbutton">', '</td>'); %>
             <%: template.use('docBarItems'); %>
 	    <td><img src="/static/img/jun09/pad/roundcorner_right_orange.gif"></td>
 	  </tr>
-- 
cgit v1.2.3-1-g7c22