From aff476d0d457f6debe21dfa1e2a0c3ccdcf71443 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Nov 2017 15:21:49 -0800
Subject: move mailhost settings from plugin to core

---
 view/tpl/settings.tpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 704d89bdd..33e0aa925 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -104,6 +104,9 @@
 				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings">
 					<div class="section-content-tools-wrapper">
 						<div id="settings-notifications">
+
+								{{include file="field_input.tpl" field=$mailhost}}
+
 							<h3>{{$activity_options}}</h3>
 							<div class="group">
 								{{*not yet implemented *}}
-- 
cgit v1.2.3


From 8d9c47acdf5644c6522cd4c0715891fab0a765dc Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 14 Nov 2017 22:35:58 +0100
Subject: move notifications full-screen handling to notifications widget

---
 view/theme/redbasic/js/redbasic.js | 14 --------------
 view/tpl/notifications_widget.tpl  | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 3fee0f282..ed9ef02aa 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -2,7 +2,6 @@
  * redbasic theme specific JavaScript
  */
 
-var notifications_parent;
 $(document).ready(function() {
 
 	// CSS3 calc() fallback (for unsupported browsers)
@@ -84,19 +83,6 @@ $(document).ready(function() {
 		}
 	});
 
-	notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
-	$('#notifications-btn').click(function() {
-		if($('#notifications_wrapper').hasClass('fs'))
-			$('#notifications_wrapper').prependTo('#' + notifications_parent);
-		else
-			$('#notifications_wrapper').prependTo('section');
-
-		$('#notifications_wrapper').toggleClass('fs');
-		if($('#navbar-collapse-2').hasClass('show')){
-			$('#navbar-collapse-2').removeClass('show');
-		}
-	});
-
 	$("input[data-role=cat-tagsinput]").tagsinput({
 		tagClass: 'badge badge-pill badge-warning text-dark'
 	});
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 0ece84891..29892ba79 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -28,6 +28,22 @@
 
 {{if $module == 'display'}}
 <script>
+	var notifications_parent;
+	$(document).ready(function() {
+		notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
+		$('#notifications-btn').click(function() {
+			if($('#notifications_wrapper').hasClass('fs'))
+				$('#notifications_wrapper').prependTo('#' + notifications_parent);
+			else
+				$('#notifications_wrapper').prependTo('section');
+
+			$('#notifications_wrapper').toggleClass('fs');
+			if($('#navbar-collapse-2').hasClass('show')){
+				$('#navbar-collapse-2').removeClass('show');
+			}
+		});
+	});
+
 	$(document).on('click', '.notification', function(e) {
 		var b64mid = $(this).data('b64mid');
 		var path = $(this)[0].pathname.substr(1,7);
-- 
cgit v1.2.3


From 3c3c0ed34269cecdbda1288eab5b63c664a8859c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 14 Nov 2017 22:52:04 +0100
Subject: change button id to not interfere with the upload submit button

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

(limited to 'view')

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 2431329ec..105cf0ac8 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -92,7 +92,7 @@
 					<i id="jot-perms-icon" class="fa fa-{{$edit.lockstate}}"></i>
 				</button>
 				{{/if}}
-				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
+				<button id="tool-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
 			</div>
 		</form>
 		{{$edit.aclselect}}
-- 
cgit v1.2.3