Merge pull request #86 from simonlnu/master

more dispy

2 files changed, 14 insertions, 18 deletions

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 93df84aae..84f152340 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -19,15 +19,11 @@ function initEditor(cb) {
 				'transitionOut' : 'elastic'
 			});
 			$(".jothidden").show();
-			if (typeof cb!="undefined") {
-                cb();
-            }
+			if (typeof cb!="undefined") cb();
 			return;
 		}
-
 		tinyMCE.init({
 			theme : "advanced",
-            skin : "default",
 			mode : "specific_textareas",
 			editor_selector: $editselect,
 			auto_focus: "profile-jot-text",
@@ -51,9 +47,8 @@ function initEditor(cb) {
 			setup : function(ed) {
 				cPopup = null;
 				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null) {
+					if(cPopup !== null)
 						cPopup.onkey(e);
-                    }
 				});
 
 				ed.onKeyUp.add(function(ed, e) {
@@ -64,7 +59,7 @@ function initEditor(cb) {
 							cPopup = new ACPopup(this,baseurl+"/acl");
 						}
 						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) { cPopup = null; }
+						if(! cPopup.ready) cPopup = null;
 					}
 					else {
 						if(cPopup !== null) { cPopup.close(); cPopup = null; }
@@ -102,9 +97,9 @@ function initEditor(cb) {
 					ed.pasteAsPlainText = true;
 					$("#profile-jot-text-loading").hide();
 					$(".jothidden").show();
-
-					if (typeof cb!="undefined") { cb(); }
+					if (typeof cb!="undefined") cb();
 				});
+
 			}
 		});
 		editor = true;
@@ -121,7 +116,7 @@ function initEditor(cb) {
 function charCounter() {
 	// character count part deux
 	$('#profile-jot-text').keyup(function(event) {
-		var textlen = $(this).val().length();
+		var textlen = $('#profile-jot-text').val().length();
 		var maxLen1 = 140;
 		var maxLen2 = 420;
 
@@ -141,7 +136,7 @@ function charCounter() {
 			$('#character-counter').removeClass('orange');
 			$('#character-counter').addClass('red');
 		}
-		$('#character-counter').html($(this).val().length);
+		$('#character-counter').html($('#profile-jot-text').val().length);
 	});
 }
 
@@ -149,7 +144,6 @@ function enableOnUser(){
 	if (editor) return;
 	$(this).val("");
 	initEditor();
-	charCounter();
 }
 
 </script>
@@ -163,6 +157,8 @@ function enableOnUser(){
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
+		$("#profile-jot-text").focus(charCounter);
+		$("#profile-jot-text").click(charCounter);
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 01c7fe664..308a2ff38 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -611,8 +611,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 **/
 aside {
     position: absolute;
-    right: 8%;
-    width: 20.5%;
+    right: 15px;
+    width: 255px;
     font-size: smaller;
 }
 .vcard .fn {
@@ -672,7 +672,7 @@ aside #viewcontacts {
  **/
 #jot {
   /*width: 785px;*/
-  margin: 0px 0 20px 0px;
+  margin: 10px 0 20px 0px;
   width: 100%;
 }
 #jot #jot-tools {
@@ -956,7 +956,7 @@ aside #viewcontacts {
  * section
  */
 section {
-    margin: 20px 8% 0 6%;
+    margin: 20px 5% 0 6%;
     font-size: 0.8em;
     padding-right: 250px;
 	min-width: 475px;
@@ -965,7 +965,7 @@ section {
 /** tabs **/
 .tabs {
     list-style: none;
-    margin: 0;
+    margin: 10px 0 10px;
     padding: 0;
     border-bottom: 1px solid #729fcf;
     font-size: 14px;