Skip to content

Commit

Permalink
issue #987 new header/menubar/footer for admin pages
Browse files Browse the repository at this point in the history 
only works fine for "day" mode, not for "night" mode yet
  • Loading branch information
@plegall
plegall committed Mar 15, 2019
1 parent 466a479 commit 6f1b75d
Show file tree
Hide file tree
Showing 6 changed files with 167 additions and 112 deletions.
79 changes: 38 additions & 41 deletions admin/themes/clear/theme.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ padding-bottom: 15px; }
}
html, body {
min-height: 100%;
background-color: #f9f9f9;
background-color: #fff;
}

/* #the_page { margin: 0; padding: 0; z-index: 1; top:0px; */
Expand All @@ -68,11 +68,11 @@ h3, .throw, .row1 { background-color: #ddd; }
.row2 { background-color:#eeeeee; }

#content {
background: #f1f1f1;
border: 1px solid #f9f9f9;
background: #fff;
border: none;
min-height: 467px;
margin-left:217px;
margin-top: 7px;
margin-left:205px;
margin-top: 0;
}

.content h3 { font-size:20px; letter-spacing:-0.4px; margin:0 20px 12px 0;
Expand Down Expand Up @@ -147,57 +147,54 @@ ul.actions, .content form#waiting {text-align:center;}
}

/* tabsheets are often used in admin pages => No specific css files */
#tabsheet { width:auto; margin:-1px; margin-right:-6px; padding:0;
border:1px solid #f9f9f9; border-bottom:1px solid #aaa; background-color:#f9f9f9;margin-top:-7px;}
.tabsheet { display:table; white-space:nowrap; padding-left:10px; margin:0; width:auto;
font-family:verdana,arial,helvetica,sans-serif; font-size:8px;
list-style-type:none; list-style-image:none; text-decoration:none; }
.tabsheet li { background:#f1f1f1; float:left; margin:0 6px 0 0; overflow:hidden; text-align:right; border:1px solid #aaa; border-bottom:none; position:relative; top:11px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px;-webkit-border-top-left-radius:5px; -webkit-border-top-right-radius:5px;border-radius:5px 5px 0 0;}
#tabsheet {
width:auto;
margin:0 0 20px 0;
padding:0 0 0 10px;
border:none;
border:none;
background-color:#f3f3f3;
}
.tabsheet {
display:table;
white-space:nowrap;
padding-left:10px;
margin:0;
width:auto;
list-style-type:none;
list-style-image:none;
text-decoration:none;
}
.tabsheet li {
background-color: transparent;
float:left;
margin:0 6px 0 0;
overflow:hidden;
text-align:right;
border:none;
position:relative;
top:11px;
border-radius:5px 5px 0 0;
}
.tabsheet a {
display:block; font-size:11px; border:0;
font-weight:bold; overflow:hidden; padding:6px;
font-weight:bold; overflow:hidden; padding:10px 20px;
text-align:right; text-decoration:none; margin: 0; }
.tabsheet a:first-letter { text-transform:capitalize; }
.tabsheet li.selected_tab {
border-bottom:1px solid #f1f1f1;
border-bottom:none;
background-color: #fff;
}
.tabsheet li:hover, .tabsheet li.selected_tab {
margin-top:4px; padding-bottom:3px; padding-top:3px; top:1px;
}
/* .tabsheet a:hover */
.tabsheet li.selected_tab a { color: #555; }
.tabsheet a span { font-size:10px; margin-right:2px; padding:0 3px 0 1px; }
.tabsheet a span { font-size:14px; margin-right:2px; padding:0 3px 0 1px; }

.sort { clear: none; }

/* menubar is on all admin pages => No specific css file */
#menubar {
padding:0; width:207px; z-index:99; text-align: left;margin-top:7px;
margin-left:0;
}

#menubar ul.scroll { overflow-y:auto; max-height:500px; }
#menubar dl { width: 200px; min-height:35px; border:0; margin: 0; padding: 0; display: block; border:0; background-color:#444; border-left:none; }
#menubar dd { margin: 0; padding: 0; }
#menubar dt {
background-color: #333; margin: 0; display: block; font-weight:bold;
position:relative; padding: 5px 1px 4px 5px; font-size: 13px; color: #aaa;
cursor:pointer;
}
#menubar dl:first-of-type, #menubar dl:first-of-type dt { border-radius:0; }
#menubar dl:last-of-type { border-radius:0; }
#menubar li { margin: 0; padding-left:10px; }
#menubar li A { display:block; color:#ccc }
#menubar li A:hover {color:#eee; text-decoration:none}
#menubar li:hover {background-color:#222;}
#menubar ul { color: #ccc; margin:0; line-height: 25px;
list-style-type: none; list-style-position: inside; padding: 0; }
#adminHome {background-color:#333;border-radius: 0;margin-left:0;margin-bottom:17px;}
#adminHome:hover {background-color:#f70;}
#adminHome A {color:#aaa}
#adminHome:hover A {color:#fff}

#menubar i {font-size:14px;}

/* jQuery tooltips */
.ui-tooltip {
Expand Down
14 changes: 14 additions & 0 deletions admin/themes/default/images/piwigo-grey.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 12 additions & 6 deletions admin/themes/default/template/admin.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,18 @@ jQuery(document).ready(function() {
jQuery("."+boxType+" .eiw-icon").css("margin-right", "20px");
}
}

var page_title = jQuery('h2').html();
jQuery('h1').html(page_title);
jQuery('h2, .titrePage').hide();
});
{/footer_script}

<div id="menubar">
<div id="adminHome"><a href="{$U_ADMIN}"><i class="icon-television"></i> {'Dashboard'|@translate}</a></div>

<dl>
<dt><i class="icon-picture"> </i><span>{'Photos'|@translate}&nbsp;</span></dt>
<dt><i class="icon-picture"> </i><span>{'Photos'|@translate}&nbsp;</span><i class="icon-down-open open-menu"></i></dt>
<dd>
<ul>
<li><a href="{$U_ADD_PHOTOS}"><i class="icon-plus-circled"></i>{'Add'|@translate}</a></li>
Expand All @@ -63,7 +67,7 @@ jQuery(document).ready(function() {
</dd>
</dl>
<dl>
<dt><i class="icon-sitemap"> </i><span>{'Albums'|@translate}&nbsp;</span></dt>
<dt><i class="icon-sitemap"> </i><span>{'Albums'|@translate}&nbsp;</span><i class="icon-down-open open-menu"></i></dt>
<dd>
<ul>
<li><a href="{$U_CATEGORIES}"><i class="icon-folder-open"></i>{'Manage'|@translate}</a></li>
Expand All @@ -72,7 +76,7 @@ jQuery(document).ready(function() {
</dd>
</dl>
<dl>
<dt><i class="icon-users"> </i><span>{'Users'|@translate}&nbsp;</span></dt>
<dt><i class="icon-users"> </i><span>{'Users'|@translate}&nbsp;</span><i class="icon-down-open open-menu"></i></dt>
<dd>
<ul>
<li><a href="{$U_USERS}"><i class="icon-user-add"></i>{'Manage'|@translate}</a></li>
Expand All @@ -82,7 +86,7 @@ jQuery(document).ready(function() {
</dd>
</dl>
<dl>
<dt><i class="icon-puzzle"> </i><span>{'Plugins'|@translate}&nbsp;</span></dt>
<dt><i class="icon-puzzle"> </i><span>{'Plugins'|@translate}&nbsp;</span><i class="icon-down-open open-menu"></i></dt>
<dd>
<ul>
<li><a href="{$U_PLUGINS}"><i class="icon-equalizer"></i>{'Manage'|@translate}</a></li>
Expand All @@ -98,7 +102,7 @@ jQuery(document).ready(function() {
</dd>
</dl>
<dl>
<dt><i class="icon-wrench"> </i><span>{'Tools'|@translate}&nbsp;</span></dt>
<dt><i class="icon-wrench"> </i><span>{'Tools'|@translate}&nbsp;</span><i class="icon-down-open open-menu"></i></dt>
<dd>
<ul>
{if $ENABLE_SYNCHRONIZATION}
Expand All @@ -118,7 +122,7 @@ jQuery(document).ready(function() {
</dd>
</dl>
<dl>
<dt><i class="icon-cog"> </i><span>{'Configuration'|@translate}&nbsp;</span></dt>
<dt><i class="icon-cog"> </i><span>{'Configuration'|@translate}&nbsp;</span><i class="icon-down-open open-menu"></i></dt>
<dd>
<ul>
<li><a href="{$U_CONFIG_GENERAL}"><i class="icon-cog-alt"></i>{'Options'|@translate}</a></li>
Expand All @@ -133,6 +137,8 @@ jQuery(document).ready(function() {

<div id="content" class="content">

<h1>Piwigo Administration Page</h1>

{if isset($TABSHEET)}
{$TABSHEET}
{/if}
Expand Down
9 changes: 1 addition & 8 deletions admin/themes/default/template/footer.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,7 @@
{/if}

<div id="footer">
<div id="piwigoInfos">
{'Powered by'|translate}
<a class="externalLink tiptip" href="{$PHPWG_URL}" title="{'Visit Piwigo project website'|translate}"><span class="Piwigo">Piwigo</span></a>
{$VERSION}
<a class="externalLink tiptip" href="{$pwgmenu.WIKI}" title="{'Read Piwigo Documentation'|translate}"><i class="icon-book"></i>{'Documentation'|translate}</a>
<a class="externalLink tiptip" href="{$pwgmenu.FORUM}" title="{'Get Support on Piwigo Forum'|translate}"><i class="icon-lifebuoy"></i>{'Support'|translate}</a>
</div>

<a class="externalLink tiptip piwigo-logo" href="{$PHPWG_URL}" title="{'Visit Piwigo project website'|translate}"><img src="admin/themes/default/images/piwigo-grey.svg"></a>
<div id="pageInfos">
{if isset($debug.TIME) }
{'Page generated in'|translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|translate} {$debug.SQL_TIME}) -
Expand Down
13 changes: 5 additions & 8 deletions admin/themes/default/template/header.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<meta charset="{$CONTENT_ENCODING}">
<title>{$GALLERY_TITLE} :: {$PAGE_TITLE}</title>
<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/default/fonts/open-sans/open-sans.css">

{strip}
{combine_css path="admin/themes/default/fontello/css/fontello.css" order=-10}
Expand Down Expand Up @@ -52,18 +53,14 @@
{/if}

<div id="pwgHead">
{strip}
<h1>
<a href="{$U_RETURN}" title="{'Visit Gallery'|translate}" class="tiptip">
<span class="icon-home"></span>
{$GALLERY_TITLE}
</a>
</h1>
{/strip}
<a href="{$U_RETURN}" class="visit-gallery tiptip" title="{'Visit Gallery'|translate}"><i class="icon-left-open"></i>Visit</a>
<div class="pwgHead-gallery-title">{$GALLERY_TITLE}</div>

<div id="headActions">
<i class="icon-user"></i>{$USERNAME}
{*
<a href="{$U_RETURN}" title="{'Visit Gallery'|translate}"><i class="icon-eye"></i><span>{'Visit Gallery'|translate}</span></a>
*}

{strip}
<a href="{$U_CHANGE_THEME}" class="tiptip" title="{'Switch to clear or dark colors for administration'|translate}">
Expand Down
Loading

0 comments on commit 6f1b75d

Please sign in to comment.