Changeset 2288


Ignore:
Timestamp:
Mar 21, 2008, 2:01:25 AM (16 years ago)
Author:
rvelices
Message:
  • minor language changes and use template->assign instead of template->assign_var
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/cat_perm.php

    r2223 r2288  
    199199$template->set_filename('cat_perm', 'admin/cat_perm.tpl');
    200200
    201 $template->assign_vars(
     201$template->assign(
    202202  array(
    203203    'CATEGORIES_NAV' =>
    … …  
    206206        'admin.php?page=cat_modify&cat_id='
    207207        ),
    208     'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_perm',
    209     'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=cat_perm&cat='.$page['cat']
     208    'U_HELP' => get_root_url().'popuphelp.php?page=cat_perm',
     209    'F_ACTION' => get_root_url().'admin.php?page=cat_perm&cat='.$page['cat']
    210210    )
    211211  );

  • trunk/admin/configuration.php

    r2249 r2288  
    55// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    7 // | branch        : BSF (Best So Far)
    8 // | file          : $RCSfile$
     7// | file          : $Id$
    98// | last update   : $Date$
    109// | last modifier : $Author$
    … …  
    174173$action.= '&section='.$page['section'];
    175174
    176 $template->assign_vars(
     175$template->assign(
    177176  array(
    178177    'U_HELP' => get_root_url().'popuphelp.php?page=configuration',
    179 
    180178    'F_ACTION'=>$action
    181179    ));

  • trunk/admin/help.php

    r2126 r2288  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    7 // | branch        : BSF (Best So Far)
    8 // | file          : $RCSfile$
     7// | file          : $Id$
    98// | last update   : $Date$
    109// | last modifier : $Author$
    … …  
    3332check_status(ACCESS_ADMINISTRATOR);
    3433
    35 $template->assign_var('ADMIN_CONTENT', load_language('help.html','','',true) );
     34$template->assign('ADMIN_CONTENT', load_language('help.html','','',true) );
    3635?>

  • trunk/admin/ws_checker.php

    r2260 r2288  
    210210
    211211
    212 $template->assign_vars(
     212$template->assign(
    213213  array(
    214     'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=web_service',   
     214    'U_HELP' => get_root_url().'popuphelp.php?page=web_service',   
    215215    )
    216216  );

  • trunk/include/menubar.inc.php

    r2231 r2288  
    271271  array(
    272272    'TITLE'=>l10n('hint_search'),
    273     'NAME'=>l10n('search'),
     273    'NAME'=>l10n('Search'),
    274274    'U_SUMMARY'=> get_root_url().'search.php',
    275275    'REL'=> 'rel="search"'

  • trunk/notification.php

    r2240 r2288  
    7676  );
    7777
    78 include(PHPWG_ROOT_PATH.'include/page_header.php');
    7978$template->set_filenames(array('notification'=>'notification.tpl'));
    8079
    81 $template->assign_vars(
     80$template->assign(
    8281  array(
    8382    'U_FEED' => $feed_url,
    8483    'U_FEED_IMAGE_ONLY' => $feed_image_only_url,
    85     'U_HOME' => make_index_url(),
    8684    )
    8785  );
    … …  
    9088// |                           html code display                           |
    9189// +-----------------------------------------------------------------------+
    92 
     90include(PHPWG_ROOT_PATH.'include/page_header.php');
    9391$template->parse('notification');
    9492include(PHPWG_ROOT_PATH.'include/page_tail.php');

  • trunk/template/yoga/admin/permalinks.tpl

    r2223 r2288  
    22<div class="titrePage">
    33  <ul class="categoryActions">
    4     <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
     4    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
    55  </ul>
    66  <h2>{'Permalinks'|@translate}</h2>
    … …  
    2525
    2626  <p>
    27     <input type="submit" class="submit" name="set_permalink" value="{'submit'|@translate}" {$TAG_INPUT_ENABLED}/>
     27    <input type="submit" class="submit" name="set_permalink" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}/>
    2828  </p>
    2929  </fieldset>
    … …  
    3737    <td>{'Permalink'|@translate} {$SORT_PERMALINK}</td>
    3838  </tr>
    39 {foreach from=$permalinks item=permalink}
    40   <tr>
     39{foreach from=$permalinks item=permalink name="permalink_loop"}
     40  <tr class="{if $smarty.foreach.permalink_loop.index is odd}row1{else}row2{/if}">
    4141    <td>{$permalink.id}</td>
    4242    <td>{$permalink.name}</td>
    … …  
    6565    <td>{$permalink.last_hit}</td>
    6666    <td>{$permalink.hit}</td>
    67     <td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" alt="Delete"></a></td>
     67    <td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" alt="[{'delete'|@translate}]" class="button"></a></td>
    6868  </tr>
    6969{/foreach}

  • trunk/template/yoga/default-layout.css

    r2135 r2288  
    1010
    1111#the_page {
    12     /* Just in case another template needs an inner frame */
     12        /* Just in case another template needs an inner frame */
    1313}
    1414
    … …  
    2222
    2323H2 {
    24     margin: 0;
    25     padding: 5px 0.5em 5px 0.5em;
    26     text-align: left;
    27     font-size: 120%;
    28 }
    29 H5 {
    30     margin: 0;
    31     padding: 0 1.5em 0 30%;
    32     text-align: right;
    33     font-size: 90%;
    34 }
     24        margin: 0;
     25        padding: 5px 0.5em 5px 0.5em;
     26        text-align: left;
     27        font-size: 120%;
     28}
     29
    3530A {
    36     text-decoration:none;
    37     border-bottom: 1px dotted #005e89;
     31        text-decoration:none;
     32        border-bottom: 1px dotted #005e89;
    3833}
    3934A:hover {
    40     border-bottom: 1px solid #858460;
     35        border-bottom: 1px solid #858460;
    4136}
    4237A.button, A.button:hover {
    43   border: 0;
     38        border: 0;
    4439}
    4540IMG {
    46     border: none;
     41        border: none;
    4742}
    4843
    … …  
    211206}
    212207
    213 #theHeader P {
    214   margin-top: 0;
    215   padding: 0;
    216 }
    217 
    218 FORM#addComment FIELDSET LABEL {
    219   clear: both;
    220 }
    221 
    222 FORM#addComment FIELDSET INPUT[type="hidden"] {
    223   display: none;
    224 }
    225 
    226208/* button tools */
    227209UL.actions {
    … …  
    273255}
    274256
    275 BODY#thePopuphelpPage #theHeader P {
    276   display: none;
    277 }
    278 
    279257BODY#thePopuphelpPage #content P {
    280258  text-align: justify;

  • trunk/template/yoga/identification.tpl

    r2223 r2288  
    44  <div class="titrePage">
    55    <ul class="categoryActions">
    6       <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
     6      <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
    77      {if isset($U_REGISTER) }
    8       <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$themeconf.icon_dir}/register.png" class="button" alt="{'register'|@translate}"/></a></li>
     8      <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"/></a></li>
    99      {/if}
    10       <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
     10      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
    1111    </ul>
    1212    <h2>{'Identification'|@translate}</h2>
    … …  
    5555  </fieldset>
    5656
    57   <p><input class="submit" tabindex="4" type="submit" name="login" value="{'submit'|@translate}"></p>
     57  <p><input class="submit" tabindex="4" type="submit" name="login" value="{'Submit'|@translate}"></p>
    5858</form>
    5959
    … …  
    6464  <p>
    6565    {if isset($U_REGISTER) }
    66     <a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$themeconf.icon_dir}/register.png" class="button" alt=""> {'Register'|@translate}</a>
     66    <a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"> {'Register'|@translate}</a>
    6767    {/if}
    68     <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$themeconf.icon_dir}/lost_password.png" class="button" alt=""> {'Forgot your password?'|@translate}</a>
     68    <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"> {'Forgot your password?'|@translate}</a>
    6969  </p>
    7070

  • trunk/template/yoga/menubar.tpl

    r2265 r2288  
    153153                  <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
    154154                  {if isset($U_REGISTER)}
    155                   <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'register'|@translate}"/></a></li>
     155                  <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"/></a></li>
    156156                  {/if}
    157157                </ul>
Note: See TracChangeset for help on using the changeset viewer.