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

- minor language changes and use template->assign instead of template->assign_var

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@2288 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2008-03-21 01:01:25 +00:00
parent 22631d6dfd
commit c6429c17ca
10 changed files with 36 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/cat_perm.php
+3 -3
View File
@@ -198,15 +198,15 @@ SELECT user_id, cat_id
$template->set_filename('cat_perm', 'admin/cat_perm.tpl'); $template->set_filename('cat_perm', 'admin/cat_perm.tpl');
$template->assign_vars( $template->assign(
array( array(
'CATEGORIES_NAV' => 'CATEGORIES_NAV' =>
get_cat_display_name_from_id( get_cat_display_name_from_id(
$page['cat'], $page['cat'],
'admin.php?page=cat_modify&cat_id=' 'admin.php?page=cat_modify&cat_id='
), ),
'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_perm', 'U_HELP' => get_root_url().'popuphelp.php?page=cat_perm',
'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=cat_perm&cat='.$page['cat'] 'F_ACTION' => get_root_url().'admin.php?page=cat_perm&cat='.$page['cat']
) )
); );
admin/configuration.php
+2 -4
View File
@@ -4,8 +4,7 @@
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
// | branch : BSF (Best So Far) // | file : $Id$
// | file : $RCSfile$
// | last update : $Date$ // | last update : $Date$
// | last modifier : $Author$ // | last modifier : $Author$
// | revision : $Revision$ // | revision : $Revision$
@@ -173,10 +172,9 @@ $tabsheet->assign();
$action = get_root_url().'admin.php?page=configuration'; $action = get_root_url().'admin.php?page=configuration';
$action.= '&section='.$page['section']; $action.= '&section='.$page['section'];
$template->assign_vars( $template->assign(
array( array(
'U_HELP' => get_root_url().'popuphelp.php?page=configuration', 'U_HELP' => get_root_url().'popuphelp.php?page=configuration',
'F_ACTION'=>$action 'F_ACTION'=>$action
)); ));
admin/help.php
+3 -4
View File
@@ -2,10 +2,9 @@
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery | // | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net | // | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
// | branch : BSF (Best So Far) // | file : $Id$
// | file : $RCSfile$
// | last update : $Date$ // | last update : $Date$
// | last modifier : $Author$ // | last modifier : $Author$
// | revision : $Revision$ // | revision : $Revision$
@@ -32,5 +31,5 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
check_status(ACCESS_ADMINISTRATOR); check_status(ACCESS_ADMINISTRATOR);
$template->assign_var('ADMIN_CONTENT', load_language('help.html','','',true) ); $template->assign('ADMIN_CONTENT', load_language('help.html','','',true) );
?> ?>
admin/ws_checker.php
+2 -2
View File
@@ -209,9 +209,9 @@ if (isset($_POST['wsX_submit']))
$template->assign_vars( $template->assign(
array( array(
'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=web_service', 'U_HELP' => get_root_url().'popuphelp.php?page=web_service',
) )
); );
include/menubar.inc.php
+1 -1
View File
@@ -270,7 +270,7 @@ $template->append(
'summaries', 'summaries',
array( array(
'TITLE'=>l10n('hint_search'), 'TITLE'=>l10n('hint_search'),
'NAME'=>l10n('search'), 'NAME'=>l10n('Search'),
'U_SUMMARY'=> get_root_url().'search.php', 'U_SUMMARY'=> get_root_url().'search.php',
'REL'=> 'rel="search"' 'REL'=> 'rel="search"'
) )
notification.php
+2 -4
View File
@@ -75,21 +75,19 @@ $template->append('head_elements',
'<link rel="alternate" type="application/rss+xml" href="'.$feed_url.'">' '<link rel="alternate" type="application/rss+xml" href="'.$feed_url.'">'
); );
include(PHPWG_ROOT_PATH.'include/page_header.php');
$template->set_filenames(array('notification'=>'notification.tpl')); $template->set_filenames(array('notification'=>'notification.tpl'));
$template->assign_vars( $template->assign(
array( array(
'U_FEED' => $feed_url, 'U_FEED' => $feed_url,
'U_FEED_IMAGE_ONLY' => $feed_image_only_url, 'U_FEED_IMAGE_ONLY' => $feed_image_only_url,
'U_HOME' => make_index_url(),
) )
); );
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
// | html code display | // | html code display |
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
include(PHPWG_ROOT_PATH.'include/page_header.php');
$template->parse('notification'); $template->parse('notification');
include(PHPWG_ROOT_PATH.'include/page_tail.php'); include(PHPWG_ROOT_PATH.'include/page_tail.php');
template/yoga/admin/permalinks.tpl
+5 -5
View File
@@ -1,7 +1,7 @@
{* $Id$ *} {* $Id$ *}
<div class="titrePage"> <div class="titrePage">
<ul class="categoryActions"> <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> <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
</ul> </ul>
<h2>{'Permalinks'|@translate}</h2> <h2>{'Permalinks'|@translate}</h2>
</div> </div>
@@ -24,7 +24,7 @@
</label> </label>
<p> <p>
<input type="submit" class="submit" name="set_permalink" value="{'submit'|@translate}" {$TAG_INPUT_ENABLED}/> <input type="submit" class="submit" name="set_permalink" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}/>
</p> </p>
</fieldset> </fieldset>
</form> </form>
@@ -36,8 +36,8 @@
<td>{'Category'|@translate} {$SORT_NAME}</td> <td>{'Category'|@translate} {$SORT_NAME}</td>
<td>{'Permalink'|@translate} {$SORT_PERMALINK}</td> <td>{'Permalink'|@translate} {$SORT_PERMALINK}</td>
</tr> </tr>
{foreach from=$permalinks item=permalink} {foreach from=$permalinks item=permalink name="permalink_loop"}
<tr> <tr class="{if $smarty.foreach.permalink_loop.index is odd}row1{else}row2{/if}">
<td>{$permalink.id}</td> <td>{$permalink.id}</td>
<td>{$permalink.name}</td> <td>{$permalink.name}</td>
<td>{$permalink.permalink}</td> <td>{$permalink.permalink}</td>
@@ -64,7 +64,7 @@
<td>{$permalink.date_deleted}</td> <td>{$permalink.date_deleted}</td>
<td>{$permalink.last_hit}</td> <td>{$permalink.last_hit}</td>
<td>{$permalink.hit}</td> <td>{$permalink.hit}</td>
<td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" alt="Delete"></a></td> <td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" alt="[{'delete'|@translate}]" class="button"></a></td>
</tr> </tr>
{/foreach} {/foreach}
</table> </table>
template/yoga/default-layout.css
+11 -33
View File
@@ -9,7 +9,7 @@ BODY {
} }
#the_page { #the_page {
/* Just in case another template needs an inner frame */ /* Just in case another template needs an inner frame */
} }
H1 { H1 {
@@ -21,29 +21,24 @@ H1 {
} }
H2 { H2 {
margin: 0; margin: 0;
padding: 5px 0.5em 5px 0.5em; padding: 5px 0.5em 5px 0.5em;
text-align: left; text-align: left;
font-size: 120%; font-size: 120%;
}
H5 {
margin: 0;
padding: 0 1.5em 0 30%;
text-align: right;
font-size: 90%;
} }
A { A {
text-decoration:none; text-decoration:none;
border-bottom: 1px dotted #005e89; border-bottom: 1px dotted #005e89;
} }
A:hover { A:hover {
border-bottom: 1px solid #858460; border-bottom: 1px solid #858460;
} }
A.button, A.button:hover { A.button, A.button:hover {
border: 0; border: 0;
} }
IMG { IMG {
border: none; border: none;
} }
HR.separation { HR.separation {
@@ -210,19 +205,6 @@ FORM.properties SPAN.property {
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
#theHeader P {
margin-top: 0;
padding: 0;
}
FORM#addComment FIELDSET LABEL {
clear: both;
}
FORM#addComment FIELDSET INPUT[type="hidden"] {
display: none;
}
/* button tools */ /* button tools */
UL.actions { UL.actions {
text-indent: 0; text-indent: 0;
@@ -272,10 +254,6 @@ BODY#thePopuphelpPage #copyright {
display: none; display: none;
} }
BODY#thePopuphelpPage #theHeader P {
display: none;
}
BODY#thePopuphelpPage #content P { BODY#thePopuphelpPage #content P {
text-align: justify; text-align: justify;
padding: 0.5em; padding: 0.5em;
template/yoga/identification.tpl
+6 -6
View File
@@ -3,11 +3,11 @@
<div class="titrePage"> <div class="titrePage">
<ul class="categoryActions"> <ul class="categoryActions">
<li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li> <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
{if isset($U_REGISTER) } {if isset($U_REGISTER) }
<li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$themeconf.icon_dir}/register.png" class="button" alt="{'register'|@translate}"/></a></li> <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"/></a></li>
{/if} {/if}
<li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li> <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
</ul> </ul>
<h2>{'Identification'|@translate}</h2> <h2>{'Identification'|@translate}</h2>
</div> </div>
@@ -54,7 +54,7 @@
</ul> </ul>
</fieldset> </fieldset>
<p><input class="submit" tabindex="4" type="submit" name="login" value="{'submit'|@translate}"></p> <p><input class="submit" tabindex="4" type="submit" name="login" value="{'Submit'|@translate}"></p>
</form> </form>
<script type="text/javascript"><!-- <script type="text/javascript"><!--
@@ -63,9 +63,9 @@ document.login_form.username.focus();
<p> <p>
{if isset($U_REGISTER) } {if isset($U_REGISTER) }
<a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$themeconf.icon_dir}/register.png" class="button" alt=""> {'Register'|@translate}</a> <a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"> {'Register'|@translate}</a>
{/if} {/if}
<a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$themeconf.icon_dir}/lost_password.png" class="button" alt=""> {'Forgot your password?'|@translate}</a> <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"> {'Forgot your password?'|@translate}</a>
</p> </p>
</div> <!-- content --> </div> <!-- content -->
template/yoga/menubar.tpl
+1 -1
View File
@@ -152,7 +152,7 @@
<ul class="actions"> <ul class="actions">
<li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li> <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
{if isset($U_REGISTER)} {if isset($U_REGISTER)}
<li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'register'|@translate}"/></a></li> <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"/></a></li>
{/if} {/if}
</ul> </ul>