From 5bdfc2f64780abd36d889dc0bbe52026b768631b Mon Sep 17 00:00:00 2001
From: Alexandre Hannud Abdo <abdo@member.fsf.org>
Date: Tue, 16 Sep 2014 18:56:34 -0300
Subject: Fix name attribute of button elements so jquery '.submit()' doesn't
 break

According to "Additional notes" in:

http://api.jquery.com/submit/

Not fixing buttons created with 'input' tags.
---
 view/tpl/jot.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index c4fdba0f5..c51dc02a5 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -85,7 +85,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 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">
-- 
cgit v1.2.3


From 55a937375df5b21da7cece5ec4b4cb5deb49245b Mon Sep 17 00:00:00 2001
From: Alexandre Hannud Abdo <abdo@member.fsf.org>
Date: Tue, 7 Oct 2014 02:47:06 -0300
Subject: datetimepicker data-format now data-date-format

---
 view/tpl/jot.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index c51dc02a5..be896adb5 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -112,7 +112,7 @@
                     <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"/>
+                    <input id="expiration-date" type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/>
                 </div>
             </div>
       <!-- </div> -->
-- 
cgit v1.2.3


From 1a445a17d8cc7c2877fe331c659abbefbc4164ad Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Wed, 5 Nov 2014 17:19:46 +0100
Subject: Fix duplicate element id

---
 view/tpl/jot.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index be896adb5..12da18ef1 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -42,7 +42,7 @@
 					<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>
+					<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>
-- 
cgit v1.2.3


From 862f0ff29addc5a764f5544ad64ac5453e818801 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sat, 8 Nov 2014 21:55:44 +0100
Subject: prevent posting before acl got populated since this will disregard
 the default acl setting and the post will be visible to the default audience
 without warning. the chance that this happens is quite small while writing a
 post but can easily happen on eg editing photos (maybe just tick a checkbox
 and press submit). the acl and submit buttons are disabled by default and
 will be activated as soon as acl is populated.

---
 view/tpl/jot.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 12da18ef1..29dc41525 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -76,7 +76,7 @@
 			</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}}" disabled="disabled" onclick="return false;">
 					<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i>
 				</button>
 				{{/if}}
@@ -85,7 +85,7 @@
 					<i class="icon-eye-open jot-icons" ></i>
 				</button>
 				{{/if}}
-				<button class="btn btn-primary btn-sm" type="submit" name="button-submit">{{$share}}</button>
+				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit"{{if $showacl}} disabled="disabled"{{/if}}>{{$share}}</button>
 			</div>
 			<div id="profile-jot-perms-end"></div>
 			<div id="profile-jot-plugin-wrapper">
-- 
cgit v1.2.3


From e190adc58980c12c6dffb21dae57194aad354e3c Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Mon, 17 Nov 2014 16:51:46 +0100
Subject: Use new date selector for item expiry

---
 view/tpl/jot.tpl | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 29dc41525..c77d49a74 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -108,12 +108,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-date-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">
-- 
cgit v1.2.3


From 1d96e165e00ed54df0573bda79c2a274f21aeb16 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 18 Nov 2014 00:24:32 -0800
Subject: undo disabled submit buttons now that ACL is initialised when page
 loaded

---
 view/tpl/jot.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index c77d49a74..f172a6dfa 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -76,7 +76,7 @@
 			</div>
 			<div id="profile-jot-submit-right" class="btn-group pull-right">
 				{{if $showacl}}
-				<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" disabled="disabled" 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 +85,7 @@
 					<i class="icon-eye-open jot-icons" ></i>
 				</button>
 				{{/if}}
-				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit"{{if $showacl}} disabled="disabled"{{/if}}>{{$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">
-- 
cgit v1.2.3


From d65ad03aec49f91e308d951dae0b5c28f3549adb Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Mon, 8 Dec 2014 22:37:02 +0100
Subject: Put some spacing between share types and other buttons in jot

---
 view/tpl/jot.tpl | 62 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index f172a6dfa..826a3dd38 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -36,40 +36,46 @@
 			<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-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>
-				<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-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>
+				{{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>
-- 
cgit v1.2.3


From 242713ebef71e0e2b6b1666f7c2400b26772ba2d Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Tue, 9 Dec 2014 15:09:19 +0100
Subject: show clear browser location button only if use browser location
 option is set and minor css fixes

---
 view/tpl/jot.tpl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 826a3dd38..8d6b5ff91 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -56,12 +56,14 @@
 					</button>
 				</div>
 				<div class='btn-group'>
-					<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>
+					{{if $noloc}}
+					<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>
+					{{/if}}
 				{{else}}
 				<div class='btn-group'>
 				{{/if}}
-- 
cgit v1.2.3


From cc365513edc0ea7829e44a7854a47f3fcf8a17d1 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Tue, 9 Dec 2014 15:22:53 +0100
Subject: adjustment to clear browser location button only if use browser
 location option is set

---
 view/tpl/jot.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 8d6b5ff91..34acce879 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -60,7 +60,7 @@
 						<i id="profile-location" class="icon-globe jot-icons"></i>
 					</button>
 					{{if $noloc}}
-					<button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" style="display: none;" title="{{$noloc}}" onclick="jotClearLocation();return false;">
+					<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}}
-- 
cgit v1.2.3


From aa73259a479d36394cf298979dc260030062ee70 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Sun, 21 Dec 2014 12:42:07 +0100
Subject: Fancy categories input with bootstrap-tagsinput

---
 view/tpl/jot.tpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'view/tpl/jot.tpl')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 34acce879..00ef77d93 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -19,17 +19,17 @@
 			<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">
-- 
cgit v1.2.3