From cd57483ed9069a26b52ae8d7d74fdc537da89946 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Mar 2017 11:59:20 +0200
Subject: namespace error

---
 view/css/bootstrap-red.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 69886b141..4c4de22f9 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -33,7 +33,6 @@ nav .badge {
 	padding: 0.2rem 0;
 }
 
-
 #navbar-collapse-1 i {
 	font-size: 1rem;
 }
-- 
cgit v1.2.3


From 3ee4dd0d52f4df47c894b7899b296e45aaf1489f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Mar 2017 18:40:07 -0700
Subject: remove the unimplemented upload limit site settings

---
 view/tpl/admin_site.tpl | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'view')

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 0bb3ceb15..1cdb4a56b 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -71,9 +71,6 @@
 	{{include file="field_select.tpl" field=$access_policy}}
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	
 	<h3>{{$corporate}}</h3>
 	{{include file="field_checkbox.tpl" field=$verify_email}}
 	{{include file="field_checkbox.tpl" field=$feed_contacts}}
-- 
cgit v1.2.3


From ee46faff1a49751dc2ee42729ccc4bb414b3d40d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 18:42:51 -0700
Subject: dim class was un-themed

---
 view/theme/redbasic/css/style.css | 2 +-
 view/tpl/admin_channels.tpl       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d5edc6902..156df07ff 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -802,7 +802,7 @@ div.jGrowl div.jGrowl-notification {
 .contact-block-content {
 	margin-top: 10px;
 }
-.contact-block-img.archived, .app-deleted {
+.contact-block-img.archived, .app-deleted, .dim {
 	opacity: 0.3;
 	filter:alpha(opacity=30);
 }
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index 087ce6d3c..452e0eeec 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -34,9 +34,9 @@
 						<td class='channel_address'>{{$c.channel_address}}</td>
 						<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
 						<td class="tools">
-							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
+							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
 						</td>
 					</tr>
 				{{/foreach}}
-- 
cgit v1.2.3


From d5525a38f185e37fe0101bc7ef6e67abf59f98f8 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 18 Mar 2017 16:41:43 -0700
Subject: various input filter fixes

---
 view/tpl/wiki.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index e54ab9680..87c649581 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -103,7 +103,8 @@
 <script>
 	window.wiki_resource_id = '{{$resource_id}}';
 	window.wiki_page_name = '{{$page}}';
-	window.wiki_page_content = `{{$content}}`;
+//	window.wiki_page_content = "{{$content|escape:'javascript'}}";
+	window.wiki_page_content = {{$content}};
 	window.wiki_page_commit = '{{$commit}}';
 
 	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-- 
cgit v1.2.3


From e97dd48b4c046bac86322d91a13fd55d0cf3a99f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 19:41:03 -0700
Subject: even more fine tuning of the markdown purifier - especially when used
 with the wiki

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

(limited to 'view')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 87c649581..452fd429d 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -104,7 +104,7 @@
 	window.wiki_resource_id = '{{$resource_id}}';
 	window.wiki_page_name = '{{$page}}';
 //	window.wiki_page_content = "{{$content|escape:'javascript'}}";
-	window.wiki_page_content = {{$content}};
+	window.wiki_page_content = '{{$content|escape:'quotes'}}';
 	window.wiki_page_commit = '{{$commit}}';
 
 	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-- 
cgit v1.2.3


From 542fa4a08c3f58d60c729ee166a2c4dc92f7524e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 00:40:19 -0700
Subject: more markdown purification

---
 view/tpl/wiki.tpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 452fd429d..564db3324 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -103,8 +103,7 @@
 <script>
 	window.wiki_resource_id = '{{$resource_id}}';
 	window.wiki_page_name = '{{$page}}';
-//	window.wiki_page_content = "{{$content|escape:'javascript'}}";
-	window.wiki_page_content = '{{$content|escape:'quotes'}}';
+	window.wiki_page_content = '{{$content|escape:'javascript'}}';
 	window.wiki_page_commit = '{{$commit}}';
 
 	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-- 
cgit v1.2.3


From b03cd330e5fe4ede362d77aa2269a3d0dccde62d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 20:11:48 -0700
Subject: begin the process of using the relevant attach directory/path for
 photo albums instead of an album basename which may not be unique. Created an
 'ellipsify()' function to shorten long names and keep the beginning and end
 intact

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

(limited to 'view')

diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index 4c0bd5a1b..c565ccaf1 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,11 +1,11 @@
 <div id="side-bar-photos-albums" class="widget">
 	<h3>{{$title}}</h3>
 	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a  class="nav-link"href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li>
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li>
 		{{if $albums}}
 		{{foreach $albums as $al}}
-		{{if $al.text}}
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.text}}</a></li>
+		{{if $al.shorttext}}
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li>
 		{{/if}}
 		{{/foreach}}
 		{{/if}}
-- 
cgit v1.2.3


From a8a6d807ff0530555434e45d0ceb5951db5fa7a5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 21:40:43 -0700
Subject: allow setting the system email name/address/reply

---
 view/tpl/admin_site.tpl | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'view')

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 1cdb4a56b..6fd0fd9ce 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -51,6 +51,11 @@
 	{{include file="field_textarea.tpl" field=$banner}}
 	{{include file="field_textarea.tpl" field=$siteinfo}}
 	{{include file="field_textarea.tpl" field=$admininfo}}
+
+    {{include file="field_input.tpl" field=$reply_address}}
+    {{include file="field_input.tpl" field=$from_email}}
+    {{include file="field_input.tpl" field=$from_email_name}}
+
 	{{include file="field_select.tpl" field=$language}}
 	{{include file="field_select.tpl" field=$theme}}
     {{include file="field_select.tpl" field=$theme_mobile}}
-- 
cgit v1.2.3


From e90e4e4a5957a8902532358ac22bffed009bb245 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Mar 2017 14:45:50 +0200
Subject: css fixes

---
 view/theme/redbasic/css/style.css | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 156df07ff..601124227 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -878,14 +878,22 @@ margin-right: 50px;
 	list-style-type: none;
 }
 
-.generic-icons {
+.generic-icons,
+a .generic-icons {
 	font-size: 1rem;
 	margin-right: 0.5rem;
+	color: $font_colour;
+}
+
+.generic-icons:hover,
+a .generic-icons:hover {
+	color: $font_colour;
 }
 
 .generic-icons-right {
 	font-size: 1rem;
 	margin-left: 0.5rem;
+	color: $font_colour;
 }
 
 
@@ -901,7 +909,8 @@ margin-right: 50px;
 
 .drop-icons,
 a .drop-icons {
-	font-size: 1.2em;
+	font-size: 1rem;
+	color: $font_colour;
 	text-decoration: none;
 	cursor: pointer;
 }
-- 
cgit v1.2.3