Merge remote-tracking branch 'friendica/master'

9 files changed, 151 insertions, 25 deletions

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 7a1012230..79db0ec5a 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -8,6 +8,7 @@ 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",
@@ -100,6 +101,31 @@ function initEditor(cb) {
                     $(this).val("");
                     initEditor();
                 }); 
+
+		$("#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/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index a2c883e4b..0ceddb3b7 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -14,8 +14,13 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" 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>
 
                 <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>
@@ -49,9 +54,6 @@
 	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
 		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
 	</div> 
-	<div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-title" class="icon border  article" title="$title" onclick="jotTitle(); return false;"></a>
-	</div> 
 
 	<div id="profile-jot-plugin-wrapper" style="display: none;">
   	$jotplugins
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 0d8b54698..08582f1d5 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -342,6 +342,22 @@ aside #viewcontacts { text-align: right;}
 #acl-deny-text-end { clear: both; }
 
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 530px;
+}
+#jot-title-display {
+	font-weight: bold;
+}
+
 
 /**
  * section
diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl
index 78cbecea8..36008c5a1 100644
--- a/view/theme/duepuntozero/jot.tpl
+++ b/view/theme/duepuntozero/jot.tpl
@@ -12,41 +12,47 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" 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>
 
 		<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>
 
 		{{ if $content }}<script>initEditor();</script>{{ endif }}
 
-<div id="profile-jot-submit-wrapper" style="display:none" class="jothidden">
-<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+<div id="profile-jot-submit-wrapper" style="display:none">
 	<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 id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload">image upload</a></div>
 	</div> 
 	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach">attach file</a></div>
 	</div> 
 
 	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+		<a id="profile-link" class="link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">enter link</a>
 	</div> 
 	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
+		<a id="profile-video" class="video" title="$video" onclick="jotVideoURL();return false;">video url</a>
 	</div> 
 	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
+		<a id="profile-audio" class="audio" title="$audio" onclick="jotAudioURL();return false;">audio url</a>
 	</div> 
 	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;">set location</a>
 	</div> 
 	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-	<div id="profile-title-wrapper" style="display: $visitor;" >
-		<a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a>
+		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;">no location</a>
 	</div> 
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="$lockstate"  title="$permset" >permissions</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">
   	$jotplugins
@@ -55,10 +61,6 @@
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 	</div> 
-	<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>
-	<div id="profile-jot-perms-end"></div>
 	
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c6582d068..6ce4c52c0 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -269,6 +269,22 @@ div.wall-item-content-wrapper.shiny {
 	float: left;
 }
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+#jot-title-display {
+	font-weight: bold;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 530px;
+}
+
 .fakelink, .fakelink:visited, .fakelink:link {
 	color: #3465a4;
 	text-decoration: none;
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 222edc166..6b8aef500 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -131,6 +131,23 @@ blockquote:before {
 	float: left;
 }
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 530px;
+}
+
+#jot-title-display {
+	font-weight: bold;
+}
+
 .fakelink, .fakelink:visited {
 	color: #15607B;
 	text-decoration: none;
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index 62351e173..7b2dca9fe 100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -8,6 +8,7 @@ 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",
@@ -122,6 +123,32 @@ function initEditor(cb) {
                     $(this).val("");
                     initEditor();
                 }); 
+
+
+		$("#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 7ccaf2aa2..fa655a13e 100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -14,8 +14,14 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" 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>
 
                 <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>
@@ -42,9 +48,6 @@
 	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
 		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
 	</div> 
-	<div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-title" class="icon border  article" title="$title" onclick="jotTitle(); return false;"></a>
-	</div> 
 
 	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
 		<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index d1d344ef9..3a5d9f178 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -744,6 +744,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;
+}
+
+#jot-title-display {
+	font-weight: bold;
+}
+
 #profile-jot-perms, #profile-jot-submit {
 	width: 60px;
 	font-size: 12px;