diff options
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/admin_site.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/chat.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/comment_item.tpl | 16 | ||||
| -rw-r--r-- | view/tpl/contact_edit_tools.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/conv_item.tpl | 20 | ||||
| -rw-r--r-- | view/tpl/conv_list.tpl | 22 | ||||
| -rw-r--r-- | view/tpl/dreport.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/field_colorinput.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/hq_controls.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/jot.tpl | 34 | ||||
| -rw-r--r-- | view/tpl/mood_content.tpl | 33 | ||||
| -rw-r--r-- | view/tpl/poke_content.tpl | 48 | ||||
| -rw-r--r-- | view/tpl/show_thing.tpl | 12 | ||||
| -rw-r--r-- | view/tpl/thing_edit.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/thing_input.tpl | 4 |
15 files changed, 63 insertions, 145 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index bad68361b..d91c7caad 100644 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -13,8 +13,6 @@ {{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 *}} {{include file="field_input.tpl" field=$frontpage}} diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index da8da30f2..a0e528894 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -70,7 +70,7 @@ </div> {{if $feature_encrypt}} <div class="btn-group me-2 d-none d-md-flex"> - <button id="chat-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="hz_encrypt('{{$cipher}}', '#chatText'); return false;"> + <button id="chat-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="sodium_encrypt('#chatText'); return false;"> <i id="chat-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i> </button> </div> @@ -83,7 +83,7 @@ <a class="dropdown-item" href="#" onclick="chatJotGetLink(); return false;" ><i class="fa fa-link"></i> {{$insert}}</a> {{if $feature_encrypt}} <div class="dropdown-divider"></div> - <a class="dropdown-item" href="#" onclick="hz_encrypt('{{$cipher}}', '#chatText'); return false;"><i class="fa fa-key"></i> {{$encrypt}}</a> + <a class="dropdown-item" href="#" onclick="sodium_encrypt('#chatText'); return false;"><i class="fa fa-key"></i> {{$encrypt}}</a> {{/if}} </div> </div> diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index d34eec7f8..891d901c9 100644 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -22,35 +22,35 @@ <div id="comment-tools-{{$id}}" class="pt-2 comment-tools"> <div id="comment-edit-bb-{{$id}}" class="btn-toolbar float-start"> <div class="btn-group me-2"> - <button class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;"> <i class="fa fa-bold comment-icon"></i> </button> - <button class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;"> <i class="fa fa-italic comment-icon"></i> </button> - <button class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;"> <i class="fa fa-underline comment-icon"></i> </button> - <button class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;"> <i class="fa fa-quote-left comment-icon"></i> </button> - <button class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> <i class="fa fa-terminal comment-icon"></i> </button> </div> <div class="btn-group me-2"> {{if $can_upload}} - <button class="btn btn-outline-secondary btn-sm" title="{{$edatt}}" onclick="insertCommentAttach('{{$comment}}',{{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$edatt}}" onclick="insertCommentAttach('{{$comment}}',{{$id}}); return false;"> <i class="fa fa-paperclip comment-icon"></i> </button> {{/if}} - <button class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;"> <i class="fa fa-link comment-icon"></i> </button> </div> {{if $feature_encrypt}} <div class="btn-group me-2"> - <button class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="hz_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}'); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$encrypt}}" onclick="sodium_encrypt('#comment-edit-text-' + '{{$id}}'); return false;"> <i class="fa fa-key comment-icon"></i> </button> </div> diff --git a/view/tpl/contact_edit_tools.tpl b/view/tpl/contact_edit_tools.tpl index 565b9df86..2d0b8a8cf 100644 --- a/view/tpl/contact_edit_tools.tpl +++ b/view/tpl/contact_edit_tools.tpl @@ -3,7 +3,6 @@ </button> <div class="dropdown-menu"> <a class="dropdown-item contact-tool" href="#" title="{{$tools.refresh.title}}" data-cmd="refresh">{{$tools.refresh.label}}</a> - <a class="dropdown-item contact-tool" href="#" title="{{$tools.rephoto.title}}" data-cmd="resetphoto">{{$tools.rephoto.label}}</a> <div class="dropdown-divider"></div> <a class="dropdown-item contact-tool" href="#" title="{{$tools.block.title}}" data-cmd="block">{{$tools.block.label}}</a> <a class="dropdown-item contact-tool" href="#" title="{{$tools.ignore.title}}" data-cmd="ignore">{{$tools.ignore.label}}</a> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 930137be8..61886c3ee 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -45,8 +45,8 @@ {{/if}} <small class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</small> </div> - {{if $item.thr_parent}} - <a href="javascript:doscroll('{{$item.thr_parent}}',{{$item.parent}});" class="ms-3" title="{{$item.top_hint}}"><i class="fa fa-angle-double-up"></i></a> + {{if $item.thr_parent_uuid}} + <a href="javascript:doscroll('{{$item.thr_parent_uuid}}',{{$item.parent}});" class="ms-3" title="{{$item.top_hint}}"><i class="fa fa-angle-double-up"></i></a> {{/if}} {{if $item.pinned}} <div class="wall-item-pinned" title="{{$item.pinned}}" id="wall-item-pinned-{{$item.id}}"><i class="fa fa-thumb-tack"></i></div> @@ -238,28 +238,28 @@ </div> {{if $item.responses || $item.attachments}} - <div class="wall-item-tools-left btn-group" id="wall-item-tools-left-{{$item.id}}"> + <div class="wall-item-tools-left hstack gap-1" id="wall-item-tools-left-{{$item.id}}"> {{if $item.star && $item.star.isstarred}} - <div class="btn-group" id="star-button-{{$item.id}}"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like" onclick="dostar({{$item.id}});"><i class="fa fa-star"></i></button> + <div class="" id="star-button-{{$item.id}}"> + <button type="button" class="btn btn-outline-secondary border-0 btn-sm wall-item-star" onclick="dostar({{$item.id}});"><i class="fa fa-star"></i></button> </div> {{/if}} {{if $item.attachments}} - <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-bs-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> + <div class=""> + <button type="button" class="btn btn-outline-secondary border-0 btn-sm wall-item-attach" data-bs-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> <div class="dropdown-menu">{{$item.attachments}}</div> </div> {{/if}} {{foreach $item.responses as $verb=>$response}} {{if $response.count}} - <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-bs-toggle="modal" data-bs-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-bs-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button> + <div class=""> + <button type="button" title="{{$response.count}} {{$response.button.label}}" class="btn btn-outline-secondary border-0 btn-sm wall-item-{{$response.button.class}}"{{if $response.modal}} data-bs-toggle="modal" data-bs-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-bs-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}"><i class="fa fa-{{$response.button.icon}}"></i> {{$response.count}}</button> {{if $response.modal}} <div class="modal" id="{{$verb}}Modal-{{$item.id}}"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <h3 class="modal-title">{{$response.count}} {{$response.button}}</h3> + <h3 class="modal-title">{{$response.count}} {{$response.button.label}}</h3> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body response-list"> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 43133027f..fe9167a88 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -216,26 +216,26 @@ </div> </div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> - <div class="wall-item-tools-left btn-group" id="wall-item-tools-left-{{$item.id}}"> + <div class="wall-item-tools-left hstack gap-1" id="wall-item-tools-left-{{$item.id}}"> {{if $item.star && $item.star.isstarred}} - <div class="btn-group" id="star-button-{{$item.id}}"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like" onclick="dostar({{$item.id}});"><i class="fa fa-star"></i></button> + <div class="" id="star-button-{{$item.id}}"> + <button type="button" class="btn btn-outline-secondary btn-sm border-0 wall-item-star" onclick="dostar({{$item.id}});"><i class="fa fa-star"></i></button> </div> {{/if}} {{if $item.attachments}} - <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-bs-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> + <div class=""> + <button type="button" class="btn btn-outline-secondary btn-sm border-0 wall-item-attach" data-bs-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul> </div> {{/if}} <div class="wall-item-list-comments btn-group"> - <a class="btn btn-outline-secondary btn-sm" href="{{$item.viewthread}}"> - {{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}} + <a class="btn btn-outline-secondary btn-sm border-0 wall-item-comments" href="{{$item.viewthread}}" title="{{$item.comment_count_txt.label}}{{if $item.list_unseen_txt}}, {{$item.list_unseen_txt.label}}{{/if}}"> + <i class="fa fa-comment-o"></i> {{$item.comment_count_txt.count}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, <i class="fa fa-eye-slash"></i> {{$item.list_unseen_txt.count}}</span>{{/if}} </a> </div> {{if $item.unseen_comments}} <div class="unseen-wall-indicator-{{$item.id}} btn-group"> - <button class="btn btn-outline-secondary btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"> <i class="fa fa-check-square-o"></i> </button> </div> @@ -243,14 +243,14 @@ {{if $item.responses }} {{foreach $item.responses as $verb=>$response}} {{if $response.count}} - <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-bs-toggle="modal" data-bs-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-bs-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button> + <div class=""> + <button type="button" class="btn btn-outline-secondary btn-sm border-0 wall-item-{{$response.button.class}}"{{if $response.modal}} data-bs-toggle="modal" data-bs-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-bs-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}"><i class="fa fa-{{$response.button.icon}}"></i> {{$response.count}}</button> {{if $response.modal}} <div class="modal" id="{{$verb}}Modal-{{$item.id}}"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <h4 class="modal-title">{{$response.count}} {{$response.button}}</h4> + <h4 class="modal-title">{{$response.count}} {{$response.button.label}}</h4> <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body response-list"> diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl index 87ec1c35f..a24608f58 100644 --- a/view/tpl/dreport.tpl +++ b/view/tpl/dreport.tpl @@ -6,7 +6,7 @@ <i class="fa fa-cog"></i> </button> <div class="dropdown-menu"> - <a href="dreport/push/{{$safe_mid}}" class="dropdown-item">{{$push}}</a> + <a href="dreport/push?mid={{$mid}}" class="dropdown-item">{{$push}}</a> </div> </div> {{/if}} diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl index f04d70c3e..e6601d69c 100644 --- a/view/tpl/field_colorinput.tpl +++ b/view/tpl/field_colorinput.tpl @@ -1,6 +1,6 @@ <div class='mb-3 field input color'> <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> <input class='form-control color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} - <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> + <small id='help_{{$field.0}}' class='form-text text-muted'>{{$field.3}}</small> <div id='end_{{$field.0}}' class='field_end'></div> </div> diff --git a/view/tpl/hq_controls.tpl b/view/tpl/hq_controls.tpl index 3adbfa7c0..0d433c2c2 100644 --- a/view/tpl/hq_controls.tpl +++ b/view/tpl/hq_controls.tpl @@ -1,7 +1,7 @@ -<div class="mb-3{{if $wrapper_class}} {{$wrapper_class}}{{/if}}"> +<div class="mb-3 hq_controls{{if $wrapper_class}} {{$wrapper_class}}{{/if}}"> {{foreach $entries as $e}} <button class="{{$e.class}} rounded-circle{{if $entry_class}} {{$entry_class}}{{/if}}" type="{{$e.type}}" title="{{$e.label}}"{{if $e.extra}} {{$e.extra}}{{/if}}> - {{if $e.icon}}<i class="fa fa-{{$e.icon}} mt-1 mb-1"></i>{{/if}} + {{if $e.icon}}<i class="fa fa-{{$e.icon}}"></i>{{/if}} </button> {{/foreach}} </div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 6c88e02b5..d80e8d066 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -100,19 +100,19 @@ <div id="profile-jot-submit-left" class="btn-toolbar float-start"> {{if $bbcode}} <div class="btn-group me-2"> - <button type="button" id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;"> + <button type="button" id="main-editor-bold" class="btn btn-outline-secondary btn-sm border-0" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;"> <i class="fa fa-bold jot-icons"></i> </button> - <button type="button" id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;"> + <button type="button" id="main-editor-italic" class="btn btn-outline-secondary btn-sm border-0" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;"> <i class="fa fa-italic jot-icons"></i> </button> - <button type="button" id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;"> + <button type="button" id="main-editor-underline" class="btn btn-outline-secondary btn-sm border-0" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;"> <i class="fa fa-underline jot-icons"></i> </button> - <button type="button" id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;"> + <button type="button" id="main-editor-quote" class="btn btn-outline-secondary btn-sm border-0" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;"> <i class="fa fa-quote-left jot-icons"></i> </button> - <button type="button" id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;"> + <button type="button" id="main-editor-code" class="btn btn-outline-secondary btn-sm border-0" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;"> <i class="fa fa-terminal jot-icons"></i> </button> </div> @@ -120,29 +120,29 @@ {{if $visitor}} <div class="btn-group me-2 d-none d-lg-flex"> {{if $writefiles}} - <button type="button" id="wall-file-upload" class="btn btn-outline-secondary btn-sm" title="{{$attach}}" > + <button type="button" id="wall-file-upload" class="btn btn-outline-secondary btn-sm border-0" title="{{$attach}}" > <i id="wall-file-upload-icon" class="fa fa-paperclip jot-icons"></i> </button> {{/if}} {{if $weblink}} - <button type="button" id="profile-link-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"> + <button type="button" id="profile-link-wrapper" class="btn btn-outline-secondary btn-sm border-0" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"> <i id="profile-link" class="fa fa-link jot-icons"></i> </button> {{/if}} {{if $embedPhotos}} - <button type="button" id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;"> + <button type="button" id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm border-0" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;"> <i id="embed-photo" class="fa fa-file-image-o jot-icons"></i> </button> {{/if}} </div> <div class="btn-group me-2 d-none d-lg-flex"> {{if $setloc}} - <button type="button" id="profile-location-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> + <button type="button" id="profile-location-wrapper" class="btn btn-outline-secondary btn-sm border-0" title="{{$setloc}}" onclick="jotGetLocation();return false;"> <i id="profile-location" class="fa fa-globe jot-icons"></i> </button> {{/if}} {{if $clearloc}} - <button type="button" id="profile-nolocation-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> + <button type="button" id="profile-nolocation-wrapper" class="btn btn-outline-secondary btn-sm border-0" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> <i id="profile-nolocation" class="fa fa-circle-o jot-icons"></i> </button> {{/if}} @@ -150,25 +150,25 @@ <div class="btn-group d-none d-lg-flex"> {{/if}} {{if $feature_expire}} - <button type="button" id="profile-expire-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> + <button type="button" id="profile-expire-wrapper" class="btn btn-outline-secondary btn-sm border-0" title="{{$expires}}" onclick="jotGetExpiry();return false;"> <i id="profile-expires" class="fa fa-eraser jot-icons"></i> </button> {{/if}} {{if $feature_future}} - <button type="button" id="profile-future-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;"> + <button type="button" id="profile-future-wrapper" class="btn btn-outline-secondary btn-sm border-0" title="{{$future_txt}}" onclick="jotGetPubDate();return false;"> <i id="profile-future" class="fa fa-clock-o jot-icons"></i> </button> {{/if}} {{if $feature_encrypt}} - <button type="button" id="profile-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="hz_encrypt('{{$cipher}}','#profile-jot-text');return false;"> + <button type="button" id="profile-encrypt-wrapper" class="btn btn-outline-secondary btn-sm border-0" title="{{$encrypt}}" onclick="sodium_encrypt('#profile-jot-text'); return false;"> <i id="profile-encrypt" class="fa fa-key jot-icons"></i> </button> {{/if}} - <button type="button" id="profile-poll-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$poll}}" onclick="initPoll();"> + <button type="button" id="profile-poll-wrapper" class="btn btn-outline-secondary btn-sm border-0" title="{{$poll}}" onclick="initPoll();"> <i id="profile-poll" class="fa fa-bar-chart jot-icons"></i> </button> {{if $feature_nocomment}} - <button type="button" id="profile-nocomment-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$nocommenttitle}}" onclick="toggleNoComment();return false;"> + <button type="button" id="profile-nocomment-wrapper" class="btn btn-outline-secondary btn-sm border-0" title="{{$nocommenttitle}}" onclick="toggleNoComment();return false;"> <i id="profile-nocomment" class="fa fa-comments jot-icons"></i> </button> {{/if}} @@ -178,7 +178,7 @@ </div> {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $custommoretoolsdropdown}} <div class="btn-group d-lg-none"> - <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> + <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm border-0 dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="fa fa-cog jot-icons"></i> </button> <div class="dropdown-menu"> @@ -206,7 +206,7 @@ <a class="dropdown-item" href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i> {{$future_txt}}</a> {{/if}} {{if $feature_encrypt}} - <a class="dropdown-item" href="#" onclick="hz_encrypt('{{$cipher}}','#profile-jot-text');return false;"><i class="fa fa-key"></i> {{$encrypt}}</a> + <a class="dropdown-item" href="#" onclick="sodium_encrypt('#profile-jot-text'); return false;"><i class="fa fa-key"></i> {{$encrypt}}</a> {{/if}} <a class="dropdown-item" href="#" onclick="initPoll(); return false"><i id="profile-poll" class="fa fa-bar-chart jot-icons"></i> {{$poll}}</a> {{if $feature_nocomment}} diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl deleted file mode 100644 index 4cb5207f6..000000000 --- a/view/tpl/mood_content.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -<div id="mood-content" class="generic-content-wrapper"> - <div class="section-title-wrapper"> - <h2>{{$title}}</h2> - </div> - <div class="section-content-wrapper"> - - <div id="mood-desc">{{$desc}}</div> - - <br /> - <br /> - - - <form action="mood" method="get"> - <br /> - <br /> - - <input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" /> - - <div class="mb-3 field custom"> - <select name="verb" id="mood-verb-select" class="form-control" > - {{foreach $verbs as $v}} - <option value="{{$v.0}}">{{$v.1}}</option> - {{/foreach}} - </select> - </div> - <br /> - <br /> - - <input type="submit" name="submit" value="{{$submit}}" /> - </form> - </div> -</div> diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl deleted file mode 100644 index 3872d21ff..000000000 --- a/view/tpl/poke_content.tpl +++ /dev/null @@ -1,48 +0,0 @@ - -<div id="poke-content" class="generic-content-wrapper"> - <div class="section-title-wrapper"> - <h2>{{$title}}</h2> - </div> - <div class="section-content-wrapper"> - - <div id="poke-desc">{{$desc}}</div> - -<br /> -<br /> - - -<form action="poke" method="get"> - - -<div class="mb-3 field input"> - <label id="poke-recip-label" for="poke-recip">{{$clabel}}</label> - <input class="form-control" id="poke-recip" type="text" value="{{$name}}" name="pokename" autocomplete="off" /> -</div> - - <input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" /> - <input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" /> - - -{{if $poke_basic}} -<input type="hidden" name="verb" value="poke" /> -{{else}} -<div class="mb-3 field custom"> - <label for="poke-verb-select" id="poke-verb-lbl">{{$choice}}</label> - <select class="form-control" name="verb" id="poke-verb-select" > - {{foreach $verbs as $v}} - <option value="{{$v.0}}">{{$v.1}}</option> - {{/foreach}} - </select> -</div> -{{/if}} - -{{if ! $parent}} -{{include file="field_checkbox.tpl" field=$private}} -{{/if}} - -<input type="submit" name="submit" value="{{$submit}}" /> -</form> - - - </div> -</div> diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl index d738c9fc9..7aee4e8b2 100644 --- a/view/tpl/show_thing.tpl +++ b/view/tpl/show_thing.tpl @@ -1,16 +1,18 @@ <h2>{{$header}}</h2> {{if $thing}} <div class="thing-show"> -{{if $thing.obj_imgurl}}<a href="{{$thing.obj_url}}" ><img src="{{$thing.obj_imgurl}}" width="175" height="175" alt="{{$thing.obj_term}}" /></a>{{/if}} -<a href="{{$thing.obj_url}}" >{{$thing.obj_term}}</a> + {{if $thing.obj_imgurl}} + <a href="{{$thing.obj_url}}" ><img src="{{$thing.obj_imgurl}}" style="max-width: 100%;" alt="{{$thing.obj_term}}" /></a> + {{else}} + <a href="{{$thing.obj_url}}" >{{$thing.obj_url}}</a> + {{/if}} </div> {{if $canedit}} <div class="thing-edit-links"> -<a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-outline-secondary" ><i class="fa fa-pencil thing-edit-icon"></i></a> -<a href="thing/drop/{{$thing.obj_obj}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-outline-secondary" ><i class="fa fa-trash-o drop-icons"></i></a> + <a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-outline-secondary" ><i class="fa fa-pencil thing-edit-icon"></i></a> + <a href="thing/drop/{{$thing.obj_obj}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-outline-secondary" ><i class="fa fa-trash-o drop-icons"></i></a> </div> <div class="thing-edit-links-end"></div> {{/if}} - {{/if}} diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl index 63b48f6fc..8067bec43 100644 --- a/view/tpl/thing_edit.tpl +++ b/view/tpl/thing_edit.tpl @@ -27,7 +27,7 @@ {{include file="field_checkbox.tpl" field=$activity}} -<div class="thing-end"></div> +<div class="thing-end"></div> {{if $lockstate}} <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" onclick="return false;"> @@ -36,6 +36,6 @@ {{/if}} -<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> +<input type="submit" class="btn btn-primary btn-sm" name="submit" value="{{$submit}}" /> </form> {{$aclselect}} diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl index d1495aba0..12e99969f 100644 --- a/view/tpl/thing_input.tpl +++ b/view/tpl/thing_input.tpl @@ -27,7 +27,7 @@ {{include file="field_checkbox.tpl" field=$activity}} -<div class="thing-end"></div> +<div class="thing-end"></div> {{if $lockstate}} <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" onclick="return false;"> @@ -36,6 +36,6 @@ {{/if}} -<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> +<input type="submit" class="btn btn-primary btn-sm" name="submit" value="{{$submit}}" /> </form> {{$aclselect}} |