adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-11 19:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge spread_menus to the core

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@10812 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2011-05-07 15:55:10 +00:00
parent 0cbac27ddb
commit fdfe41e343
32 changed files with 191 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/Sylvia/theme.css
+8 -7
View File
@@ -141,6 +141,10 @@
.content {
background:#222 url(images/fillet.gif) repeat-x scroll left top;
min-height:466px;
border: 1px solid #000;
border-top: 0;
margin:21px 7px 0 290px !important;
padding-top:7px;
}
#the_page {
@@ -155,13 +159,6 @@
min-width: 100%;
}
#theCategoryPage .content {
border: 1px solid #000;
border-top: 0;
margin:21px 7px 0 290px !important;
padding-top:7px;
}
.content h2 {
margin:0;
padding:0px 10px 15px 15px;
@@ -362,6 +359,10 @@
border-top:0 !important;
}
.pictureContent {
margin:0 7px 7px 290px;
}
#addComment fieldset {
color: #f70;
border-color: #f70;
themes/default/local_head.tpl
+3 -1
View File
@@ -6,4 +6,6 @@
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie7.css">
<![endif]-->
{combine_css path="themes/default/print.css" order=-10}
{/if}
{/if}
{if !isset($MENUBAR)}<style type="text/css">.content {ldelim} margin-left:auto !important; }</style>{/if}
themes/default/template/about.tpl
+2 -5
View File
@@ -1,10 +1,7 @@
{if isset($MENUBAR)}{$MENUBAR}{/if}
<div id="content" class="content">
<div class="titrePage">
<ul class="categoryActions">
<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
</a></li>
</ul>
<ul class="categoryActions"></ul>
<h2>{'About'|@translate}</h2>
</div>
<div id="piwigoAbout">
themes/default/template/comments.tpl
+2 -5
View File
@@ -1,11 +1,8 @@
{if isset($MENUBAR)}{$MENUBAR}{/if}
<div id="content" class="content">
<div class="titrePage">
<ul class="categoryActions">
<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
</a></li>
</ul>
<ul class="categoryActions"></ul>
<h2>{'User comments'|@translate}</h2>
</div>
themes/default/template/identification.tpl
+2 -5
View File
@@ -1,11 +1,8 @@
{if isset($MENUBAR)}{$MENUBAR}{/if}
<div id="content" class="content">
<div class="titrePage">
<ul class="categoryActions">
<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
</a></li>
</ul>
<ul class="categoryActions"></ul>
<h2>{'Identification'|@translate}</h2>
</div>
themes/default/template/nbm.tpl
+2 -6
View File
@@ -1,11 +1,7 @@
{if isset($MENUBAR)}{$MENUBAR}{/if}
<div id="content" class="content">
<div class="titrePage">
<ul class="categoryActions">
<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
</a></li>
</ul>
<ul class="categoryActions"></ul>
<h2>{'Notification'|@translate}</h2>
</div>
themes/default/template/notification.tpl
+3 -5
View File
@@ -2,14 +2,12 @@
<link rel="alternate" type="application/rss+xml" title="{'Photos only RSS feed'|@translate}" href="{$U_FEED_IMAGE_ONLY}">
<link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed (photos, comments)'|@translate}" href="{$U_FEED}">
{/html_head}
{if isset($MENUBAR)}{$MENUBAR}{/if}
<div id="content" class="content">
<div class="titrePage">
<ul class="categoryActions">
<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
</a></li>
</ul>
<ul class="categoryActions"></ul>
<h2>{'Notification'|@translate}</h2>
</div>
themes/default/template/password.tpl
+2 -5
View File
@@ -1,11 +1,8 @@
{if isset($MENUBAR)}{$MENUBAR}{/if}
<div id="content" class="content">
<div class="titrePage">
<ul class="categoryActions">
<li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
</a></li>
</ul>
<ul class="categoryActions"></ul>
<h2>{'Password forgotten'|@translate}</h2>
</div>
themes/default/template/picture.tpl
+9
View File
@@ -2,6 +2,11 @@
{include file='include/autosize.inc.tpl'}
*}
{if isset($MENUBAR)}
{$MENUBAR}
<div id="content" class="pictureContent">
{/if}
{if isset($errors)}
<div class="errors">
<ul>
@@ -310,3 +315,7 @@ y.callService(
{/if}{*comments*}
{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
{if isset($MENUBAR)}
</div>
{/if}
themes/default/template/profile.tpl
+2 -5
View File
@@ -1,3 +1,4 @@
{if isset($MENUBAR)}{$MENUBAR}{/if}
<div id="content" class="content">
{if isset($errors)}
@@ -11,11 +12,7 @@
{/if}
<div class="titrePage">
<ul class="categoryActions">
<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
</a></li>
</ul>
<ul class="categoryActions"></ul>
<h2>{'Profile'|@translate}</h2>
</div>
themes/default/template/register.tpl
+2 -5
View File
@@ -1,13 +1,10 @@
{if isset($MENUBAR)}{$MENUBAR}{/if}
<div id="registerPage">
<div id="content" class="content">
<div class="titrePage">
<ul class="categoryActions">
<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
</a></li>
</ul>
<ul class="categoryActions"></ul>
<h2>{'Registration'|@translate}</h2>
</div>
themes/default/template/search.tpl
+1 -3
View File
@@ -14,6 +14,7 @@
{/literal}{/footer_script}
*}
{if isset($MENUBAR)}{$MENUBAR}{/if}
<div id="content" class="content">
<div class="titrePage">
@@ -22,9 +23,6 @@
<li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-help">&nbsp;</span><span class="pwg-button-text">{'Help'|@translate}</span>
</a></li>
<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
</a></li>
</ul>
<h2>{'Search'|@translate}</h2>
</div>
themes/default/template/tags.tpl
+1 -3
View File
@@ -1,3 +1,4 @@
{if isset($MENUBAR)}{$MENUBAR}{/if}
<div id="content" class="content">
<div class="titrePage">
@@ -12,9 +13,6 @@
<span class="pwg-icon pwg-icon-letters">&nbsp;</span><span class="pwg-button-text">{'letters'|@translate}</span>
</a></li>
{/if}
<li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button">
<span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span>
</a></li>
</ul>
<h2>{'Tags'|@translate}</h2>
</div>
themes/default/theme.css
+10 -5
View File
@@ -89,11 +89,6 @@
* Content
*/
.content {
margin: 1em;
}
#theCategoryPage .content
{
margin-left: 20em; /* = #menubar width + 2em */
}
@@ -411,6 +406,16 @@ TD.calDayHead {
background: url('icon/rating-stars.gif') no-repeat 0 center; width:16px;
}
/* only if menubar is shown */
.pictureContent {
margin-left:20em;
}
.pictureContent #imageToolBar,
.pictureContent #theImage,
.pictureContent hr.separation {
clear:none;
}
/**
* Default Layout