Merge pull request #1 from friendica/master

test pull request

1 files changed, 45 insertions, 42 deletions

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index c4fdba0f5..00ef77d93 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -19,64 +19,72 @@
 			<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
 			</div>
 		{{/if}}
-		<div id="jot-title-wrap">
-			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none">
+		<div id="jot-title-wrap"  class="jothidden" style="display:none">
+			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}">
 		</div>
 		{{if $catsenabled}}
-		<div id="jot-category-wrap">
-			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" />
+		<div id="jot-category-wrap"  class="jothidden" style="display:none">
+			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="tagsinput"/>
 		</div>
 		{{/if}}
 		{{if $webpage}}
-		<div id="jot-pagetitle-wrap">
-			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" />
+		<div id="jot-pagetitle-wrap" class="jothidden" style="display:none">
+			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}"  />
 		</div>
 		{{/if}}
 		<div id="jot-text-wrap">
 			<textarea class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea>
 		</div>
 		<div id="profile-jot-submit-wrapper" class="jothidden">
-			<div id="profile-jot-submit-left" class="btn-group pull-left">
+			<div id="profile-jot-submit-left" class="btn-toolbar pull-left">
 				{{if $visitor}}
-				<button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" >
-					<i class="icon-camera jot-icons"></i>
-				</button>
-				<button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
-					<i id="wall-file-upload" class="icon-paper-clip jot-icons"></i>
-				</button>
-				<button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
-					<i id="profile-link" class="icon-link jot-icons"></i>
-				</button>
-				<button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;">
-					<i id="profile-video" class="icon-facetime-video jot-icons"></i>
-				</button>
-				<button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;">
-					<i id="profile-audio" class="icon-volume-up jot-icons"></i>
-				</button>
-				<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
-					<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
-				</button>
-				<button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
-					<i id="profile-location" class="icon-globe jot-icons"></i>
-				</button>
+				<div class='btn-group'>
+					<button id="wall-image-upload" class="btn btn-default btn-sm" title="{{$upload}}" >
+						<i class="icon-camera jot-icons"></i>
+					</button>
+					<button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
+						<i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i>
+					</button>
+					<button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);"  onclick="jotGetLink(); return false;">
+						<i id="profile-link" class="icon-link jot-icons"></i>
+					</button>
+					<button id="profile-video-wrapper" class="btn btn-default btn-sm" title="{{$video}}" onclick="jotVideoURL();return false;">
+						<i id="profile-video" class="icon-facetime-video jot-icons"></i>
+					</button>
+					<button id="profile-audio-wrapper" class="btn btn-default btn-sm" title="{{$audio}}" onclick="jotAudioURL();return false;">
+						<i id="profile-audio" class="icon-volume-up jot-icons"></i>
+					</button>
+				</div>
+				<div class='btn-group'>
+					<button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
+						<i id="profile-location" class="icon-globe jot-icons"></i>
+					</button>
+					{{if $noloc}}
+					<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
+						<i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
+					</button>
+					{{/if}}
+				{{else}}
+				<div class='btn-group'>
 				{{/if}}
 				{{if $feature_expire}}
-				<button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
-					<i id="profile-expires" class="icon-eraser jot-icons"></i>
-				</button>
+					<button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
+						<i id="profile-expires" class="icon-eraser jot-icons"></i>
+					</button>
 				{{/if}}
 				{{if $feature_encrypt}}
-				<button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
-					<i id="profile-encrypt" class="icon-key jot-icons"></i>
-				</button>
+					<button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
+						<i id="profile-encrypt" class="icon-key jot-icons"></i>
+					</button>
 				{{/if}}
+				</div>
 			</div>
 			<div id="profile-rotator-wrapper">
 				<div id="profile-rotator"></div>
 			</div>
 			<div id="profile-jot-submit-right" class="btn-group pull-right">
 				{{if $showacl}}
-				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
+				<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
 					<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i>
 				</button>
 				{{/if}}
@@ -85,7 +93,7 @@
 					<i class="icon-eye-open jot-icons" ></i>
 				</button>
 				{{/if}}
-				<button class="btn btn-primary btn-sm" type="submit" name="submit">{{$share}}</button>
+				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit" >{{$share}}</button>
 			</div>
 			<div id="profile-jot-perms-end"></div>
 			<div id="profile-jot-plugin-wrapper">
@@ -108,12 +116,7 @@
       </div>
      <!--  <div class="modal-body"> -->
             <div class="modal-body form-group" style="width:90%">
-                <div class="input-group input-group-sm date" id="datetimepicker1">
-                    <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> -->
-                    <span class="icon-calendar"></span>
-                    </span>
-                    <input id="expiration-date" type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/>
-                </div>
+		<div class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='start_text' id='expiration-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script>
             </div>
       <!-- </div> -->
       <div class="modal-footer">