list.rhtml in Pimki-1.4.092

- old
+ new

@@ -1,25 +1,26 @@
 <% @title = "All Pages" %>
 <%= sub_template "top" %>
 
 <% unless @categories.empty? %>
 <div id="categories">
-  <strong>Categories</strong>:
+  <p><strong>Categories</strong>:
   
   <% if @params["category"].nil? %>
-    [Any]
+    [<span class='selected'>Any</span>]
   <% else %>
     <a href=".">Any</a>
   <% end %>
   
   <% if @params["category"] == 'none' %>
-    [None]
+    [<span class='selected'>None</span>]
   <% else %>
     <a href="?category=none">None</a>
   <% end %>
 
   <%= @category_links.join(', ') %>
+  </p>
 </div>
 <% end %>
 
 <div id="listsContainer" style="float: left; width: 300px;">
   <% unless @pages_that_are_orphaned.empty? && @page_names_that_are_wanted.empty? %>
@@ -101,12 +102,17 @@
 
   <!-- hr -->
   <h2>Page Administration</h2>
     
   <table border="0" style="font-size:10px">
-    <!-- Delete Page -->
-    <form class="navigation" action="list/" action="get" onSubmit="return validateSelection('sel_delete') && verifyDelete();">
+    <form class="navigation" action="list/" action="get">
+      <% if @web.check_pass_on_edit %>
+        <tr>
+          <td colspan="2">Enter edit Password <input type="password" name="password" id="password" size="11"> and...</td>
+        </tr>
+      <% end %>
+      <!-- Delete Page -->
       <tr>
         <td>Delete page:</td>
         <td><select id="sel_delete" name="sel_page_name" size="1" style="width:195">
               <option value="noselect">------------</option>
               <% for page in @pages_by_name %>
@@ -116,16 +122,14 @@
         </td>
       </tr>
       <tr>
         <td>&nbsp;</td>
         <td align="right">
-          <input type="submit" name="Action" value="Delete">
+          <input type="submit" name="Action" value="Delete" onClick="return validateSelection('sel_delete') && verifyDelete();">
         </td>
       </tr>
-    </form>
-    <!-- Rename Page -->
-    <form class="navigation" action="../list/" action="get" onSubmit="return validateSelection('sel_rename') && verifyRename() && validatePageName('ren_newpage');">
+      <!-- Rename Page -->
       <tr>
         <td>Rename:</td>
         <td><select id="sel_rename" name="sel_page_name" size="1" style="width:195">
               <option value="noselect">------------</option>
               <% for page in @pages_by_name %>
@@ -141,25 +145,23 @@
         </td>
       </tr>
       <tr>
         <td>&nbsp;</td>
         <td  align="right">
-          <input type="submit" name="Action" value="Rename">
+          <input type="submit" name="Action" value="Rename" onClick="return validateSelection('sel_rename') && verifyRename() && validatePageName('ren_newpage');">
         </td>
       </tr>
-    </form>
-    <!-- Create Page -->
-    <form class="navigation" action="../list/" action="get" onSubmit="return validatePageName('newpage');">
+      <!-- Create Page -->
       <tr>
         <td>Create New Page:</td>
         <td>
-          <input type="text" name="newpage" id="newpage"  size="28">
+          <input type="text" name="newpage" id="newpage" size="28">
         </td>
       </tr>
       <tr>
         <td>&nbsp;</td>
         <td  align="right">
-          <input type="submit" name="Action" value="Create">
+          <input type="submit" name="Action" value="Create" onClick="return validatePageName('newpage');">
         </td>
         </td>
       </tr>
     </form>
   </table>