6 files changed, 32 insertions, 2 deletions
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 5bc11c92a..393cf7157 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -74,7 +74,9 @@ jQuery(document).ready(function(){ldelim}
         <li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li>
 {/if}
         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
+{if isset($U_PENDING_COMMENTS)}
         <li><a href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li>
+{/if}
         <li><a href="{$U_UPDATES}">{'Updates'|@translate}</a></li>
       </ul>
     </dd>
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index 23c68fe97..91b580998 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -82,12 +82,14 @@
         {html_radios name='visible' values='true,false'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE}
       </td>
     </tr>
+  {if isset($CAT_COMMENTABLE)}
     <tr>
       <td><strong>{'Comments'|@translate}</strong>
       <td>
         {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
       </td>
     </tr>
+  {/if}
   </table>
 </fieldset>
 
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 008dfe4e0..bc64a14ff 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -183,6 +183,15 @@ jQuery(document).ready(function () {
   <ul>
     <li>
       <label>
+        <span class="property">{'Activate comments'|@translate}</span>
+        <input type="checkbox" name="activate_comments" id="activate_comments"{if ($comments.activate_comments)}checked="checked"{/if}>
+      </label>
+    </li>
+  </ul>
+  
+  <ul id="comments_param_warp"{if not ($comments.activate_comments)} style="display:none;"{/if}>
+    <li>
+      <label>
         <span class="property">{'Comments for all'|@translate}</span>
         <input type="checkbox" name="comments_forall" {if ($comments.comments_forall)}checked="checked"{/if}>
       </label>
@@ -243,6 +252,17 @@ jQuery(document).ready(function () {
 
   </ul>
 </fieldset>
+{footer_script}{literal}
+$(document).ready(function(){
+  $("#activate_comments").change(function(){
+    if ($(this).attr('checked')) {
+      $("#comments_param_warp").css('display', '');
+    } else {
+      $("#comments_param_warp").css('display', 'none');
+    }
+  });
+});
+{/literal}{/footer_script}
 {/if}
 
 </div> <!-- configContent -->
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl
index 7afbd6ab4..679a3565f 100644
--- a/admin/themes/default/template/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -72,12 +72,14 @@ jQuery().ready(function(){
       <li>{$DB_TAGS} ({$DB_IMAGE_TAG})</li>
       <li>{$DB_USERS}</li>
       <li>{$DB_GROUPS}</li>
+    {if isset($DB_COMMENTS)}
       <li>
         {$DB_COMMENTS}
         {if isset($unvalidated)}
         (<a href="{$unvalidated.URL}">{$unvalidated.INFO}</a>)
         {/if}
       </li>
+    {/if}
 			<li>{$DB_RATES}</li>
     </ul>
   </dd>
diff --git a/admin/themes/default/template/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index 24cf53abe..33727f7aa 100644
--- a/admin/themes/default/template/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
@@ -47,7 +47,7 @@
         </span>
         <input type="text" size="4" maxlength="3" name="nb_image_page" id="nb_image_page" value="{$NB_IMAGE_PAGE}">
       </li>
-{if not $SPECIAL_USER}
+    {if not $SPECIAL_USER}
       <li>
         <span class="property">
           <label for="template">{'Interface theme'|@translate}</label>
@@ -60,7 +60,7 @@
         </span>
         {html_options id=language name=language options=$language_options selected=$language_selection}
       </li>
-{/if}
+    {/if}
       <li>
         <span class="property">
           <label for="recent_period">{'Recent period'|@translate}</label>
@@ -71,10 +71,12 @@
         <span class="property">{'Expand all albums'|@translate}</span>
         {html_radios name='expand' options=$radio_options selected=$EXPAND}
       </li>
+    {if $ACTIVATE_COMMENTS}
       <li>
         <span class="property">{'Show number of comments'|@translate}</span>
         {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
       </li>
+    {/if}
       <li>
         <span class="property">{'Show number of hits'|@translate}</span>
         {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl
index 4458f9792..5bb3f18ed 100644
--- a/admin/themes/default/template/user_list.tpl
+++ b/admin/themes/default/template/user_list.tpl
@@ -235,6 +235,7 @@
     </td>
   </tr>
 
+{if $ACTIVATE_COMMENTS}
   <tr>
     <td>{'Show number of comments'|@translate}</td>
     <td>
@@ -244,6 +245,7 @@
       <label><input type="radio" name="show_nb_comments" value="false">{'No'|@translate}</label>
     </td>
   </tr>
+{/if}
 
   <tr>
     <td>{'Show number of hits'|@translate}</td>