2 files changed, 33 insertions, 2 deletions
diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index 9fc63321b..fdbd50614 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -15,8 +15,8 @@
     <dd>
       <ul>
         <li><a href="{U_CONFIG_GENERAL}">{lang:general}</a></li>
-        <li><a href="{U_CONFIG_COMMENTS}">{lang:comments}</a></li>
         <li><a href="{U_CONFIG_DISPLAY}">{lang:conf_default}</a></li>
+        <li><a href="{U_CONFIG_COMMENTS}">{lang:comments}</a></li>
       </ul>
     </dd>
   </dl>
@@ -29,7 +29,6 @@
         <li><a href="{U_CATEGORIES}">{lang:manage}</a></li>
         <li><a href="{U_MOVE}">{lang:Move}</a></li>
         <li><a href="{U_CAT_UPLOAD}">{lang:upload}</a></li>
-        <li><a href="{U_CAT_COMMENTS}">{lang:comments}</a></li>
         <li><a href="{U_CAT_VISIBLE}">{lang:lock}</a></li>
         <li><a href="{U_CAT_STATUS}">{lang:cat_security}</a></li>
         <!-- BEGIN representative -->
diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index a6b14e1e5..7622564d4 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
@@ -221,3 +221,35 @@
     <input class="submit" type="reset" name="reset" value="{lang:Reset}">
   </p>
 </form>
+
+
+<!-- BEGIN comments -->
+<form method="post" action="{F_ACTION}" class="properties">
+<fieldset>
+  <legend>{lang:cat_comments_title}</legend>
+  <table class="doubleSelect">
+    <tr>
+      <td>
+        <h3>{lang:authorized}</h3>
+        <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
+          <!-- BEGIN category_option_true -->
+          <option {comments.category_option_true.SELECTED} value="{comments.category_option_true.VALUE}">{comments.category_option_true.OPTION}</option>
+          <!-- END category_option_true -->
+        </select>
+        <p><input class="submit" type="submit" value="&raquo;" name="falsify" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+      </td>
+
+      <td>
+        <h3>{lang:forbidden}</h3>
+        <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
+          <!-- BEGIN category_option_false -->
+          <option {comments.category_option_false.SELECTED} value="{comments.category_option_false.VALUE}">{comments.category_option_false.OPTION}</option>
+          <!-- END category_option_false -->
+        </select>
+        <p><input class="submit" type="submit" value="&laquo;" name="trueify" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+      </td>
+    </tr>
+  </table>
+</fieldset>
+</form>
+<!-- END comments -->