Changeset 28690


Ignore:
Timestamp:
06/13/14 21:10:41 (5 years ago)
Author:
mistic100
Message:

clean HTML code of header and footer

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/themes/default/template/footer.tpl

    r12613 r28690  
    33          don't be confusing with the public page footer 
    44*} 
    5 </div> <!-- pwgMain --> 
     5</div>{* <!-- pwgMain --> *} 
     6 
    67{if isset($footer_elements)} 
    7 {foreach from=$footer_elements item=v} 
    8 {$v} 
     8{foreach from=$footer_elements item=elt} 
     9  {$elt} 
    910{/foreach} 
    1011{/if} 
     12 
    1113{if isset($debug.QUERIES_LIST)} 
    1214<div id="debug"> 
    13 {$debug.QUERIES_LIST} 
     15  {$debug.QUERIES_LIST} 
    1416</div> 
    1517{/if} 
     
    1719<div id="footer"> 
    1820  <div id="piwigoInfos"> 
    19  {* Please, do not remove this copyright. If you really want to, 
    20       contact us on http://piwigo.org to find a solution on how 
    21       to show the origin of the script... 
    22   *} 
    23  
    24   {'Powered by'|@translate} 
    25   <a class="externalLink" href="{$PHPWG_URL}" title="{'Visit Piwigo project website'|@translate}"> 
    26   <span class="Piwigo">Piwigo</span></a> 
     21  {'Powered by'|translate} 
     22  <a class="externalLink tiptip" href="{$PHPWG_URL}" title="{'Visit Piwigo project website'|translate}"><span class="Piwigo">Piwigo</span></a> 
    2723  {$VERSION} 
    28   | <a class="externalLink" href="{$pwgmenu.WIKI}" title="{'Read Piwigo Documentation'|@translate}">{'Documentation'|@translate}</a> 
    29   | <a class="externalLink" href="{$pwgmenu.FORUM}" title="{'Get Support on Piwigo Forum'|@translate}">{'Support'|@translate}</a> 
    30   </div> <!-- piwigoInfos --> 
     24  | <a class="externalLink tiptip" href="{$pwgmenu.WIKI}" title="{'Read Piwigo Documentation'|translate}">{'Documentation'|translate}</a> 
     25  | <a class="externalLink tiptip" href="{$pwgmenu.FORUM}" title="{'Get Support on Piwigo Forum'|translate}">{'Support'|translate}</a> 
     26  </div> 
    3127 
    3228  <div id="pageInfos"> 
    33  {if isset($debug.TIME) } 
    34  {'Page generated in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME}) - 
    35  {/if} 
     29    {if isset($debug.TIME) } 
     30    {'Page generated in'|translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|translate} {$debug.SQL_TIME}) - 
     31    {/if} 
     32 
     33    {'Contact'|translate} 
     34    <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|translate|escape:url}">{'Webmaster'|translate}</a> 
     35  </div>{* <!-- pageInfos --> *} 
     36 
     37</div>{* <!-- footer --> *} 
     38</div>{* <!-- the_page --> *} 
    3639 
    3740 
    38   {'Contact'|@translate} 
    39   <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Webmaster'|@translate}</a> 
    40   </div> <!-- pageInfos --> 
     41{combine_script id='jquery.tipTip' load='footer' path='themes/default/js/plugins/jquery.tipTip.minified.js'} 
     42{footer_script require='jquery.tipTip'} 
     43jQuery('.tiptip').tipTip({ 
     44  delay: 0, 
     45  fadeIn: 200, 
     46  fadeOut: 200 
     47}); 
    4148 
    42 </div> <!-- footer --> 
    43 </div> <!-- the_page --> 
    44  
    45  
    46 {combine_script id='jquery.tipTip' load='async' path='themes/default/js/plugins/jquery.tipTip.minified.js'} 
    47 {footer_script require='jquery.tipTip'} 
    48 jQuery(document).ready(function() {ldelim} 
    49         jQuery('#pwgHead A[title], #footer A[title], .themeActions .tiptip, .languageActions .tiptip').tipTip({ldelim} 
    50                         'delay' : 0, 
    51                         'fadeIn' : 200, 
    52                         'fadeOut' : 200 
    53         }); 
     49jQuery('a.externalLink').click(function() { 
     50  window.open(jQuery(this).attr("href")); 
     51  return false; 
    5452}); 
    5553{/footer_script} 
    5654 
    57 <!-- BEGIN get_combined_scripts --> 
     55<!-- BEGIN get_combined --> 
    5856{get_combined_scripts load='footer'} 
    59 <!-- END get_combined_scripts --> 
    60  
    61 {literal} 
    62 <script type='text/javascript'> 
    63   jQuery(document).ready(function() { 
    64     $("a.externalLink").click(function() { 
    65       window.open($(this).attr("href")); 
    66       return false; 
    67     }); 
    68   }); 
    69 </script> 
    70 {/literal} 
    71  
    72 {if not $ENABLE_SYNCHRONIZATION} 
    73 {literal} 
    74 <script type='text/javascript'> 
    75   $(document).ready(function() { 
    76     $("#helpSynchro").hide(); 
    77   }); 
    78 </script> 
    79 {/literal} 
    80 {/if} 
     57<!-- END get_combined --> 
    8158 
    8259</body> 
  • trunk/admin/themes/default/template/header.tpl

    r28689 r28690  
    11{*  
    2  
    32          Warning : This is the admin pages header only  
    43          don't confuse with the public page header 
    5  
    64*} 
    75<!DOCTYPE html> 
     
    1210<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico"> 
    1311 
    14 {get_combined_css} 
     12{strip} 
    1513{foreach from=$themes item=theme} 
    16 {if $theme.load_css} 
    17 {combine_css path="admin/themes/`$theme.id`/theme.css" order=-10} 
    18 {/if} 
    19 {if !empty($theme.local_head)}{include file=$theme.local_head load_css=$theme.load_css}{/if} 
     14  {if $theme.load_css} 
     15  {combine_css path="admin/themes/`$theme.id`/theme.css" order=-10} 
     16  {/if} 
     17  {if !empty($theme.local_head)} 
     18  {include file=$theme.local_head load_css=$theme.load_css} 
     19  {/if} 
    2020{/foreach} 
     21 
    2122{combine_css path="admin/themes/default/fontello/css/fontello.css"} 
    2223 
    23 <!-- BEGIN get_combined_scripts --> 
     24{combine_script id='jquery' path='themes/default/js/jquery.min.js'} 
     25{/strip} 
     26 
     27<!-- BEGIN get_combined --> 
     28{get_combined_css} 
     29 
    2430{get_combined_scripts load='header'} 
    25 <!-- END get_combined_scripts --> 
    26  
    27 {combine_script id='jquery' path='themes/default/js/jquery.min.js'} 
     31<!-- END get_combined --> 
    2832 
    2933{if not empty($head_elements)} 
    3034{foreach from=$head_elements item=elt} 
    31 {$elt} 
     35  {$elt} 
    3236{/foreach} 
    3337{/if} 
    34  
    3538</head> 
    3639 
     
    4952<div id="pwgHead"> 
    5053  <h1> 
    51     <a href="{$U_RETURN}" title="{'Visit Gallery'|@translate}"> 
    52                         <span class="icon-home" style="font-size:larger"></span> 
    53                         {$GALLERY_TITLE} 
     54    <a href="{$U_RETURN}" title="{'Visit Gallery'|translate}" class="tiptip"> 
     55      <span class="icon-home" style="font-size:larger"></span> 
     56      {$GALLERY_TITLE} 
    5457    </a> 
    5558  </h1> 
    5659 
    5760  <div id="headActions"> 
    58     {'Hello'|@translate} {$USERNAME} | 
    59     <a class="icon-eye" href="{$U_RETURN}">{'Visit Gallery'|@translate}</a> | 
    60     <a class="icon-brush" href="{$U_CHANGE_THEME}" title="{'Switch to clear or dark colors for administration'|@translate}">{'Change Admin Colors'|@translate}</a> | 
    61     <a class="icon-help-circled" href="{$U_FAQ}" title="{'Instructions to use Piwigo'|@translate}">{'Help Me'|@translate}</a> | 
    62     <a class="icon-logout" href="{$U_LOGOUT}">{'Logout'|@translate}</a> 
     61    {'Hello'|translate} {$USERNAME} | 
     62    <a class="icon-eye" href="{$U_RETURN}">{'Visit Gallery'|translate}</a> | 
     63    <a class="icon-brush tiptip" href="{$U_CHANGE_THEME}" title="{'Switch to clear or dark colors for administration'|translate}">{'Change Admin Colors'|translate}</a> | 
     64    <a class="icon-help-circled tiptip" href="{$U_FAQ}" title="{'Instructions to use Piwigo'|@translate}">{'Help Me'|translate}</a> | 
     65    <a class="icon-logout" href="{$U_LOGOUT}">{'Logout'|translate}</a> 
    6366  </div> 
    6467</div> 
  • trunk/themes/default/template/footer.tpl

    r17496 r28690  
    11<div id="copyright"> 
    2 {if isset($debug.TIME)} 
    3         {'Page generated in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME}) - 
    4 {/if} 
     2  {if isset($debug.TIME)} 
     3    {'Page generated in'|translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|translate} {$debug.SQL_TIME}) - 
     4  {/if} 
     5 
    56{* 
    6         Please, do not remove this copyright. If you really want to, 
    7                         contact us on http://piwigo.org to find a solution on how 
    8                         to show the origin of the script... 
     7    Please, do not remove this copyright. If you really want to, 
     8    contact us on http://piwigo.org to find a solution on how 
     9    to show the origin of the script... 
    910*} 
    10         {'Powered by'|@translate}       <a href="{$PHPWG_URL}" class="Piwigo">Piwigo</a> 
    11         {$VERSION} 
    12         {if isset($CONTACT_MAIL)} 
    13         - <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Contact webmaster'|@translate}</a> 
    14         {/if} 
    15         {if isset($TOGGLE_MOBILE_THEME_URL)} 
    16         - {'View in'|@translate} : <a href="{$TOGGLE_MOBILE_THEME_URL}">{'Mobile'|@translate}</a> | <b>{'Desktop'|@translate}</b> 
    17         {/if} 
    1811 
    19 {get_combined_scripts load='footer'} 
     12  {'Powered by'|translate}      <a href="{$PHPWG_URL}" class="Piwigo">Piwigo</a> 
     13  {$VERSION} 
     14  {if isset($CONTACT_MAIL)} 
     15  - <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|translate|@escape:url}">{'Contact webmaster'|translate}</a> 
     16  {/if} 
     17  {if isset($TOGGLE_MOBILE_THEME_URL)} 
     18  - {'View in'|translate} : <a href="{$TOGGLE_MOBILE_THEME_URL}">{'Mobile'|translate}</a> | <b>{'Desktop'|translate}</b> 
     19  {/if} 
     20   
     21  {if isset($footer_elements)} 
     22  {foreach from=$footer_elements item=elt} 
     23    {$elt} 
     24  {/foreach} 
     25  {/if} 
     26</div>{* <!-- copyright --> *} 
    2027 
    21 {if isset($footer_elements)} 
    22 {foreach from=$footer_elements item=v} 
    23 {$v} 
    24 {/foreach} 
    25 {/if} 
    26 </div> {* copyright *} 
    2728{if isset($debug.QUERIES_LIST)} 
    2829<div id="debug"> 
    29 {$debug.QUERIES_LIST} 
     30  {$debug.QUERIES_LIST} 
    3031</div> 
    3132{/if} 
    32 </div>{* the_page *} 
     33</div>{* <!-- the_page --> *} 
     34 
     35<!-- BEGIN get_combined --> 
     36{get_combined_scripts load='footer'} 
     37<!-- END get_combined --> 
     38 
    3339</body> 
    3440</html> 
  • trunk/themes/default/template/header.tpl

    r19233 r28690  
    22<html lang="{$lang_info.code}" dir="{$lang_info.direction}"> 
    33<head> 
    4 <meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}"> 
     4<meta charset="{$CONTENT_ENCODING}"> 
    55<meta name="generator" content="Piwigo (aka PWG), see piwigo.org"> 
    6 {if isset($meta_ref) }  
     6 
     7{if isset($meta_ref)}  
    78{if isset($INFO_AUTHOR)} 
    8 <meta name="author" content="{$INFO_AUTHOR|@strip_tags:false|@replace:'"':' '}"> 
     9<meta name="author" content="{$INFO_AUTHOR|strip_tags:false|replace:'"':' '}"> 
    910{/if} 
    1011{if isset($related_tags)} 
     
    1213{/if} 
    1314{if isset($COMMENT_IMG)} 
    14 <meta name="description" content="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}"> 
     15<meta name="description" content="{$COMMENT_IMG|strip_tags:false|replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}"> 
    1516{else} 
    1617<meta name="description" content="{$PAGE_TITLE}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}"> 
    1718{/if} 
    1819{/if} 
     20 
    1921<title>{if $PAGE_TITLE!=l10n('Home') && $PAGE_TITLE!=$GALLERY_TITLE}{$PAGE_TITLE} | {/if}{$GALLERY_TITLE}</title> 
    2022<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico"> 
    2123 
    22 <link rel="start" title="{'Home'|@translate}" href="{$U_HOME}" > 
    23 <link rel="search" title="{'Search'|@translate}" href="{$ROOT_URL}search.php" > 
    24 {if isset($first.U_IMG)   }<link rel="first" title="{'First'|@translate}" href="{$first.U_IMG}" >{/if} 
    25 {if isset($previous.U_IMG)}<link rel="prev" title="{'Previous'|@translate}" href="{$previous.U_IMG}" >{/if} 
    26 {if isset($next.U_IMG)    }<link rel="next" title="{'Next'|@translate}" href="{$next.U_IMG}" >{/if} 
    27 {if isset($last.U_IMG)    }<link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >{/if} 
    28 {if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if} 
     24<link rel="start" title="{'Home'|translate}" href="{$U_HOME}" > 
     25<link rel="search" title="{'Search'|translate}" href="{$ROOT_URL}search.php" > 
    2926 
    30 {get_combined_css} 
     27{if isset($first.U_IMG)   }<link rel="first" title="{'First'|translate}" href="{$first.U_IMG}" >{/if} 
     28{if isset($previous.U_IMG)}<link rel="prev" title="{'Previous'|translate}" href="{$previous.U_IMG}" >{/if} 
     29{if isset($next.U_IMG)    }<link rel="next" title="{'Next'|translate}" href="{$next.U_IMG}" >{/if} 
     30{if isset($last.U_IMG)    }<link rel="last" title="{'Last'|translate}" href="{$last.U_IMG}" >{/if} 
     31{if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|translate}" href="{$U_UP}" >{/if} 
     32 
     33{if isset($U_PREFETCH)    }<link rel="prefetch" href="{$U_PREFETCH}">{/if} 
     34{if isset($U_CANONICAL)   }<link rel="canonical" href="{$U_CANONICAL}">{/if} 
     35 
     36{if not empty($page_refresh)}<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if} 
     37 
     38{strip} 
    3139{foreach from=$themes item=theme} 
    32 {if $theme.load_css} 
    33 {combine_css path="themes/`$theme.id`/theme.css" order=-10} 
    34 {/if} 
    35 {if !empty($theme.local_head)}{include file=$theme.local_head load_css=$theme.load_css}{/if} 
     40  {if $theme.load_css} 
     41  {combine_css path="themes/`$theme.id`/theme.css" order=-10} 
     42  {/if} 
     43  {if !empty($theme.local_head)} 
     44  {include file=$theme.local_head load_css=$theme.load_css} 
     45  {/if} 
    3646{/foreach} 
    3747 
     48{combine_script id="jquery" load="footer"} 
     49{/strip} 
    3850 
    39 {if isset($U_PREFETCH)}<link rel="prefetch" href="{$U_PREFETCH}">{/if} 
    40 {if isset($U_CANONICAL)}<link rel="canonical" href="{$U_CANONICAL}">{/if} 
    41  
    42 {if not empty($page_refresh)    }<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if} 
     51<!-- BEGIN get_combined --> 
     52{get_combined_css} 
    4353 
    4454{get_combined_scripts load='header'} 
     55<!-- END get_combined --> 
     56 
    4557<!--[if lt IE 7]> 
    4658<script type="text/javascript" src="{$ROOT_URL}themes/default/js/pngfix.js"></script> 
    4759<![endif]--> 
    4860 
    49 {combine_script id="jquery" load="footer"} 
    50  
    5161{if not empty($head_elements)} 
    52         {foreach from=$head_elements item=elt}{$elt} 
    53         {/foreach} 
     62{foreach from=$head_elements item=elt} 
     63  {$elt} 
     64{/foreach} 
    5465{/if} 
    55  
    5666</head> 
    5767 
    5868<body id="{$BODY_ID}"> 
     69 
    5970<div id="the_page"> 
    6071 
    6172{if not empty($header_msgs)} 
    6273<div class="header_msgs"> 
    63         {foreach from=$header_msgs item=elt} 
    64         {$elt}<br> 
    65         {/foreach} 
     74  {foreach from=$header_msgs item=elt} 
     75  {$elt}<br> 
     76  {/foreach} 
    6677</div> 
    6778{/if} 
    6879 
    6980<div id="theHeader">{$PAGE_BANNER}</div> 
    70 {if isset($theSwiftHeader)}{$theSwiftHeader}{/if} 
     81 
    7182{if not empty($header_notes)} 
    7283<div class="header_notes"> 
    73         {foreach from=$header_notes item=elt} 
    74         <p>{$elt}</p> 
    75         {/foreach} 
     84  {foreach from=$header_notes item=elt} 
     85  <p>{$elt}</p> 
     86  {/foreach} 
    7687</div> 
    7788{/if} 
Note: See TracChangeset for help on using the changeset viewer.