Changeset 13556


Ignore:
Timestamp:
03/14/12 14:51:37 (8 years ago)
Author:
plg
Message:

import theme Simple version 2.5.1

  • refactor code for #titrePage and add the link to switch the menu
  • fixes for comments page
  • fixes for pages where the $MENUBAR is present
Location:
extensions/simple_themes/simple
Files:
1 added
15 edited

Legend:

Unmodified
Added
Removed
  • extensions/simple_themes/simple/content.css

    r13555 r13556  
    218218  height: 160px; 
    219219  overflow: hidden; 
     220  vertical-align: top; 
    220221  margin: 1em; 
    221222  width: 45%; 
     
    394395 
    395396#theCommentsPage #comments li { 
    396   clear: left; 
    397   list-style: none; 
     397  list-style: none; 
     398  display: table-row; 
    398399} 
    399400 
     
    401402  display: inline-block; 
    402403  line-height: 25px; 
     404} 
     405 
     406#comments .description { 
     407  vertical-align: top; 
     408  display: inline-block; 
     409} 
     410#comments .illustration { 
     411  width: auto; 
    403412} 
    404413 
  • extensions/simple_themes/simple/template/about.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'About'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='About'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
    96  {$ABOUT_MESSAGE} 
    107  {if isset($THEME_ABOUT) } 
    118  <ul> 
    12    <li>{$THEME_ABOUT}</li> 
     9    <li>{$THEME_ABOUT}</li> 
    1310  </ul> 
    1411  {/if} 
    1512  {if not empty($about_msgs)} 
    16     {foreach from=$about_msgs item=elt} 
    17     {$elt} 
    18     {/foreach} 
     13  {foreach from=$about_msgs item=elt} 
     14  {$elt} 
     15  {/foreach} 
    1916  {/if} 
     17  <div style="clear: both;"></div> 
    2018</div> 
  • extensions/simple_themes/simple/template/comments.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a class="button" href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'User comments'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='User comments'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
    96  <form class="filter" action="{$F_ACTION}" method="get"> 
    107    <fieldset> 
  • extensions/simple_themes/simple/template/identification.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'Identification'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='Identification'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
    96  {if isset($errors) } 
    107  <div class="errors"> 
     
    5350    </p> 
    5451  </form> 
    55 <script type="text/javascript"><!-- 
     52  <script type="text/javascript"> 
     53    <!-- 
    5654       document.login_form.username.focus(); 
    57 //--></script> 
     55    //--> 
     56  </script> 
     57  <div style="clear: both;"></div> 
    5858</div> <!-- content --> 
  • extensions/simple_themes/simple/template/index.tpl

    r13555 r13556  
    7171  <div style="clear: both;"></div> 
    7272</div> <!-- content --> 
    73  
  • extensions/simple_themes/simple/template/nbm.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'Notification'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='Notification'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
    96  {if not empty($errors)} 
    107  <div class="errors"> 
  • extensions/simple_themes/simple/template/notification.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'Notification'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='Notification'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
    9   <p>{'The RSS notification feed provides notification on news from this website : new photos, updated categories, new comments. Use a RSS feed reader.'|@translate}</p> 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
     6  <p>{'The RSS notification feed provides notification on news from this 
     7  website : new photos, updated categories, new comments. Use a RSS feed 
     8  reader.'|@translate}</p> 
    109  <ul> 
    1110    <li><a href="{$U_FEED_IMAGE_ONLY}">{'Photos only RSS feed'|@translate}</a></li> 
    1211    <li><a href="{$U_FEED}">{'Complete RSS feed (photos, comments)'|@translate}</a></li> 
    1312  </ul> 
     13  <div style="clear: both;"></div> 
    1414</div> 
  • extensions/simple_themes/simple/template/password.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a class="button" href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'Password forgotten'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='Password forgotten'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
    96  {if count($errors)} 
    107  <div class="errors"> 
     
    2724  {/if} 
    2825 
    29 {if $action ne 'none'} 
    30 <form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post"> 
    31   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
     26  {if $action ne 'none'} 
     27  <form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post"> 
     28    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
    3229 
    33   {if $action eq 'lost'} 
    34   <div class="message">{'Please enter your username or email address.'|@translate} {'You will receive a link to create a new password via email.'|@translate}</div> 
     30    {if $action eq 'lost'} 
     31    <div class="message">{'Please enter your username or email address.'|@translate} {'You will receive a link to create a new password via email.'|@translate}</div> 
    3532 
    36   <p> 
    37     <label> 
    38       {'Username or email'|@translate} 
    39       <br> 
    40       <input type="text" id="username_or_email" name="username_or_email" size="40" maxlength="40"{if isset($username_or_email)} value="{$username_or_email}"{/if}> 
    41     </label> 
    42   </p> 
     33    <p> 
     34      <label> 
     35        {'Username or email'|@translate} 
     36        <br> 
     37        <input type="text" id="username_or_email" name="username_or_email" size="40" maxlength="40"{if isset($username_or_email)} value="{$username_or_email}"{/if}> 
     38      </label> 
     39    </p> 
    4340 
    44   <p class="bottomButtons"><input class="submit" type="submit" name="submit" value="{'Change my password'|@translate}"></p> 
    45   {elseif $action eq 'reset'} 
     41    <p class="bottomButtons"><input class="submit" type="submit" name="submit" value="{'Change my password'|@translate}"></p> 
     42    {elseif $action eq 'reset'} 
    4643 
    47   <div class="message">{'Hello'|@translate} <em>{$username}</em>. {'Enter your new password below.'|@translate}</div> 
     44    <div class="message">{'Hello'|@translate} <em>{$username}</em>. {'Enter your new password below.'|@translate}</div> 
    4845 
    49   <p> 
    50     <label> 
    51       {'New password'|@translate} 
    52       <br> 
    53       <input type="password" name="use_new_pwd" id="use_new_pwd" value=""> 
    54     </label> 
    55   </p> 
     46    <p> 
     47      <label> 
     48        {'New password'|@translate} 
     49        <br> 
     50        <input type="password" name="use_new_pwd" id="use_new_pwd" value=""> 
     51      </label> 
     52    </p> 
    5653 
    57   <p> 
    58     <label> 
    59       {'Confirm Password'|@translate} 
    60       <br> 
    61       <input type="password" name="passwordConf" id="passwordConf" value=""> 
    62     </label> 
    63   </p> 
     54    <p> 
     55      <label> 
     56        {'Confirm Password'|@translate} 
     57        <br> 
     58        <input type="password" name="passwordConf" id="passwordConf" value=""> 
     59      </label> 
     60    </p> 
    6461 
    65   <p class="bottomButtons"><input class="submit" type="submit" name="submit" value="{'Submit'|@translate}"></p> 
    66   {/if} 
     62    <p class="bottomButtons"><input class="submit" type="submit" name="submit" value="{'Submit'|@translate}"></p> 
     63    {/if} 
    6764 
    6865  </form> 
    69 {/if} {* $action ne 'none' *} 
     66  {/if} {* $action ne 'none' *} 
    7067 
    71 <script type="text/javascript"> 
    72 {if $action eq 'lost'} 
    73 {literal}try{document.getElementById('username_or_email').focus();}catch(e){}{/literal} 
    74 {elseif $action eq 'reset'} 
    75 {literal}try{document.getElementById('use_new_pwd').focus();}catch(e){}{/literal} 
    76 {/if} 
    77 </script> 
    78  
     68  <script type="text/javascript"> 
     69    {if $action eq 'lost'} 
     70    {literal}try{document.getElementById('username_or_email').focus();}catch(e){}{/literal} 
     71    {elseif $action eq 'reset'} 
     72    {literal}try{document.getElementById('use_new_pwd').focus();}catch(e){}{/literal} 
     73    {/if} 
     74  </script> 
    7975</div> <!-- content --> 
  • extensions/simple_themes/simple/template/profile.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'Profile'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='Profile'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
    96  {if isset($errors)} 
    107  <div class="errors"> 
     
    1613  </div> 
    1714  {/if} 
    18 {$PROFILE_CONTENT} 
     15  {$PROFILE_CONTENT} 
     16  <div style="clear: both;"></div> 
    1917</div> <!-- content --> 
  • extensions/simple_themes/simple/template/register.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'Registration'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='Registration'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
    96  {if isset($errors)} 
    107  <div class="errors"> 
     
    5956       //--> 
    6057  </script> 
     58  <div style="clear: both;"></div> 
    6159</div> <!-- content --> 
  • extensions/simple_themes/simple/template/search.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a href="{$U_HOME}" title="{'Home'|@translate}" rel="home">{'Home'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'Search'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='Search'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
    96  {if isset($errors) } 
    107  <div class="errors"> 
  • extensions/simple_themes/simple/template/search_rules.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a href="#" onclick="window.close();" title="{'Close this window'|@translate}">{'Close this window'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'Search rules'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='Search rules'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
    96  {if isset($INTRODUCTION) } 
    107  <p>{$INTRODUCTION}</p> 
  • extensions/simple_themes/simple/template/tags.tpl

    r13555 r13556  
    4747  {/if} 
    4848{/if} 
     49<div style="clear: both;"></div> 
    4950</div> <!-- content --> 
  • extensions/simple_themes/simple/template/upload.tpl

    r13555 r13556  
    1 <div class="titrePage"> 
    2   <ul class="categoryActions"> 
    3     <li><a href="{$U_HOME}" title="{'Home'|@translate}">{'Home'|@translate}</a></li> 
    4   </ul> 
    5   <h2>{'Upload a picture'|@translate}</h2> 
    6 </div> 
     1{assign var='pagetitle' value='Upload a picture'} 
     2{include file='pagetitle.tpl'} 
     3 
    74<div id="content"> 
    8 {if isset($MENUBAR)}{$MENUBAR}{/if} 
     5  {if isset($MENUBAR)}{$MENUBAR}{/if} 
    96  {if isset($errors) and count($errors)} 
    107  <div class="errors"> 
  • extensions/simple_themes/simple/themeconf.inc.php

    r13555 r13556  
    22/* 
    33Theme Name: Simple Grey 
    4 Version: 2.5 
     4Version: 2.5.1 
    55Description: Simple Grey 
    66Theme URI: http://piwigo.org/ext/extension_view.php?eid=308 
Note: See TracChangeset for help on using the changeset viewer.