Resolving merge conflict

9 files changed, 49 insertions, 302 deletions

diff --git a/include/datetime.php b/include/datetime.php
index 952151a00..1d10e7ad7 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -235,11 +235,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
 	$o .= replace_macros($tpl,array(
 			'$field' => array($id, $label, $input_text, (($required) ? t('Required') : ''), (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'),
 		));
-<<<<<<< HEAD
-	$o .= "<script>\$(function () {var picker = \$('#id_$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs,dayOfWeekStart:$first_day}); $extra_js})</script>";
-=======
 	$o .= "<script>\$(function () {var picker = \$('#id_$id').datetimepicker({step:15,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs,dayOfWeekStart:$first_day}); $extra_js})</script>";
->>>>>>> upstream/master
 
 	return $o;
 }
diff --git a/include/text.php b/include/text.php
index 99c73ebee..4777e7a61 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1444,62 +1444,11 @@ function prepare_body(&$item,$attach = false) {
 		}
 	}
 
-<<<<<<< HEAD
-	$event = array();
-	$is_event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? true : false);
-
-	if($is_event) {
-		$object = json_decode($item['object'],true);
-		
-		//ensure compatibility with older items
-		if(array_key_exists('description', $object)) {
-
-			$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8:01 AM
-
-			$event['header'] 	= '<div class="event-title"><h3><i class="icon-calendar"></i>&nbsp;' . bbcode($object['title']) .  '</h3></div>' . "\r\n";
-
-			$event['header'] 	.= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
-						. datetime_convert('UTC', 'UTC', $object['start'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
-						. '" >' 
-						. (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), 
-							$object['start'] , $bd_format ))
-							:  day_translate(datetime_convert('UTC', 'UTC', 
-							$object['start'] , $bd_format)))
-						. '</span></div>' . "\r\n";
-
-			if(! $object['nofinish'])
-				$event['header'] .= '<div class="event-end" ><span class="event-label">' . t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
-						 . datetime_convert('UTC','UTC',$object['finish'], (($object['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
-						 . '" >' 
-						 . (($object['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), 
-							$object['finish'] , $bd_format ))
-							:  day_translate(datetime_convert('UTC', 'UTC', 
-							$object['finish'] , $bd_format )))
-						 . '</span></div>'  . "\r\n";
-
-
-			$event['content'] = '<div class="event-description">' . bbcode($object['description']) .  '</div>' . "\r\n";
-
-			if(strlen($object['location']))
-				$event['content'] .= '<div class="event-location"><span class="event-label"> ' . t('Location:') . '</span>&nbsp;<span class="location">' 
-						  . bbcode($object['location'])
-						  . '</span></div>' . "\r\n";
-		}
-		else {
-			$is_event = false;
-		}
-	}
-
-	$prep_arr = array(
-		'item' => $item,
-		'html' => $is_event ? $event['content'] : $s,
-=======
 	$event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event($item['object']) : false);
 
 	$prep_arr = array(
 		'item' => $item,
 		'html' => $event ? $event['content'] : $s,
->>>>>>> upstream/master
 		'event' => $event['header'],
 		'photo' => $photo
 	);
diff --git a/mod/events.php b/mod/events.php
index a61da5f3e..080c39911 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -90,11 +90,7 @@ function events_post(&$a) {
 	linkify_tags($a, $desc, local_channel());
 	linkify_tags($a, $location, local_channel());
 
-<<<<<<< HEAD
-	$action = ($event_hash == '') ? 'new' : "event/" . $event_hash;
-=======
 	//$action = ($event_hash == '') ? 'new' : "event/" . $event_hash;
->>>>>>> upstream/master
 
 	//fixme: this url gives a wsod if there is a linebreak detected in one of the variables ($desc or $location)
 	//$onerror_url = $a->get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish&type=$type";
@@ -326,7 +322,6 @@ function events_content(&$a) {
 	}
 
 	if($mode == 'view') {
-<<<<<<< HEAD
 
 		/* edit/create form */
 		if($event_id) {
@@ -344,25 +339,6 @@ function events_content(&$a) {
 		if(!x($orig_event))
 			$orig_event = array();
 
-=======
-
-		/* edit/create form */
-		if($event_id) {
-			$r = q("SELECT * FROM `event` WHERE event_hash = '%s' AND `uid` = %d LIMIT 1",
-				dbesc($event_id),
-				intval(local_channel())
-			);
-			if(count($r))
-				$orig_event = $r[0];
-		}
-
-		$channel = $a->get_channel();
-
-		// Passed parameters overrides anything found in the DB
-		if(!x($orig_event))
-			$orig_event = array();
-
->>>>>>> upstream/master
 		// In case of an error the browser is redirected back here, with these parameters filled in with the previous values
 		/*
 		if(x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish'];
@@ -400,55 +376,24 @@ function events_content(&$a) {
 		if(x($orig_event))
 			$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
 
-<<<<<<< HEAD
-//		$syear = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'Y') : '0000');
-//		$smonth = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'm') : '00');
-//		$sday = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'd') : '00');
-
-		$syear = datetime_convert('UTC', $tz, $sdt, 'Y');
-		$smonth = datetime_convert('UTC', $tz, $sdt, 'm');
-		$sday = datetime_convert('UTC', $tz, $sdt, 'd');
-
-//		$shour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : '00');
-//		$sminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'i') : '00');
-
-=======
 		$syear = datetime_convert('UTC', $tz, $sdt, 'Y');
 		$smonth = datetime_convert('UTC', $tz, $sdt, 'm');
 		$sday = datetime_convert('UTC', $tz, $sdt, 'd');
->>>>>>> upstream/master
 		$shour = datetime_convert('UTC', $tz, $sdt, 'H');
 		$sminute = datetime_convert('UTC', $tz, $sdt, 'i');
 
 		$stext = datetime_convert('UTC',$tz,$sdt);
 		$stext = substr($stext,0,14) . "00:00";
 
-<<<<<<< HEAD
-//		$fyear = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'Y') : '0000');
-//		$fmonth = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'm') : '00');
-//		$fday = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'd') : '00');
-
-		$fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
-		$fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
-		$fday = datetime_convert('UTC', $tz, $fdt, 'd');
-
-//		$fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : '00');
-//		$fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : '00');
-
-=======
 		$fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
 		$fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
 		$fday = datetime_convert('UTC', $tz, $fdt, 'd');
->>>>>>> upstream/master
 		$fhour = datetime_convert('UTC', $tz, $fdt, 'H');
 		$fminute = datetime_convert('UTC', $tz, $fdt, 'i');
 
 		$ftext = datetime_convert('UTC',$tz,$fdt);
 		$ftext = substr($ftext,0,14) . "00:00";
-<<<<<<< HEAD
-=======
 
->>>>>>> upstream/master
 		$type = ((x($orig_event)) ? $orig_event['type'] : 'event');
 
 		$f = get_config('system','event_input_format');
@@ -648,11 +593,7 @@ function events_content(&$a) {
 					
 				$last_date = $d;
 
-<<<<<<< HEAD
-				$edit = array($a->get_baseurl().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','');
-=======
 				$edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array($a->get_baseurl().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false);
->>>>>>> upstream/master
 
 				$drop = array($a->get_baseurl().'/events/drop/'.$rr['event_hash'],t('Delete event'),'','');
 
diff --git a/version.inc b/version.inc
index 30d5c870f..7e47edd58 100644
--- a/version.inc
+++ b/version.inc
@@ -1,5 +1 @@
-<<<<<<< HEAD
-2015-11-25.1227
-=======
 2015-11-27.1229
->>>>>>> upstream/master
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index 3e6ee63ac..dc1dc902f 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -4,8 +4,6 @@
 	margin-bottom: -1px;
 }
 
-<<<<<<< HEAD
-=======
 .fc-unthemed th,
 .fc-unthemed td,
 .fc-unthemed thead,
@@ -21,13 +19,10 @@
 	margin-bottom: -9px;
 }
 
->>>>>>> upstream/master
 .bootstrap-tagsinput {
 	width: 100%;
 	padding: 6px 12px;
 }
-<<<<<<< HEAD
-=======
 
 .event-wrapper {
 	max-width: 700px;
@@ -55,4 +50,3 @@
 #event-upload-choose {
 	width: 100%;
 }
->>>>>>> upstream/master
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 11e56cfc2..e392f00d9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -848,71 +848,6 @@ nav .acpopup {
   cursor: pointer;
 }
 
-<<<<<<< HEAD
-.fc-unthemed th,
-.fc-unthemed td,
-.fc-unthemed thead,
-.fc-unthemed tbody,
-.fc-unthemed .fc-divider,
-.fc-unthemed .fc-row,
-.fc-unthemed .fc-popover {
-	border-color: #ccc !important;
-}
-
-.wall-event-item {
-	padding: 10px;
-	color: #fff;
-	background-color: #3A87AD; /* should reflect calendar color */
-	border-top-left-radius: $radiuspx;
-	border-top-right-radius: $radiuspx;
-}
-
-.vevent .event-end {
-	padding-bottom: 10px;
-}
-
-#event-summary-text {
-	margin-top: 15px;
-}
-
-
-#new-event-link {
-	margin-bottom: 10px;
-}
-
-.edit-event-link, .plink-event-link, .drop-event-link {
-	float: left;
-	margin-top: 4px;
-	margin-right: 4px;
-	margin-bottom: 15px;
-}
-
-.event-owner img {
-	padding-bottom: 10px;
-	padding-right: 10px;
-}
-
-.event-buttons {
-	margin-top: 10px;
-}
-
-.event-list-date {
-	margin-bottom: 10px;
-}
-
-.prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
-}
-.event-calendar-end {
-	clear: both;
-}
-
-
-=======
->>>>>>> upstream/master
 #cboxOverlay {
 	z-index: 1050;
 }
@@ -2260,11 +2195,3 @@ nav .badge.mail-update:hover {
 .help-searchlist a {
 	font-size: 130%;
 }
-<<<<<<< HEAD
-
-.response-list ul {
-	list-style-type: none;
-}
-
-=======
->>>>>>> upstream/master
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
index b13d66cc4..e7edb7e64 100644..100755
--- 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>