Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / view / head.tpl

diff --git a/view/head.tpl b/view/head.tpl
index f606f2f7e2dde6a0bdff17a11e9a9c4e19f1a4bf..722c79441465698acf0debaa8b38bcbb49a46281 100755 (executable)
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -7,7 +7,7 @@
 
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
 <link rel="search"
          href="$baseurl/opensearch" 
          type="application/opensearchdescription+xml" 
@@ -34,14 +34,16 @@
        function commentOpen(obj,id) {
                if(obj.value == '$comment') {
                        obj.value = '';
-                       obj.className = "comment-edit-text-full";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                        openMenu("comment-edit-submit-wrapper-" + id);
                }
        }
        function commentClose(obj,id) {
                if(obj.value == '') {
                        obj.value = '$comment';
-                       obj.className="comment-edit-text-empty";
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
                        closeMenu("comment-edit-submit-wrapper-" + id);
                }
        }