diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 352c48647e..d998e977a4 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -7,7 +7,6 @@ var textlen = 0; function initEditor(cb){ if (editor==false){ $("#profile-jot-text-loading").show(); - $("#jot-title-desc").show(); tinyMCE.init({ theme : "advanced", mode : "specific_textareas", @@ -196,14 +195,6 @@ function enableOnUser(){ } } - function jotTitle() { - reply = prompt("$title", $('#jot-title').val()); - if(reply && reply.length) { - $('#jot-title').val(reply); - } - } - - function jotShare(id) { $('#like-rotator-' + id).show(); $.get('share/' + id, function(data) { diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl index 74027846c5..6a105e1da4 100644 --- a/view/theme/duepuntozero/jot.tpl +++ b/view/theme/duepuntozero/jot.tpl @@ -21,6 +21,8 @@ {{ if $content }}{{ endif }}
+ +
@@ -46,7 +48,6 @@
$bang
-
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 790867d5ca..ab729b9da3 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -274,7 +274,8 @@ div.wall-item-content-wrapper.shiny { border: 0px; margin: 0px; height: 20px; - width: 465px; + width: 530px; + margin-bottom: 5px; font-weight: bold; border: 1px solid #ffffff; } diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl index 7b2dca9fe9..18f07970c2 100644 --- a/view/theme/testbubble/jot-header.tpl +++ b/view/theme/testbubble/jot-header.tpl @@ -8,7 +8,6 @@ var textlen = 0; function initEditor(cb) { if (editor==false) { $("#profile-jot-text-loading").show(); - $("#jot-title-desc").show(); tinyMCE.init({ theme : "advanced", mode : "specific_textareas", @@ -85,6 +84,7 @@ function initEditor(cb) { ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; $("#profile-jot-text-loading").hide(); + $(".jothidden").show(); $("#profile-jot-submit-wrapper").show(); {{ if $newpost }} $("#profile-upload-wrapper").show(); @@ -125,30 +125,6 @@ function initEditor(cb) { }); - $("#jot-title").mouseout(function() { - $("#jot-title").hide(); - var ttl = $("#jot-title").val(); - $('#jot-title-display').html(ttl); - if(ttl.length) { - $("#jot-title-display").show(); - } - else { - $("#jot-title-desc").show(); - } - }); - - $("#jot-title-display").hover(function() { - $("#jot-title-display").hide(); - $("#jot-title").show(); - $("#jot-title").focus(); - }); - - $("#jot-title-desc").click(function() { - $("#jot-title-desc").hide(); - $("#jot-title").show(); - $("#jot-title").focus(); - }); - var uploader = new window.AjaxUpload( 'wall-image-upload', { action: 'wall_upload/$nickname', diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl index fa655a13e2..feffea9d8b 100644 --- a/view/theme/testbubble/jot.tpl +++ b/view/theme/testbubble/jot.tpl @@ -16,12 +16,7 @@ - -
- - - -
+ diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 28fb0ae455..a17d702c1c 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -761,21 +761,23 @@ ul .sidebar-group-li .icon{ #profile-jot-submit-wrapper { } -#jot-title-desc { - color: #cccccc; -} - -#jot-title-wrapper { - margin-bottom: 5px; -} #jot-title { - border: 1px solid #cccccc; - width: 460px; + border: 0px; + margin: 0px; + height: 20px; + width: 462px; + font-weight: bold; + border: 1px solid #ffffff; } -#jot-title-display { - font-weight: bold; +#jot-title::-webkit-input-placeholder{font-weight: normal;} +#jot-title:-moz-placeholder{font-weight: normal;} + + +#jot-title:hover, +#jot-title:focus { + border: 1px solid #cccccc; } #profile-jot-perms, #profile-jot-submit {