Index: extensions/Subscribe_to_comments/template/admin.tpl
===================================================================
--- extensions/Subscribe_to_comments/template/admin.tpl	(revision 15641)
+++ extensions/Subscribe_to_comments/template/admin.tpl	(revision 15641)
@@ -0,0 +1,25 @@
+<div class="titrePage" style="clear:right;">
+  <h2>Subscribe to Comments</h2>
+</div>
+
+<form method="post" action="" class="properties">
+  <fieldset>
+    <legend>{'Configuration'|@translate}</legend>
+    <ul>
+      <li>
+        <label>
+          <span class="property">{'Notify administrators when a user take a new subscription'|@translate}</span>
+          <input type="checkbox" name="notify_admin_on_subscribe" value="1" {if $notify_admin_on_subscribe}checked="checked"{/if}>
+        </label>
+      </li>
+      <li>
+        <label>
+          <span class="property">{'Allow users to subscribe to global notifications'|@translate}</span>
+          <input type="checkbox" name="allow_global_subscriptions" value="1" {if $allow_global_subscriptions}checked="checked"{/if}>
+        </label>
+      </li>  
+    </ul>
+  </fieldset>
+
+  <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="config_submit"/></p>
+</form>
Index: extensions/Subscribe_to_comments/template/form_comment.tpl
===================================================================
--- extensions/Subscribe_to_comments/template/form_comment.tpl	(revision 15641)
+++ extensions/Subscribe_to_comments/template/form_comment.tpl	(revision 15641)
@@ -0,0 +1,36 @@
+{if !$SUBSCRIBED_ALL_IMAGES && !$SUBSCRIBED_ALL_ALBUMS && !$SUBSCRIBED_ALBUM && !$SUBSCRIBED_ALBUM_IMAGES && !$SUBSCRIBED_IMAGE}
+<p>
+  {'Notify me of followup comments'|@translate} :<br>
+  <label><input type="radio" name="stc_mode" value="-1" {if !$STC_MODE}checked="checked"{/if}> {'no'|@translate}</label>
+  {if $STC_ON_PICTURE}
+    {if $STC_ALLOW_GLOBAL} 
+      <label><input type="radio" name="stc_mode" value="image" {if $STC_MODE == "image"}checked="checked"{/if}> {'this picture'|@translate}</label>
+      {if $STC_ALLOW_ALBUM_IMAGES}<label><input type="radio" name="stc_mode" value="album-images" {if $STC_MODE == "album-images"}checked="checked"{/if}> {'all pictures of this album'|@translate}</label>{/if}
+      <label><input type="radio" name="stc_mode" value="all-images" {if $STC_MODE == "all-images"}checked="checked"{/if}> {'all pictures of the gallery'|@translate}</label>
+    {else}
+      <label><input type="radio" name="stc_mode" value="image" {if $STC_MODE == "image"}checked="checked"{/if}> {'yes'|@translate}</label>
+    {/if}
+  {elseif $STC_ON_ALBUM}
+    {if $STC_ALLOW_GLOBAL}
+      <label><input type="radio" name="stc_mode" value="album" {if $STC_MODE == "album"}checked="checked"{/if}> {'this album'|@translate}</label>
+      <label><input type="radio" name="stc_mode" value="all-albums" {if $STC_MODE == "all-albums"}checked="checked"{/if}> {'all albums of the gallery'|@translate}</label>
+    {else}
+      <label><input type="radio" name="stc_mode" value="album" {if $STC_MODE == "album"}checked="checked"{/if}> {'yes'|@translate}</label>
+    {/if}
+  {/if}
+</p>
+
+{if $STC_ASK_MAIL}
+  <p><label id="stc_mail" {if !$STC_MODE}style="display:none;"{/if}>{'Email address'|@translate} : <input type="text" name="stc_mail" value="{$STC_MAIL}"></label></p>
+  {footer_script require="jquery"}{literal}
+  jQuery(document).ready(function() {
+    $("#addComment input[name='stc_mode']").change(function() {
+      if ($(this).val() != "-1")
+        $("#stc_mail").css("display", "");
+      else
+        $("#stc_mail").css("display", "none");
+    });
+  });
+  {/literal}{/footer_script}
+{/if}
+{/if}
Index: extensions/Subscribe_to_comments/template/form_standalone.tpl
===================================================================
--- extensions/Subscribe_to_comments/template/form_standalone.tpl	(revision 15641)
+++ extensions/Subscribe_to_comments/template/form_standalone.tpl	(revision 15641)
@@ -0,0 +1,52 @@
+{if isset($comment_add)}
+<div id="pictureCommentList">
+<form method="post" action="{$comment_add.F_ACTION}" id="stc_standalone">
+  <fieldset>
+  {if $SUBSCRIBED_ALL_IMAGES}
+    {'You are currently subscribed to comments on'|@translate} {'all pictures of the gallery'|@translate}.
+    <a href="{$MANAGE_LINK}">{'Manage my subscribtions'|@translate}</a> 
+    
+  {elseif $SUBSCRIBED_ALBUM_IMAGES}
+    {'You are currently subscribed to comments on'|@translate} {'all pictures of this album'|@translate}.
+    <a href="{$UNSUB_LINK}">{'Unsubscribe'|@translate}</a>
+    
+  {elseif $SUBSCRIBED_IMAGE}
+    {'You are currently subscribed to comments on'|@translate} {'this picture'|@translate}.
+    <a href="{$UNSUB_LINK}">{'Unsubscribe'|@translate}</a>
+    
+  {elseif $SUBSCRIBED_ALL_ALBUMS}
+    {'You are currently subscribed to comments on'|@translate} {'all albums of the gallery'|@translate}.
+    <a href="{$MANAGE_LINK}">{'Manage my subscribtions'|@translate}</a>
+    
+  {elseif $SUBSCRIBED_ALBUM}
+    {'You are currently subscribed to comments on'|@translate} {'this album'|@translate}.
+    <a href="{$UNSUB_LINK}">{'Unsubscribe'|@translate}</a>
+    
+  {else}
+    <legend>{'Subscribe to mail notifications'|@translate}</legend>
+    {if $STC_ON_PICTURE}
+      {if $STC_ALLOW_GLOBAL}
+        <label><input type="radio" name="stc_mode" value="image"> {'this picture'|@translate}</label>
+        {if $STC_ALLOW_ALBUM_IMAGES}<label><input type="radio" name="stc_mode" value="album-images"> {'all pictures of this album'|@translate}</label>{/if}
+        <label><input type="radio" name="stc_mode" value="all-images"> {'all pictures of the gallery'|@translate}</label>
+      {else}
+        <input type="hidden" name="stc_mode" value="image">
+      {/if}
+    {elseif $STC_ON_ALBUM}
+      {if $STC_ALLOW_GLOBAL}
+        <label><input type="radio" name="stc_mode" value="album"> {'this album'|@translate}</label>
+        <label><input type="radio" name="stc_mode" value="all-albums"> {'all albums of the gallery'|@translate}</label>
+      {else}
+        <input type="hidden" name="stc_mode" value="album">
+      {/if}
+    {/if}
+    {if $STC_ALLOW_GLOBAL and $STC_ASK_MAIL}<br>{/if}
+    {if $STC_ASK_MAIL}
+      <label>{'Email address'|@translate} <input type="text" name="stc_mail" size="30"></label>
+    {/if}
+    <label><input type="submit" name="stc_submit" value="{'Subscribe'|@translate}"></label>
+  {/if}
+  </fieldset>
+</form>
+</div>
+{/if}
Index: extensions/Subscribe_to_comments/template/index.php
===================================================================
--- extensions/Subscribe_to_comments/template/index.php	(revision 12607)
+++ extensions/Subscribe_to_comments/template/index.php	(revision 15641)
@@ -1,26 +1,3 @@
 <?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// Recursive call
 $url = '../';
 header( 'Request-URI: '.$url );
Index: extensions/Subscribe_to_comments/template/mail/admin.tpl
===================================================================
--- extensions/Subscribe_to_comments/template/mail/admin.tpl	(revision 15641)
+++ extensions/Subscribe_to_comments/template/mail/admin.tpl	(revision 15641)
@@ -0,0 +1,14 @@
+<div id="the_header">
+{'New subscription on'|@translate} <b>{$STC.GALLERY_TITLE}</b>
+</div>
+
+<div id="the_content">
+
+<p>
+  {'Hi administrators,'|@translate}<br>
+  {$STC.USER} {$STC.ELEMENT}.
+</p>
+
+<p>{$STC.TECHNICAL}</p>
+
+</div>
Index: extensions/Subscribe_to_comments/template/mail/confirm.tpl
===================================================================
--- extensions/Subscribe_to_comments/template/mail/confirm.tpl	(revision 15641)
+++ extensions/Subscribe_to_comments/template/mail/confirm.tpl	(revision 15641)
@@ -0,0 +1,19 @@
+<div id="the_header">
+{'Subscribe to comments on'|@translate} <b>{$STC.GALLERY_TITLE}</b>
+</div>
+
+<div id="the_content">
+
+<p>{'You requested to subscribe by email to comments on'|@translate} {$STC.element.on}.</p>
+
+{if not empty($STC.element.thumbnail)}
+<p id="the_image"><img src="{$STC.element.thumbnail}" alt="{$STC.element.name}"></p>
+{/if}
+
+<p>{'To activate, click the confirm button. If you believe this is an error, please just ignore this message.'|@translate}</p>
+
+<p><a href="{$STC.VALIDATE_URL}" class="button">{'Confirm subscription'|@translate}</a></p>
+
+<p>{'Want to edit your notifications options?'|@translate} <a href="{$STC.MANAGE_URL}">{'Manage my subscribtions'|@translate}</a>.</p>
+
+</div>
Index: extensions/Subscribe_to_comments/template/mail/footer.tpl
===================================================================
--- extensions/Subscribe_to_comments/template/mail/footer.tpl	(revision 15641)
+++ extensions/Subscribe_to_comments/template/mail/footer.tpl	(revision 15641)
@@ -0,0 +1,8 @@
+<div id="the_footer">
+  {'Sent by'|@translate} <a href="{$GALLERY_URL}">{$GALLERY_TITLE}</a>
+  - {'Powered by'|@translate} <a href="{$PHPWG_URL}" class="Piwigo">Piwigo</a> {$VERSION}
+</div>
+
+</div>
+</body>
+</html>
Index: extensions/Subscribe_to_comments/template/mail/header.tpl
===================================================================
--- extensions/Subscribe_to_comments/template/mail/header.tpl	(revision 15641)
+++ extensions/Subscribe_to_comments/template/mail/header.tpl	(revision 15641)
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Piwigo Mail</title>
+  <meta http-equiv="Content-Type" content="text/html; charset={$CONTENT_ENCODING}">
+  
+  <style type="text/css">{strip}<!--
+  {$STC_MAIL_CSS}
+  -->{/strip}</style>
+</head>
+
+<body>
+<div id="the_page">
Index: extensions/Subscribe_to_comments/template/mail/index.php
===================================================================
--- extensions/Subscribe_to_comments/template/mail/index.php	(revision 15641)
+++ extensions/Subscribe_to_comments/template/mail/index.php	(revision 15641)
@@ -0,0 +1,7 @@
+<?php
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: extensions/Subscribe_to_comments/template/mail/notification.tpl
===================================================================
--- extensions/Subscribe_to_comments/template/mail/notification.tpl	(revision 15641)
+++ extensions/Subscribe_to_comments/template/mail/notification.tpl	(revision 15641)
@@ -0,0 +1,22 @@
+<div id="the_header">
+{'New comment on'|@translate} <b>{$STC.GALLERY_TITLE}</b>
+</div>
+
+<div id="the_content">
+
+<p id="the_image">
+  <a href="{$STC.element.url}">{$STC.element.name}<br>
+  <img src="{$STC.element.thumbnail}" alt="{$STC.element.name}"></a>
+</p>
+
+<p>
+  {$STC.comment.caption}:
+  <blockquote>{$STC.comment.content}</blockquote>
+</p>
+
+<p>
+  <a href="{$STC.UNSUB_URL}">{'Stop receiving notifications'|@translate}</a><br>
+  <a href="{$STC.MANAGE_URL}">{'Manage my subscribtions'|@translate}</a>
+</p>
+
+</div>
Index: extensions/Subscribe_to_comments/template/mail/style.css
===================================================================
--- extensions/Subscribe_to_comments/template/mail/style.css	(revision 15641)
+++ extensions/Subscribe_to_comments/template/mail/style.css	(revision 15641)
@@ -0,0 +1,56 @@
+body {
+  margin:0px; 
+  padding:0px;
+  font-family: Univers, Helvetica, Optima; 
+  font-size:12px;
+  text-align:left;
+  background:#111;
+  color:#aaa;
+}
+
+a {
+  color:#CE2E5A;
+}
+ 
+#the_page {
+  width:600px;
+  margin:10px auto; 
+  padding:0px; 
+}
+
+#the_header {
+  background:#222;
+  border-top:5px solid #CE2E5A;
+  border-bottom:1px solid #111;
+  font-size:16px;
+  padding:10px;
+}
+
+#the_content {
+  background:#333;
+  border-top:1px solid #555;
+  border-bottom:1px solid #111;
+  padding:10px;
+}
+
+#the_footer {
+  background:#222;
+  border-top:1px solid #555;
+  border-bottom:3px solid #CE2E5A;
+  font-size:10px;
+  padding:5px;
+}
+
+#the_image img {
+  border:10px solid #444;
+}
+
+.button {
+  padding:8px 15px;
+  background:#A80D24;
+  color:#bbb;
+  border:1px solid #CE2E5A;
+  text-decoration:none;
+  font-size:14px;
+  font-weight:bold;
+}
Index: extensions/Subscribe_to_comments/template/style.css
===================================================================
--- extensions/Subscribe_to_comments/template/style.css	(revision 12607)
+++ extensions/Subscribe_to_comments/template/style.css	(revision 15641)
@@ -1,22 +1,71 @@
 .subscriptions_list {
-  width:600px;
-	border: 1px solid #111;
+  width:700px;
+	border-left: 1px solid #444;
+	border-right: 1px solid #444;
 	margin: 1em auto;
 	padding: 0;
   background-color:#222;
-  border-collapse:collapse;
+  border-spacing:0;
+  text-align: left;
 }
 
-.subscriptions_list TD {
+.subscriptions_list td, .subscriptions_list th {
 	padding:5px 5px 2px 5px;
   vertical-align:center;
+  border-top: 1px solid #444;
+  border-bottom: 1px solid #111;
+}
+  .subscriptions_list .chkb {
+    text-align:center;
+  }
+  .subscriptions_list td.info {
+    width:200px;
+    padding-top:2em;
+    vertical-align:top;
+  }
+    .subscriptions_list tr .actions {
+      display:none;
+    }
+    .subscriptions_list tr:hover .actions {
+      display:block;
+    }
+  .subscriptions_list td.date {
+    width:250px;
+    padding-top:2em;
+    vertical-align:top;
+  }
+  
+.subscriptions_list tr.row2 { background-color:#222; }
+.subscriptions_list tr.row1 { background-color:#333; }
+
+.subscriptions_list tr.not-validated { background-color:#433; }
+
+.subscriptions_list tr.header th, .subscriptions_list tr.footer td
+{
+  height:30px;
+}
+.subscriptions_list tr.header th, .subscriptions_list tr.footer.row1 td {
+  
+  background: #333333;
+  background: -moz-linear-gradient(top,  #333333 0%, #222222 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#333333), color-stop(100%,#222222));
+  background: -webkit-linear-gradient(top,  #333333 0%,#222222 100%);
+  background: -o-linear-gradient(top,  #333333 0%,#222222 100%);
+  background: -ms-linear-gradient(top,  #333333 0%,#222222 100%);
+  background: linear-gradient(top,  #333333 0%,#222222 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#333333', endColorstr='#222222',GradientType=0 );
+}
+.subscriptions_list tr.footer.row2 td {
+  background: #222222;
+  background: -moz-linear-gradient(top,  #222222 0%, #333333 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#222222), color-stop(100%,#333333));
+  background: -webkit-linear-gradient(top,  #222222 0%,#333333 100%);
+  background: -o-linear-gradient(top,  #222222 0%,#333333 100%);
+  background: -ms-linear-gradient(top,  #222222 0%,#333333 100%);
+  background: linear-gradient(top,  #222222 0%,#333333 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#222222', endColorstr='#333333',GradientType=0 );
 }
 
-.subscriptions_list TR {
-	text-align: left;
-}
 
-.row2 { background-color:#222; }
-.row1 { background-color:#333; }
 
 .stc p {
@@ -32,2 +81,3 @@
   max-height:90px;
 }
+
Index: extensions/Subscribe_to_comments/template/subscribtions_page.tpl
===================================================================
--- extensions/Subscribe_to_comments/template/subscribtions_page.tpl	(revision 12607)
+++ extensions/Subscribe_to_comments/template/subscribtions_page.tpl	(revision 15641)
@@ -1,92 +1,115 @@
 {combine_css path=$SUBSCRIBE_TO_PATH|@cat:'template/style.css'}
 
-{$MENUBAR}
+{if $themeconf.name != "stripped" and $themeconf.parent != "stripped" and $themeconf.name != "simple-grey" and $themeconf.parent != "simple"}
+  {$MENUBAR}
+{else}
+  {assign var="intern_menu" value="true"}
+{/if}
+<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
+{if $intern_menu}{$MENUBAR}{/if}
 
-{if !empty($PLUGIN_INDEX_CONTENT_BEFORE)}{$PLUGIN_INDEX_CONTENT_BEFORE}{/if}
+<div class="titrePage">
+  <h2>{'Subscriptions of'|@translate} <i>{$EMAIL}</i></h2>
+</div>
 
-<div id="content" class="content stc">
-  <div class="titrePage">
-    <ul class="categoryActions">
-      {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if}
-    </ul>
-    <h2>{'Subscriptions of'|@translate} <i>{$EMAIL}</i></h2>
-  </div> <!-- titrePage -->
+{include file='infos_errors.tpl'}
+ 
+{if $IN_VALIDATE or $IN_UNSUBSCRIBE}
+<p>
+  {if !empty($element)}<a href="{$element.url}" title="{$element.name}">{'Return to item page'|@translate}</a><br>{/if}
+  <a href="{$MANAGE_LINK}">{'Manage my subscriptions to comments'|@translate}</a>
+</p>
+{/if}
   
-  {if !empty($errors)}
-  <div class="errors">
-    <ul>
-      {foreach from=$errors item=error}
-      <li>{$error}</li>
+<form action="{$MANAGE_LINK}" method="post">
+  {if !empty($global_subscriptions)}
+  <fieldset>
+    <legend>{'Global subscriptions'|@translate}</legend>
+    <table class="subscriptions_list">
+      {foreach from=$global_subscriptions item=sub name=subs_loop}
+      <tr class="{if $smarty.foreach.subs_loop.index is odd}row1{else}row2{/if}">
+        <td>
+          {if $sub.type == 'all-images'}
+            <img src="{$SUBSCRIBE_TO_PATH}template/image.png"> {'You are currently subscribed to comments on all pictures of the gallery.'|@translate}
+          {else $sub.type == 'all-albums'}
+            <img src="{$SUBSCRIBE_TO_PATH}template/album.png"> {'You are currently subscribed to comments on all albums of the gallery.'|@translate}
+          {/if}
+        </td>
+        <td style="white-space:nowrap;">
+          <a href="{$MANAGE_LINK}&amp;unsubscribe={$sub.id}">{'Unsubscribe'|@translate}</a>
+          {if $sub.validated == 'false'}<br> <a href="{$MANAGE_LINK}&amp;validate={$sub.id}">{'Validate'|@translate}</a>{/if}
+        </td>
+        <td style="white-space:nowrap;">
+          <i>{$sub.registration_date}</i>
+        </td>
+      </tr>
       {/foreach}
-    </ul>
-  </div>
-  {/if}
-  {if !empty($infos)}
-  <div class="infos">
-    <ul>
-      {foreach from=$infos item=info}
-      <li>{$info}</li>
-      {/foreach}
-    </ul>
-  </div>
+    </table>
+  </fieldset>
   {/if}
   
-  {if !empty($unsubscribe_form)}
-  <form action="" method="post">
-  <fieldset>
-    <legend>{'Unsubscribe from email notification'|@translate}</legend>
-    
-    <p>
-      <label><input type="radio" name="unsubscribe" value="{$unsubscribe_form}" checked="checked"> {'Only unsubscribe notifications for comments from:'|@translate} <a href="{$element.url}" target="_blank">{$element.name}</a></label>
-      <label><input type="radio" name="unsubscribe" value="all"> {'Unsubscribe from all email notifications'|@translate}</label>
-      <br>
-      <label><input type="submit" value="Unsubscribe notifications for {$EMAIL}"></label>
-      <a href="{$MANAGE_LINK}">{'Manage my subscriptions'|@translate}</a>
-    </p>
-  </fieldset>
-  </form>
-  {/if}
-  
-  {if !empty($validate)}
-  <p>
-    {if empty($errors)}<a href="{$element.url}">{'Return to item page'|@translate}</a><br>{/if}
-    <a href="{$MANAGE_LINK}">{'Manage my subscriptions'|@translate}</a>
-  </p>
-  {/if}
-  
-  {if !empty($subscriptions) and $subscriptions != 'none'}
-  <form action="{$MANAGE_LINK}" method="post">
+  {if !empty($subscriptions)}
   <fieldset>
     <legend>{'Manage my subscriptions to comments'|@translate}</legend>
     <table class="subscriptions_list">
+      <tr class="header">
+        <th class="chkb"><input type="checkbox" id="check_all"></th>
+        <th colspan="2" class="info">{'Subject'|@translate}</th>
+        <th class="date">{'Followed on'|@translate}</th>
+      </tr>
+      
       {foreach from=$subscriptions item=sub name=subs_loop}
-      <tr class="{if $smarty.foreach.subs_loop.index is odd}row1{else}row2{/if}">
-        <td><img src="{$sub.infos.thumbnail}" alt="{$sub.infos.name}" class="thumbnail"></td>
-        <td>
-          {if $sub.type == 'image'}
-          <img src="{$SUBSCRIBE_TO_PATH}template/picture.png" alt="(P)">
-          {else}
-          <img src="{$SUBSCRIBE_TO_PATH}template/folder_picture.png" alt="(A)">
-          {/if} 
+      <tr class="{if $smarty.foreach.subs_loop.index is odd}row1{else}row2{/if} {if $sub.validated == 'false'}not-validated{/if}">
+        <td class="chkb"><input type="checkbox" name="selected[]" value="{$sub.id}"></td>
+        <td class="thumb"><img src="{$sub.infos.thumbnail}" alt="{$sub.infos.name}" class="thumbnail"></td>
+        <td class="info">
+          <img src="{$SUBSCRIBE_TO_PATH}template/{$sub.type}.png">
           <a href="{$sub.infos.url}">{$sub.infos.name}</a>
-          <br>{$sub.registration_date}
+
+          <div class="actions">
+            <a href="{$MANAGE_LINK}&amp;unsubscribe={$sub.id}">{'Unsubscribe'|@translate}</a>
+            {if $sub.validated == 'false'}| <a href="{$MANAGE_LINK}&amp;validate={$sub.id}">{'Validate'|@translate}</a>{/if}
+          </div>
         </td>
-        <td><a href="{$MANAGE_LINK}&amp;unsubscribe={$sub.id}">{'Unsubscribe'|@translate}</a></td>
+        <td class="date">
+          <i>{$sub.registration_date}</i>
+        </td>
       </tr>
       {/foreach}
+      
+      <tr class="footer {if $smarty.foreach.subs_loop.index is odd}row1{else}row2{/if}"><td colspan="4">
+        <select name="action">
+          <option value="-1">{'Choose an action'|@translate}</option>
+          <option value="unsubscribe">{'Unsubscribe'|@translate}</option>
+          <option value="validate">{'Validate'|@translate}</option>
+        </select>
+        <input type="submit" name="apply_bulk" value="{'Apply action'|@translate}">
+      </td></tr>
     </table>
     
     <p>
-      <input type="hidden" name="unsubscribe" value="all">
-      <input type="submit" value="{'Unsubscribe from all email notifications'|@translate}">
+      <b>Legend :</b> 
+      <img src="{$SUBSCRIBE_TO_PATH}template/image.png"> {'comments on a picture'|@translate}. 
+      <img src="{$SUBSCRIBE_TO_PATH}template/album-images.png"> {'comments on all pictures of an album'|@translate}.
+      {if $COA_ACTIVATED}<img src="{$SUBSCRIBE_TO_PATH}template/album.png"> {'comments on an album'|@translate}.{/if}
     </p>
   </fieldset>
-  {elseif !empty($subscriptions) and $subscriptions == 'none'}
-  <p>
-    {'You are not subscribed to any comment.'|@translate}
-  </p>
   {/if}
+  
+  {if !empty($global_subscriptions) or !empty($subscriptions)}
+    <p>
+      <label><input type="checkbox" name="unsubscribe_all_check" value="1"> {'Unsubscribe from all email notifications'|@translate}</label>
+      <input type="submit" name="unsubscribe_all" value="{'Submit'|@translate}">
+  {/if}
+</form>
+
+{footer_script require="jquery"}{literal}
+jQuery("#check_all").change(function() {
+  if ($(this).is(":checked"))
+    $("input[name^='selected']").attr('checked', 'checked');
+  else
+    $("input[name^='selected']").removeAttr('checked');
+});
+{/literal}{/footer_script}
 
 </div> <!-- content -->
-
-{if !empty($PLUGIN_INDEX_CONTENT_AFTER)}{$PLUGIN_INDEX_CONTENT_AFTER}{/if}
