Changeset 8774


Ignore:
Timestamp:
01/19/11 22:18:45 (9 years ago)
Author:
rvelices
Message:

more compact html output

Location:
trunk/themes/default/template
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/themes/default/template/index.tpl

    r8711 r8774  
    44<div class="titrePage"> 
    55        <ul class="categoryActions"> 
    6                 {if !empty($image_orders)} 
    7                 <li> 
    8                 {'Sort order'|@translate}: 
     6{if !empty($image_orders)} 
     7                <li>{'Sort order'|@translate}: {strip} 
    98                <select onchange="document.location = this.options[this.selectedIndex].value;"> 
    109                        {foreach from=$image_orders item=image_order} 
     
    1211                        {/foreach} 
    1312                </select> 
    14                 </li> 
    15                 {/if} 
    16  
     13{/strip}</li> 
     14{/if} 
    1715{if isset($favorite)} 
    1816                <li><a href="{$favorite.U_FAVORITE}" title="{'delete all photos from your favorites'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    19                         <span class="pwg-icon pwg-icon-favorite-del">&nbsp;</span><span class="pwg-button-text">{'delete all photos from your favorites'|@translate}</span> 
     17                        <span class="pwg-icon pwg-icon-favorite-del"> </span><span class="pwg-button-text">{'delete all photos from your favorites'|@translate}</span> 
    2018                </a></li> 
    2119{/if} 
    2220{if isset($U_CADDIE)} 
    2321                <li><a href="{$U_CADDIE}" title="{'add to caddie'|@translate}" class="pwg-state-default pwg-button"> 
    24                         <span class="pwg-icon pwg-icon-caddie-add">&nbsp;</span><span class="pwg-button-text">{'caddie'|@translate}</span> 
     22                        <span class="pwg-icon pwg-icon-caddie-add"> </span><span class="pwg-button-text">{'caddie'|@translate}</span> 
    2523                </a></li> 
    2624{/if} 
    2725{if isset($U_EDIT)} 
    2826                <li><a href="{$U_EDIT}" title="{'edit'|@translate}" class="pwg-state-default pwg-button"> 
    29                         <span class="pwg-icon pwg-icon-category-edit">&nbsp;</span><span class="pwg-button-text">{'edit'|@translate}</span> 
     27                        <span class="pwg-icon pwg-icon-category-edit"> </span><span class="pwg-button-text">{'edit'|@translate}</span> 
    3028                </a></li> 
    3129{/if} 
     
    3331                {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'} 
    3432                <li><a href="{$U_SEARCH_RULES}" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    35                         <span class="pwg-icon pwg-icon-help">&nbsp;</span><span class="pwg-button-text">(?)</span> 
     33                        <span class="pwg-icon pwg-icon-help"> </span><span class="pwg-button-text">(?)</span> 
    3634                </a></li> 
    3735{/if} 
    3836{if isset($U_SLIDESHOW)} 
    39                 <li><a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    40                         <span class="pwg-icon pwg-icon-slideshow">&nbsp;</span><span class="pwg-button-text">{'slideshow'|@translate}</span> 
    41                 </a></li> 
     37                <li>{strip}<a href="{$U_SLIDESHOW}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
     38                        <span class="pwg-icon pwg-icon-slideshow"> </span><span class="pwg-button-text">{'slideshow'|@translate}</span> 
     39                </a>{/strip}</li> 
    4240{/if} 
    4341{if isset($U_MODE_FLAT)} 
    44                 <li><a href="{$U_MODE_FLAT}" title="{'display all photos in all sub-albums'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    45                         <span class="pwg-icon pwg-icon-category-view-flat">&nbsp;</span><span class="pwg-button-text">{'display all photos in all sub-albums'|@translate}</span> 
    46                 </a></li> 
     42                <li>{strip}<a href="{$U_MODE_FLAT}" title="{'display all photos in all sub-albums'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
     43                        <span class="pwg-icon pwg-icon-category-view-flat"> </span><span class="pwg-button-text">{'display all photos in all sub-albums'|@translate}</span> 
     44                </a>{/strip}</li> 
    4745{/if} 
    4846{if isset($U_MODE_NORMAL)} 
    49                 <li><a href="{$U_MODE_NORMAL}" title="{'return to normal view mode'|@translate}" class="pwg-state-default pwg-button"> 
    50                         <span class="pwg-icon pwg-icon-category-view-normal">&nbsp;</span><span class="pwg-button-text">{'return to normal view mode'|@translate}</span> 
    51                 </a></li> 
     47                <li>{strip}<a href="{$U_MODE_NORMAL}" title="{'return to normal view mode'|@translate}" class="pwg-state-default pwg-button"> 
     48                        <span class="pwg-icon pwg-icon-category-view-normal"> </span><span class="pwg-button-text">{'return to normal view mode'|@translate}</span> 
     49                </a>{/strip}</li> 
    5250{/if} 
    5351{if isset($U_MODE_POSTED)} 
    54                 <li><a href="{$U_MODE_POSTED}" title="{'display a calendar by posted date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    55                         <span class="pwg-icon pwg-icon-camera-calendar">&nbsp;</span><span class="pwg-button-text">{'Calendar'|@translate}</span> 
    56                 </a></li> 
     52                <li>{strip}<a href="{$U_MODE_POSTED}" title="{'display a calendar by posted date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
     53                        <span class="pwg-icon pwg-icon-camera-calendar"> </span><span class="pwg-button-text">{'Calendar'|@translate}</span> 
     54                </a>{/strip}</li> 
    5755{/if} 
    5856{if isset($U_MODE_CREATED)} 
    59                 <li><a href="{$U_MODE_CREATED}" title="{'display a calendar by creation date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    60                         <span class="pwg-icon pwg-icon-camera-calendar">&nbsp;</span><span class="pwg-button-text">{'Calendar'|@translate}</span> 
    61                 </a></li> 
     57                <li>{strip}<a href="{$U_MODE_CREATED}" title="{'display a calendar by creation date'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
     58                        <span class="pwg-icon pwg-icon-camera-calendar"> </span><span class="pwg-button-text">{'Calendar'|@translate}</span> 
     59                </a>{/strip}</li> 
    6260{/if} 
    6361{if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if} 
     
    8078{/if} 
    8179 
    82 </div><!-- titrePage --> 
     80</div>{* <!-- titrePage --> *} 
    8381 
    8482{if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if} 
     
    126124 
    127125{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if} 
    128 </div><!-- content --> 
     126</div>{* <!-- content --> *} 
    129127{if !empty($PLUGIN_INDEX_CONTENT_AFTER)}{$PLUGIN_INDEX_CONTENT_AFTER}{/if} 
  • trunk/themes/default/template/menubar_identification.tpl

    r8432 r8774  
    11<dt>{'Identification'|@translate}</dt> 
    22<dd> 
     3{strip} 
    34        {if isset($USERNAME)} 
    4         <p>{'Hello'|@translate}&nbsp;{$USERNAME}&nbsp;!</p> 
     5        <p>{'Hello'|@translate} {$USERNAME} !</p> 
    56        {/if} 
    6  
    77        <ul> 
    88        {if isset($U_REGISTER)} 
    99        <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow">{'Register'|@translate}</a></li> 
    1010        {/if} 
    11  
    1211        {if isset($U_LOGIN)} 
    1312        <li><a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a></li> 
    1413        {/if} 
    15  
    1614        {if isset($U_LOGOUT)} 
    1715        <li><a href="{$U_LOGOUT}">{'Logout'|@translate}</a></li> 
    1816        {/if} 
    19  
    2017        {if isset($U_PROFILE)} 
    2118        <li><a href="{$U_PROFILE}" title="{'customize the appareance of the gallery'|@translate}">{'Customize'|@translate}</a></li> 
    2219        {/if} 
    23  
    2420        {if isset($U_ADMIN)} 
    2521        <li><a href="{$U_ADMIN}" title="{'available for administrators only'|@translate}">{'Administration'|@translate}</a></li> 
    2622        {/if} 
    2723        </ul> 
    28  
     24{/strip} 
    2925        {if isset($U_LOGIN)} 
     26{strip} 
    3027        <form method="post" action="{$U_LOGIN}" id="quickconnect"> 
    3128        <fieldset> 
     
    3633        </div> 
    3734 
    38         <div><label for="password">{'Password'|@translate}</label> 
    39         <br> 
     35        <div><label for="password">{'Password'|@translate}</label><br> 
    4036        <input type="password" name="password" id="password" style="width:99%"> 
    4137        </div> 
     
    4339        {if $AUTHORIZE_REMEMBERING} 
    4440        <div><label for="remember_me"> 
    45         {'Auto login'|@translate} 
    46         <input type="checkbox" name="remember_me" id="remember_me" value="1"> 
     41        {'Auto login'|@translate} <input type="checkbox" name="remember_me" id="remember_me" value="1"> 
    4742        </label></div> 
    4843        {/if} 
     
    5045        <div> 
    5146        <input type="hidden" name="redirect" value="{$smarty.server.REQUEST_URI|@urlencode}"> 
    52         <input class="submit" type="submit" name="login" value="{'Submit'|@translate}"> 
     47        <input type="submit" name="login" value="{'Submit'|@translate}"> 
    5348        <span class="categoryActions"> 
    5449{if isset($U_REGISTER)} 
    5550                <a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" class="pwg-state-default pwg-button"> 
    56                         <span class="pwg-icon pwg-icon-register">&nbsp;</span> 
     51                        <span class="pwg-icon pwg-icon-register"> </span> 
    5752                </a> 
    5853{/if} 
    5954                <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" class="pwg-state-default pwg-button"> 
    60                         <span class="pwg-icon pwg-icon-lost-password">&nbsp;</span> 
     55                        <span class="pwg-icon pwg-icon-lost-password"> </span> 
    6156                </a> 
    6257        </span> 
     
    6560        </fieldset> 
    6661        </form> 
     62{/strip} 
    6763        {/if} 
    6864</dd> 
    69  
  • trunk/themes/default/template/menubar_links.tpl

    r5095 r8774  
    11<dt>{'Links'|@translate}</dt> 
    22<dd> 
    3         <ul> 
     3        <ul>{strip} 
    44                {foreach from=$block->data item=link} 
    55                        <li> 
    6                                 <a href="{$link.URL}" class="external"  
    7                                         {if isset($link.new_window) } onclick="window.open(this.href, '{$link.new_window.NAME}','{$link.new_window.FEATURES}'); return false;"{/if} 
    8                                 > 
     6                                <a href="{$link.URL}" class="external"{if isset($link.new_window)} onclick="window.open(this.href, '{$link.new_window.NAME}','{$link.new_window.FEATURES}'); return false;"{/if}> 
    97                                {$link.LABEL} 
    108                                </a> 
    119                        </li> 
    1210                {/foreach} 
    13         </ul> 
     11        {/strip}</ul> 
    1412</dd> 
    15  
  • trunk/themes/default/template/menubar_menu.tpl

    r5178 r8774  
    11<dt>{'Menu'|@translate}</dt> 
    22<dd> 
    3   {if isset($block->data.qsearch) and  $block->data.qsearch==true} 
    4     <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;"> 
    5       <p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}> 
    6         <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%"> 
    7       </p> 
    8     </form> 
    9     <script type="text/javascript">var qsearch_prompt="{'Quick search'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script> 
    10   {/if} 
    11  
    12         <ul> 
     3{if isset($block->data.qsearch) and  $block->data.qsearch==true} 
     4        <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;"> 
     5                <p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}> 
     6                        <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%"> 
     7                </p> 
     8        </form> 
     9        <script type="text/javascript">var qsearch_prompt="{'Quick search'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script> 
     10{/if} 
     11        <ul>{strip} 
    1312        {foreach from=$block->data item=link} 
    1413                {if is_array($link)} 
    15                         <li><a href="{$link.URL}" title="{$link.TITLE}" {if isset($link.REL)}{$link.REL}{/if}>{$link.NAME}</a></li> 
     14                        <li><a href="{$link.URL}" title="{$link.TITLE}"{if isset($link.REL)} {$link.REL}{/if}>{$link.NAME}</a></li> 
    1615                {/if} 
    1716        {/foreach} 
    18         </ul> 
     17        {/strip}</ul> 
    1918</dd> 
    20  
  • trunk/themes/default/template/menubar_specials.tpl

    r5095 r8774  
    11<dt>{'Specials'|@translate}</dt> 
    22<dd> 
    3         <ul> 
     3        <ul>{strip} 
    44                {foreach from=$block->data item=link} 
    5                 <li><a href="{$link.URL}" title="{$link.TITLE}" {if isset($link.REL)}{$link.REL}{/if}>{$link.NAME}</a></li> 
     5                <li><a href="{$link.URL}" title="{$link.TITLE}"{if isset($link.REL)} {$link.REL}{/if}>{$link.NAME}</a></li> 
    66                {/foreach} 
    7         </ul> 
     7        {/strip}</ul> 
    88</dd> 
    9  
  • trunk/themes/default/template/menubar_tags.tpl

    r8665 r8774  
    33        <div id="menuTagCloud"> 
    44                {foreach from=$block->data item=tag} 
    5                 <span> 
    6                         <a class="tagLevel{$tag.level}" 
     5                <span>{strip} 
     6                        <a class="tagLevel{$tag.level}" href= 
    77                        {if isset($tag.U_ADD)} 
    8                                 href="{$tag.U_ADD}" 
    9                                 title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photos are also linked to current tags', $tag.counter)}" 
    10                                 rel="nofollow">+ 
     8                                "{$tag.U_ADD}" title="{$pwg->l10n_dec('%d photo is also linked to current tags', '%d photos are also linked to current tags', $tag.counter)}" rel="nofollow">+ 
    119                        {else} 
    12                                 href="{$tag.URL}" 
    13                                 title="{'display photos linked to this tag'|@translate}"> 
     10                                "{$tag.URL}" title="{'display photos linked to this tag'|@translate}"> 
    1411                        {/if} 
    15                                 {$tag.name}</a></span> 
     12                                {$tag.name}</a></span>{/strip} 
    1613{* ABOVE there should be no space between text, </a> and </span> elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *} 
    1714                {/foreach} 
  • trunk/themes/default/template/picture.tpl

    r8757 r8774  
    3838{strip}{if isset($U_SLIDESHOW_START)} 
    3939        <a href="{$U_SLIDESHOW_START}" title="{'slideshow'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    40                 <span class="pwg-icon pwg-icon-slideshow">&nbsp;</span><span class="pwg-button-text">{'slideshow'|@translate}</span> 
     40                <span class="pwg-icon pwg-icon-slideshow"> </span><span class="pwg-button-text">{'slideshow'|@translate}</span> 
    4141        </a> 
    4242{/if}{/strip} 
    4343{strip}{if isset($U_METADATA)} 
    4444        <a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    45                 <span class="pwg-icon pwg-icon-camera-info">&nbsp;</span><span class="pwg-button-text">{'Show file metadata'|@translate}</span> 
     45                <span class="pwg-icon pwg-icon-camera-info"> </span><span class="pwg-button-text">{'Show file metadata'|@translate}</span> 
    4646        </a> 
    4747{/if}{/strip} 
    4848{strip}{if isset($current.U_DOWNLOAD)} 
    4949        <a href="{$current.U_DOWNLOAD}" title="{'download this file'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    50                 <span class="pwg-icon pwg-icon-save">&nbsp;</span><span class="pwg-button-text">{'download'|@translate}</span> 
     50                <span class="pwg-icon pwg-icon-save"> </span><span class="pwg-button-text">{'download'|@translate}</span> 
    5151        </a> 
    5252{/if}{/strip} 
     
    5454{strip}{if isset($favorite)} 
    5555        <a href="{$favorite.U_FAVORITE}" title="{if $favorite.IS_FAVORITE}{'delete this photo from your favorites'|@translate}{else}{'add this photo to your favorites'|@translate}{/if}" class="pwg-state-default pwg-button" rel="nofollow"> 
    56                 <span class="pwg-icon pwg-icon-favorite-{if $favorite.IS_FAVORITE}del{else}add{/if}">&nbsp;</span><span class="pwg-button-text">{'Favorites'|@translate}</span> 
     56                <span class="pwg-icon pwg-icon-favorite-{if $favorite.IS_FAVORITE}del{else}add{/if}"> </span><span class="pwg-button-text">{'Favorites'|@translate}</span> 
    5757        </a> 
    5858{/if}{/strip} 
    5959{strip}{if isset($U_SET_AS_REPRESENTATIVE)} 
    6060        <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as album representative'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    61                 <span class="pwg-icon pwg-icon-representative">&nbsp;</span><span class="pwg-button-text">{'representative'|@translate}</span> 
     61                <span class="pwg-icon pwg-icon-representative"> </span><span class="pwg-button-text">{'representative'|@translate}</span> 
    6262        </a> 
    6363{/if}{/strip} 
    6464{strip}{if isset($U_ADMIN)} 
    6565        <a href="{$U_ADMIN}" title="{'Modify information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    66                 <span class="pwg-icon pwg-icon-edit">&nbsp;</span><span class="pwg-button-text">{'edit'|@translate}</span> 
     66                <span class="pwg-icon pwg-icon-edit"> </span><span class="pwg-button-text">{'edit'|@translate}</span> 
    6767        </a> 
    6868{/if}{/strip} 
     
    8484{/footer_script} 
    8585        <a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL}', {$current.id}); return false;" title="{'add to caddie'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    86                 <span class="pwg-icon pwg-icon-caddie-add">&nbsp;</span><span class="pwg-button-text">{'caddie'|@translate}</span> 
     86                <span class="pwg-icon pwg-icon-caddie-add"> </span><span class="pwg-button-text">{'caddie'|@translate}</span> 
    8787        </a> 
    8888{/if}{/strip}{*caddie management END*} 
     
    301301                <label>{'Comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label> 
    302302                <input type="hidden" name="key" value="{$comment_add.KEY}"> 
    303                 <input class="submit" type="submit" value="{'Submit'|@translate}"> 
     303                <input type="submit" value="{'Submit'|@translate}"> 
    304304        </fieldset> 
    305305        </form> 
Note: See TracChangeset for help on using the changeset viewer.