Changeset 2515


Ignore:
Timestamp:
Sep 10, 2008, 3:16:13 AM (16 years ago)
Author:
rvelices
Message:
  • fix undefined template vars U_LOST_PASSWORD (menubar), F_ACTION (extend_for_templates) and F_C13Y_ACTION (check_integrity)
  • normalized some template variable names between category thumbnails and thumbnails (take advantage of full template change with smarty and do it now)
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/template/yoga/admin/check_integrity.tpl

    r2390 r2515  
    44  <dd>
    55    <ul>
    6       <form method="post" name="c13y" id="c13y" action="{$F_C13Y_ACTION}">
     6      <form method="post" name="c13y" id="c13y" action="">
    77      <fieldset>
    88        <table class="table2">
  • trunk/admin/template/yoga/admin/extend_for_templates.tpl

    r2434 r2515  
    44{if isset($extents)}
    55<h4>{'Replacement of original templates'|@translate}</h4>
    6 <form method="post" name="extend_for_templates" id="extend_for_templates" action="{$F_ACTION}">
     6<form method="post" name="extend_for_templates" id="extend_for_templates" action="">
    77  <table class="table2">
    88    <tr class="throw">
  • trunk/include/category_cats.inc.php

    r2433 r2515  
    3333  $query = '
    3434SELECT
    35   id, name, permalink, representative_picture_id, comment, nb_images, uppercats,
    36   date_last, max_date_last, count_images, count_categories, global_rank
    37   FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
     35  c.*, nb_images, date_last, max_date_last, count_images, count_categories
     36  FROM '.CATEGORIES_TABLE.' c INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
    3837  ON id = cat_id and user_id = '.$user['id'].'
    3938  WHERE date_last >= SUBDATE(
     
    5554  $query = '
    5655SELECT
    57   id, name, permalink, representative_picture_id, comment, nb_images, uppercats,
    58   date_last, max_date_last, count_images, count_categories
    59   FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
     56  c.*, nb_images, date_last, max_date_last, count_images, count_categories
     57  FROM '.CATEGORIES_TABLE.' c INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
    6058  ON id = cat_id and user_id = '.$user['id'].'
    6159  WHERE id_uppercat '.
     
    246244          'ID'    => $category['id'],
    247245          'TN_SRC'   => $thumbnail_src_of[$category['representative_picture_id']],
    248           'ALT'   => strip_tags($category['name']),
    249           'ICON'  => $icon_ts,
     246          'TN_ALT'   => strip_tags($category['name']),
     247          'ICON_TS'  => $icon_ts,
    250248
    251249          'URL'   => make_index_url(
  • trunk/include/category_default.inc.php

    r2299 r2515  
    108108    array(
    109109      'ID'            => $row['id'],
    110       'IMAGE'         => $thumbnail_url,
    111       'IMAGE_ALT'     => $row['file'],
    112       'IMAGE_TITLE'   => get_thumbnail_title($row),
    113       'IMAGE_TS'      => get_icon($row['date_available']),
    114       'U_IMG_LINK'    => $url,
     110      'TN_SRC'         => $thumbnail_url,
     111      'TN_ALT'     => $row['file'],
     112      'TN_TITLE'   => get_thumbnail_title($row),
     113      'ICON_TS'      => get_icon($row['date_available']),
     114      'URL'    => $url,
    115115    );
    116116
     
    148148    }
    149149
    150     $tpl_var['ELEMENT_NAME'] = $name;
     150    $tpl_var['NAME'] = $name;
    151151  }
    152152
  • trunk/include/menubar.inc.php

    r2488 r2515  
    267267        array(
    268268          'U_LOGIN' => get_root_url().'identification.php',
     269          'U_LOST_PASSWORD' => get_root_url().'password.php',
    269270          'AUTHORIZE_REMEMBERING' => $conf['authorize_remembering']
    270271        )
  • trunk/template-extension/distributed/samples/my-thumbnails.tpl

    r2434 r2515  
    77        <span class="wrap1">
    88                <span class="wrap2">
    9                 <a href="{$thumbnail.U_IMG_LINK}">
    10                         <img class="thumbnail" src="{$thumbnail.IMAGE}" alt="{$thumbnail.IMAGE_ALT}" title="{$thumbnail.IMAGE_TITLE}" />
     9                <a href="{$thumbnail.URL}">
     10                        <img class="thumbnail" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" />
    1111                </a>
    1212                </span>
    1313                <span class="thumbLegend" style="color:#F36;">
    1414    &copy; 2008 Piwigo<br />
    15                 {if !empty($thumbnail.ELEMENT_NAME)}{$thumbnail.ELEMENT_NAME}{/if}
    16                 {if !empty($thumbnail.IMAGE_TS)}{$thumbnail.IMAGE_TS}{/if}
     15                {if !empty($thumbnail.NAME)}{$thumbnail.NAME}{/if}
     16                {if !empty($thumbnail.ICON_TS)}{$thumbnail.ICON_TS}{/if}
    1717
    1818                {if isset($thumbnail.NB_COMMENTS)}
  • trunk/template-extension/distributed/samples/my-thumbnails2.tpl

    r2465 r2515  
    88        <fieldset class="fld1">
    99                <legend class="thumbLegend">
    10                 {if !empty($thumbnail.ELEMENT_NAME)}{$thumbnail.ELEMENT_NAME}{/if}
     10                {if !empty($thumbnail.NAME)}{$thumbnail.NAME}{/if}
    1111                </legend>
    12                 <a href="{$thumbnail.U_IMG_LINK}" class="lap2">
    13                         <span><img class="thumbnail" src="{$thumbnail.IMAGE}" alt="{$thumbnail.IMAGE_ALT}" title="{$thumbnail.IMAGE_TITLE}" /></span>
     12                <a href="{$thumbnail.URL}" class="lap2">
     13                        <span><img class="thumbnail" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" /></span>
    1414                </a>
    1515  </fieldset>
  • trunk/template/yoga/mainpage_categories.tpl

    r2231 r2515  
    22
    33<ul class="thumbnailCategories">
    4   {foreach from=$category_thumbnails item=cat}
    5   <li>
    6     <div class="thumbnailCategory">
    7       <div class="illustration">
    8         <a href="{$cat.URL}">
    9           <img src="{$cat.TN_SRC}" alt="{$cat.ALT}" title="{'hint_category'|@translate}">
    10         </a>
    11       </div>
    12       <div class="description">
    13         <h3>
    14           <a href="{$cat.URL}">{$cat.NAME}</a>
    15           {$cat.ICON}
    16         </h3>
    17         {if isset($cat.INFO_DATES) }
    18         <p>{$cat.INFO_DATES}</p>
    19         {/if}
    20         <p>{$cat.CAPTION_NB_IMAGES}</p>
    21         <p>{$cat.DESCRIPTION}</p>
    22       </div>
    23     </div>
    24   </li>
    25   {/foreach}
     4{foreach from=$category_thumbnails item=cat}
     5        <li>
     6                <div class="thumbnailCategory">
     7                        <div class="illustration">
     8                        <a href="{$cat.URL}">
     9                                <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{'hint_category'|@translate}">
     10                        </a>
     11                        </div>
     12                        <div class="description">
     13                                <h3>
     14                                        <a href="{$cat.URL}">{$cat.NAME}</a>
     15                                        {$cat.ICON_TS}
     16                                </h3>
     17                                {if isset($cat.INFO_DATES) }
     18                                <p>{$cat.INFO_DATES}</p>
     19                                {/if}
     20                                <p>{$cat.CAPTION_NB_IMAGES}</p>
     21                                {if not empty($cat.DESCRIPTION)}
     22                                <p>{$cat.DESCRIPTION}</p>
     23                                {/if}
     24                        </div>
     25                </div>
     26        </li>
     27{/foreach}
    2628</ul>
    2729
  • trunk/template/yoga/thumbnails.tpl

    r2274 r2515  
    77        <span class="wrap1">
    88                <span class="wrap2">
    9                 <a href="{$thumbnail.U_IMG_LINK}">
    10                         <img class="thumbnail" src="{$thumbnail.IMAGE}" alt="{$thumbnail.IMAGE_ALT}" title="{$thumbnail.IMAGE_TITLE}" />
     9                <a href="{$thumbnail.URL}">
     10                        <img class="thumbnail" src="{$thumbnail.TN_SRC}" alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}" />
    1111                </a>
    1212                </span>
    1313                <span class="thumbLegend">
    14 
    15                 {if !empty($thumbnail.ELEMENT_NAME)}{$thumbnail.ELEMENT_NAME}{/if}
    16                 {if !empty($thumbnail.IMAGE_TS)}{$thumbnail.IMAGE_TS}{/if}
    17 
     14                {$thumbnail.NAME|@default}
     15                {$thumbnail.ICON_TS}
    1816                {if isset($thumbnail.NB_COMMENTS)}
    1917                <span class="{if 0==$thumbnail.NB_COMMENTS}zero {/if}nb-comments">
Note: See TracChangeset for help on using the changeset viewer.