Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/datetime.php
	include/text.php
	mod/events.php
	version.inc
	view/css/mod_events.css
	view/theme/redbasic/css/style.css
	view/tpl/event_head.tpl
	view/tpl/events-js.tpl
	view/tpl/jot.tpl

14 files changed, 357 insertions, 8 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 19796679a..29164c7ad 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -57,7 +57,8 @@ nav .navbar-toggle {
 /* nav overrides end */
 
 
-aside .nav-pills > li > a {
+aside .nav-pills > li > a,
+.response-list .nav-pills > li > a {
 	padding: 6px 10px;
 }
 
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index 00dcc40f8..3e6ee63ac 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -4,7 +4,55 @@
 	margin-bottom: -1px;
 }
 
+<<<<<<< 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;
+}
+
+#events-spinner .spinner {
+	margin-top: 9px;
+	margin-bottom: -9px;
+}
+
+>>>>>>> upstream/master
 .bootstrap-tagsinput {
 	width: 100%;
 	padding: 6px 12px;
 }
+<<<<<<< HEAD
+=======
+
+.event-wrapper {
+	max-width: 700px;
+	height: auto;
+	padding: 10px;
+}
+
+.event-owner {
+	margin-bottom: 15px;
+}
+
+.event-owner img {
+	margin-right: 5px;
+}
+
+.event-buttons,
+.event-description {
+	margin-top: 10px;
+}
+
+#event-upload-form {
+	margin-top: 10px;
+}
+
+#event-upload-choose {
+	width: 100%;
+}
+>>>>>>> upstream/master
diff --git a/view/pdl/mod_events.pdl b/view/pdl/mod_events.pdl
index 5a71d88d9..a3bc0c019 100644
--- a/view/pdl/mod_events.pdl
+++ b/view/pdl/mod_events.pdl
@@ -1,4 +1,5 @@
 [region=aside]
 [widget=eventsmenu][/widget]
+[widget=eventstools][/widget]
 [widget=tasklist][/widget]
 [/region]
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index fe6f10365..11e56cfc2 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -241,7 +241,8 @@ footer {
 	padding-right: 3em; 
 }
 
-.birthday-today, .event-today {
+.birthday-today,
+.event-today {
 	font-weight: bold;
 }
 
@@ -847,6 +848,7 @@ nav .acpopup {
   cursor: pointer;
 }
 
+<<<<<<< HEAD
 .fc-unthemed th,
 .fc-unthemed td,
 .fc-unthemed thead,
@@ -909,6 +911,8 @@ nav .acpopup {
 }
 
 
+=======
+>>>>>>> upstream/master
 #cboxOverlay {
 	z-index: 1050;
 }
@@ -1562,8 +1566,12 @@ img.mail-conv-sender-photo {
 	padding: 0.5em 10px;
 }
 
-.wall-photo-item {
-	/*padding: 0.5em 10px;*/
+.wall-event-item {
+	padding: 10px;
+	color: #fff;
+	background-color: #3A87AD; /* should reflect calendar color */
+	border-top-left-radius: $radiuspx;
+	border-top-right-radius: $radiuspx;
 }
 
 .wall-photo-item img {
@@ -2252,8 +2260,11 @@ 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/conv_item.tpl b/view/tpl/conv_item.tpl
index 206ee245e..08f0d4fbe 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -183,7 +183,7 @@
 											<h4 class="modal-title">{{$response.title}}</h4>
 										</div>
 										<div class="modal-body response-list">
-										<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+										<ul class="nav nav-pills nav-stacked">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
 										</div>
 										<div class="modal-footer clear">
 											<button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button>
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 4362360d3..496a07782 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -55,7 +55,14 @@
 				showEvent(calEvent.id);
 			},
 			loading: function(isLoading, view) {
+				$('#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');
@@ -71,30 +78,54 @@
 				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
+							event.title,
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
 					));
 					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/event_item_content.tpl b/view/tpl/event_item_content.tpl
new file mode 100644
index 000000000..868e5ad27
--- /dev/null
+++ b/view/tpl/event_item_content.tpl
@@ -0,0 +1,10 @@
+{{if $description}}
+<div class="event-description">
+	{{$description}}
+</div>
+{{/if}}
+{{if $location}}
+<div class="event-location">
+	<span class="event-label">{{$location_label}}</span>&nbsp;<span class="event_location">{{$location}}</span>
+</div>
+{{/if}}
diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl
new file mode 100755
index 000000000..70ddfd808
--- /dev/null
+++ b/view/tpl/event_item_header.tpl
@@ -0,0 +1,11 @@
+<div class="event-title">
+	<h3><i class="icon-calendar"></i>&nbsp;{{$title}}</h3>
+</div>
+<div class="event-start">
+	<span class="event-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
+</div>
+{{if $finish}}
+<div class="event-start">
+	<span class="event-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
+</div>
+{{/if}}
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index b2de90da1..cef7b45cc 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,12 +1,16 @@
 <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 class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
+				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
 				<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button>
 			</div>
 		</div>
@@ -15,6 +19,7 @@
 	</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">
@@ -28,6 +33,8 @@
 
 			</form>
 		</div>
+=======
+>>>>>>> upstream/master
 	</div>
 	<div class="clear"></div>
 	<div class="section-content-wrapper-np">
diff --git a/view/tpl/events_side.tpl b/view/tpl/events_menu_side.tpl
index b9a9062b1..b9a9062b1 100755
--- a/view/tpl/events_side.tpl
+++ b/view/tpl/events_menu_side.tpl
diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl
new file mode 100755
index 000000000..5e20511fc
--- /dev/null
+++ b/view/tpl/events_tools_side.tpl
@@ -0,0 +1,15 @@
+<div class="widget">
+	<h3>{{$title}}</h3>
+	<ul class="nav nav-pills nav-stacked">
+		<li><a href="#" onclick="exportDate(); return false;"><i class="icon-download"></i>&nbsp;{{$export}}</a></li>
+		<li><a href="#" onclick="openClose('event-upload-form'); return false;"><i class="icon-upload"></i>&nbsp;{{$import}}</a></li>
+	</ul>
+	<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">
+			<div class="form-group">
+				<input id="event-upload-choose" type="file" name="userfile" />
+			</div>
+			<button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit" >{{$submit}}</button>
+		</form>
+	</div>
+</div>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
new file mode 100755
index 000000000..e7edb7e64
--- /dev/null
+++ b/view/tpl/jot.tpl
@@ -0,0 +1,213 @@
+<div id="profile-jot-wrapper">
+	<form id="profile-jot-form" action="{{$action}}" method="post">
+		{{if $parent}}
+			<input type="hidden" name="parent" value="{{$parent}}" />
+		{{/if}}
+		<input type="hidden" name="obj_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="expire" id="jot-expire" value="{{$defexpire}}" />
+		<input type="hidden" name="created" id="jot-created" value="{{$defpublish}}" />
+		<input type="hidden" name="media_str" id="jot-media" value="" />
+		<input type="hidden" name="source" id="jot-source" value="{{$source}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="webpage" value="{{$webpage}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
+		{{if $showacl}}{{$acl}}{{/if}}
+		{{$mimeselect}}
+		{{$layoutselect}}
+		{{if $id_select}}
+		<div class="channel-id-select-div">
+			<span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
+		</div>
+		{{/if}}
+		{{if $webpage}}
+		<div id="jot-pagetitle-wrap" class="jothidden">
+			<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
+		</div>
+		{{/if}}
+		<div id="jot-title-wrap" class="jothidden">
+			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex=1 value="{{$title}}">
+		</div>
+		{{if $catsenabled}}
+		<div id="jot-category-wrap" class="jothidden">
+			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
+		</div>
+		{{/if}}
+		<div id="jot-text-wrap">
+			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex=2 placeholder="{{$share}}">{{$content}}</textarea>
+		</div>
+		{{if $attachment}}
+		<div id="jot-attachment-wrap">
+			<input class="jot-attachment" name="attachment" id="jot-attachment" type="text" value="{{$attachment}}" readonly="readonly" onclick="this.select();">
+		</div>
+		{{/if}}
+		<div id="profile-jot-submit-wrapper" class="jothidden">
+			<div id="profile-jot-submit-left" class="btn-toolbar pull-left">
+				<div class="btn-group">
+					<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>
+					<button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;">
+						<i class="icon-italic jot-icons"></i>
+					</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 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>
+				{{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}}
+					<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}}
+				{{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}}
+				{{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}}
+				{{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 $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 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>
+						{{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}}
+						<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>
+						{{if $noloc}}
+						<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>
+						{{/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>
+						{{/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>
+						{{/if}}
+					</ul>
+				</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 $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}}
+				{{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}}
+				<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>
+			<div id="profile-jot-plugin-wrapper">
+				{{$jotplugins}}
+			</div>
+		</div>
+		<div id="profile-jot-text-loading"></div>
+		<div id="profile-jot-end" class="clear"></div>
+		<div id="jot-preview-content" style="display:none;"></div>
+	</form>
+</div>
+
+<!-- Modal for item expiry-->
+<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4>
+      </div>
+     <!--  <div class="modal-body"> -->
+            <div class="modal-body form-group" style="width:90%">
+		<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">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
+        <button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+<!-- Modal for item created-->
+<div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4>
+      </div>
+     <!--  <div class="modal-body"> -->
+            <div class="modal-body form-group" style="width:90%">
+		<div class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='created_text' id='created-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script>
+            </div>
+      <!-- </div> -->
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
+        <button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+
+{{if $content || $attachment || $expanded}}
+<script>initEditor();</script>
+{{/if}}
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 38cf8edbd..4243c2ea5 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -22,6 +22,7 @@
 		'submit'      : "{{$submit}}",
 		'linkurl'     : "{{$linkurl}}",
 		'leavethispage' : "{{$leavethispage}}",
+		'location'    : "{{$location}}",
 
 		't01' : "{{$t01}}",
 		't02' : "{{$t02}}",
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 2c71c64fb..af5f222fe 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -159,12 +159,12 @@
 							{{/foreach}}
 							</select>
 						</div>
+						{{/if}}
 						{{include file="field_checkbox.tpl" field=$cal_first_day}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
 					</div>
-					{{/if}}
 				</div>
 			</div>
 		</div>