diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 6 | ||||
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 14 | ||||
| -rw-r--r-- | view/theme/redbasic/php/theme_init.php | 2 | ||||
| -rwxr-xr-x | view/tpl/comment_item.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 11 |
6 files changed, 31 insertions, 12 deletions
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/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/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index faa292fe5..07dfd938d 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; +} + 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; 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'); diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index bd5176c83..02b0c527c 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -10,6 +10,14 @@ <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}}" 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}} <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}});" > 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 @@ -102,6 +102,17 @@ <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> {{if $item.conv}} |