From 4d97ea106cf45f9dd191358dc6bde3a7fab438c1 Mon Sep 17 00:00:00 2001
From: Haakon Meland Eriksen <haakon.eriksen@far.no>
Date: Sun, 29 Nov 2015 11:55:39 +0100
Subject: Resolving merge conflict

---
 view/tpl/event_head.tpl |  25 -----------
 view/tpl/events-js.tpl  |  22 ----------
 view/tpl/jot.tpl        | 107 ++++++++++++++++++++++--------------------------
 3 files changed, 49 insertions(+), 105 deletions(-)
 mode change 100644 => 100755 view/tpl/jot.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 496a07782..dc98d14b3 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -58,11 +58,8 @@
 				$('#events-spinner').spin('tiny');
 				$('#events-spinner > i').css('color', 'transparent');
 				if(!isLoading) {
-<<<<<<< HEAD
-=======
 					$('#events-spinner').spin(false);
 					$('#events-spinner > i').css('color', '');
->>>>>>> upstream/master
 					$('td.fc-day').dblclick(function() {
 						openMenu('form');
 						//window.location.href='/events/new?start='+$(this).data('date');
@@ -78,11 +75,7 @@
 				switch(view.name){
 					case "month":
 					element.find(".fc-title").html(
-<<<<<<< HEAD
-						"<img src='{0}' style='height:10px;width:10px'>&nbsp;{1}: {2}".format(
-=======
 						"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}{4}'>{2}</span>".format(
->>>>>>> upstream/master
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
@@ -92,40 +85,22 @@
 					break;
 					case "agendaWeek":
 					element.find(".fc-title").html(
-<<<<<<< HEAD
-						"<img src='{0}' style='height:10px; width:10px'>&nbsp;{1}: {2}<p>{3}</p><p>{4}</p>".format(
-							event.item['author']['xchan_photo_s'],
-							event.item['author']['xchan_name'],
-							event.title,
-							event.item.description,
-							event.item.location
-=======
 						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
 							event.item.description ? event.item.description + "\r\n\r\n" : '',
 							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
->>>>>>> upstream/master
 					));
 					break;
 					case "agendaDay":
 					element.find(".fc-title").html(
-<<<<<<< HEAD
-						"<img src='{0}' style='height:10px;width:10px'>&nbsp;{1}: {2}<p>{3}</p><p>{4}</p>".format(
-							event.item['author']['xchan_photo_s'],
-							event.item['author']['xchan_name'],
-							event.title,
-							event.item.description,
-							event.item.location
-=======
 						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
 							event.item.description ? event.item.description + "\r\n\r\n" : '',
 							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
->>>>>>> upstream/master
 					));
 					break;
 				}
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index cef7b45cc..08c8aa64a 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,13 +1,7 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-<<<<<<< HEAD
-			<button class="btn btn-default btn-xs" onclick="openClose('event-tools'); closeMenu('form');"><i class="icon-cog"></i></button>
 			<button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button>
-
-=======
-			<button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button>
->>>>>>> upstream/master
 			<div class="btn-group">
 				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
 				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
@@ -19,22 +13,6 @@
 	</div>
 	<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
 		{{$form}}
-<<<<<<< HEAD
-	</div>
-	<div id="event-tools" class="section-content-tools-wrapper" style="display:none;">
-		<div class="form-group">
-			<button class="btn btn-primary btn-xs" onclick="exportDate(); return false;"><i class="icon-download"></i>&nbsp;{{$export.1}}</button>
-			<button class="btn btn-primary btn-xs" onclick="openClose('event-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
-		</div>
-		<div id="event-upload-form" style="display:none;">
-			<form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
-				<button id="dbtn-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" >{{$submit}}</button>
-				<input id="event-upload-choose" type="file" name="userfile" />
-
-			</form>
-		</div>
-=======
->>>>>>> upstream/master
 	</div>
 	<div class="clear"></div>
 	<div class="section-content-wrapper-np">
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
old mode 100644
new mode 100755
index b13d66cc4..e7edb7e64
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -48,24 +48,6 @@
 		<div id="profile-jot-submit-wrapper" class="jothidden">
 			<div id="profile-jot-submit-left" class="btn-toolbar pull-left">
 				<div class="btn-group">
-					{{if $writefiles}}
-                                        <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>
-                                        {{/if}}
-				</div>
-				<div class="btn-group hidden-xs">
-					<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="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
-						<i class="icon-terminal jot-icons"></i>
-					</button>
-					<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
-						<i class="icon-quote-left jot-icons"></i>
-					</button>					
-				</div>
-				<div class="btn-group hidden-xs">
 					<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
 						<i class="icon-bold jot-icons"></i>
 					</button>
@@ -74,63 +56,81 @@
 					</button>
 					<button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;">
 						<i class="icon-underline jot-icons"></i>
-					</button>					
+					</button>
+					<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
+						<i class="icon-quote-left jot-icons"></i>
+					</button>
+					<button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
+						<i class="icon-terminal jot-icons"></i>
+					</button>
 				</div>
-				<div class="btn-group">
-				{{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>
+				{{if $visitor}}
+				<div class="btn-group hidden-xs">
+					{{if $writefiles}}
+					<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>
-				{{/if}}
-				{{if $feature_future}}
-					<button id="profile-future-wrapper" class="btn btn-default btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
-						<i id="profile-future" class="icon-time jot-icons"></i>
+					{{/if}}
+					<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>
+				</div>
+				<div class="btn-group hidden-xs hidden-sm">
+					<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}}				
+					{{/if}}
+				{{else}}
+				<div class="btn-group hidden-xs">
+				{{/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>
 				{{/if}}
-					<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>
+				{{if $feature_future}}
+					<button id="profile-future-wrapper" class="btn btn-default btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
+						<i id="profile-future" class="icon-time 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>
+				{{/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>
-				{{/if}}				
-				{{if $showacl}}
-				<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"></i>{{if $bang}}&nbsp;<i class="icon-exclamation jot-icons"></i>{{/if}}
-				</button>
-				{{/if}}				
+				{{/if}}
+				{{if $feature_voting}}
+					<button id="profile-voting-wrapper" class="btn btn-default btn-sm" title="{{$voting}}" onclick="toggleVoting();return false;">
+						<i id="profile-voting" class="icon-check-empty jot-icons"></i>
+					</button>
+				{{/if}}
 				</div>
-				<div class="btn-group hidden-xs visible-sm">
+				<div class="btn-group visible-xs visible-sm">
 					<button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
 						<i id="more-tools-icon" class="icon-caret-down jot-icons"></i>
 					</button>
 					<ul class="dropdown-menu dropdown-menu-right" role="menu">
-						<!--li class="visible-xs"><a href="#" onclick="preview_post();return false;"><i class="icon-eye-open"></i>&nbsp;{{$preview}}</a></li-->
+						<li class="visible-xs"><a href="#" onclick="preview_post();return false;"><i class="icon-eye-open"></i>&nbsp;{{$preview}}</a></li>
 						{{if $visitor}}
 						<li class="divider visible-xs"></li>
-						{{if $writefiles}}
-						<!--li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li-->
-						{{/if}}
+						{{if $writefiles}}<li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li>{{/if}}
 						<li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i>&nbsp;{{$weblink}}</a></li>
 						<!--li class="visible-xs"><a href="#" onclick="jotVideoURL(); return false;"><i class="icon-facetime-video"></i>&nbsp;{{$video}}</a></li-->
 						<!--li class="visible-xs"><a href="#" onclick="jotAudioURL(); return false;"><i class="icon-volume-up"></i>&nbsp;{{$audio}}</a></li-->
 						{{/if}}
 						<li class="divider visible-xs"></li>
-						<!--li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i>&nbsp;{{$setloc}}</a></li-->
+						<li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i>&nbsp;{{$setloc}}</a></li>
 						{{if $noloc}}
-						<!--li class="visible-xs visible-sm"><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i>&nbsp;{{$noloc}}</a></li-->
+						<li class="visible-xs visible-sm"><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i>&nbsp;{{$noloc}}</a></li>
 						{{/if}}
 						{{if $feature_expire}}
-						<!--li class="visible-xs visible-sm"><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i>&nbsp;{{$expires}}</a></li-->
+						<li class="visible-xs visible-sm"><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i>&nbsp;{{$expires}}</a></li>
 						{{/if}}
 						{{if $feature_encrypt}}
-						<!--li class="visible-xs visible-sm"><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i>&nbsp;{{$encrypt}}</a></li-->
+						<li class="visible-xs visible-sm"><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i>&nbsp;{{$encrypt}}</a></li>
 						{{/if}}
 						{{if $feature_voting}}
 						<li class="visible-xs visible-sm"><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="icon-check-empty"></i>&nbsp;{{$voting}}</a></li>
@@ -141,26 +141,17 @@
 			<div id="profile-rotator-wrapper">
 				<div id="profile-rotator"></div>
 			</div>
-<<<<<<< HEAD
-			<div id="profile-jot-submit-right" class="btn-group">
-=======
 			<div id="profile-jot-submit-right" class="btn-group pull-right">
->>>>>>> upstream/master
 				{{if $preview}}
-				<button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
+				<button class="btn btn-default btn-sm hidden-xs" onclick="preview_post();return false;" title="{{$preview}}">
 					<i class="icon-eye-open jot-icons" ></i>
 				</button>
 				{{/if}}
-<<<<<<< HEAD
-			</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}}" onclick="return false;">
 					<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>{{if $bang}}&nbsp;<i class="icon-exclamation jot-icons"></i>{{/if}}
 				</button>
 				{{/if}}
->>>>>>> upstream/master
 				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit" >{{$share}}</button>
 			</div>
 			<div id="profile-jot-perms-end"></div>
-- 
cgit v1.2.3