aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin/cat_perm.php6
-rw-r--r--admin/configuration.php6
-rw-r--r--admin/help.php7
-rw-r--r--admin/ws_checker.php4
-rw-r--r--include/menubar.inc.php2
-rw-r--r--notification.php6
-rw-r--r--template/yoga/admin/permalinks.tpl10
-rw-r--r--template/yoga/default-layout.css44
-rw-r--r--template/yoga/identification.tpl12
-rw-r--r--template/yoga/menubar.tpl2
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',
'<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->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$ *}
<div class="titrePage">
<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>
<h2>{'Permalinks'|@translate}</h2>
</div>
@@ -24,7 +24,7 @@
</label>
<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>
</fieldset>
</form>
@@ -36,8 +36,8 @@
<td>{'Category'|@translate} {$SORT_NAME}</td>
<td>{'Permalink'|@translate} {$SORT_PERMALINK}</td>
</tr>
-{foreach from=$permalinks item=permalink}
- <tr>
+{foreach from=$permalinks item=permalink name="permalink_loop"}
+ <tr class="{if $smarty.foreach.permalink_loop.index is odd}row1{else}row2{/if}">
<td>{$permalink.id}</td>
<td>{$permalink.name}</td>
<td>{$permalink.permalink}</td>
@@ -64,7 +64,7 @@
<td>{$permalink.date_deleted}</td>
<td>{$permalink.last_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>
{/foreach}
</table>
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 @@
<div class="titrePage">
<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) }
- <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}
- <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>
<h2>{'Identification'|@translate}</h2>
</div>
@@ -54,7 +54,7 @@
</ul>
</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>
<script type="text/javascript"><!--
@@ -63,9 +63,9 @@ document.login_form.username.focus();
<p>
{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}
- <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>
</div> <!-- content -->
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index 7169ff39f..b53af4b1e 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -152,7 +152,7 @@
<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>
{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}
</ul>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 18:06:15 +0000