diff options
Diffstat (limited to '')
20 files changed, 123 insertions, 127 deletions
diff --git a/template/yoga/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl index f9087648a..e6186d551 100644 --- a/template/yoga/admin/cat_options.tpl +++ b/template/yoga/admin/cat_options.tpl @@ -1,10 +1,10 @@ {* $Id$ *} <div class="titrePage"> + {$TABSHEET} <ul class="categoryActions"> <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li> </ul> <h2>{'cat_options_title'|@translate} {$TABSHEET_TITLE}</h2> - {$TABSHEET} </div> <form method="post" action="{$F_ACTION}" id="cat_options"> diff --git a/template/yoga/admin/comments.tpl b/template/yoga/admin/comments.tpl index 84b1677c6..1c7df910e 100644 --- a/template/yoga/admin/comments.tpl +++ b/template/yoga/admin/comments.tpl @@ -1,7 +1,7 @@ {* $Id$ *} <div class="titrePage"> - <h2>{'waiting'|@translate} {$TABSHEET_TITLE}</h2> {$TABSHEET} + <h2>{'waiting'|@translate} {$TABSHEET_TITLE}</h2> </div> <h3>{'User comments validation'|@translate}</h3> diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl index 04d8c7855..ec5695f5a 100644 --- a/template/yoga/admin/configuration.tpl +++ b/template/yoga/admin/configuration.tpl @@ -1,10 +1,10 @@ {* $Id$ *} <div class="titrePage"> + {$TABSHEET} <ul class="categoryActions"> <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li> </ul> <h2>{'title_configuration'|@translate} {$TABSHEET_TITLE}</h2> - {$TABSHEET} </div> <form method="post" action="{$F_ACTION}" class="properties"> diff --git a/template/yoga/admin/history.tpl b/template/yoga/admin/history.tpl index db503b32f..fece092f0 100644 --- a/template/yoga/admin/history.tpl +++ b/template/yoga/admin/history.tpl @@ -1,5 +1,6 @@ {* $Id$ *} <div class="titrePage"> + {$TABSHEET}
<ul class="categoryActions"> <li> <a @@ -12,7 +13,6 @@ </li> </ul> <h2>{'History'|@translate} {$TABSHEET_TITLE}</h2> - {$TABSHEET}
</div> <form class="filter" method="post" name="filter" action="{$F_ACTION}"> diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl index eb5e2a0f9..a8e3f8108 100644 --- a/template/yoga/admin/notification_by_mail.tpl +++ b/template/yoga/admin/notification_by_mail.tpl @@ -1,11 +1,11 @@ {* $Id$ *} <div class="titrePage"> + {$TABSHEET} <ul class="categoryActions"> <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li> </ul> <h2>{'nbm_send_mail_to_users'|@translate} {$TABSHEET_TITLE}</h2> - {$TABSHEET} </div> <form method="post" name="notification_by_mail" id="notification_by_mail" action="{$F_ACTION}"> diff --git a/template/yoga/admin/plugins_list.tpl b/template/yoga/admin/plugins_list.tpl index abba01861..d5b045141 100644 --- a/template/yoga/admin/plugins_list.tpl +++ b/template/yoga/admin/plugins_list.tpl @@ -1,6 +1,6 @@ <div class="titrePage"> - <h2>{'Plugins'|@translate}</h2> {$TABSHEET} + <h2>{'Plugins'|@translate}</h2> </div> {'Sort order'|@translate} : diff --git a/template/yoga/admin/plugins_new.tpl b/template/yoga/admin/plugins_new.tpl index fa22aaa26..f778c6aa2 100644 --- a/template/yoga/admin/plugins_new.tpl +++ b/template/yoga/admin/plugins_new.tpl @@ -1,6 +1,6 @@ <div class="titrePage"> - <h2>{'Plugins'|@translate}</h2> {$TABSHEET} + <h2>{'Plugins'|@translate}</h2> </div> {'Sort order'|@translate} : diff --git a/template/yoga/admin/plugins_update.tpl b/template/yoga/admin/plugins_update.tpl index df0ac4ae0..fb2f38f67 100644 --- a/template/yoga/admin/plugins_update.tpl +++ b/template/yoga/admin/plugins_update.tpl @@ -1,6 +1,6 @@ <div class="titrePage"> - <h2>{'Plugins'|@translate}</h2> {$TABSHEET} + <h2>{'Plugins'|@translate}</h2> </div> {if isset($plugins_not_uptodate)} diff --git a/template/yoga/admin/stats.tpl b/template/yoga/admin/stats.tpl index 95331b7ef..cb20be916 100644 --- a/template/yoga/admin/stats.tpl +++ b/template/yoga/admin/stats.tpl @@ -1,6 +1,7 @@ {* $Id$ *} <div class="titrePage"> + {$TABSHEET} <ul class="categoryActions"> <li> <a @@ -13,7 +14,6 @@ </li> </ul> <h2>{'History'|@translate} {$TABSHEET_TITLE}</h2> - {$TABSHEET} </div> <h3>{$L_STAT_TITLE}</h3> diff --git a/template/yoga/admin/upload.tpl b/template/yoga/admin/upload.tpl index f95609316..b580f9d30 100644 --- a/template/yoga/admin/upload.tpl +++ b/template/yoga/admin/upload.tpl @@ -1,7 +1,7 @@ {* $Id$ *} <div class="titrePage"> - <h2>{'waiting'|@translate} {$TABSHEET_TITLE}</h2> {$TABSHEET} + <h2>{'waiting'|@translate} {$TABSHEET_TITLE}</h2> </div> <h3>{'title_upload'|@translate}</h3> diff --git a/template/yoga/footer.tpl b/template/yoga/footer.tpl index fff70e1f1..a44260184 100644 --- a/template/yoga/footer.tpl +++ b/template/yoga/footer.tpl @@ -11,8 +11,8 @@ *} {'powered_by'|@translate} - <a href="http://piwigo.org" class="PWG"> - <span class="P">Php</span><span class="W">Web</span><span class="G">Gallery</span></a> + <a href="http://piwigo.org" class="Piwigo"> + <span class="Piwigo">Piwigo</span></a> {$VERSION} {if isset($CONTACT_MAIL)} - {'send_mail'|@translate} diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index d0bec5e61..a7ebf22b6 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -69,10 +69,8 @@ <div id="theHeader">{$PAGE_BANNER}</div> {if isset($pwgmenu)} <ul class="pwgmenu"> - <li><a href="{$pwgmenu.HOME}" onclick="window.open(this.href, ''); return false;"><span class="bg">{'HOME'|@translate}</span></a></li> <li><a href="{$pwgmenu.WIKI}" onclick="window.open(this.href, ''); return false;"><span class="bg">{'WIKI / DOC'|@translate}</span></a></li> <li><a href="{$pwgmenu.FORUM}" onclick="window.open(this.href, ''); return false;"><span class="bg">{'FORUM'|@translate}</span></a></li> - <li><a href="{$pwgmenu.EXTENSIONS}" onclick="window.open(this.href, ''); return false;"><span class="bg">{'EXTENSIONS'|@translate}</span></a></li> </ul> {/if} {if not empty($header_notes)} diff --git a/template/yoga/theme/admin/images/admin_v2_top-left-bg.png b/template/yoga/theme/admin/images/admin_v2_top-left-bg.png Binary files differdeleted file mode 100644 index afe4eabd9..000000000 --- a/template/yoga/theme/admin/images/admin_v2_top-left-bg.png +++ /dev/null diff --git a/template/yoga/theme/admin/images/fillet.png b/template/yoga/theme/admin/images/fillet.png Binary files differnew file mode 100644 index 000000000..dd63b2e49 --- /dev/null +++ b/template/yoga/theme/admin/images/fillet.png diff --git a/template/yoga/theme/admin/images/menubar-bg.png b/template/yoga/theme/admin/images/menubar-bg.png Binary files differindex eb998d35c..7cc61ad40 100644 --- a/template/yoga/theme/admin/images/menubar-bg.png +++ b/template/yoga/theme/admin/images/menubar-bg.png diff --git a/template/yoga/theme/admin/images/menubar-detail.png b/template/yoga/theme/admin/images/menubar-detail.png Binary files differindex e2d411e95..8b75a2a7b 100644 --- a/template/yoga/theme/admin/images/menubar-detail.png +++ b/template/yoga/theme/admin/images/menubar-detail.png diff --git a/template/yoga/theme/admin/images/menubar-top.png b/template/yoga/theme/admin/images/menubar-top.png Binary files differindex 7a1195c5f..0e4b26cb1 100644 --- a/template/yoga/theme/admin/images/menubar-top.png +++ b/template/yoga/theme/admin/images/menubar-top.png diff --git a/template/yoga/theme/admin/images/top-left-bg.png b/template/yoga/theme/admin/images/top-left-bg.png Binary files differindex 2650367b0..afe4eabd9 100644 --- a/template/yoga/theme/admin/images/top-left-bg.png +++ b/template/yoga/theme/admin/images/top-left-bg.png diff --git a/template/yoga/theme/admin/theme.css b/template/yoga/theme/admin/theme.css index 7b8e63e9a..632d8ab03 100644 --- a/template/yoga/theme/admin/theme.css +++ b/template/yoga/theme/admin/theme.css @@ -66,10 +66,10 @@ BODY { margin: 0px; padding: 0px; } -H3, #imageToolBar A:hover, .row1, .tabsheet li { +H3, #imageToolBar A:hover, .row1 { background-color: #222; } -#theAdminPage h2, #theAdminPage h3 { border-bottom: 1px solid #69c; } +#theAdminPage h2, #theAdminPage h3 { color: #777; } #imageHeaderBar, #theAdminPage #the_page { background-color: transparent; } @@ -88,13 +88,13 @@ A:hover { border: 1px solid #eee; padding: 5px; } -#theAdminPage #the_page .content { - background-color: transparent; - border-width: 0px; - padding: 5px; -} -H2, #menubar DT, .throw, TD H3, #theAdminPage H3 { - background-image: url(images/tableh1_bg.png); + + + + + +H2, .throw, TD H3, #theAdminPage H3 { + background-image: url(images/fillet.png); background-repeat: repeat-x; } .content H2 { @@ -187,7 +187,7 @@ H2, #imageToolBar { FIELDSET, INPUT, SELECT, TEXTAREA, .content DIV.comment A.illustration IMG, .content DIV.thumbnailCategory { - border: 1px solid gray; + border: 1px solid #333; } .content DIV.thumbnailCategory { border: 1px solid #69c; @@ -241,7 +241,9 @@ A.navThumb, A.navThumb:hover { margin: 2px; } #copyright { - color: #69c; +color:#777; +margin:60px 0px; +text-align:center; } label { @@ -280,18 +282,14 @@ FORM#quickconnect INPUT[type=password] { .virtual_cat { background: #222 !important; } -.PWG { +.Piwigo { font-family: verdana, arial, helvetica, sans-serif !important; font-size: 0.9em; font-weight: normal; letter-spacing: 0px; } -a.PWG { border: 0px; } -a.PWG .P { color : #f92; } -a.PWG .W { color : #aaa; } -a.PWG .G { color : #69c; } -a.PWG:hover .P { color : #69c; } -a.PWG:hover .G { color : #f92; } +a.Piwigo { border: 0px; color : #f36; text-decoration: none; border: 0px; color: #f36; } + @@ -307,39 +305,42 @@ a.PWG:hover .G { color : #f92; } #menubar .menuInfoCatByChild, h2.showtitle, #theImage p.showlegend { display: none } * { outline-width: 0px; } -ul.tabsheet, ul.tabsheet li { - border-color: #69c; -} -ul.tabsheet li.normal_tab { - background-image: url(images/tableh1_bg.png); - background-repeat: repeat-x; -} + + + + + + + + ul.tabsheet li.normal_tab:hover { border-color: #f92 } -ul.tabsheet li { - -moz-border-radius: 0px 0px 3px 3px; - border-radius: 0px 0px 12px 12px; - -webkit-border-radius: 0px 0px 3px 3px; -} + + + + + /* New in 1.8 : Special Admin */ body#theAdminPage #menubar { background: transparent url(images/menubar-bg.png) repeat-y scroll right top; border-bottom: #ccc ridge 2px; width:13.5em; padding: 0; margin: 0; } -body#theAdminPage .content { /*default-layout.cs... (line 1)*/ -list-style-type:none; padding: 0px; - /*default-layout.cs... (line 23) */ -margin: 0px 0px 0px 200px; background-color: transparent;} -#theAdminPage #menubar ul { list-style-image:url(images/list-image.png); } -#theAdminPage #menubar ul:hover { list-style-image:url(images/list-hover.png); } + + + + +#theAdminPage #menubar ul { color: #333; margin:9px 0pt 3px 9px; } +#theAdminPage #menubar ul:hover { color: #850; } +#theAdminPage #menubar li:hover { color: #F36; } +#theAdminPage #menubar li { margin: 0px 0px 0px 6px; } a, input.rateButton, legend { color:#777; } -#menubar a { border-bottom:0; text-decoration:none; font-style: italic;} +#menubar a { border-bottom:0; text-decoration:none; font-size: 11px; } body#theAdminPage #theHeader { - background:transparent url(images/piwigo_logo_sombre_214x100.png) no-repeat 230px top; height:105px; + background:transparent url(images/piwigo_logo_sombre_214x100.png) no-repeat scroll 245px top; height:105px; } body#theAdminPage #post-header { - background-color: transparent; + background-color: transparent; display:none; width: 60%; height: 4px; margin-left:40%; } #theHeader h1 { /*default-layout.cs... (line 204) */ @@ -349,26 +350,26 @@ body#theAdminPage #post-header { border:0; display:block; margin:0px; padding-bottom:0px; padding-top:0px; text-align:center; min-height: 100%; position:relative; } -.pwgmenu { /* default-layout.cs... (line 136) */ -background:transparent none repeat scroll 0%; -display:table; font-family:verdana,arial,helvetica,sans-serif; -font-size: 8px; line-height:1.1em; list-style-image:none; -list-style-type:none; margin:1px 8px 1px auto; -padding:3px; position:relative; -text-decoration:none; top:-100px; -white-space:nowrap; width:66em; -} -.pwgmenu a { /* default-layout.cs... (line 159) */ -background:#f36 none repeat scroll 0%; -border:1px solid #FFFFFF; -color:white; -display:block; -font-weight:bold; -padding:4px 8px; -text-align:center; -text-decoration:none; -width:9em !important; -} + + + + + + + + + + + + + + + + + + + + @@ -380,41 +381,10 @@ width:9em !important; background:transparent none no-repeat scroll left top; height: 22px; overflow: hidden; margin: 0px; } -.pwgmenu { /*theme.css (line 335)*/ -background:transparent url(images/header_bottom.png) repeat-x scroll left 25px; -float:right; -font-family:verdana,arial,helvetica,sans-serif; -font-size:8px; -line-height:1.1em; -list-style-image:none; -list-style-type:none; -margin:1px 8px 1px 0px; -padding:3px 3px 3px 101px; -text-decoration:none; top:-35px; -width:587px; -} -.pwgmenu li { /*default-layout.cs... (line 151)*/ -float:left; -margin:0px; -padding:0px; -text-align:center; -width:126px !important; -} -.pwgmenu a { /*theme.css (line 344)*/ -background:transparent url(images/onglet_inactif_transp.png) no-repeat scroll left 3px; -border:0px none; -color:#FF3333; -display:block; -font-size:8px; height:33px; -padding:3px 0px 5px 13px; text-align:left; -text-decoration:none; width:126px !important; -} -.pwgmenu a:hover { /*theme.css (line 344)*/ -background:transparent url(images/onglet_actif_transp.png) no-repeat scroll left 2px; -color: #ff7700; } +.pwgmenu { display:none; } .content h2:before, .content h2:after, #menubar DT:before, #menubar DT:after { content: ""; } -#theHeader h1 { /*theme.css (line 345) */ color:#441100; } +#theHeader h1 { /*theme.css (line 345) */ color:#441100; display:none;} .content h2 { /*theme.css (line 100)*/ letter-spacing:0.1em; margin-right:45px; text-align:right; color: #777777; text-transform:none; } @@ -423,46 +393,73 @@ text-transform:none; } font-weight:bold; margin-right:30px; padding-left:2em; } #theAdminPage h3 { /* theme.css (line 96) */ background: transparent none; margin-right:30px; font-weight: lighter;} -#theAdminPage h2 { /* theme.css (line 72) */ border-bottom:0px; } +#theAdminPage h2 { /* theme.css (line 72) */ border-bottom:0px none; +color:#333; display:block; font-size:36px; margin:0px; overflow:hidden; +position:relative; right:0px; text-align:right; top:-50px; +width:920px !important; } body#theAdminPage { /*theme.css (line 324) */ background:#111111 url(images/top-left-bg.png) no-repeat scroll left top;} #theAdminPage #the_page { /*theme.css (line 73)*/ background:transparent url(images/bottom-left-bg.png) no-repeat fixed left bottom; } #the_page { /*theme.css (line 348)*/ padding-bottom:0px;} -.content {background-color:transparent;} + body#theAdminPage #menubar { /* theme.css (line 324) */ -background:transparent none repeat-y scroll right top; border-bottom:0px; margin-top:110px; -float: none; position: absolute; left: 0px; top: 160px;} -#theAdminPage #the_page .content { /*theme.css (line 91)*/ -background-color:transparent; border-width:0px; padding:5px 35px 5px 5px; } -body#theAdminPage #menubar dl.selected dd { padding-bottom: 145px; } +background:transparent url(images/admin_v2_menuBox-bottom.png) no-repeat scroll left bottom; +border-bottom:0px none; float:none; left:0px; margin:100px 35px; min-height:423px; +position:absolute; top:0px; width:207px; } +#theAdminPage #the_page .content { + background: #222 url(images/fillet.png) repeat-x top left; min-height: 424px; + border-width:0px; padding: 0px 5px 0px 0px; list-style-type:none; margin: 0px 10px 0px 248px; } + +body#theAdminPage #menubar dl.selected dd { padding-bottom: 110px; } + .header_notes {/*default-colors.cs... (line 91)*/ background-image:url(icon/note.png); background-position:left top; background-repeat:no-repeat; border:1px solid #AAAAAA; font-weight:bold; margin:14px; padding:5px 0px 0px; position:absolute; right:31px; text-align:center; top:96px; width:502px; } #theAdminPage #menubar dl {/*theme.css (line 372)*/ -background:transparent url(images/menubar-top.png) no-repeat scroll left top; width: 198px; +background:transparent url(images/menubar-top.png) no-repeat scroll left top; width: 207px; border:0; box-shadow: none; } #theAdminPage #menubar dl.selected {/*theme.css (line 372)*/ background:transparent url(images/menubar-top.png) no-repeat scroll left top; } -#theAdminPage #menubar dt { background: none; left:10px; position:relative; text-align:left; top:-10px;} +#theAdminPage #menubar dt { background: none; left:10px; position:relative; text-align:left; top:-15px; font-size: 14px;} #theAdminPage #menubar dd { background: transparent url(images/menubar-detail.png) repeat-y top left; -margin: 0px 0px 0px 4px; padding: 0px;} -span.bg { background-color: #111111; padding-right: 3px; } +margin: 0px; padding: 0px;} +span.bg { background-color: #222; padding-left: 3px; } html, body { height:100%; } ul.tabsheet li.normal_tab, ul.tabsheet li.selected_tab { -background: transparent none repeat-x top left; -border:0; } -ul.tabsheet { border:0; -background: transparent url(images/internal_onglet.png) repeat-x bottom left; } -ul.tabsheet a { border:0; font-size: 12px; +border: 0; padding:0px; } +ul.tabsheet a { +background: transparent url(images/inactive_tab.png) no-repeat scroll left top; +width:145px !important;} +ul.tabsheet a { border:0; font-size: 8px; font-family: verdana,arial,helvetica,sans-serif; line-height: 14px; } -ul.tabsheet li.selected_tab > a { color: #ff3333; } -ul.tabsheet, ul.tabsheet li { border-bottom: #eee solid 1px; } -ul.tabsheet li.selected_tab { -font-weight:bold; padding-top:0px; position:relative; top:0px; }
\ No newline at end of file + +ul.tabsheet { +background-color:transparent; border:0pt none; display:table; +float:right; font-family:verdana,arial,helvetica,sans-serif; +font-size:8px; line-height:1.1em; list-style-image:none; +margin: 0px; padding:0px; +position:relative; text-decoration:none; +top:-2px; white-space:nowrap; width:730px; } +ul.tabsheet li { +float:right; margin:0px; padding:0px; text-align:right; overflow: hidden; +width:136px !important; } +ul.tabsheet a { +background:transparent url(images/inactive_tab.png) no-repeat scroll left 4px; +border:0px none; color:#777777; display:block; font-size:8px; text-transform:capitalize; +font-weight:bold; height:33px; overflow:hidden; padding:18px 30px 5px 0px; +text-align:right; text-decoration:none; width:122px !important; } +ul.tabsheet a:hover, .tabsheet li.selected_tab a { +background:transparent url(images/active_tab.png) no-repeat scroll left 0px; +color: #F36; } +#menubar a { color: #555; border-bottom: 1px dotted #777;} +#menubar .selected a { color: #850; border-bottom: 1px dotted #a72;} +#menubar .selected a:hover { color: #f36; border-bottom: 1px solid #f36;} +fieldset#uploadConf input { margin-left:5%; width:160px; } +table.table2 th { padding:3px 0.8em; }
\ No newline at end of file diff --git a/template/yoga/theme/admin/themeconf.inc.php b/template/yoga/theme/admin/themeconf.inc.php index 5a6450e82..f1f0d90e0 100644 --- a/template/yoga/theme/admin/themeconf.inc.php +++ b/template/yoga/theme/admin/themeconf.inc.php @@ -24,6 +24,7 @@ function selected_admin_menu() } return 2; case 'comments': + case 'upload': case 'thumbnail': case 'rating': case 'tags': @@ -63,7 +64,7 @@ $themeconf = array( jQuery().ready(function(){ jQuery(\'#menubar\').accordion({ header: "dt.rdion", - event: "mouseover", + event: "click", active: '. selected_admin_menu() . ' }); }); |
