From 80333d8e0a60017b5625ac885ff66a41d5ef01b8 Mon Sep 17 00:00:00 2001
From: spcsser <swen.jung@psx-technology.com>
Date: Sun, 27 Jan 2013 23:02:27 +0100
Subject: [PATCH] Added ability to add menu entries for admin pages.

---
 src/static/css/admin.css              |  1 +
 src/templates/admin/index.html        |  5 +++--
 src/templates/admin/plugins-info.html | 10 +++++++---
 src/templates/admin/plugins.html      | 13 ++++++++-----
 src/templates/admin/settings.html     | 10 +++++++---
 5 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index 3a7291516..9ea02744f 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -42,6 +42,7 @@ div.innerwrapper {
   border-radius: 0 0 7px 7px;
   margin-left:250px;
   min-width:400px;
+  width:100%;
 }
 
 #wrapper {
diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html
index 16ea84279..8827f1957 100644
--- a/src/templates/admin/index.html
+++ b/src/templates/admin/index.html
@@ -9,12 +9,13 @@
   <body>
     <div id="wrapper">
       <div class="menu">
-        <h1>Etherpad lite</h1> 
+        <h1>Etherpad lite</h1>
+        <% e.begin_block("adminMenu");  %>
         <li><a href="admin/plugins">Plugin manager</a> </li>
         <li><a href="admin/settings">Settings</a> </li>
         <li><a href="admin/plugins/info">Troubleshooting information</a> </li>
+        <% e.end_block(); %>
       </div>
-
     </div>
     <div id="topborder"></div>
   </body>
diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html
index 605b23d38..648e7d6d0 100644
--- a/src/templates/admin/plugins-info.html
+++ b/src/templates/admin/plugins-info.html
@@ -12,9 +12,13 @@
     <div id="wrapper">
       <div class="menu">
         <h1>Etherpad lite</h1> 
-        <li><a href="../plugins">Plugin manager</a> </li>
-        <li><a href="../settings">Settings</a> </li>
-        <li><a href="../plugins/info">Troubleshooting information</a> </li>
+        <ul>
+          <% e.begin_block("adminMenu"); %>
+          <li><a href="../plugins">Plugin manager</a> </li>
+          <li><a href="../settings">Settings</a> </li>
+          <li><a href="../plugins/info">Troubleshooting information</a> </li>
+          <% e.end_block(); %>
+        </ul>
       </div>
 
       <div class="innerwrapper">
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index a85db557a..bfe535e7e 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -19,11 +19,14 @@
       <% } %>
 
        <div class="menu">
-        <h1>Etherpad lite</h1> 
-        <li><a href="plugins">Plugin manager</a> </li>
-        <li><a href="settings">Settings</a> </li>
-        <li><a href="plugins/info">Troubleshooting information</a> </li>
-        
+        <h1>Etherpad lite</h1>
+        <ul> 
+          <% e.begin_block("adminMenu"); %>
+          <li><a href="plugins">Plugin manager</a> </li>
+          <li><a href="settings">Settings</a> </li>
+          <li><a href="plugins/info">Troubleshooting information</a> </li>
+          <% e.end_block(); %>
+        </ul>
         <div id="progress"><img src="../static/img/loading.gif" alt=""/>&nbsp;&nbsp;<span class="message"></span></div>
       </div>
 
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html
index be262f243..0fb1c9ae1 100644
--- a/src/templates/admin/settings.html
+++ b/src/templates/admin/settings.html
@@ -24,9 +24,13 @@
 
       <div class="menu">
         <h1>Etherpad lite</h1> 
-        <li><a href="plugins">Plugin manager</a> </li>
-        <li><a href="settings">Settings</a> </li>
-        <li><a href="plugins/info">Troubleshooting information</a> </li>
+        <ul>
+          <% e.begin_block("adminMenu"); %>
+          <li><a href="plugins">Plugin manager</a> </li>
+          <li><a href="settings">Settings</a> </li>
+          <li><a href="plugins/info">Troubleshooting information</a> </li>
+          <% e.end_block(); %>
+        </ul>
       </div>
 
       <div class="innerwrapper">
