4 files changed, 7 insertions, 18 deletions
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>