aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--view/jot-header.tpl9
-rw-r--r--view/theme/duepuntozero/jot.tpl3
-rw-r--r--view/theme/duepuntozero/style.css3
-rw-r--r--view/theme/testbubble/jot-header.tpl26
-rw-r--r--view/theme/testbubble/jot.tpl7
-rw-r--r--view/theme/testbubble/style.css24
6 files changed, 19 insertions, 53 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 352c48647..d998e977a 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 74027846c..6a105e1da 100644
--- a/view/theme/duepuntozero/jot.tpl
+++ b/view/theme/duepuntozero/jot.tpl
@@ -21,6 +21,8 @@
{{ if $content }}<script>initEditor();</script>{{ endif }}
<div id="profile-jot-submit-wrapper" class="jothidden">
+ <input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+
<div id="profile-upload-wrapper" style="display: $visitor;" >
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
</div>
@@ -46,7 +48,6 @@
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
</div>
-<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
<div id="profile-jot-perms-end"></div>
<div id="profile-jot-plugin-wrapper">
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 790867d5c..ab729b9da 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 7b2dca9fe..18f07970c 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 fa655a13e..feffea9d8 100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -16,12 +16,7 @@
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
-
- <div id="jot-title-wrapper">
- <span id="jot-title-desc" style="display: none;">$addtitle</span>
- <span id="jot-title-display" style="display: none;"></span>
- <input type="text" name="title" id="jot-title" value="" style="display: none;" />
- </div>
+ <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 28fb0ae45..a17d702c1 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 {