From 1855642bd169a1cae69cd9efb8da4458ea6e4a3c Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Fri, 28 Aug 2009 16:19:41 -0400
Subject: improved UI for the languages admin this should take care of bug #329

---
 themes/admin_default/css/admin_screen.css | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_default/css/admin_screen.css b/themes/admin_default/css/admin_screen.css
index d408acf0..913631dc 100644
--- a/themes/admin_default/css/admin_screen.css
+++ b/themes/admin_default/css/admin_screen.css
@@ -451,8 +451,20 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   cursor: pointer;
 }
 
-#gLanguageSettingsForm .checklist li {
-  width: 150px;
-  overflow: hidden;
+#gLanguagesForm table {
+	width: 400px;
+	float: left;
+	margin: 0 3em 1em 0;
+}
+#gLanguagesForm .installed {
+  background-color: #EEEEEE;
 }
+#gLanguagesForm .default {
+	background-color: #C5DBEC;
+	font-weight: bold;
+}
+#gLanguagesForm input, #gShareTranslationsForm, #gLanguages h2 {
+	clear: both;
+}
+
 
-- 
cgit v1.2.3


From 1d5262f9c354a8564f05a8a31b915ad479f4d361 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 28 Aug 2009 13:44:01 -0700
Subject: Fix ticket #591: reCaptcha always on the page. 1) move creating the
 "Add a comment" button into the comments.html.php 2) use $.get() to retrieve
 the comment add form

---
 modules/comment/helpers/comment_theme.php |  2 --
 modules/comment/js/comment.js             | 10 +++++++++-
 modules/comment/views/comments.html.php   | 10 ++++++++--
 themes/default/css/screen.css             |  7 +++++++
 themes/default/js/ui.init.js              | 12 ------------
 themes/default/views/movie.html.php       |  3 ---
 themes/default/views/photo.html.php       |  3 ---
 7 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'themes')

diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index b807e2cf..38a00b5c 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -26,7 +26,6 @@ class comment_theme_Core {
   static function photo_bottom($theme) {
     $block = new Block;
     $block->css_id = "gComments";
-    $block->anchor = t("comments");
     $block->title = t("Comments");
 
     $view = new View("comments.html");
@@ -37,7 +36,6 @@ class comment_theme_Core {
       ->find_all();
 
     $block->content = $view;
-    $block->content .= comment::get_add_form($theme->item())->render("form.html");
     return $block;
   }
 }
\ No newline at end of file
diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js
index 00fc6027..9fd63c1a 100644
--- a/modules/comment/js/comment.js
+++ b/modules/comment/js/comment.js
@@ -1,5 +1,13 @@
 $("document").ready(function() {
-  ajaxify_comment_form();
+  $("#gAddCommentButton").click(function(event) {
+    event.preventDefault();
+    $.get($(this).attr("href"),
+          {},
+          function(data) {
+            $("#gCommentDetail").append(data);
+            ajaxify_comment_form();
+          });
+    });
 });
 
 function ajaxify_comment_form() {
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index f7251389..6dce9971 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -1,11 +1,17 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+  <a href="<?= url::site("form/add/comments/{$item->id})") ?>" id="gAddCommentButton"
+   class="gButtonLink ui-corner-all ui-icon-left ui-state-default right">
+  <span class="ui-icon ui-icon-comment"></span>
+  <?= t("Add a comment") ?>
+</a>
+<div id="gCommentDetail">
 <? if (!$comments->count()): ?>
 <p id="gNoCommentsYet">
   <?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
       array("attrs" => "href=\"#add_comment_form\" class=\"showCommentForm\"")) ?>
 </p>
 <? endif ?>
-<ul id="gComments">
+<ul>
   <? foreach ($comments as $comment): ?>
   <li id="gComment-<?= $comment->id ?>">
     <p class="gAuthor">
@@ -26,4 +32,4 @@
   </li>
   <? endforeach ?>
 </ul>
-<a name="add_comment_form"></a>
+</div>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index ecae2bb2..481581a2 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -530,6 +530,7 @@ form .gError,
 
 #gContent #gComments {
   margin-top: 2em;
+  position: relative;
 }
 
 #gContent #gComments ul li {
@@ -561,6 +562,12 @@ form .gError,
   width: 32px;
 }
 
+#gAddCommentButton {
+  position: absolute;
+  right: 0;
+  top: 2px;
+}
+
 #gContent #gAddCommentForm {
   margin-top: 2em;
 }
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 2391f638..67cdb968 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -110,18 +110,6 @@ $(document).ready(function() {
       $(this).gallery_context_menu();
     });
 
-    // Collapse comments form, insert button to expand
-    if ($("#gAddCommentForm").length) {
-      var showCommentForm = '<a href="#add_comment_form"'
-        + ' class="showCommentForm gButtonLink ui-corner-all ui-icon-left ui-state-default right">'
-        + '<span class="ui-icon ui-icon-comment"></span>' + ADD_A_COMMENT + '</a>';
-      $("#gAddCommentForm").hide();
-      $("#gComments").prepend(showCommentForm);
-      $(".showCommentForm").click(function(){
-        $("#gAddCommentForm").show(1000);
-      });
-    }
-
     // Add scroll effect for links to named anchors
     $.localScroll({
       queue: true,
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index c8ecd769..29789f8e 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -32,9 +32,6 @@
        <div><?= nl2br(p::purify($item->description)) ?></div>
   </div>
 
-  <script type="text/javascript">
-    var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
-  </script>
   <?= $theme->photo_bottom() ?>
   <?= $theme->context_menu($item, "#gMovieId-{$item->id}") ?>
 </div>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index fa5def47..39e61ef6 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -55,8 +55,5 @@
     <div><?= nl2br(p::purify($item->description)) ?></div>
   </div>
 
-  <script type="text/javascript">
-    var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
-  </script>
   <?= $theme->photo_bottom() ?>
 </div>
-- 
cgit v1.2.3