adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

svn merge -r1366:1371 from branch 1.6 into trunk

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@1377 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2006-06-22 19:21:56 +00:00
parent ad45eccd33
commit a08cd1a583
9 changed files with 453 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
template/yoga/header.tpl
+3 -2
View File
@@ -9,11 +9,12 @@
the "text/nonsense" prevents gecko based browsers to load it -->
<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/{themeconf:template}/fix-khtml.css">
<!--[if lt IE 7]>
<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/fix-ie5-ie6.css">
<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/fix-ie5-ie6.css">
<![endif]-->
<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/{themeconf:template}/print.css">
<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/default-colors.css">
<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/theme.css">
{themeconf:local_head}
<!-- BEGIN next -->
<link rel="prefetch" href="{next.U_IMG_SRC}">
<!-- END next -->
@@ -23,7 +24,7 @@ the "text/nonsense" prevents gecko based browsers to load it -->
<title>{GALLERY_TITLE}:{PAGE_TITLE}</title>
<script type="text/javascript" src="{pwg_root}include/scripts.js"></script>
<!--[if lt IE 7]>
<script type="text/javascript" src="{pwg_root}include/pngfix.js"></script>
<script type="text/javascript" src="{pwg_root}include/pngfix.js"></script>
<![endif]-->
</head>
template/yoga/index.tpl
+1 -121
View File
@@ -1,125 +1,5 @@
<!-- $Id$ -->
<div id="menubar">
<!-- BEGIN links -->
<dl>
<dt>{lang:Links}</dt>
<dd>
<ul>
<!-- BEGIN link -->
<li><a href="{links.link.URL}">{links.link.LABEL}</a></li>
<!-- END link -->
</ul>
</dd>
</dl>
<!-- END links -->
<dl>
<dt><a href="{U_HOME}">{lang:Categories}</a></dt>
<dd>
{MENU_CATEGORIES_CONTENT}
<p class="totalImages">{NB_PICTURE} {lang:total}</p>
</dd>
</dl>
<!-- BEGIN tags -->
<dl>
<dt>{lang:Related tags}</dt>
<dd>
<ul id="menuTagCloud">
<!-- BEGIN tag -->
<li>
<a href="{tags.tag.URL_ADD}" title="{tags.tag.TITLE_ADD}"><img src="{pwg_root}{themeconf:icon_dir}/add_tag.png" alt="+"></a>
<a href="{tags.tag.URL}" class="{tags.tag.CLASS}" title="{tags.tag.TITLE}">{tags.tag.NAME}</a>
</li>
<!-- END tag -->
</ul>
</dd>
</dl>
<!-- END tags -->
<dl>
<dt>{lang:special_categories}</dt>
<dd>
<ul>
<!-- BEGIN special_cat -->
<li><a href="{special_cat.URL}" title="{special_cat.TITLE}">{special_cat.NAME}</a></li>
<!-- END special_cat -->
</ul>
</dd>
</dl>
<dl>
<dt>{lang:title_menu}</dt>
<dd>
<ul>
<!-- BEGIN summary -->
<li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li>
<!-- END summary -->
<!-- BEGIN upload -->
<li><a href="{upload.U_UPLOAD}">{lang:upload_picture}</a></li>
<!-- END upload -->
</ul>
</dd>
</dl>
<dl>
<dt>{lang:identification}</dt>
<dd>
<!-- BEGIN hello -->
<p>{lang:hello}&nbsp;{USERNAME}&nbsp;!</p>
<!-- END hello -->
<ul>
<!-- BEGIN register -->
<li><a href="{U_REGISTER}" rel="nofollow">{lang:ident_register}</a></li>
<!-- END register -->
<!-- BEGIN login -->
<li><a href="{F_IDENTIFY}" rel="nofollow">{lang:Connection}</a></li>
<!-- END login -->
<!-- BEGIN logout -->
<li><a href="{U_LOGOUT}">{lang:logout}</a></li>
<!-- END logout -->
<!-- BEGIN profile -->
<li><a href="{U_PROFILE}" title="{lang:hint_customize}">{lang:customize}</a></li>
<!-- END profile -->
<!-- BEGIN admin -->
<li><a href="{U_ADMIN}" title="{lang:hint_admin}">{lang:admin}</a></li>
<!-- END admin -->
</ul>
<!-- BEGIN quickconnect -->
<form method="post" action="{F_IDENTIFY}" class="filter" id="quickconnect">
<fieldset>
<legend>{lang:Quick connect}</legend>
<label>
{lang:Username}
<input type="text" name="username" size="15" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
</label>
<label>
{lang:password}
<input type="password" name="password" size="15" onfocus="this.className='focus';" onblur="this.className='nofocus';">
</label>
<!-- BEGIN remember_me -->
<label>
{lang:remember_me}
<input type="checkbox" name="remember_me" value="1">
</label>
<!-- END remember_me -->
<p>
<input type="submit" name="login" value="{lang:submit}">
</p>
<ul class="actions">
<li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
<li><a href="{U_REGISTER}" title="{lang:Create a new account}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
</ul>
</fieldset>
</form>
<!-- END quickconnect -->
</dd>
</dl>
</div> <!-- menubar -->
{MENUBAR}
<div id="content">
<div class="titrePage">
<ul class="categoryActions">
template/yoga/menubar.tpl
+121
View File
@@ -0,0 +1,121 @@
<!-- $Id:$ -->
<div id="menubar">
<!-- BEGIN links -->
<dl>
<dt>{lang:Links}</dt>
<dd>
<ul>
<!-- BEGIN link -->
<li><a href="{links.link.URL}">{links.link.LABEL}</a></li>
<!-- END link -->
</ul>
</dd>
</dl>
<!-- END links -->
<dl>
<dt><a href="{U_HOME}">{lang:Categories}</a></dt>
<dd>
{MENU_CATEGORIES_CONTENT}
<p class="totalImages">{NB_PICTURE} {lang:total}</p>
</dd>
</dl>
<!-- BEGIN tags -->
<dl>
<dt>{lang:Related tags}</dt>
<dd>
<ul id="menuTagCloud">
<!-- BEGIN tag -->
<li>
<a href="{tags.tag.URL_ADD}" title="{tags.tag.TITLE_ADD}"><img src="{pwg_root}{themeconf:icon_dir}/add_tag.png" alt="+"></a>
<a href="{tags.tag.URL}" class="{tags.tag.CLASS}" title="{tags.tag.TITLE}">{tags.tag.NAME}</a>
</li>
<!-- END tag -->
</ul>
</dd>
</dl>
<!-- END tags -->
<dl>
<dt>{lang:special_categories}</dt>
<dd>
<ul>
<!-- BEGIN special_cat -->
<li><a href="{special_cat.URL}" title="{special_cat.TITLE}">{special_cat.NAME}</a></li>
<!-- END special_cat -->
</ul>
</dd>
</dl>
<dl>
<dt>{lang:title_menu}</dt>
<dd>
<ul>
<!-- BEGIN summary -->
<li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li>
<!-- END summary -->
<!-- BEGIN upload -->
<li><a href="{upload.U_UPLOAD}">{lang:upload_picture}</a></li>
<!-- END upload -->
</ul>
</dd>
</dl>
<dl>
<dt>{lang:identification}</dt>
<dd>
<!-- BEGIN hello -->
<p>{lang:hello}&nbsp;{USERNAME}&nbsp;!</p>
<!-- END hello -->
<ul>
<!-- BEGIN register -->
<li><a href="{U_REGISTER}" rel="nofollow">{lang:ident_register}</a></li>
<!-- END register -->
<!-- BEGIN login -->
<li><a href="{F_IDENTIFY}" rel="nofollow">{lang:Connection}</a></li>
<!-- END login -->
<!-- BEGIN logout -->
<li><a href="{U_LOGOUT}">{lang:logout}</a></li>
<!-- END logout -->
<!-- BEGIN profile -->
<li><a href="{U_PROFILE}" title="{lang:hint_customize}">{lang:customize}</a></li>
<!-- END profile -->
<!-- BEGIN admin -->
<li><a href="{U_ADMIN}" title="{lang:hint_admin}">{lang:admin}</a></li>
<!-- END admin -->
</ul>
<!-- BEGIN quickconnect -->
<form method="post" action="{F_IDENTIFY}" class="filter" id="quickconnect">
<fieldset>
<legend>{lang:Quick connect}</legend>
<label>
{lang:Username}
<input type="text" name="username" size="15" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
</label>
<label>
{lang:password}
<input type="password" name="password" size="15" onfocus="this.className='focus';" onblur="this.className='nofocus';">
</label>
<!-- BEGIN remember_me -->
<label>
{lang:remember_me}
<input type="checkbox" name="remember_me" value="1">
</label>
<!-- END remember_me -->
<p>
<input type="submit" name="login" value="{lang:submit}">
</p>
<ul class="actions">
<li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
<li><a href="{U_REGISTER}" title="{lang:Create a new account}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
</ul>
</fieldset>
</form>
<!-- END quickconnect -->
</dd>
</dl>
</div> <!-- menubar -->
template/yoga/theme/clear/themeconf.inc.php
+2 -1
View File
@@ -4,6 +4,7 @@ $themeconf = array(
'theme' => 'clear',
'icon_dir' => 'template/yoga/icon',
'admin_icon_dir' => 'template/yoga/icon/admin',
'mime_icon_dir' => 'template/yoga/icon/mimetypes/'
'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
'local_head' => '<!-- no theme specific head content -->'
);
?>
template/yoga/theme/dark/themeconf.inc.php
+2 -1
View File
@@ -4,6 +4,7 @@ $themeconf = array(
'theme' => 'dark',
'icon_dir' => 'template/yoga/icon',
'admin_icon_dir' => 'template/yoga/icon/admin',
'mime_icon_dir' => 'template/yoga/icon/mimetypes/'
'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
'local_head' => '<!-- no theme specific head content -->'
);
?>