Changeset 16016 for extensions/gally/gally-default/template/comment_list.tpl

Timestamp:

Jun 24, 2012, 9:26:25 PM (12 years ago)

Author:

grum

Message:

feature:2664- compatibility with Piwigo 2.4

File:

• extensions/gally/gally-default/template/comment_list.tpl (modified) (3 diffs)

extensions/gally/gally-default/template/comment_list.tpl

@@ -6 +6 @@
 *}
 
-<script type="text/javascript">
-{literal}
+{footer_script}{literal}
   function editInside(url, text, imageId, key, index)
   {
@@ -18 +17 @@
 
   }
-{/literal}
-
-</script>
+{/literal}{/footer_script}
 
 
 <div id="formEditInside" style="display:none;">
-  <form  method='post' action='' class='filter' id='editComment'>
-    <fieldset>
-      <legend>{'Edit a comment'|@translate}</legend>
+  <form  method='post' action='' id='editComment'>
+      {'Edit'|@translate}<br>
       <textarea name='content' id='contentEditId' rows='5' cols='80'></textarea></label><br>
       <input type='hidden' name='key' id='feiKey' value=''>
+      <input type="hidden" name="pwg_token" id='feiToken' value="{$gally->getToken()}">
       <input type='hidden' name='image_id' id='feiImageId' value=''>
       <input class='submit' type='submit' value='{"Submit"|@translate}'>
-    </fieldset>
   </form>
 </div>
@@ -39 +35 @@
 <li>
   <div class="commentDetail">
-    {if isset($comment.TN_SRC)}
+    {if isset($comment.src_image)}
     <div class="illustration">
       <a href="{$comment.U_PICTURE}">
-        <img src="{$comment.TN_SRC}" alt="{$comment.ALT}" />
+        <img src="{$pwg->derivative_url($derivative_params, $comment.src_image)}" alt="{$comment.ALT}">
       </a>
     </div>
     {/if}
     <div class="description">
-      {if isset($comment.U_DELETE) or isset($comment.U_VALIDATE) or isset($comment.U_EDIT) }
+      {if isset($comment.U_DELETE) or isset($comment.U_VALIDATE) or isset($comment.U_EDIT)}
       <ul class="actions" style="float:right">
         {if isset($comment.U_DELETE)}
         <li>
-          <span class="button id_delete" onclick="document.location='{$comment.U_DELETE}';" title="{'delete this comment'|@translate}"></span>
+          <span class="button id_delete" onclick="document.location='{$comment.U_DELETE}';" title="{'Delete'|@translate}"></span>
         </li>
         {/if}
 
-        {if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)}
+        {if isset($comment.U_EDIT)}
         <li>
-          {php}
-            /*
-              this php code is used to calculate the key need to be allowed to
-              edit the comment, and determine the picture number if necessary
-              (theses properties are not in the template var because with the
-              default template, Piwigo reloads the page for editing an item :
-              this template is abble to edit an item without reloading the page)
-            */
-            global $conf;
-            $comment=$this->get_template_vars('comment');
-            $current=$this->get_template_vars('current');
-            if(!array_key_exists('image_id', $comment))
-            {
-              if(isset($current['id']))
-              {
-                $comment['IMAGE_ID']=$current['id'];
-              }
-              else
-              {
-                preg_match('#picture\.php\?/(\d+)/category/#i', $comment['U_PICTURE'], $result);
-                if(isset($result[1]))
-                {
-                  $comment['IMAGE_ID']=$result[1];
-                }
-              }
-            }
-            $now=time();
-            $comment['KEY']=$now.":".hash_hmac('md5', $now.':'.$comment['IMAGE_ID'], $conf['secret_key']);
-            $this->assign_by_ref('comment', $comment);
-          {/php}
-          <span class="button id_edit" onclick="editInside('{$comment.U_EDIT}#edit_comment}', '{$comment.CONTENT|@escape}', {$comment.IMAGE_ID|@default:$current.id}, '{$comment.KEY}', {$smarty.foreach.comment_loop.index});" title="{'edit this comment'|@translate}"></span>
-
+          <span class="button id_edit" onclick="editInside('{$comment.U_EDIT}#edit_comment', '{$comment.CONTENT|@escape}', {$gally->getCommentImage($comment.ID)}, '{$gally->getCommentKey($comment.ID)}', {$smarty.foreach.comment_loop.index});" title="{'Edit'|@translate}"></span>
         </li>
         {/if}
-
         {if isset($comment.U_VALIDATE)}
         <li>
-          <span class="button id_validate" onclick="document.location='{$comment.U_VALIDATE}';" title="{'validate this comment'|@translate}"></span>
+          <span class="button id_validate" onclick="document.location='{$comment.U_VALIDATE}';" title="{'Validate'|@translate}"></span>
         </li>
         {/if}