From c6429c17ca59f36bf54986b438bf00cce85986f2 Mon Sep 17 00:00:00 2001 From: rvelices Date: Fri, 21 Mar 2008 01:01:25 +0000 Subject: - minor language changes and use template->assign instead of template->assign_var git-svn-id: http://piwigo.org/svn/trunk@2288 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_perm.php | 6 +++--- admin/configuration.php | 6 ++---- admin/help.php | 7 +++--- admin/ws_checker.php | 4 ++-- include/menubar.inc.php | 2 +- notification.php | 6 ++---- template/yoga/admin/permalinks.tpl | 10 ++++----- template/yoga/default-layout.css | 44 ++++++++++---------------------------- template/yoga/identification.tpl | 12 +++++------ template/yoga/menubar.tpl | 2 +- 10 files changed, 36 insertions(+), 63 deletions(-) diff --git a/admin/cat_perm.php b/admin/cat_perm.php index bca45faa0..13da8e727 100644 --- a/admin/cat_perm.php +++ b/admin/cat_perm.php @@ -198,15 +198,15 @@ SELECT user_id, cat_id $template->set_filename('cat_perm', 'admin/cat_perm.tpl'); -$template->assign_vars( +$template->assign( array( 'CATEGORIES_NAV' => get_cat_display_name_from_id( $page['cat'], 'admin.php?page=cat_modify&cat_id=' ), - 'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_perm', - 'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=cat_perm&cat='.$page['cat'] + 'U_HELP' => get_root_url().'popuphelp.php?page=cat_perm', + 'F_ACTION' => get_root_url().'admin.php?page=cat_perm&cat='.$page['cat'] ) ); diff --git a/admin/configuration.php b/admin/configuration.php index 9f741ad89..772e2965b 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -4,8 +4,7 @@ // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | // | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -173,10 +172,9 @@ $tabsheet->assign(); $action = get_root_url().'admin.php?page=configuration'; $action.= '&section='.$page['section']; -$template->assign_vars( +$template->assign( array( 'U_HELP' => get_root_url().'popuphelp.php?page=configuration', - 'F_ACTION'=>$action )); diff --git a/admin/help.php b/admin/help.php index bc588ee22..4634a4d41 100644 --- a/admin/help.php +++ b/admin/help.php @@ -2,10 +2,9 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | 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 : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -32,5 +31,5 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); // +-----------------------------------------------------------------------+ check_status(ACCESS_ADMINISTRATOR); -$template->assign_var('ADMIN_CONTENT', load_language('help.html','','',true) ); +$template->assign('ADMIN_CONTENT', load_language('help.html','','',true) ); ?> diff --git a/admin/ws_checker.php b/admin/ws_checker.php index e50f17fdf..d820c5340 100644 --- a/admin/ws_checker.php +++ b/admin/ws_checker.php @@ -209,9 +209,9 @@ if (isset($_POST['wsX_submit'])) -$template->assign_vars( +$template->assign( array( - 'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=web_service', + 'U_HELP' => get_root_url().'popuphelp.php?page=web_service', ) ); diff --git a/include/menubar.inc.php b/include/menubar.inc.php index 38c0b3fd0..abe4220ca 100644 --- a/include/menubar.inc.php +++ b/include/menubar.inc.php @@ -270,7 +270,7 @@ $template->append( 'summaries', array( 'TITLE'=>l10n('hint_search'), - 'NAME'=>l10n('search'), + 'NAME'=>l10n('Search'), 'U_SUMMARY'=> get_root_url().'search.php', 'REL'=> 'rel="search"' ) diff --git a/notification.php b/notification.php index 6d5d67ae3..a65411bd8 100644 --- a/notification.php +++ b/notification.php @@ -75,21 +75,19 @@ $template->append('head_elements', '' ); -include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->set_filenames(array('notification'=>'notification.tpl')); -$template->assign_vars( +$template->assign( array( 'U_FEED' => $feed_url, 'U_FEED_IMAGE_ONLY' => $feed_image_only_url, - 'U_HOME' => make_index_url(), ) ); // +-----------------------------------------------------------------------+ // | html code display | // +-----------------------------------------------------------------------+ - +include(PHPWG_ROOT_PATH.'include/page_header.php'); $template->parse('notification'); include(PHPWG_ROOT_PATH.'include/page_tail.php'); diff --git a/template/yoga/admin/permalinks.tpl b/template/yoga/admin/permalinks.tpl index 2013666eb..f6a1d72ac 100644 --- a/template/yoga/admin/permalinks.tpl +++ b/template/yoga/admin/permalinks.tpl @@ -1,7 +1,7 @@ {* $Id$ *}

{'Permalinks'|@translate}

@@ -24,7 +24,7 @@

- +

@@ -36,8 +36,8 @@ {'Category'|@translate} {$SORT_NAME} {'Permalink'|@translate} {$SORT_PERMALINK} -{foreach from=$permalinks item=permalink} - +{foreach from=$permalinks item=permalink name="permalink_loop"} + {$permalink.id} {$permalink.name} {$permalink.permalink} @@ -64,7 +64,7 @@ {$permalink.date_deleted} {$permalink.last_hit} {$permalink.hit} - Delete + [{'delete'|@translate}] {/foreach} diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css index 025dc1f78..d7e8fc865 100644 --- a/template/yoga/default-layout.css +++ b/template/yoga/default-layout.css @@ -9,7 +9,7 @@ BODY { } #the_page { - /* Just in case another template needs an inner frame */ + /* Just in case another template needs an inner frame */ } H1 { @@ -21,29 +21,24 @@ H1 { } H2 { - margin: 0; - padding: 5px 0.5em 5px 0.5em; - text-align: left; - font-size: 120%; -} -H5 { - margin: 0; - padding: 0 1.5em 0 30%; - text-align: right; - font-size: 90%; + margin: 0; + padding: 5px 0.5em 5px 0.5em; + text-align: left; + font-size: 120%; } + A { - text-decoration:none; - border-bottom: 1px dotted #005e89; + text-decoration:none; + border-bottom: 1px dotted #005e89; } A:hover { - border-bottom: 1px solid #858460; + border-bottom: 1px solid #858460; } A.button, A.button:hover { - border: 0; + border: 0; } IMG { - border: none; + border: none; } HR.separation { @@ -210,19 +205,6 @@ FORM.properties SPAN.property { 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 */ UL.actions { text-indent: 0; @@ -272,10 +254,6 @@ BODY#thePopuphelpPage #copyright { display: none; } -BODY#thePopuphelpPage #theHeader P { - display: none; -} - BODY#thePopuphelpPage #content P { text-align: justify; padding: 0.5em; diff --git a/template/yoga/identification.tpl b/template/yoga/identification.tpl index 5cb4555e8..d4c2293f6 100644 --- a/template/yoga/identification.tpl +++ b/template/yoga/identification.tpl @@ -3,11 +3,11 @@

{'Identification'|@translate}

@@ -54,7 +54,7 @@ -

+