Merge remote-tracking branch 'friendica/master'

2 files changed, 35 insertions, 17 deletions

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;