diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 12 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 1 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/Focus-Boxy.css | 1 | ||||
| -rw-r--r-- | view/tpl/conv_item.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/profile_vcard.tpl | 16 | ||||
| -rw-r--r-- | view/tpl/search_item.tpl | 13 | ||||
| -rw-r--r-- | view/tpl/settings_privacy.tpl | 1 |
7 files changed, 33 insertions, 18 deletions
diff --git a/view/js/main.js b/view/js/main.js index dcdf58396..9c2480795 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1314,6 +1314,18 @@ function dounsubthread(ident) { liking = 1; } +function moderate_approve(ident) { + $('#like-rotator-' + ident.toString()).show(); + $.get('moderate/' + ident.toString() + '/approve', updateInit ); + liking = 1; +} + +function moderate_drop(ident) { + $('#like-rotator-' + ident.toString()).show(); + $.get('moderate/' + ident.toString() + '/drop', $('#thread-wrapper-' + ident.toString()).fadeOut(function() { this.remove(); })); + liking = 1; +} + function dostar(ident) { ident = ident.toString(); $('#like-rotator-' + ident).show(); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3e34fff95..4ba65c112 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1380,7 +1380,6 @@ blockquote { overflow: auto; } -.dropdown-item.active, .textcomplete-item.active { color: #fff; background-color: var(--bs-tertiary-bg); diff --git a/view/theme/redbasic/schema/Focus-Boxy.css b/view/theme/redbasic/schema/Focus-Boxy.css index e5f3280f6..df5bf2d75 100644 --- a/view/theme/redbasic/schema/Focus-Boxy.css +++ b/view/theme/redbasic/schema/Focus-Boxy.css @@ -25,6 +25,7 @@ } .vcard-card .card { + border: 1px solid var(--bs-border-color); border-top: 0; border-right: 0; border-left: 0; diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 3f760998d..cd2130295 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -7,7 +7,7 @@ <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite{{/if}}" data-b64mids='{{$item.mids}}'> <a name="item_{{$item.id}}" ></a> <div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > - <div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}"> + <div class="rounded clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}"> {{if $item.photo}} <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> {{$item.photo}} @@ -120,6 +120,10 @@ </div> </div> {{/if}} + {{if $item.moderate}} + <a href="#" onclick="moderate_approve({{$item.id}}); return false;" class="btn btn-sm btn-outline-success"><i class="fa fa-check" ></i> {{$item.moderate_approve}}</a> + <a href="#" onclick="moderate_drop({{$item.id}}); return false;" class="btn btn-sm btn-outline-danger"><i class="fa fa-trash-o" ></i> {{$item.moderate_delete}}</a> + {{else}} <div class="btn-group"> {{if $item.like}} <button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;"> @@ -230,6 +234,7 @@ </div> </div> </div> + {{/if}} </div> {{if $item.responses || $item.attachments}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 6cf40bf79..37339a40a 100644 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -48,10 +48,10 @@ {{/if}} </div> </div> - {{if $details}} - <div class="vcard ps-2 pe-2"> + {{if $details && ($location || $hometown || $gender || $marital || $homepage)}} + <div class="vcard rounded ps-2 pe-2"> {{if $location}} - <dl class="mb-0 pb-1"> + <dl class="mb-0 pb-1 rounded"> <dt class="location-label">{{$location}}</dt> <dd class="adr h-adr"> {{if $profile.address}} @@ -71,30 +71,30 @@ </dl> {{/if}} {{if $hometown}} - <dl class="mb-0 pb-1"> + <dl class="mb-0 pb-1 rounded"> <dt class="hometown-label">{{$hometown}}</dt> <dd class="p-hometown">{{$profile.hometown}}</dd> </dl> {{/if}} {{if $gender}} - <dl class="mb-0 pb-1"> + <dl class="mb-0 pb-1 rounded"> <dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{if $profile.gender_icon}}<i class="fa fa-{{$profile.gender_icon}}"></i> {{/if}}{{$profile.gender}}</dd> </dl> {{/if}} {{if $marital}} - <dl class="mb-0 pb-1"> + <dl class="mb-0 pb-1 rounded"> <dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i> </span>{{$marital}}</dt> <dd class="marital-text">{{$profile.marital}}</dd> </dl> {{/if}} {{if $homepage}} - <dl class="mb-0 pb-1"> + <dl class="mb-0 pb-1 rounded"> <dt class="homepage-label">{{$homepage}}</dt> <dd class="homepage-url u-url">{{$profile.homepage}}</dd> </dl> {{/if}} - <div class="hcard-addon"></div> + <div class="hcard-addon rounded"></div> </div> {{/if}} </div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index b2a99b64a..da5bac5dc 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -107,6 +107,10 @@ <div class="spinner s"></div> </div> </div> + {{if $item.mode === 'moderate'}} + <a href="moderate/{{$item.id}}/approve" class="btn btn-outline-success btn-sm">{{$item.approve}}</a> + <a href="moderate/{{$item.id}}/drop" class="btn btn-outline-danger btn-sm">{{$item.delete}}</a> + {{else}} {{if $item.star || $item.thread_action_menu || $item.drop.dropping}} <div class="btn-group"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown"> @@ -127,6 +131,7 @@ </div> </div> {{/if}} + {{/if}} </div> {{if $item.star && $item.star.isstarred}} <div class="btn-group" id="star-button-{{$item.id}}"> @@ -139,14 +144,6 @@ <div class="dropdown-menu">{{$item.attachments}}</div> </div> {{/if}} - - <div class="wall-item-tools-left btn-group" id="wall-item-tools-left-{{$item.id}}"> - {{if $item.mode === 'moderate'}} - <a href="moderate/{{$item.id}}/approve" class="btn btn-success btn-sm">{{$item.approve}}</a> - <a href="moderate/{{$item.id}}/drop" class="btn btn-danger btn-sm">{{$item.delete}}</a> - {{/if}} - </div> - </div> </div> {{if $item.conv}} diff --git a/view/tpl/settings_privacy.tpl b/view/tpl/settings_privacy.tpl index ae81cee78..03224ae65 100644 --- a/view/tpl/settings_privacy.tpl +++ b/view/tpl/settings_privacy.tpl @@ -11,6 +11,7 @@ {{include file="field_checkbox.tpl" field=$index_opt_out}} {{include file="field_checkbox.tpl" field=$autoperms}} {{include file="field_checkbox.tpl" field=$permit_all_mentions}} + {{include file="field_checkbox.tpl" field=$moderate_unsolicited_comments}} {{include file="field_checkbox.tpl" field=$ocap_enabled}} {{if $sec_addon}} |