Merge branch 'master' into talmdal_dev

gallery · May 9, 2010 · 357d20a · 357d20a
2 parents 14683ec + b2f7f80
commit 357d20a
Show file tree

Hide file tree

Showing 32 changed files with 78 additions and 59 deletions.
diff --git a/lib/flowplayer.controls.swf b/lib/flowplayer.controls.swf
diff --git a/lib/flowplayer.h264streaming.swf b/lib/flowplayer.h264streaming.swf
diff --git a/lib/flowplayer.js b/lib/flowplayer.js
diff --git a/lib/flowplayer.pseudostreaming.swf b/lib/flowplayer.pseudostreaming.swf
diff --git a/lib/flowplayer.swf b/lib/flowplayer.swf
diff --git a/lib/yui/base-min.css b/lib/yui/base-min.css
diff --git a/lib/yui/reset-fonts-grids.css b/lib/yui/reset-fonts-grids.css
diff --git a/modules/akismet/controllers/admin_akismet.php b/modules/akismet/controllers/admin_akismet.php
@@ -50,6 +50,7 @@ public function index() {
 
     akismet::check_config();
     $view = new Admin_View("admin.html");
+    $view->page_title = t("Akismet spam filtering");
     $view->content = new View("admin_akismet.html");
     $view->content->valid_key = $valid_key;
     $view->content->form = $form;

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
@@ -44,6 +44,7 @@ public function queue($state) {
     $page = max(Input::instance()->get("page"), 1);
 
     $view = new Admin_View("admin.html");
+    $view->page_title = t("Manage comments");
     $view->content = new View("admin_comments.html");
     $view->content->counts = $this->_counts();
     $view->content->menu = $this->_menu($view->content->counts);

diff --git a/modules/comment/css/comment.css b/modules/comment/css/comment.css
@@ -28,7 +28,7 @@
   width: 32px;
 }
 
-#g-admin-comment-button {
+#g-add-comment {
   position: absolute;
   right: 0;
   top: 2px;

diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js
@@ -1,16 +1,17 @@
 $("document").ready(function() {
-  $("#g-admin-comment-button").click(function(event) {
+  $("#g-add-comment").click(function(event) {
     event.preventDefault();
     if (!$("#g-comment-form").length) {
       $.get($(this).attr("href"),
 	    {},
 	    function(data) {
 	      $("#g-comment-detail").append(data);
 	      ajaxify_comment_form();
+        $.scrollTo("#g-comment-form-anchor", 800);
 	    });
     }
   });
-  $("#g-no-comments").click(function(event) {
+  $(".g-no-comments a").click(function(event) {
     event.preventDefault();
     if (!$("#g-comment-form").length) {
       $.get($(this).attr("href"),
@@ -19,7 +20,7 @@ $("document").ready(function() {
 	      $("#g-comment-detail").append(data);
 	      ajaxify_comment_form();
 	    });
-      $("#g-no-comments-yet").remove();
+      $(".g-no-comments").remove();
     }
   });
 });
@@ -32,7 +33,7 @@ function ajaxify_comment_form() {
         $("#g-comments #g-comment-detail ul").append(data.view);
         $("#g-comments #g-comment-detail ul li:last").effect("highlight", {color: "#cfc"}, 8000);
         $("#g-comment-form").hide(2000).remove();
-        $("#g-no-comments-yet").hide(2000);
+        $("#g-no-comments").hide(2000);
       } else {
         if (data.form) {
           $("#g-comments form").replaceWith(data.form);