From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 6 Jan 2012 08:10:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a9670cbb7d2cab644ee9d499aade98164f92631a;p=friendica.git

Merge remote-tracking branch 'friendica/master'
---

a9670cbb7d2cab644ee9d499aade98164f92631a
diff --cc view/jot-header.tpl
index 4186ef78e2,1a9016f5d5..cdef9ef832
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@@ -108,11 -103,40 +109,46 @@@ function enableOnUser()
  <script type="text/javascript" src="js/ajaxupload.js" ></script>
  <script>
  	var ispublic = '$ispublic';
+ 	var addtitle = '$addtitle';
+ 
  	$(document).ready(function() {
  		
++<<<<<<< HEAD
 +		/* enable tinymce on focus and click */
 +		$("#profile-jot-text").focus(enableOnUser);
 +		$("#profile-jot-text").click(enableOnUser);
++=======
+ 		/* enable tinymce on focus */
+ 		$("#profile-jot-text").focus(function(){
+ 			if (editor) return;
+ 			$(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();
+ 		});		
++>>>>>>> friendica/master
  	
  		var uploader = new window.AjaxUpload(
  			'wall-image-upload',
diff --cc view/jot.tpl
index e20d17b221,e81c8eb3f7..12df0d9c25
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@@ -10,39 -13,67 +10,40 @@@
  		<input type="hidden" name="location" id="jot-location" value="$defloc" />
  		<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>
 -
 -		<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>
 -
 +		
 +		<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">
 -<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> 
 -	<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> 
 -
 -	<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>
 -	</div> 
 -	<div id="profile-video-wrapper" style="display: $visitor;" >
 -		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
 -	</div> 
 -	<div id="profile-audio-wrapper" style="display: $visitor;" >
 -		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
 -	</div> 
 -	<div id="profile-location-wrapper" style="display: $visitor;" >
 -		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></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-jot-plugin-wrapper">
 -  	$jotplugins
 +		
 +		
 +		<ul id="jot-tools" class="jothidden" style="display:none">
 +			<li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
 +			<li><a href="#" onclick="return false;" id="wall-file-upload"  title="$attach">$shortattach</a></li>
 +			<li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
 +			<li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li>
 +			<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
 +			<li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
 +			<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
 +			$jotplugins
 +
 +			<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang"  title="$permset" ></a></li>
 +			<li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
 +			<li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait"  /></li>
 +		</ul>
  	</div>
 -
 -	<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;">
 -			$acl
 -			<hr style="clear:both"/>
 -			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
 -			<div id="profile-jot-email-end"></div>
 -			$jotnets
 -		</div>
 +</form>
 +
 +<div style="display: none;">
 +	<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
 +		$acl
 +		<hr style="clear:both"/>
 +		<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
 +		<div id="profile-jot-email-end"></div>
 +		$jotnets
  	</div>
 +</div>	
 +
 +
  
 -</div>
  
 -<div id="profile-jot-end"></div>
 -</form>
 -</div>
diff --cc view/theme/duepuntozero/jot.tpl
index 78cbecea81,0000000000..36008c5a1e
mode 100644,000000..100644
--- a/view/theme/duepuntozero/jot.tpl
+++ b/view/theme/duepuntozero/jot.tpl
@@@ -1,77 -1,0 +1,79 @@@
 +
 +<div id="profile-jot-wrapper" >
 +	<div id="profile-jot-banner-wrapper">
 +		<div id="profile-jot-desc" >&nbsp;</div>
 +		<div id="character-counter" class="grey"></div>
 +	</div>
 +	<div id="profile-jot-banner-end"></div>
 +
 +	<form id="profile-jot-form" action="$action" method="post" >
 +		<input type="hidden" name="type" value="$ptyp" />
 +		<input type="hidden" name="profile_uid" value="$profile_uid" />
 +		<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
 +	</div>
 +
 +	<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;">
 +			$acl
 +			<hr style="clear:both"/>
 +			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
 +			<div id="profile-jot-email-end"></div>
 +			$jotnets
 +		</div>
 +	</div>
 +
 +</div>
 +
 +<div id="profile-jot-end"></div>
 +</form>
 +</div>