From 3d6255ae24310a935caf4e74729aa7165f94aeda Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 17 Jun 2017 17:59:31 -0700
Subject: brainstorming a comment moderation system

---
 view/tpl/comment_item.tpl | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'view')

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index bd5176c83..92eeac056 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -10,6 +10,13 @@
 				<input type="hidden" name="return" value="{{$return_path}}" />
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				{{if $anoncomments && ! $observer}}
+				<div id="comment-edit-anon-{{$id}}">
+					{{include file="field_input.tpl" field=$authorname}}
+					{{include file="field_input.tpl" field=$authormail}}
+					{{$anon_extras}}
+				</div>
+				{{/if}}
 				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$comment}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
-- 
cgit v1.2.3


From 1472f85b162ea6f1ab9e19e94b86fc4a8ef074be Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 18 Jun 2017 22:25:41 -0700
Subject: allow moderated comments like wordpress if permissions are compatible

---
 view/js/main.js           |  2 ++
 view/tpl/comment_item.tpl |  7 ++++---
 view/tpl/search_item.tpl  | 11 +++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index 38b9754a1..6c42531ea 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -13,6 +13,7 @@ function commentOpenUI(obj, id) {
 			$("#comment-edit-text-" + id).attr('tabindex','9');
 			$("#comment-edit-submit-" + id).attr('tabindex','10');
 			$("#comment-tools-" + id).show();
+			$("#comment-edit-anon-" + id).show();
 		}
 	};
 
@@ -41,6 +42,7 @@ function commentOpen(obj, id) {
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		$("#mod-cmnt-wrap-" + id).show();
+		$("#comment-edit-anon-" + id).show();
 		openMenu("comment-tools-" + id);
 		return true;
 	}
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 92eeac056..02b0c527c 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -11,9 +11,10 @@
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				{{if $anoncomments && ! $observer}}
-				<div id="comment-edit-anon-{{$id}}">
-					{{include file="field_input.tpl" field=$authorname}}
-					{{include file="field_input.tpl" field=$authormail}}
+				<div id="comment-edit-anon-{{$id}}" style="display: none;" >
+					{{include file="field_input.tpl" field=$anonname}}
+					{{include file="field_input.tpl" field=$anonmail}}
+					{{include file="field_input.tpl" field=$anonurl}}
 					{{$anon_extras}}
 				</div>
 				{{/if}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 66618a216..4ca6378b8 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -101,6 +101,17 @@
 					<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
 					<div class="dropdown-menu">{{$item.attachments}}</div>
 				</div>
+				{{/if}}
+				{{if $item.mode === 'moderate'}}
+
+				<div class="wall-item-tools-left btn-group">
+					<a href="moderate/{{$item.id}}/approve" class="btn btn-outline-secondary btn-small">{{$item.approve}}</a>
+					<a href="moderate/{{$item.id}}/drop" class="btn btn-outline-secondary btn-small">{{$item.delete}}</a>
+
+				</div>
+
+
+
 				{{/if}}
 			</div>
 		</div>
-- 
cgit v1.2.3


From aed1373b7099a081f258d36270df509eeed9ddcd Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 20 Jun 2017 11:52:09 +0200
Subject: update bs4-dev and use min version of popper

---
 view/css/bootstrap-red.css             | 6 ------
 view/theme/redbasic/php/theme_init.php | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'view')

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index b2b2ca759..1bb82f11c 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -46,12 +46,6 @@ nav .dropdown-menu {
 	overflow: auto;
 }
 
-/* this is a hack and needs fixing in bootstrap */
-nav .dropdown-menu-right {
-	right: 0;
-	left: auto !important;
-}
-
 #navbar-collapse-2 {
 	flex-basis: 100%;
 	max-height: 70vh;
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index bfeabcb46..b12d80ea5 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -8,7 +8,7 @@ head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
-head_add_js('/library/popper/popper.js');
+head_add_js('/library/popper/popper.min.js');
 head_add_js('/library/bootstrap/js/bootstrap.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
-- 
cgit v1.2.3


From b858eec644f5a3e773c9513891070bc86f700aa8 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 20 Jun 2017 12:57:23 +0200
Subject: make bootstrap respect our radius setting

---
 view/theme/redbasic/css/style.css | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index faa292fe5..ce98f8d49 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1339,6 +1339,14 @@ main.fullscreen .section-content-wrapper-np {
 }
 /* bootstrap overrides */
 
+.btn,
+.rounded-top,
+.form-control,
+.nav-pills .nav-link,
+.nav-tabs .nav-link {
+	border-radius: $radius !important;
+}
+
 blockquote {
 	font-size: 1rem;
 	font-style: italic;
@@ -1353,10 +1361,6 @@ blockquote {
 	border-radius: $radius;
 }
 
-.dropdown-menu img {
-	border-radius: $radius;
-}
-
 .dropdown-item {
 	color: $font_colour;
 }
@@ -1491,7 +1495,7 @@ dl.bb-dl > dd > li {
 .form-group.checkbox > div label {
     display: block; overflow: hidden; cursor: pointer;
     border: 1px solid #ccc;
-    border-radius: 4px;
+    border-radius: $radius;
     margin:0px;
 	-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
 	-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-- 
cgit v1.2.3


From 075ced80a6e167c8a81b07d134c7575ba5da6676 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Tue, 20 Jun 2017 15:44:47 +0200
Subject: Remove important flag

---
 view/theme/redbasic/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ce98f8d49..07dfd938d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1344,7 +1344,7 @@ main.fullscreen .section-content-wrapper-np {
 .form-control,
 .nav-pills .nav-link,
 .nav-tabs .nav-link {
-	border-radius: $radius !important;
+	border-radius: $radius;
 }
 
 blockquote {
-- 
cgit v1.2.3