Merge pull request #75 from simonlnu/master

theme tweaks

2 files changed, 37 insertions, 7 deletions

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 0a559aae7..23883036b 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -4,10 +4,11 @@
 var editor=false;
 var textlen = 0;
 var plaintext = '$editselect';
+// this is here because of the silly tinymce error. didn't help.
 var skin = 'default';
 
-function initEditor(cb){
-	if (editor==false){
+function initEditor(cb) {
+	if (editor==false) {
 		$("#profile-jot-text-loading").show();
 		if(plaintext == 'none') {
 			$("#profile-jot-text-loading").hide();
@@ -22,7 +23,8 @@ function initEditor(cb){
                 cb();
             }
 			return;
-		}	
+		}
+
 		tinyMCE.init({
 			theme : "advanced",
             skin : "default",
@@ -100,7 +102,36 @@ function initEditor(cb){
 					ed.pasteAsPlainText = true;
 					$("#profile-jot-text-loading").hide();
 					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
+
+					if (typeof cb!="undefined") { cb(); }
+
+					// character count part deux
+					//
+					// get # of chars
+					var textlen = $('#profile-jot-text').val().length();
+					$('#character-counter').html(textlen);
+
+					$('#profile-jot-text').keyup(function() {
+						$('#character-counter').removeClass('jothidden');
+						if(textlen <= 140) {
+							$('#character-counter').removeClass('red');
+							$('#character-counter').removeClass('orange');
+							$('#character-counter').addClass('grey');
+						}
+						if((textlen > 140) && (textlen <= 420)) {
+							$('#character-counter').removeClass('grey');
+							$('#character-counter').removeClass('red');
+							$('#character-counter').addClass('orange');
+						}
+						if(textlen > 420) {
+							$('#character-counter').removeClass('grey');
+							$('#character-counter').removeClass('orange');
+							$('#character-counter').addClass('red');
+						}
+						// get new len
+						$('#character-counter').html($(this).val().length);
+					});
+
 				});
 			}
 		});
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index f0929094c..8d7bbc630 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -988,7 +988,7 @@ section {
 }
 .wall-item-content-wrapper {
     position: relative;
-    border-top: 1px #aaa solid;
+    border-left: 1px #aaa solid;
     padding: 10px;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
@@ -996,7 +996,6 @@ section {
 }
 .wall-item-content-wrapper.shiny {
     background: #efefcf;
-    border-right: 3px solid #ffd398;
 }
 .wall-item-content {
     overflow-x: auto;
@@ -1039,7 +1038,7 @@ section {
     border-radius: 5px;
 }
 [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-	margin: 0 0 10px 0;
+	margin: 0 0 5px 0;
 }
 .wall-item-tools {
     float: right;