Feature 1026 : Modify / delete comments for users

 + update config table content
 + minor modification of Sylvia theme
 + need refactoring

git-svn-id: http://piwigo.org/svn/trunk@3445 68402e56-0260-453c-a942-63ccdbb3a9ee

5 files changed, 27 insertions, 16 deletions

diff --git a/template/yoga/comment_list.tpl b/template/yoga/comment_list.tpl
index d1ebc2f26..2f453ecde 100644
--- a/template/yoga/comment_list.tpl
+++ b/template/yoga/comment_list.tpl
@@ -2,7 +2,7 @@
 <ul class="thumbnailCategories">
 {foreach from=$comments item=comment name=comment_loop}
 <li>
-	<div class="thumbnailCategory {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
+  <div class="thumbnailCategory {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}">
     {if isset($comment.TN_SRC)}
     <div class="illustration">
       <a href="{$comment.U_PICTURE}">
@@ -10,16 +10,23 @@
       </a>
     </div>
     {/if}
-    <div class="description">
-      {if isset($comment.U_DELETE) or isset($comment.U_VALIDATE) }
+    <div class="description" style="height:{if ($comment.IN_EDIT==1)}200{/if}px">
+      {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>
-          <a href="{$comment.U_DELETE}" title="{'delete this comment'|@translate}">
+          <a href="{$comment.U_DELETE}" title="{'delete this comment'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');">
             <img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" alt="[delete]">
           </a>
         </li>
         {/if}
+        {if isset($comment.U_EDIT) and ($comment.IN_EDIT!=1)}
+        <li>
+          <a class="editComment" href="{$comment.U_EDIT}#edit_comment" title="{'edit this comment'|@translate}">
+            <img src="{$ROOT_URL}{$themeconf.icon_dir}/edit.png" class="button" alt="[edit]">
+          </a>
+        </li>
+        {/if}
         {if isset($comment.U_VALIDATE)}
         <li>
           <a href="{$comment.U_VALIDATE}" title="validate this comment">
@@ -30,12 +37,22 @@
       </ul>
       {/if}
       <span class="author">{$comment.AUTHOR}</span> - <span class="date">{$comment.DATE}</span>
+      {if ($comment.IN_EDIT==1)}
+      <a name="edit_comment"></a>
+      <form  method="post" action="{$comment.U_EDIT}" class="filter" id="editComment">
+	<fieldset>
+	  <legend>{'Edit a comment'|@translate}</legend>
+	  <label>{'comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT}</textarea></label>
+	  <input type="hidden" name="key" value="{$comment.KEY}">
+	  <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|default:$current.id}">
+	  <input class="submit" type="submit" value="{'Submit'|@translate}">
+	</fieldset>
+      </form>
+      {else}      
       <blockquote>{$comment.CONTENT}</blockquote>
+      {/if}
     </div>
   </div>
-</li>
-{if isset($comment_separator)}
-<hr>
-{/if}
+<li>
 {/foreach}
 </ul>
diff --git a/template/yoga/icon/edit.png b/template/yoga/icon/edit.png
new file mode 100644
index 000000000..9c755cda1
--- /dev/null
+++ b/template/yoga/icon/edit.png
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index dd83138cf..e8c7d9609 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -257,7 +257,7 @@ y.callService(
   {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
 
 	{if isset($comments)}
-		{include file='comment_list.tpl' comment_separator=true}
+		{include file='comment_list.tpl'}
 	{/if}
 
 	{if isset($comment_add)}
diff --git a/template/yoga/theme/Sylvia/icon/edit.png b/template/yoga/theme/Sylvia/icon/edit.png
new file mode 100644
index 000000000..9c755cda1
--- /dev/null
+++ b/template/yoga/theme/Sylvia/icon/edit.png
diff --git a/template/yoga/theme/Sylvia/theme.css b/template/yoga/theme/Sylvia/theme.css
index bf884feb8..b4182391e 100644
--- a/template/yoga/theme/Sylvia/theme.css
+++ b/template/yoga/theme/Sylvia/theme.css
@@ -1,12 +1,6 @@
 .content div.thumbnailCategory div.illustration { 
 	width:165px !important; /* Usable range 162px-360px , optimal : Thumbnail width + 40px */ 
 }
-.content div.thumbnailCategory { 
-	height: 180px !important; /* Usable range 172px-250px , optimal : Thumbnail height + 30px */ 
-}
-.content div.thumbnailCategory div.description .text { 
-	height: 130px !important; /* -42px than previous one */ 
-}
 #comments div.thumbnailCategory div.illustration { 
 	width:220px !important; /* Usable range 219px-360px , optimal : Thumbnail width + 95px */ 
 }
@@ -221,7 +215,7 @@ BODY {
 	background:transparent url(images/cat_top-right.gif) no-repeat scroll right top;
 	margin: 0; 
 	padding:15px 10px 3px 0; 
-	overflow: hidden !important; 
+	overflow-x: hidden !important; 
 }
 .content .thumbnailCategory div.description .text { 
 	display:block;