From cea4f12be4b9d3f95dd21fb297694d89cdb45e4b Mon Sep 17 00:00:00 2001
From: Garvin Hicking <mail@garv.in>
Date: Thu, 9 Aug 2007 09:31:29 +0000
Subject: [PATCH] Upport

---
 serendipity_admin.php             | 15 +++++++++++----
 templates/default/admin/index.tpl | 14 +++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/serendipity_admin.php b/serendipity_admin.php
index ee088616..71aa299f 100644
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@@ -360,15 +360,16 @@ if ($use_installer) {
     if (!$no_sidebar) { ?>
                 <td id="serendipitySideBar">
                     <ul class="serendipitySideBarMenu serendipitySideBarMenuMain">
+                        <li class="serendipitySideBarMenuHead serendipitySideBarMenuMainLinks" style="display:none"></li>
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuMainLinks serendipitySideBarMenuMainFrontpage"><a href="serendipity_admin.php"><?php echo ADMIN_FRONTPAGE; ?></a></li>
 <?php if (serendipity_checkPermission('personalConfiguration')) { ?>
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuMainLinks serendipitySideBarMenuMainPersonal"><a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a></li>
 <?php } ?>
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuMainLinks" style="display:none"></li>
                     </ul>
                     <br class="serendipitySideBarMenuSpacer" />
-
-                    <ul class="serendipitySideBarMenu serendipitySideBarMenuEntry">
 <?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?>
+                    <ul class="serendipitySideBarMenu serendipitySideBarMenuEntry">
                         <li class="serendipitySideBarMenuHead serendipitySideBarMenuEntryLinks"><?php echo ADMIN_ENTRIES ?></li>
 <?php if (serendipity_checkPermission('adminEntries')) { ?>
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li>
@@ -383,9 +384,10 @@ if ($use_installer) {
 <?php if (serendipity_checkPermission('adminEntries') || serendipity_checkPermission('adminEntriesPlugins')) { ?>
                         <?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?>
 <?php } ?>
-<?php } ?>
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuEntryLinks" style="display:none"></li>
                     </ul>
-
+<?php } ?>
+                    
 <?php if (serendipity_checkPermission('adminImages')) { ?>
                     <ul class="serendipitySideBarMenu serendipitySideBarMenuMedia">
                         <li class="serendipitySideBarMenuHead serendipitySideBarMenuMediaLinks"><?php echo MEDIA; ?></li>
@@ -402,6 +404,7 @@ if ($use_installer) {
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li>
 <?php } ?>
                         <?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?>
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuMediaLinks" style="display:none"></li>
                     </ul>
 <?php } ?>
 <?php if (serendipity_checkPermission('adminTemplates') || serendipity_checkPermission('adminPlugins')) { ?>
@@ -414,6 +417,7 @@ if ($use_installer) {
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuAppearanceLinks"><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li>
 <?php } ?>
                         <?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?>
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuAppearance" style="display:none"></li>
                     </ul>
 <?php } ?>
 <?php if (serendipity_checkPermission('siteConfiguration') || serendipity_checkPermission('blogConfiguration') || serendipity_checkPermission('adminUsers') || serendipity_checkPermission('adminUsersGroups') || serendipity_checkPermission('adminImport')) { ?>
@@ -433,13 +437,16 @@ if ($use_installer) {
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li>
 <?php } ?>
                         <?php if ($serendipity['no_create'] !== true) serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?>
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuUserManagement" style="display:none"></li>
                     </ul>
 <?php } ?>
                     <br class="serendipitySideBarMenuSpacer" />
 
                     <ul class="serendipitySideBarMenu serendipitySideBarMenuLogout">
+                        <li class="serendipitySideBarMenuHead serendipitySideBarMenuLogoutLinks" style="display:none"></li>
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks serendipitySideBarMenuLogoutWeblog"><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li>
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks serendipitySideBarMenuLogoutLogout"><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li>
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuLogoutLinks" style="display:none"></li>
                     </ul>
 
                 </td>
diff --git a/templates/default/admin/index.tpl b/templates/default/admin/index.tpl
index a3bde233..c9612230 100644
--- a/templates/default/admin/index.tpl
+++ b/templates/default/admin/index.tpl
@@ -117,17 +117,19 @@
 
     {*** MAIN LINKS START ***}
                     <ul class="serendipitySideBarMenu serendipitySideBarMenuMain">
+                        <li class="serendipitySideBarMenuHead serendipitySideBarMenuMainLinks" style="display:none"></li>
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuMainLinks serendipitySideBarMenuMainFrontpage"><a href="serendipity_admin.php">{$CONST.ADMIN_FRONTPAGE}</a></li>
                         {if 'personalConfiguration'|checkPermission}
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuMainLinks serendipitySideBarMenuMainPersonal"><a href="serendipity_admin.php?serendipity[adminModule]=personal">{$CONST.PERSONAL_SETTINGS}</a></li>
                         {/if}
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuMainLinks" style="display:none"></li>
                     </ul>
                     <br class="serendipitySideBarMenuSpacer" />                                                                                             
     {*** MAIN LINKS END ***}
 
     {*** ENTRY LINKS START ***}
-                    <ul class="serendipitySideBarMenu serendipitySideBarMenuEntry">
                     {if 'adminEntries'|checkPermission OR 'adminEntriesPlugins'|checkPermission}
+                    <ul class="serendipitySideBarMenu serendipitySideBarMenuEntry">
                         <li class="serendipitySideBarMenuHead serendipitySideBarMenuEntryLinks">{$CONST.ADMIN_ENTRIES}</li>
                         {if 'adminEntries'|checkPermission}
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuEntryLinks"><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new">{$CONST.NEW_ENTRY}</a></li>
@@ -145,9 +147,10 @@
                         {if 'adminEntries'|checkPermission OR 'adminEntriesPlugins'|checkPermission}
                         {if $admin_vars.no_create !== true} {serendipity_hookPlugin hook="backend_sidebar_entries" hookAll="true"}{/if}
                         {/if}
-                    {/if}
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuEntryLinks" style="display:none"></li>
                     </ul>
-    {*** ENTRY LINKS END ***}
+                    {/if}
+                    {*** ENTRY LINKS END ***}
 
     {*** MEDIA LINKS START ***}
         {if 'adminImages'|checkPermission}
@@ -166,6 +169,7 @@
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuMediaLinks"><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=sync" onclick="return confirm('{$CONST.WARNING_THIS_BLAHBLAH}');">{$CONST.CREATE_THUMBS}</a></li>
                         {/if}
                         {if $admin_vars.no_create !== true} {serendipity_hookPlugin hook="backend_sidebar_entries_images" hookAll="true"}{/if}
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuMediaLinks" style="display:none"></li>
                     </ul>
         {/if}
     {*** MEDIA LINKS END ***}
@@ -181,6 +185,7 @@
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuAppearanceLinks"><a href="serendipity_admin.php?serendipity[adminModule]=plugins">{$CONST.CONFIGURE_PLUGINS}</a></li>
                         {/if}
                         {if $admin_vars.no_create !== true} {serendipity_hookPlugin hook="backend_sidebar_admin_appearance" hookAll="true"}{/if}
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuAppearance" style="display:none"></li>
                     </ul>
         {/if}
     {*** APPEARANCE END ***}
@@ -203,6 +208,7 @@
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuUserManagementLinks"><a href="serendipity_admin.php?serendipity[adminModule]=export">{$CONST.EXPORT_ENTRIES}</a></li>
                         {/if}
                         {if $admin_vars.no_create !== true} {serendipity_hookPlugin hook="backend_sidebar_admin" hookAll="true"}{/if}
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuUserManagement" style="display:none"></li>
                     </ul>
         {/if}
     {*** USER MANAGEMENT END ***}
@@ -210,8 +216,10 @@
     {*** LOGOUT START ***}
                     <br class="serendipitySideBarMenuSpacer" />                                                                                             
                     <ul class="serendipitySideBarMenu serendipitySideBarMenuLogout">
+                        <li class="serendipitySideBarMenuHead serendipitySideBarMenuLogoutLinks" style="display:none"></li>
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks serendipitySideBarMenuLogoutWeblog"><a href="{$serendipityBaseURL}">{$CONST.BACK_TO_BLOG}</a></li>
                         <li class="serendipitySideBarMenuLink serendipitySideBarMenuLogoutLinks serendipitySideBarMenuLogoutLogout"><a href="serendipity_admin.php?serendipity[adminModule]=logout">{$CONST.LOGOUT}</a></li>
+                        <li class="serendipitySideBarMenuFoot serendipitySideBarMenuLogoutLinks" style="display:none"></li>
                     </ul>
     {*** LOGOUT END ***}