From 87fde3f360d557d48241d09cae4f25949e748d4f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 5 Jun 2010 23:35:32 -0700
Subject: Create a UI under Admin > Settings > Comments where you can limit
 comments only to registered users.  It's simplistic, but is better than
 adding a permission since generally this setting will be used Gallery-wide.

Fixes ticket #1002
---
 modules/comment/views/comments.html.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules/comment/views/comments.html.php')

diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index e4322e08..9a608a43 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -1,9 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-  <a href="<?= url::site("form/add/comments/{$item->id}") ?>#comment-form" id="g-add-comment"
+<? if (comment::can_comment()): ?>
+<a href="<?= url::site("form/add/comments/{$item->id}") ?>#comment-form" id="g-add-comment"
    class="g-button ui-corner-all ui-icon-left ui-state-default">
   <span class="ui-icon ui-icon-comment"></span>
   <?= t("Add a comment") ?>
 </a>
+<? endif ?>
+
 <div id="g-comment-detail">
   <? if (!$comments->count()): ?>
   <p class="g-no-comments">
-- 
cgit v1.2.3


From 70f56ba43aa77568d96fbc8003619007b01acf8e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 17 Jun 2010 14:22:35 -0700
Subject: Fix for ticket #1163.  Don't all guests to a comment when there are
 no comments and the comment access permission is register users.

---
 modules/comment/views/comments.html.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/comment/views/comments.html.php')

diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 9a608a43..1b9f8bbb 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -10,12 +10,16 @@
 <div id="g-comment-detail">
   <? if (!$comments->count()): ?>
   <p class="g-no-comments">
+    <? if (comment::can_comment()): ?>
     <?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
           array("attrs" => html::mark_clean("href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>
+    <? else: ?>
+    <?= t("No comments yet.") ?>
+    <? endif ?>
   </p>
   <ul><li class="g-no-comments">&nbsp;</li></ul>
-  <? endif ?>
-  <? if ($comments->count()): ?>
+  <? else: ?>
+
   <ul>
     <? foreach ($comments as $comment): ?>
     <li id="g-comment-<?= $comment->id ?>">
-- 
cgit v1.2.3


From f0a99ffc2764a64712a5c5c3abc9a4b3f3c09616 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 18 Jun 2010 14:31:04 -0700
Subject: Undo "else" clause -- we should keep the logic simple and easy to
 follow, even if it's redundant.

Expand a <ul> to multiple lines.
---
 modules/comment/views/comments.html.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'modules/comment/views/comments.html.php')

diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index 1b9f8bbb..da45f57b 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -16,10 +16,13 @@
     <? else: ?>
     <?= t("No comments yet.") ?>
     <? endif ?>
-  </p>
-  <ul><li class="g-no-comments">&nbsp;</li></ul>
-  <? else: ?>
+   </p>
+  <ul>
+    <li class="g-no-comments">&nbsp;</li>
+  </ul>
+  <? endif ?>
 
+  <? if ($comments->count()): ?>
   <ul>
     <? foreach ($comments as $comment): ?>
     <li id="g-comment-<?= $comment->id ?>">
-- 
cgit v1.2.3