Changeset 17856


Ignore:
Timestamp:
Sep 11, 2012, 4:47:32 AM (12 years ago)
Author:
rvelices
Message:

fix batch manager unit photo titles with quotes (+ send all photo data to template)
fix batch manager global fix tiptip selector for thumbs

Location:
trunk/admin
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/batch_manager_unit.php

    r17765 r17856  
    199199
    200200  $query = '
    201 SELECT id,path,representative_ext,name,date_creation,comment,author,level,file
     201SELECT *
    202202  FROM '.IMAGES_TABLE;
    203203 
    … …  
    264264
    265265    $template->append(
    266       'elements',
     266      'elements', array_merge($row,
    267267      array(
    268268        'ID' => $row['id'],
    … …  
    271271        'LEGEND' => $legend,
    272272        'U_EDIT' => get_root_url().'admin.php?page=photo-'.$row['id'],
    273         'NAME' => !empty($row['name'])?$row['name']:'',
    274         'AUTHOR' => !empty($row['author'])?htmlspecialchars($row['author']):'',
     273        'NAME' => htmlspecialchars(@$row['name']),
     274        'AUTHOR' => htmlspecialchars(@$row['author']),
    275275        'LEVEL' => !empty($row['level'])?$row['level']:'0',
    276         'DESCRIPTION' => !empty($row['comment'])?$row['comment']:'',
     276        'DESCRIPTION' => htmlspecialchars(@$row['comment']),
    277277        'DATE_CREATION_YEAR' => $year,
    278278        'DATE_CREATION_MONTH' => (int)$month,
    … …  
    280280        'TAGS' => $tag_selection,
    281281        )
    282       );
     282      ));
    283283  }
    284284

  • trunk/admin/themes/default/template/batch_manager_global.tpl

    r17509 r17856  
    239239  }
    240240
    241   $('img.thumbnail').tipTip({
     241  $('.thumbnails img').tipTip({
    242242    'delay' : 0,
    243243    'fadeIn' : 200,

  • trunk/admin/themes/default/template/batch_manager_unit.tpl

    r14647 r17856  
    1212prefix = ", ";
    1313{/if}
    14         tag_boxes_selector = tag_boxes_selector + prefix + "#tags-" + {$element.ID};
     14        tag_boxes_selector = tag_boxes_selector + prefix + "#tags-" + {$element.id};
    1515{/foreach}
    1616
    … …  
    5656
    5757  <span class="thumb">
    58     <a href="{$element.FILE_SRC}" class="preview-box" title="{$element.LEGEND}"><img src="{$element.TN_SRC}" alt=""></a>
     58    <a href="{$element.FILE_SRC}" class="preview-box" title="{$element.LEGEND|@htmlspecialchars}"><img src="{$element.TN_SRC}" alt=""></a>
    5959    <br/>
    60     <a href="{$element.U_EDIT}">{'Informations'|@translate}</a>
     60    <a href="{$element.U_EDIT}">{'Edit'|@translate}</a>
    6161  </span>
    6262
    … …  
    6565    <tr>
    6666      <td><strong>{'Title'|@translate}</strong></td>
    67       <td><input type="text" class="large" name="name-{$element.ID}" value="{$element.NAME}"></td>
     67      <td><input type="text" class="large" name="name-{$element.id}" value="{$element.NAME}"></td>
    6868    </tr>
    6969
    7070    <tr>
    7171      <td><strong>{'Author'|@translate}</strong></td>
    72       <td><input type="text" class="large" name="author-{$element.ID}" value="{$element.AUTHOR}"></td>
     72      <td><input type="text" class="large" name="author-{$element.id}" value="{$element.AUTHOR}"></td>
    7373    </tr>
    7474
    … …  
    7676      <td><strong>{'Creation date'|@translate}</strong></td>
    7777      <td>
    78         <label><input type="radio" name="date_creation_action-{$element.ID}" value="unset"> {'unset'|@translate}</label>
    79         <label><input type="radio" name="date_creation_action-{$element.ID}" value="set" id="date_creation_action_set-{$element.ID}"> {'set to'|@translate}</label>
     78        <label><input type="radio" name="date_creation_action-{$element.id}" value="unset"> {'unset'|@translate}</label>
     79        <label><input type="radio" name="date_creation_action-{$element.id}" value="set" id="date_creation_action_set-{$element.id}"> {'set to'|@translate}</label>
    8080
    81         <select id="date_creation_day-{$element.ID}" name="date_creation_day-{$element.ID}">
     81        <select id="date_creation_day-{$element.id}" name="date_creation_day-{$element.id}">
    8282                <option value="0">--</option>
    8383           {section name=day start=1 loop=32}
    … …  
    8585           {/section}
    8686        </select>
    87         <select id="date_creation_month-{$element.ID}" name="date_creation_month-{$element.ID}">
     87        <select id="date_creation_month-{$element.id}" name="date_creation_month-{$element.id}">
    8888          {html_options options=$month_list selected=$element.DATE_CREATION_MONTH}
    8989        </select>
    90         <input id="date_creation_year-{$element.ID}"
    91                name="date_creation_year-{$element.ID}"
     90        <input id="date_creation_year-{$element.id}"
     91               name="date_creation_year-{$element.id}"
    9292               type="text"
    9393               size="4"
    9494               maxlength="4"
    9595               value="{$element.DATE_CREATION_YEAR}">
    96         <input id="date_creation_linked_date-{$element.ID}" name="date_creation_linked_date-{$element.ID}" type="hidden" size="10" disabled="disabled">
     96        <input id="date_creation_linked_date-{$element.id}" name="date_creation_linked_date-{$element.id}" type="hidden" size="10" disabled="disabled">
    9797        {footer_script}
    98           pwg_initialization_datepicker("#date_creation_day-{$element.ID}", "#date_creation_month-{$element.ID}", "#date_creation_year-{$element.ID}", "#date_creation_linked_date-{$element.ID}", "#date_creation_action_set-{$element.ID}");
     98          pwg_initialization_datepicker("#date_creation_day-{$element.id}", "#date_creation_month-{$element.id}", "#date_creation_year-{$element.id}", "#date_creation_linked_date-{$element.id}", "#date_creation_action_set-{$element.id}");
    9999        {/footer_script}
    100100      </td>
    … …  
    103103      <td><strong>{'Who can see this photo?'|@translate}</strong></td>
    104104      <td>
    105         <select name="level-{$element.ID}">
     105        <select name="level-{$element.id}">
    106106          {html_options options=$level_options selected=$element.LEVEL}
    107107        </select>
    … …  
    113113      <td>
    114114
    115 <select id="tags-{$element.ID}" name="tags-{$element.ID}">
     115<select id="tags-{$element.id}" name="tags-{$element.id}">
    116116{foreach from=$element.TAGS item=tag}
    117117  <option value="{$tag.id}" class="selected">{$tag.name}</option>
    … …  
    124124    <tr>
    125125      <td><strong>{'Description'|@translate}</strong></td>
    126       <td><textarea cols="50" rows="5" name="description-{$element.ID}" id="description-{$element.ID}" class="description">{$element.DESCRIPTION}</textarea></td>
     126      <td><textarea cols="50" rows="5" name="description-{$element.id}" id="description-{$element.id}" class="description">{$element.DESCRIPTION}</textarea></td>
    127127    </tr>
    128128
Note: See TracChangeset for help on using the changeset viewer.