diff options
Diffstat (limited to 'themes/default')
-rw-r--r-- | themes/default/template/footer.tpl | 52 | ||||
-rw-r--r-- | themes/default/template/header.tpl | 75 |
2 files changed, 72 insertions, 55 deletions
diff --git a/themes/default/template/footer.tpl b/themes/default/template/footer.tpl index 08c94fb4f..a62b27a18 100644 --- a/themes/default/template/footer.tpl +++ b/themes/default/template/footer.tpl @@ -1,34 +1,40 @@ <div id="copyright"> -{if isset($debug.TIME)} - {'Page generated in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME}) - -{/if} + {if isset($debug.TIME)} + {'Page generated in'|translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|translate} {$debug.SQL_TIME}) - + {/if} + {* - Please, do not remove this copyright. If you really want to, - contact us on http://piwigo.org to find a solution on how - to show the origin of the script... + Please, do not remove this copyright. If you really want to, + contact us on http://piwigo.org to find a solution on how + to show the origin of the script... *} - {'Powered by'|@translate} <a href="{$PHPWG_URL}" class="Piwigo">Piwigo</a> - {$VERSION} - {if isset($CONTACT_MAIL)} - - <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Contact webmaster'|@translate}</a> - {/if} - {if isset($TOGGLE_MOBILE_THEME_URL)} - - {'View in'|@translate} : <a href="{$TOGGLE_MOBILE_THEME_URL}">{'Mobile'|@translate}</a> | <b>{'Desktop'|@translate}</b> - {/if} -{get_combined_scripts load='footer'} + {'Powered by'|translate} <a href="{$PHPWG_URL}" class="Piwigo">Piwigo</a> + {$VERSION} + {if isset($CONTACT_MAIL)} + - <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|translate|@escape:url}">{'Contact webmaster'|translate}</a> + {/if} + {if isset($TOGGLE_MOBILE_THEME_URL)} + - {'View in'|translate} : <a href="{$TOGGLE_MOBILE_THEME_URL}">{'Mobile'|translate}</a> | <b>{'Desktop'|translate}</b> + {/if} + + {if isset($footer_elements)} + {foreach from=$footer_elements item=elt} + {$elt} + {/foreach} + {/if} +</div>{* <!-- copyright --> *} -{if isset($footer_elements)} -{foreach from=$footer_elements item=v} -{$v} -{/foreach} -{/if} -</div> {* copyright *} {if isset($debug.QUERIES_LIST)} <div id="debug"> -{$debug.QUERIES_LIST} + {$debug.QUERIES_LIST} </div> {/if} -</div>{* the_page *} +</div>{* <!-- the_page --> *} + +<!-- BEGIN get_combined --> +{get_combined_scripts load='footer'} +<!-- END get_combined --> + </body> </html>
\ No newline at end of file diff --git a/themes/default/template/header.tpl b/themes/default/template/header.tpl index 3debe3872..03084aa87 100644 --- a/themes/default/template/header.tpl +++ b/themes/default/template/header.tpl @@ -1,77 +1,88 @@ <!DOCTYPE html> <html lang="{$lang_info.code}" dir="{$lang_info.direction}"> <head> -<meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}"> +<meta charset="{$CONTENT_ENCODING}"> <meta name="generator" content="Piwigo (aka PWG), see piwigo.org"> -{if isset($meta_ref) } + +{if isset($meta_ref)} {if isset($INFO_AUTHOR)} -<meta name="author" content="{$INFO_AUTHOR|@strip_tags:false|@replace:'"':' '}"> +<meta name="author" content="{$INFO_AUTHOR|strip_tags:false|replace:'"':' '}"> {/if} {if isset($related_tags)} <meta name="keywords" content="{foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}{$tag.name}{/foreach}"> {/if} {if isset($COMMENT_IMG)} -<meta name="description" content="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}"> +<meta name="description" content="{$COMMENT_IMG|strip_tags:false|replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}"> {else} <meta name="description" content="{$PAGE_TITLE}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}"> {/if} {/if} + <title>{if $PAGE_TITLE!=l10n('Home') && $PAGE_TITLE!=$GALLERY_TITLE}{$PAGE_TITLE} | {/if}{$GALLERY_TITLE}</title> <link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico"> -<link rel="start" title="{'Home'|@translate}" href="{$U_HOME}" > -<link rel="search" title="{'Search'|@translate}" href="{$ROOT_URL}search.php" > -{if isset($first.U_IMG) }<link rel="first" title="{'First'|@translate}" href="{$first.U_IMG}" >{/if} -{if isset($previous.U_IMG)}<link rel="prev" title="{'Previous'|@translate}" href="{$previous.U_IMG}" >{/if} -{if isset($next.U_IMG) }<link rel="next" title="{'Next'|@translate}" href="{$next.U_IMG}" >{/if} -{if isset($last.U_IMG) }<link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >{/if} -{if isset($U_UP) }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if} +<link rel="start" title="{'Home'|translate}" href="{$U_HOME}" > +<link rel="search" title="{'Search'|translate}" href="{$ROOT_URL}search.php" > -{get_combined_css} +{if isset($first.U_IMG) }<link rel="first" title="{'First'|translate}" href="{$first.U_IMG}" >{/if} +{if isset($previous.U_IMG)}<link rel="prev" title="{'Previous'|translate}" href="{$previous.U_IMG}" >{/if} +{if isset($next.U_IMG) }<link rel="next" title="{'Next'|translate}" href="{$next.U_IMG}" >{/if} +{if isset($last.U_IMG) }<link rel="last" title="{'Last'|translate}" href="{$last.U_IMG}" >{/if} +{if isset($U_UP) }<link rel="up" title="{'Thumbnails'|translate}" href="{$U_UP}" >{/if} + +{if isset($U_PREFETCH) }<link rel="prefetch" href="{$U_PREFETCH}">{/if} +{if isset($U_CANONICAL) }<link rel="canonical" href="{$U_CANONICAL}">{/if} + +{if not empty($page_refresh)}<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if} + +{strip} {foreach from=$themes item=theme} -{if $theme.load_css} -{combine_css path="themes/`$theme.id`/theme.css" order=-10} -{/if} -{if !empty($theme.local_head)}{include file=$theme.local_head load_css=$theme.load_css}{/if} + {if $theme.load_css} + {combine_css path="themes/`$theme.id`/theme.css" order=-10} + {/if} + {if !empty($theme.local_head)} + {include file=$theme.local_head load_css=$theme.load_css} + {/if} {/foreach} +{combine_script id="jquery" load="footer"} +{/strip} -{if isset($U_PREFETCH)}<link rel="prefetch" href="{$U_PREFETCH}">{/if} -{if isset($U_CANONICAL)}<link rel="canonical" href="{$U_CANONICAL}">{/if} - -{if not empty($page_refresh) }<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if} +<!-- BEGIN get_combined --> +{get_combined_css} {get_combined_scripts load='header'} +<!-- END get_combined --> + <!--[if lt IE 7]> <script type="text/javascript" src="{$ROOT_URL}themes/default/js/pngfix.js"></script> <![endif]--> -{combine_script id="jquery" load="footer"} - {if not empty($head_elements)} - {foreach from=$head_elements item=elt}{$elt} - {/foreach} +{foreach from=$head_elements item=elt} + {$elt} +{/foreach} {/if} - </head> <body id="{$BODY_ID}"> + <div id="the_page"> {if not empty($header_msgs)} <div class="header_msgs"> - {foreach from=$header_msgs item=elt} - {$elt}<br> - {/foreach} + {foreach from=$header_msgs item=elt} + {$elt}<br> + {/foreach} </div> {/if} <div id="theHeader">{$PAGE_BANNER}</div> -{if isset($theSwiftHeader)}{$theSwiftHeader}{/if} + {if not empty($header_notes)} <div class="header_notes"> - {foreach from=$header_notes item=elt} - <p>{$elt}</p> - {/foreach} + {foreach from=$header_notes item=elt} + <p>{$elt}</p> + {/foreach} </div> {/if} |