From b153d19474c6cc1a48ba73df15f65b27bae9fc4f Mon Sep 17 00:00:00 2001 From: mistic100 Date: Fri, 13 Jun 2014 19:10:41 +0000 Subject: clean HTML code of header and footer git-svn-id: http://piwigo.org/svn/trunk@28690 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/default/template/footer.tpl | 52 ++++++++++++++------------ themes/default/template/header.tpl | 75 ++++++++++++++++++++++---------------- 2 files changed, 72 insertions(+), 55 deletions(-) (limited to 'themes') 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 @@ {* *} -{if isset($footer_elements)} -{foreach from=$footer_elements item=v} -{$v} -{/foreach} -{/if} - {* copyright *} {if isset($debug.QUERIES_LIST)}
-{$debug.QUERIES_LIST} + {$debug.QUERIES_LIST}
{/if} -{* the_page *} +{* *} + + +{get_combined_scripts load='footer'} + + \ 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 @@ - + -{if isset($meta_ref) } + +{if isset($meta_ref)} {if isset($INFO_AUTHOR)} - + {/if} {if isset($related_tags)} {/if} {if isset($COMMENT_IMG)} - + {else} {/if} {/if} + {if $PAGE_TITLE!=l10n('Home') && $PAGE_TITLE!=$GALLERY_TITLE}{$PAGE_TITLE} | {/if}{$GALLERY_TITLE} - - -{if isset($first.U_IMG) }{/if} -{if isset($previous.U_IMG)}{/if} -{if isset($next.U_IMG) }{/if} -{if isset($last.U_IMG) }{/if} -{if isset($U_UP) }{/if} + + -{get_combined_css} +{if isset($first.U_IMG) }{/if} +{if isset($previous.U_IMG)}{/if} +{if isset($next.U_IMG) }{/if} +{if isset($last.U_IMG) }{/if} +{if isset($U_UP) }{/if} + +{if isset($U_PREFETCH) }{/if} +{if isset($U_CANONICAL) }{/if} + +{if not empty($page_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)}{/if} -{if isset($U_CANONICAL)}{/if} - -{if not empty($page_refresh) }{/if} + +{get_combined_css} {get_combined_scripts load='header'} + + -{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} - +
{if not empty($header_msgs)}
- {foreach from=$header_msgs item=elt} - {$elt}
- {/foreach} + {foreach from=$header_msgs item=elt} + {$elt}
+ {/foreach}
{/if}
{$PAGE_BANNER}
-{if isset($theSwiftHeader)}{$theSwiftHeader}{/if} + {if not empty($header_notes)}
- {foreach from=$header_notes item=elt} -

{$elt}

- {/foreach} + {foreach from=$header_notes item=elt} +

{$elt}

+ {/foreach}
{/if} -- cgit v1.2.3