Skip to content

Commit

Permalink
feature 1515: new organization for menu. Photos, Categories, Users, P…
Browse files Browse the repository at this point in the history 
…lugins,

Tools, Configuration.

menubar bottom is ugly with the roma theme, it needs a fix.

git-svn-id: http://piwigo.org/svn/trunk@5170 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
@plegall
plegall committed Mar 17, 2010
1 parent 61b6e99 commit 3f2eb3a
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 33 deletions.
6 changes: 4 additions & 2 deletions admin/themes/clear/theme.css
View file
Expand Up @@ -127,7 +127,7 @@ margin-top:4px; padding-bottom:3px; padding-top:3px; top:1px;
#menubar {
display:inline; float:left; left:0; margin: 10px 0 0 10px; min-height:475px; height:475px; /* should be 477 */
padding:0; width:207px; z-index:99; text-align: left; }
#menubar ul.scroll { height:163px; margin-right:10px; overflow-y:auto;
#menubar ul.scroll { height:163px; overflow-y:auto;
/* Only IE family supports colored scrollbar */
scrollbar-face-color: #ddd; scrollbar-shadow-color: #bbb; scrollbar-highlight-color: #fff;
scrollbar-3dlight-color: #d6d6d6; scrollbar-darkshadow-color: #ccc; scrollbar-track-color: #eee;
Expand Down Expand Up @@ -207,4 +207,6 @@ html>body #menubar {min-height:477px; height:477px;} /* IE 7 and modern browsers
.themeBox IMG {border:1px solid white;}
.themeName {color:black;}
#themesContent H3 {border-bottom:1px solid #aaa;}
.themeDefault {background-color:#dbe8f3;}
.themeDefault {background-color:#dbe8f3;}

#pluginsMenuSeparator {border:1px solid #ddd;}
2 changes: 2 additions & 0 deletions admin/themes/default/default-layout.css
View file
Expand Up @@ -750,3 +750,5 @@ BODY#thePopuphelpPage {

h2 { letter-spacing:2px; font-weight:bold;}
h2:lang(en) { text-transform:capitalize; }

#pluginsMenuSeparator {width:80%; margin:5px auto;}
65 changes: 36 additions & 29 deletions admin/themes/default/template/admin.tpl
View file
Expand Up @@ -15,14 +15,15 @@ jQuery().ready(function(){ldelim}
<div id="menubar">
<div id="adminHome"><a href="{$U_ADMIN}">Administration Home</a></div>
<dl class="first">
<dt class="rdion"><span>{'Configuration'|@translate}&nbsp;</span></dt>
<dt class="rdion"><span>{'Photos'|@translate}&nbsp;</span></dt>
<dd>
<ul>
<li><a href="{$U_CONFIG_GENERAL}">{'General'|@translate}</a></li>
<li><a href="{$U_CONFIG_DISPLAY}">{'Default display'|@translate}</a></li>
<li><a href="{$U_CONFIG_MENUBAR}">{'Menu'|@translate}</a></li>
<li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>
<li><a href="{$U_CONFIG_THEMES}">{'Themes'|@translate}</a></li>
<li><a href="{$U_ADD_PHOTOS}">{'Add'|@translate}</a></li>
<li><a href="{$U_WAITING}">{'Waiting'|@translate}</a></li>
<li><a href="{$U_RATING}">{'Rating'|@translate}</a></li>
<li><a href="{$U_TAGS}">{'Tags'|@translate}</a></li>
<li><a href="{$U_CADDIE}">{'Caddie'|@translate}</a></li>
<li><a href="{$U_RECENT_SET}">{'Recent pictures'|@translate}</a></li>
</ul>
</dd>
</dl>
Expand All @@ -40,45 +41,51 @@ jQuery().ready(function(){ldelim}
</dd>
</dl>
<dl>
<dt class="rdion"><span>{'Pictures'|@translate}&nbsp;</span></dt>
<dt class="rdion"><span>{'Users'|@translate}&nbsp;</span></dt>
<dd>
<ul>
<li><a href="{$U_ADD_PHOTOS}">{'Add'|@translate}</a></li>
<li><a href="{$U_WAITING}">{'Waiting'|@translate}</a></li>
<li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li>
<li><a href="{$U_RATING}">{'Rating'|@translate}</a></li>
<li><a href="{$U_TAGS}">{'Tags'|@translate}</a></li>
<li><a href="{$U_CADDIE}">{'Caddie'|@translate}</a></li>
<li><a href="{$U_RECENT_SET}">{'Recent pictures'|@translate}</a></li>
<li><a href="{$U_USERS}">{'Manage'|@translate}</a></li>
<li><a href="{$U_GROUPS}">{'Groups'|@translate}</a></li>
<li><a href="{$U_NOTIFICATION_BY_MAIL}">{'Notification'|@translate}</a></li>
</ul>
</dd>
</dl>
<dl>
<dt class="rdion"><span>{'Identification'|@translate}&nbsp;</span></dt>
<dt class="rdion"><span>{'Plugins'|@translate}&nbsp;</span></dt>
<dd>
<ul>
<li><a href="{$U_USERS}">{'Users'|@translate}</a></li>
<li><a href="{$U_GROUPS}">{'Groups'|@translate}</a></li>
<li><a href="{$U_NOTIFICATION_BY_MAIL}">{'Notification'|@translate}</a></li>
<li><a href="{$U_PLUGINS}">{'Manage'|@translate}</a></li>
</ul>
<div id="pluginsMenuSeparator"></div>
{if !empty($plugin_menu_items)}
<ul class="scroll">
{foreach from=$plugin_menu_items item=menu_item}
<li><a href="{$menu_item.URL}">{$menu_item.NAME}</a></li>
{/foreach}
</ul>
{/if}
</dd>
</dl>
<dl class="last">
<dt class="rdion"><span>{'Specials'|@translate}&nbsp;</span></dt>
<dl>
<dt class="rdion"><span>{'Tools'|@translate}&nbsp;</span></dt>
<dd>
<ul>
<li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
<li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li>
<li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
<li><a href="{$U_ADVANCED_FEATURE}">{'Advanced features'|@translate}</a></li>
<li><a href="{$U_PLUGINS}">{'Plugins'|@translate}</a>
{if !empty($plugin_menu_items)}
<ul class="scroll">
{foreach from=$plugin_menu_items item=menu_item}
<li><a href="{$menu_item.URL}">{$menu_item.NAME}</a></li>
{/foreach}
</ul>
{/if}
</li>
</ul>
</dd>
</dl>
<dl class="last">
<dt class="rdion"><span>{'Configuration'|@translate}&nbsp;</span></dt>
<dd>
<ul>
<li><a href="{$U_CONFIG_GENERAL}">{'General'|@translate}</a></li>
<li><a href="{$U_CONFIG_DISPLAY}">{'Default display'|@translate}</a></li>
<li><a href="{$U_CONFIG_MENUBAR}">{'Menu'|@translate}</a></li>
<li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>
<li><a href="{$U_CONFIG_THEMES}">{'Themes'|@translate}</a></li>
</ul>
</dd>
</dl>
Expand Down
5 changes: 3 additions & 2 deletions admin/themes/roma/theme.css
View file
Expand Up @@ -136,7 +136,7 @@ margin-top:4px; padding-bottom:3px; padding-top:3px; top:1px;
background:transparent url(images/menuBoxBottom_new.png) no-repeat scroll left bottom;
border:0; display:inline; float:left; left:0; margin: 10px 0 0 10px; min-height:475px; height:475px; /* should be 477 */
padding:0; width:230px; z-index:99; text-align: left; }
#menubar ul.scroll { height:163px; margin-right:10px; overflow-y:auto;
#menubar ul.scroll { height:163px; overflow-y:auto;
/* Only IE family supports colored scrollbar */
scrollbar-face-color: #222; scrollbar-shadow-color: #444; scrollbar-highlight-color: #000;
scrollbar-3dlight-color: #292929; scrollbar-darkshadow-color: #333; scrollbar-track-color: #111;
Expand Down Expand Up @@ -219,5 +219,6 @@ html>body #menubar {min-height:477px; height:477px;} /* IE 7 and modern browsers
.themeBox IMG {border:1px solid #666;}
.themeName {color:white;}
.themeActions A {border-bottom:none;}
.themeDefault {background-color:#555;}

.themeDefault {background-color:#555;}
#pluginsMenuSeparator {border:1px solid #333;}

0 comments on commit 3f2eb3a

Please sign in to comment.