diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-05-31 09:56:35 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-05-31 09:56:35 +0200 |
| commit | 47d55694a4c84b6c12c0db61a69bcac8b671b20e (patch) | |
| tree | b15e96f4ea67e2214a66a9d28dafaf53d25b98ec /view/tpl | |
| parent | 087f9784e3c5a860ed2b86e7f9e8e9f312038546 (diff) | |
| parent | f0e615dee529e031663576286345141ad2996974 (diff) | |
| download | volse-hubzilla-47d55694a4c84b6c12c0db61a69bcac8b671b20e.tar.gz volse-hubzilla-47d55694a4c84b6c12c0db61a69bcac8b671b20e.tar.bz2 volse-hubzilla-47d55694a4c84b6c12c0db61a69bcac8b671b20e.zip | |
Merge branch '2.4RC'2.4
Diffstat (limited to 'view/tpl')
123 files changed, 1451 insertions, 1298 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index ebc69c5f8..9fb5c4b18 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -3,31 +3,36 @@ {{if $notself}} <div class="pull-right"> <div class="btn-group"> - <button id="connection-dropdown" class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="fa fa-caret-down"></i> {{$tools_label}} + <button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <i class="fa fa-cog"></i> {{$tools_label}} </button> - <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> - <li><a href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a></li> - <li><a href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a></li> - <li class="divider"></li> - <li><a href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a></li> - <li><a href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a></li> - <li><a href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a></li> - <li><a href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a></li> - <li><a href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a></li> - <li><a href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a></li> - </ul> + <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> + <a class="dropdown-item" href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a> + <a class="dropdown-item" href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a> + {{if $tools.fetchvc}} + <a class="dropdown-item" href="{{$tools.fetchvc.url}}" title="{{$tools.fetchvc.title}}">{{$tools.fetchvc.label}}</a> + {{/if}} + <a class="dropdown-item" href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a> + <a class="dropdown-item" href="#" title="{{$tools.rephoto.title}}" onclick="window.location.href='{{$tools.rephoto.url}}'; return false;">{{$tools.rephoto.label}}</a> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a> + <a class="dropdown-item" href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a> + <a class="dropdown-item" href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a> <a class="dropdown-item" href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a> + <a class="dropdown-item" href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a> + </div> </div> {{if $abook_prev || $abook_next}} <div class="btn-group"> - <a href="connedit/{{$abook_prev}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-default btn-xs{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a> - <button class="btn btn-default btn-xs{{if $is_pending}} disabled{{/if}}" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button> - <a href="connedit/{{$abook_next}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-default btn-xs{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a> - <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> - {{foreach $sections as $s}} - <li><a href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a></li> - {{/foreach}} - </ul> + <a href="connedit/{{$abook_prev}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a> + <div class="btn-group" > + <button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button> + <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> + {{foreach $sections as $s}} + <a class="dropdown-item" href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a> + {{/foreach}} + </div> + </div> + <a href="connedit/{{$abook_next}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a> </div> {{/if}} </div> @@ -79,7 +84,7 @@ </a> </h3> </div> - <div id="pending-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="pending-tool"> + <div id="pending-tool-collapse" class="panel-collapse collapse show" role="tabpanel" aria-labelledby="pending-tool"> <div class="section-content-tools-wrapper"> {{include file="field_checkbox.tpl" field=$unapproved}} <div class="settings-submit-wrapper" > @@ -187,7 +192,7 @@ <div class="section-content-wrapper-np"> <div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div> <div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field"> - <button data-toggle="dropdown" type="button" class="btn btn-default btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button> + <button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button> <ul class="dropdown-menu"> <li class="add-vcard-org"{{if $vcard.org}} style="display: none"{{/if}}><a href="#" data-add="vcard-org" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$org_label}}</a></li> <li class="add-vcard-title"{{if $vcard.title}} style="display: none"{{/if}}><a href="#" data-add="vcard-title" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$title_label}}</a></li> @@ -203,8 +208,8 @@ <i class="vcard-fn-preview fa fa-address-card-o"></i> <span id="vcard-preview-{{$vcard.id}}" class="vcard-preview"> {{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}} - {{if $vcard.emails.0.address}}<span class="vcard-email-preview hidden-xs"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}} - {{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-default btn-xs" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}} + {{if $vcard.emails.0.address}}<span class="vcard-email-preview d-none d-md-table-cell"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}} + {{if $vcard.tels.0}}<span class="vcard-tel-preview d-none d-md-table-cell">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}} </span> <input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}"> </div> @@ -381,7 +386,7 @@ </a> </h3> </div> - <div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} in{{/if}}" role="tabpanel" aria-labelledby="affinity-tool"> + <div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} show{{/if}}" role="tabpanel" aria-labelledby="affinity-tool"> <div class="section-content-tools-wrapper"> {{if $slide}} <div class="form-group"><strong>{{$lbl_slider}}</strong></div> @@ -412,7 +417,7 @@ </a> </h3> </div> - <div id="fitert-tool-collapse" class="panel-collapse collapse{{if $section == 'filter' }} in{{/if}}" role="tabpanel" aria-labelledby="fitert-tool"> + <div id="fitert-tool-collapse" class="panel-collapse collapse{{if $section == 'filter' }} show{{/if}}" role="tabpanel" aria-labelledby="fitert-tool"> <div class="section-content-tools-wrapper"> {{include file="field_textarea.tpl" field=$incl}} {{include file="field_textarea.tpl" field=$excl}} @@ -466,7 +471,7 @@ </h3> </div> {{/if}} - <div id="perms-tool-collapse" class="panel-collapse collapse{{if $self || $section === 'perms'}} in{{/if}}" role="tabpanel" aria-labelledby="perms-tool"> + <div id="perms-tool-collapse" class="panel-collapse collapse{{if $self || $section === 'perms'}} show{{/if}}" role="tabpanel" aria-labelledby="perms-tool"> <div class="section-content-tools-wrapper"> <div class="section-content-warning-wrapper"> {{if $notself}}{{$permnote}}{{/if}} diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index c23840c16..f4f851c8a 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -3,11 +3,13 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> + <h4 class="modal-title"> + <i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}} + {{if $helpUrl}} + <a target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-fw fa-question"></i></a> + {{/if}} + </h4> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - {{if $helpUrl}} - <a type="button" target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-question"></i></a> - {{/if}} - <h4 class="modal-title"><i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}</h4> </div> <div class="section-content-wrapper"> {{if $aclModalDesc}} @@ -29,32 +31,30 @@ <div id="acl-wrapper"> <div id="acl-list"> - <div id="acl-search-wrapper"> - <input type="text" id="acl-search" placeholder=" {{$search}}"> - </div> - <div id="acl-list-content-wrapper"> - <div id=acl-showlimited-description>{{$showlimitedDesc}}</div> - <div id="acl-list-content"></div> - </div> + <input class="form-control" type="text" id="acl-search" placeholder=" {{$search}}"> + <small class="text-muted">{{$showlimitedDesc}}</small> + <div id="acl-list-content"></div> </div> </div> <div class="acl-list-item" rel="acl-template" style="display:none"> - <img data-src="{0}"><p>{1}</p> - <button class="acl-button-hide btn btn-xs btn-default"><i class="fa fa-times"></i> {{$hide}}</button> - <button class="acl-button-show btn btn-xs btn-default"><i class="fa fa-check"></i> {{$show}}</button> + <div class="acl-item-header"> + <img class="menu-img-1" data-src="{0}"> {1} + </div> + <button class="acl-button-hide btn btn-sm btn-outline-danger"><i class="fa fa-times"></i> {{$hide}}</button> + <button class="acl-button-show btn btn-sm btn-outline-success"><i class="fa fa-check"></i> {{$show}}</button> </div> - </div> <div class="modal-footer clear"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$aclModalDismiss}}</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> </form> <script> - $('[data-toggle="popover"]').popover(); // Init the popover, if present + // compatibility issue with bootstrap v4 + //$('[data-toggle="popover"]').popover(); // Init the popover, if present if(typeof acl=="undefined"){ acl = new ACL( diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl index c2a50e3ff..3535363a0 100755 --- a/view/tpl/admin_accounts.tpl +++ b/view/tpl/admin_accounts.tpl @@ -33,8 +33,8 @@ <td class="email">{{$u.account_email}}</td> <td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td> <td class="tools"> - <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a> - <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a> + <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$approve}}"><i class="fa fa-thumbs-o-up admin-icons"></i></a> + <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-outline-secondary btn-sm" title="{{$deny}}"><i class="fa fa-thumbs-o-down admin-icons"></i></a> </td> </tr> {{/foreach}} @@ -73,7 +73,7 @@ <td class="service_class">{{$u.account_service_class}}</td> <td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td> <td class="tools"> - <a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a> + <a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a> </td> </tr> {{/foreach}} diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index 70e1677af..99f139e57 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -12,17 +12,17 @@ </script> <div class="widget"> <h3>{{$admtxt}}</h3> -<ul class="nav nav-pills nav-stacked"> +<ul class="nav nav-pills flex-column"> {{foreach $admin as $link}} - <li><a href='{{$link.0}}'>{{$link.1}}{{if $link.3}}<span id='{{$link.3}}' title='{{$link.4}}'></span>{{/if}}</a></li> + <li class="nav-item"><a class="nav-link" href='{{$link.0}}'>{{$link.1}}{{if $link.3}}<span id='{{$link.3}}' title='{{$link.4}}'></span>{{/if}}</a></li> {{/foreach}} </ul> </div> {{if $admin.update}} -<ul class="nav nav-pills nav-stacked"> - <li><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li> - <li><a href=''>Important Changes</a></li> +<ul class="nav nav-pills flex-column"> + <li class="nav-item"><a class="nav-link" href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li> + <li class="nav-item"><a class="nav-link" href=''>Important Changes</a></li> </ul> {{/if}} @@ -30,9 +30,9 @@ {{if $plugins}} <div class="widget"> <h3>{{$plugadmtxt}}</h3> -<ul class="nav nav-pills nav-stacked"> +<ul class="nav nav-pills flex-column"> {{foreach $plugins as $l}} - <li><a href='{{$l.0}}'>{{$l.1}}</a></li> + <li class="nav-item"><a class="nav-link" href='{{$l.0}}'>{{$l.1}}</a></li> {{/foreach}} </ul> </div> @@ -40,7 +40,7 @@ <div class="widget"> <h3>{{$logtxt}}</h3> -<ul class="nav nav-pills nav-stacked"> - <li><a href='{{$logs.0}}'>{{$logs.1}}</a></li> +<ul class="nav nav-pills flex-column"> + <li class="nav-item"><a class="nav-link" href='{{$logs.0}}'>{{$logs.1}}</a></li> </ul> </div> diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index f15742f78..452e0eeec 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -35,7 +35,7 @@ <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-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" 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/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> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 4360aa30c..fd5ae7d5e 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> {{if $allowManageRepos}} <div class="pull-right"> - <button class="btn btn-success btn-xs" onclick="openClose('form');">{{$managerepos}}</button> + <button class="btn btn-success btn-sm" onclick="openClose('form');">{{$managerepos}}</button> </div> {{/if}} <h2 id="title">{{$title}} - {{$page}}</h2> @@ -23,10 +23,10 @@ <span class="pull-left">{{$repo.name}}</span><span id="update-message-{{$repo.name}}" style="margin-left: 20px;"></span> </td> <td style="width: 15%;"> - <button class="btn btn-xs btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i> {{$repoUpdateButton}}</button> + <button class="btn btn-sm btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i> {{$repoUpdateButton}}</button> </td> <td style="width: 15%;"> - <button class="btn btn-xs btn-danger pull-right" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i> {{$repoRemoveButton}}</button> + <button class="btn btn-sm btn-danger pull-right" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i> {{$repoRemoveButton}}</button> </td> <div class="clear"></div> </td></tr> diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl index 35685505f..e3a08449c 100644 --- a/view/tpl/admin_profiles.tpl +++ b/view/tpl/admin_profiles.tpl @@ -1,5 +1,5 @@ <div class="generic-content-wrapper"> -<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-xs pull-right" href="admin/profs/new"><i class="fa fa-plus-circle"></i> {{$new}}</a><h2>{{$title}}</h2> +<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-sm pull-right" href="admin/profs/new"><i class="fa fa-plus-circle"></i> {{$new}}</a><h2>{{$title}}</h2> <div class="clear"></div> </div> @@ -28,7 +28,7 @@ <table width="100%"> {{foreach $cust_fields as $field}} -<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-xs" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="fa fa-trash-o"></i> {{$drop}}</a> <a class="btn btn-xs" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="fa fa-pencil"></i></a></td></tr> +<tr><td>{{$field.field_name}}</td><td>{{$field.field_desc}}</td><td><a class="btn btn-danger btn-sm" href="admin/profs/drop/{{$field.id}}" title="{{$drop}}"><i class="fa fa-trash-o"></i> {{$drop}}</a> <a class="btn btn-sm" title="{{$edit}}" href="admin/profs/{{$field.id}}" ><i class="fa fa-pencil"></i></a></td></tr> {{/foreach}} </table> {{/if}} diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl index 35c2e644a..9d3d848c9 100644 --- a/view/tpl/admin_queue.tpl +++ b/view/tpl/admin_queue.tpl @@ -7,7 +7,7 @@ {{foreach $entries as $e}} -<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td>{{$e.priority}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-default"><i class="fa fa-times"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-default"><i class="fa fa-trash-o"></i></a></td>{{/if}}</tr> +<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td>{{$e.priority}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-outline-secondary"><i class="fa fa-times"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-outline-secondary"><i class="fa fa-trash-o"></i></a></td>{{/if}}</tr> {{/foreach}} </table> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 0bb3ceb15..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}} @@ -71,9 +76,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}} diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 5ff205c53..28f28611e 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -8,23 +8,23 @@ {{if $app.type !== 'system'}} {{if $purchase}} <div class="app-purchase"> - <a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="fa fa-external"></i></a> + <a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a> </div> {{/if}} {{if $install || $update || $delete || $feature}} <div class="app-tools"> <form action="{{$hosturl}}appman" method="post"> <input type="hidden" name="papp" value="{{$app.papp}}" /> - {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default btn-xs" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}} - {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default btn-xs" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}} - {{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-default btn-xs" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}} - {{if $feature}}<button type="submit" name="feature" value="feature" class="btn btn-default btn-xs" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button>{{/if}} + {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-outline-secondary btn-sm" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}} + {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}} + {{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}} + {{if $feature}}<button type="submit" name="feature" value="feature" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button>{{/if}} </form> </div> {{/if}} {{/if}} </div> {{else}} -<li><a href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a></li> +<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a> {{/if}} diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl index 7a0521436..5075ce5e2 100644 --- a/view/tpl/app_create.tpl +++ b/view/tpl/app_create.tpl @@ -3,7 +3,7 @@ <h2>{{$banner}}</h2> </div> - <div class="section-content-wrapper"> + <div class="clearfix section-content-wrapper"> <form action="appman" method="post"> {{if $guid}} <input type="hidden" name="guid" value="{{$guid}}" /> @@ -33,7 +33,7 @@ {{include file="field_textarea.tpl" field=$embed}} {{/if}} - <input type="submit" name="submit" value="{{$submit}}" /> + <button class="btn btn-primary float-right" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> </form> </div> diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl index 37eaf954a..ba50867ff 100755 --- a/view/tpl/atom_feed.tpl +++ b/view/tpl/atom_feed.tpl @@ -3,24 +3,21 @@ xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:at="http://purl.org/atompub/tombstones/1.0" xmlns:media="http://purl.org/syndication/atommedia" - xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" + xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" xmlns:zot="http://purl.org/zot" xmlns:as="http://activitystrea.ms/spec/1.0/" - xmlns:georss="http://www.georss.org/georss" - xmlns:poco="http://portablecontacts.net/spec/1.0" - xmlns:ostatus="http://ostatus.org/schema/1.0" - xmlns:statusnet="http://status.net/schema/api/1/" > + xmlns:georss="http://www.georss.org/georss" + xmlns:poco="http://portablecontacts.net/spec/1.0" + xmlns:ostatus="http://ostatus.org/schema/1.0" + xmlns:statusnet="http://status.net/schema/api/1/" > <id>{{$feed_id}}</id> <title>{{$feed_title}}</title> <generator uri="http://hubzilla.org" version="{{$version}}">{{$red}}</generator> <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> <link rel="alternate" type="text/html" href="{{$profile_page}}" /> -{{if $hub}} - {{$hub}} -{{/if}} -{{if $salmon}} - {{$salmon}} +{{if $author}} +{{$author}} {{/if}} <updated>{{$feed_updated}}</updated> diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 1d58004e5..62442ff7a 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -7,19 +7,19 @@ {{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}} <div id="attach-edit-tools-share" class="btn-group form-group"> {{if !$isadir}} - <a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}"> + <a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-outline-secondary btn-sm" title="{{$attach_btn_title}}"> <i class="fa fa-share-square-o jot-icons"></i> </a> {{/if}} - <button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}"> + <button id="link-btn" class="btn btn-outline-secondary btn-sm" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}"> <i class="fa fa-link jot-icons"></i> </button> </div> <div id="attach-edit-perms" class="btn-group pull-right"> - <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i> </button> - <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit"> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit"> {{$submit}} </button> </div> diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index c88d91463..7f400bba2 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> {{if $editor}} <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('block-editor');"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> + <button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('block-editor');"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> </div> {{/if}} <h2>{{$title}}</h2> @@ -22,8 +22,8 @@ <th width="1%"></th> <th width="1%"></th> <th width="1%"></th> - <th width="1%" class="hidden-xs">{{$created}}</th> - <th width="1%" class="hidden-xs">{{$edited}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$created}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$edited}}</th> </tr> {{foreach $pages as $key => $items}} {{foreach $items as $item}} @@ -53,10 +53,10 @@ <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a> {{/if}} </td> - <td class="hidden-xs"> + <td class="d-none d-md-table-cell"> {{$item.created}} </td> - <td class="hidden-xs"> + <td class="d-none d-md-table-cell"> {{$item.edited}} </td> </tr> diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 91bb0bfc0..a76d4e549 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -20,6 +20,7 @@ var bParam_static = {{$static}}; var bParam_search = "{{$search}}"; + var bParam_xchan = "{{$xchan}}"; var bParam_order = "{{$order}}"; var bParam_file = "{{$file}}"; var bParam_cats = "{{$cats}}"; @@ -47,6 +48,7 @@ if(bParam_list != 0) bCmd = bCmd + "&list=" + bParam_list; if(bParam_fh != 0) bCmd = bCmd + "&fh=" + bParam_fh; if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search; + if(bParam_xchan != "") bCmd = bCmd + "&xchan=" + bParam_xchan; if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order; if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file; if(bParam_cats != "") bCmd = bCmd + "&cat=" + bParam_cats; diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl index ea6d28dfc..72478aa3d 100755 --- a/view/tpl/categories_widget.tpl +++ b/view/tpl/categories_widget.tpl @@ -2,10 +2,10 @@ <h3>{{$title}}</h3> <div id="categories-sidebar-desc">{{$desc}}</div> - <ul class="nav nav-pills nav-stacked"> - <li><a href="{{$base}}"{{if $sel_all}} class="categories-selected"{{/if}}>{{$all}}</a></li> + <ul class="nav nav-pills flex-column"> + <li class="nav-item"><a href="{{$base}}" class="nav-link{{if $sel_all}} active{{/if}}">{{$all}}</a></li> {{foreach $terms as $term}} - <li><a href="{{$base}}?f=&cat={{$term.name}}"{{if $term.selected}} class="categories-selected"{{/if}}>{{$term.name}}</a></li> + <li class="nav-item"><a href="{{$base}}?f=&cat={{$term.name}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.name}}</a></li> {{/foreach}} </ul> diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl index 2028d6181..baffe9b06 100755 --- a/view/tpl/channel_import.tpl +++ b/view/tpl/channel_import.tpl @@ -1,7 +1,7 @@ <h2>{{$title}}</h2> <form action="import" method="post" enctype="multipart/form-data" id="import-channel-form"> - + <input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <div id="import-desc" class="descriptive-paragraph">{{$desc}}</div> <label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label> @@ -40,7 +40,4 @@ <div id="import-submit-end" class="import-field-end"></div> <div id="import-common-desc" class="descriptive-paragraph">{{$pleasewait}}</div> - - </form> - diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 171f833ee..f484b49e5 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a class="btn btn-success btn-xs pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="fa fa-plus-circle"></i> {{$create.2}}</a> + <a class="btn btn-success btn-sm pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="fa fa-plus-circle"></i> {{$create.2}}</a> <h2>{{$header}}</h2> </div> <div class="section-content-wrapper-np"> diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 31be4136f..22f3465bf 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -5,11 +5,11 @@ <form id="chat-destroy" method="post" action="chat"> <input type="hidden" name="room_name" value="{{$room_name}}" /> <input type="hidden" name="action" value="drop" /> - <button class="btn btn-danger btn-xs" type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$drop}}</button> + <button class="btn btn-danger btn-sm" type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$drop}}</button> </form> {{/if}} - <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button> - <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button> + <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button> + <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button> </div> <h2>{{$room_name}}</h2> <div class="clear"></div> @@ -27,62 +27,62 @@ </div> <div id="chat-submit-wrapper"> <div id="chat-submit" class="dropup pull-right"> - <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-caret-up"></i></button> + <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-cog"></i></button> <button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button> - <ul class="dropdown-menu"> - <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="fa fa-circle online"></i> {{$online}}</a></li> - <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="fa fa-circle away"></i> {{$away}}</a></li> - <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="fa fa-circle leave"></i> {{$leave}}</a></li> - <li class="divider"></li> - <li class="nav-item" id="toggle-notifications"><a class="nav-link" href="" onclick="toggleChatNotifications(); return false;"><i id="toggle-notifications-icon" class="fa fa-bell-slash-o"></i> Toggle notifications</a></li> - <li class="nav-item disabled" id="toggle-notifications-audio"><a class="nav-link" href="" onclick="toggleChatNotificationAudio(); return false;"><i id="toggle-notifications-audio-icon" class="fa fa-volume-off"></i> Toggle sound</a></li> + <div class="dropdown-menu dropdown-menu-right"> + <a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="fa fa-circle online"></i> {{$online}}</a> + <a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="fa fa-circle away"></i> {{$away}}</a> + <a class="dropdown-item" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="fa fa-circle leave"></i> {{$leave}}</a> + <div class="dropdown-divider"></div> + <a id="toggle-notifications" class="dropdown-item" href="" onclick="toggleChatNotifications(); return false;"><i id="toggle-notifications-icon" class="fa fa-bell-slash-o"></i> Toggle notifications</a> + <a id="toggle-notifications-audio" class="dropdown-item disabled" href="" onclick="toggleChatNotificationAudio(); return false;"><i id="toggle-notifications-audio-icon" class="fa fa-volume-off"></i> Toggle sound</a> {{if $bookmark_link}} - <li class="divider"></li> - <li class="nav-item"><a class="nav-link" href="{{$bookmark_link}}" target="_blank" ><i class="fa fa-bookmark"></i> {{$bookmark}}</a></li> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="{{$bookmark_link}}" target="_blank" ><i class="fa fa-bookmark"></i> {{$bookmark}}</a> {{/if}} - </ul> + </div> </div> <div id="chat-tools" class="btn-toolbar pull-left"> - <div class="btn-group"> - <button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;"> + <div class="btn-group mr-2"> + <button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;"> <i class="fa fa-bold jot-icons"></i> </button> - <button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'chatText'); return false;"> + <button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'chatText'); return false;"> <i class="fa fa-italic jot-icons"></i> </button> - <button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'chatText'); return false;"> + <button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'chatText'); return false;"> <i class="fa fa-underline jot-icons"></i> </button> - <button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'chatText'); return false;"> + <button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'chatText'); return false;"> <i class="fa fa-quote-left jot-icons"></i> </button> - <button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'chatText'); return false;"> + <button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'chatText'); return false;"> <i class="fa fa-terminal jot-icons"></i> </button> </div> - <div class="btn-group hidden-xs"> - <button id="chat-link-wrapper" class="btn btn-default btn-sm" onclick="chatJotGetLink(); return false;" > + <div class="btn-group mr-2 d-none d-md-flex"> + <button id="chat-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="chatJotGetLink(); return false;" > <i id="chat-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i> </button> </div> {{if $feature_encrypt}} - <div class="btn-group hidden-xs"> - <button id="chat-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}', '#chatText', $('#chatText').val()); return false;"> + <div class="btn-group mr-2 d-none d-md-flex"> + <button id="chat-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}', '#chatText', $('#chatText').val()); return false;"> <i id="chat-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i> </button> </div> {{/if}} - <div class="btn-group dropup visible-xs"> - <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> - <i id="more-tools-icon" class="fa fa-caret-up jot-icons"></i> + <div class="btn-group dropup d-md-none"> + <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + <i id="more-tools-icon" class="fa fa-cog jot-icons"></i> </button> - <ul class="dropdown-menu dropdown-menu-right" role="menu"> - <li class="visible-xs"><a href="#" onclick="chatJotGetLink(); return false;" ><i class="fa fa-link"></i> {{$insert}}</a></li> + <div class="dropdown-menu"> + <a class="dropdown-item" href="#" onclick="chatJotGetLink(); return false;" ><i class="fa fa-link"></i> {{$insert}}</a> {{if $feature_encrypt}} - <li class="divider"></li> - <li class="visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}', '#chatText' ,$('#chatText').val()); return false;"><i class="fa fa-key"></i> {{$encrypt}}</a></li> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}', '#chatText' ,$('#chatText').val()); return false;"><i class="fa fa-key"></i> {{$encrypt}}</a> {{/if}} - </ul> + </div> </div> </div> <div id="chat-rotator-wrapper" class="pull-left"> @@ -150,7 +150,7 @@ function update_inroom(inroom) { $.each( inroom, function(index, item) { var newNode = document.createElement('div'); newNode.setAttribute('class', 'member-item'); - $(newNode).html('<img style="height: 32px; width: 32px;" src="' + item.img + '" alt="' + item.name + '" /> ' + '<span class="name">' + item.name + '</span><br /><span class="' + item.status_class + '">' + item.status + '</span>'); + $(newNode).html('<img class="menu-img-2" src="' + item.img + '" alt="' + item.name + '" /> ' + '<span class="contactname">' + item.name + '</span><span class="' + item.status_class + '">' + item.status + '</span>'); html.appendChild(newNode); }); memberChange = chatRoomMembersChange(inroom); // get list of arrivals and departures diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index 1b7e0501a..1497939f6 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -3,7 +3,7 @@ {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$chat_expire}} <div class="btn-group pull-right"> - <button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> + <button id="dbtn-acl" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> <button id="dbtn-submit" class="acl-submit btn btn-primary" type="submit" name="submit" value="{{$submit}}" data-formid="chatroom-new-form">{{$submit}}</button> </div> <div class="clear"></div> diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl index ff4b79a4b..a81b8ec1e 100644 --- a/view/tpl/chatroomlist.tpl +++ b/view/tpl/chatroomlist.tpl @@ -1,9 +1,9 @@ <div id="chatroom_list" class="widget"> <h3>{{$header}}</h3> - <ul class="nav nav-pills nav-stacked"> - <li><a href="{{$baseurl}}/chat/{{$nickname}}">{{$overview}}</a></li> + <ul class="nav nav-pills flex-column"> + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}">{{$overview}}</a></li> {{foreach $items as $item}} - <li><a href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}"><span class="badge pull-right">{{$item.cr_inroom}}</span>{{$item.cr_name}}</a></li> + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}"><span class="badge pull-right">{{$item.cr_inroom}}</span>{{$item.cr_name}}</a></li> {{/foreach}} </ul> </div> diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index 64f6e8d0f..d3eeed24f 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> - <div class="section-title-wrapper"> + <div class="section-title-wrapper clearfix"> {{if $is_owner}} - <button type="button" class="btn btn-success btn-xs pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i> {{$newroom}}</button> + <button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i> {{$newroom}}</button> {{/if}} <h2>{{$header}}</h2> </div> @@ -21,13 +21,13 @@ <tr class="chatroom-index-row"> <td><a href="{{$baseurl}}/chat/{{$nickname}}/{{$room.cr_id}}">{{$room.cr_name}}</a></td> <td>{{$room.cr_expire}} min</td> - <td class="chatrooms-index-tool{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} dropdown pull-right{{/if}}"> + <td class="chatrooms-index-tool{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} dropdown float-right{{/if}}"> {{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} - <i class="fa fa-lock lockview dropdown-toggle" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i> + <i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i> <ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul> {{/if}} </td> - <td><span class="badge">{{$room.cr_inroom}}</span></td> + <td><span class="badge badge-default">{{$room.cr_inroom}}</span></td> </tr> {{/foreach}} </table> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 36edc3b44..0ebecce29 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -8,7 +8,7 @@ <div class="pull-right btn-group"> <div class="btn-group"> {{if $lockstate}} - <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" type="button"> + <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button"> <i class="jot-perms-icon fa fa-{{$lockstate}}"></i> </button> {{/if}} @@ -19,7 +19,7 @@ <div class="clear"></div> </div> <div id="files-upload-tools" class="section-content-tools-wrapper"> - {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}} + {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{if $quota.desc}}{{$quota.desc}}<br><br>{{/if}}{{$info}}</div>{{/if}} <form id="ajax-upload-files" method="post" action="file_upload" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="directory" value="{{$path}}" /> <input type="hidden" name="channick" value="{{$channick}}" /> @@ -29,7 +29,7 @@ <div class="pull-right btn-group"> <div class="btn-group"> {{if $lockstate}} - <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" type="button"> + <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button"> <i class="jot-perms-icon fa fa-{{$lockstate}}"></i> </button> {{/if}} diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 5a84028c1..adc8584c3 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -5,8 +5,8 @@ <th width="92%">{{$name}}</th> <th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th> <th width="1%">{{*{{$type}}*}}</th> - <th width="1%" class="hidden-xs">{{$size}}</th> - <th width="1%" class="hidden-xs">{{$lastmod}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$size}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th> </tr> {{if $parentpath}} <tr> @@ -14,8 +14,8 @@ <td><a href="{{$parentpath.path}}" title="{{$parent}}">..</a></td> <td></td><td></td><td></td><td></td> <td>{{*[{{$parent}}]*}}</td> - <td class="hidden-xs"></td> - <td class="hidden-xs"></td> + <td class="d-none d-md-table-cell"></td> + <td class="d-none d-md-table-cell"></td> </tr> {{/if}} <tr id="new-upload-progress-bar--1"></tr> {{* this is needed to append the upload files in the right order *}} @@ -33,8 +33,8 @@ <td></td><td></td><td></td><td></td> {{/if}} <td>{{*{{$item.type}}*}}</td> - <td class="hidden-xs">{{$item.sizeFormatted}}</td> - <td class="hidden-xs">{{$item.lastmodified}}</td> + <td class="d-none d-md-table-cell">{{$item.sizeFormatted}}</td> + <td class="d-none d-md-table-cell">{{$item.lastmodified}}</td> </tr> <tr id="cloud-tools-{{$item.attachId}}"> <td id="perms-panel-{{$item.attachId}}" colspan="9"></td> diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index d41cc9d67..c1e589341 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -2,10 +2,10 @@ {{if $actionspanel}} <div class="pull-right"> {{if $is_owner}} - <a href="/sharedwithme" class="btn btn-xs btn-default"><i class="fa fa-cloud-download"></i> {{$shared}}</a> + <a href="/sharedwithme" class="btn btn-sm btn-outline-secondary"><i class="fa fa-cloud-download"></i> {{$shared}}</a> {{/if}} - <button id="files-create-btn" class="btn btn-xs btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="fa fa-folder-o"></i> {{$create}}</button> - <button id="files-upload-btn" class="btn btn-xs btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="fa fa-arrow-circle-o-up"></i> {{$upload}}</button> + <button id="files-create-btn" class="btn btn-sm btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="fa fa-folder-o"></i> {{$create}}</button> + <button id="files-upload-btn" class="btn btn-sm btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="fa fa-arrow-circle-o-up"></i> {{$upload}}</button> </div> {{/if}} <h2>{{$header}}</h2> diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index a98b9e5eb..bd5176c83 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -19,56 +19,49 @@ {{/foreach}} </select> {{/if}} - <div class="clear"></div> - <div id="comment-tools-{{$id}}" class="comment-tools"> + <div id="comment-tools-{{$id}}" class="pt-2 comment-tools"> <div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left"> - <div class='btn-group'> - <button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;"> + <div class="btn-group mr-2"> + <button class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;"> <i class="fa fa-bold comment-icon"></i> </button> - <button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', {{$id}}); return false;"> <i class="fa fa-italic comment-icon"></i> </button> - <button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', {{$id}}); return false;"> <i class="fa fa-underline comment-icon"></i> </button> - <button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote', {{$id}}); return false;"> <i class="fa fa-quote-left comment-icon"></i> </button> - <button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> <i class="fa fa-terminal comment-icon"></i> </button> </div> - <div class='btn-group'> - <!--button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;"> - <i class="fa fa-camera comment-icon"></i> - </button--> - <button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;"> + <div class="btn-group mr-2"> + <button class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;"> <i class="fa fa-link comment-icon"></i> </button> - <!--button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> - <i class="fa fa-video-camera comment-icon"></i> - </button--> </div> {{if $feature_encrypt}} - <div class='btn-group'> - <button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"> + <div class="btn-group mr-2"> + <button class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"> <i class="fa fa-key comment-icon"></i> </button> </div> {{/if}} {{$comment_buttons}} </div> - <div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}"> + <div class="btn-group float-right" id="comment-edit-submit-wrapper-{{$id}}"> {{if $preview}} - <button id="comment-edit-presubmit-{{$id}}" class="btn btn-default btn-xs" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}"> + <button id="comment-edit-presubmit-{{$id}}" class="btn btn-outline-secondary btn-sm" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}"> <i class="fa fa-eye comment-icon" ></i> </button> {{/if}} - <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> + <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-sm" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> </div> </div> <div class="clear"></div> </form> </div> - <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview"></div> + <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview mt-4"></div> diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl index fa6bfbdfa..29c46369b 100755 --- a/view/tpl/common_tabs.tpl +++ b/view/tpl/common_tabs.tpl @@ -1,8 +1,17 @@ -<div id="tabs-collapse-1" class="navbar-collapse collapse"> - <ul class="nav nav-tabs nav-justified"> +<div class="mb-4 d-none d-md-block"> + <ul class="nav nav-tabs nav-fill"> {{foreach $tabs as $tab}} - <li class="{{$tab.sel}}" {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li> + <li class="nav-item"{{if $tab.id}} id="{{$tab.id}}"{{/if}}><a class="nav-link{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li> {{/foreach}} </ul> </div> -<div class="tabs-end"></div> +<div class="d-md-none dropdown clearfix" style="position:fixed; right:7px; top:4.5rem; z-index:1020"> + <button type="button" class="btn btn-outline-secondary btn-sm float-right" data-toggle="dropdown"> + <i class="fa fa-bars"></i> + </button> + <div class="dropdown-menu dropdown-menu-right"> + {{foreach $tabs as $tab}} + <a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a> + {{/foreach}} + </div> +</div> diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 64d27e609..16915abda 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -1,20 +1,20 @@ <div id="contact-entry-wrapper-{{$contact.id}}"> - <div class="section-subtitle-wrapper"> + <div class="section-subtitle-wrapper clearfix"> <div class="pull-right"> {{if $contact.approve && $contact.ignore}} <form action="connedit/{{$contact.id}}" method="post" > - <button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button> + <button type="submit" class="btn btn-success btn-sm" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button> - <a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-xs" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a> + <a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a> {{/if}} - <a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a> - <a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a> + <a href="#" class="btn btn-danger btn-sm" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a> + <a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a> {{if $contact.approve}} </form> {{/if}} </div> - <h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i> {{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}} <a class="btn btn-default btn-xs" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3> + <h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i> {{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3> </div> <div class="section-content-tools-wrapper"> <div class="contact-photo-wrapper" > diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index f85adc592..13261965a 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,31 +1,31 @@ <div class="generic-content-wrapper"> - <div class="section-title-wrapper"> + <div class="section-title-wrapper clearfix"> <div class="dropdown pull-right"> - <button type="button" class="btn btn-primary btn-xs" onclick="openClose('contacts-search-form');"> + <button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus()"> <i class="fa fa-search"></i> {{$label}} </button> - <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> <i class="fa fa-sort"></i> </button> - <ul class="dropdown-menu"> + <div class="dropdown-menu dropdown-menu-right"> {{foreach $tabs as $menu}} - <li><a href="{{$menu.url}}">{{$menu.label}}</a></li> + <a class="dropdown-item" href="{{$menu.url}}">{{$menu.label}}</a> {{/foreach}} - </ul> + </div> </div> {{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}} </div> <div id="contacts-search-form" class="section-content-tools-wrapper"> <form action="{{$cmd}}" method="get" > <div class="input-group form-group"> - <input type="text" name="search" id="contacts-search" class="form-control input-sm" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> + <input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> <div class="input-group-btn"> - <button id="contacts-search-submit" class="btn btn-default btn-sm" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button> + <button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button> </div> </div> </form> </div> - <div id="connections-wrapper"> + <div id="connections-wrapper clearfix"> {{foreach $contacts as $contact}} {{include file="connection_template.tpl"}} {{/foreach}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index e73ee7fb5..2d51af4ff 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -4,10 +4,10 @@ </div> <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> {{/if}} - <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}} item_{{$item.submid}}"> + <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}"> <a name="item_{{$item.id}}" ></a> - <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > - <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> + <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}}"> {{if $item.photo}} <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> {{$item.photo}} @@ -18,21 +18,24 @@ {{$item.event}} </div> {{/if}} - <div class="wall-item-head"> + {{if $item.title && !$item.event}} + <div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}"> + {{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}} + </div> + {{if ! $item.is_new}} + <hr class="m-0"> + {{/if}} + {{/if}} + <div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> </div> - <div class="wall-item-photo-end" style="clear:both"></div> - </div> - {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> - <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> </div> - {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> - <i class="fa fa-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + <i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i> + <div id="panel-{{$item.id}}" class="dropdown-menu"></div> </div> {{/if}} <div class="wall-item-author"> @@ -41,19 +44,22 @@ <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span 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}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> - <div class="clear"></div> </div> {{if $item.body}} - <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> + <div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}"> <div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" > {{$item.body}} </div> - <div class="clear"></div> </div> {{/if}} {{if $item.has_tags}} - <div class="wall-item-tools"> + <div class="p-2 wall-item-tools clearfix"> + + <div class="body-tags"> + <span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span> + </div> + {{** {{if $item.mentions}} <div class="body-tags" id="item-mentions"> <span class="tag">{{$item.mentions}}</span> @@ -74,120 +80,116 @@ <span class="tag">{{$item.folders}}</span> </div> {{/if}} - <div class="clear"></div> + **}} </div> {{/if}} - <div class="wall-item-tools"> + <div class="p-2 clearfix wall-item-tools"> <div class="wall-item-tools-right pull-right"> {{if $item.toplevel && $item.emojis && $item.reactions}} <div class="btn-group dropdown"> - <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}"> <i class="fa fa-smile-o"></i> </button> - <ul class="dropdown-menu dropdown-menu-left" role="menu" aria-labelledby="wall-item-react-{{$item.id}}"> + <div class="dropdown-menu dropdown-menu-right"> {{foreach $item.reactions as $react}} - <li role="presentation"><a role="menuitem" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="dropdown-menu-img-sm" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a></li> + <a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a> {{/foreach}} - </ul> + </div> </div> {{/if}} <div class="btn-group dropdown"> {{if $item.like}} - <button type="button" title="{{$item.like.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false;"> + <button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;"> <i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i> </button> {{/if}} {{if $item.dislike}} - <button type="button" title="{{$item.dislike.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;"> + <button type="button" title="{{$item.dislike.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;"> <i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i> </button> {{/if}} {{if $item.isevent}} <div class="btn-group dropdown"> - <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}"> <i class="fa fa-calendar-check-o"></i> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-attend-menu-{{$item.id}}"> - <li role="presentation"><a class="menuitem" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;"> - <i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}}</a> - </li> - <li role="presentation"><a class="menuitem" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;"> - <i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}}</a> - </li> - <li role="presentation"><a class="menuitem" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;"> - <i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}}</a> - </li> - </ul> + <div class="dropdown-menu"> + <a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;"> + <i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}} + </a> + <a class="dropdown-item" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;"> + <i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}} + </a> + <a class="dropdown-item" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;"> + <i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}} + </a> + </div> </div> {{/if}} {{if $item.canvote}} <div class="btn-group dropdown"> - <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}"> <i class="fa fa-check-square-o"></i> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}"> - <li role="presentation"><a class="menuitem" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;"> - <i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}}</a> - </li> - <li role="presentation"><a class="menuitem" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;"> - <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}</a> - </li> - <li role="presentation"><a class="menuitem" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;"> - <i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}</a> - </li> - </ul> + <div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}"> + <a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;"> + <i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}} + </a> + <a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;"> + <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}} + </a> + <a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;"> + <i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}} + </a> + </div> </div> {{/if}} - <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> - <i class="fa fa-caret-down"></i> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> + <i class="fa fa-cog"></i> </button> - <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> + <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> {{if $item.share}} - <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a></li> + <a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a> {{/if}} {{if $item.plink}} - <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a></li> + <a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a> {{/if}} {{if $item.edpost}} - <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a></li> + <a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a> {{/if}} {{if $item.tagger}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a></li> + <a class="dropdown-item" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a> {{/if}} {{if $item.filer}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a></li> + <a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a> {{/if}} {{if $item.bookmark}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a></li> + <a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a> {{/if}} {{if $item.addtocal}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a></li> + <a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a> {{/if}} {{if $item.star}} - <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a></li> + <a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a> {{/if}} - {{if $item.thread_action_menu}} {{foreach $item.thread_action_menu as $mitem}} - <li role="presentation"><a role="menuitem" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a></li> + <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a> {{/foreach}} {{/if}} - {{if $item.drop.dropping}} - <li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a></li> + <a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a> {{/if}} - {{if $item.thread_author_menu}} - <li role="presentation" class="divider"></li> + <div class="dropdown-divider"></div> {{foreach $item.thread_author_menu as $mitem}} - <li role="presentation"><a role="menuitem" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li> + <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> {{/foreach}} {{/if}} - {{if $item.edpost && $item.dreport}} - <li role="presentation"><a role="menuitem" href="dreport/{{$item.mid}}">{{$item.dreport}}</a></li> + <a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a> {{/if}} - </ul> + </div> </div> </div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> @@ -196,47 +198,41 @@ <div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count && $item.attachments)}} btn-group{{/if}}"> {{if $item.attachments}} <div class="btn-group"> - <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-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> + <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}} {{foreach $item.responses as $verb=>$response}} {{if $response.count}} <div class="btn-group"> - <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button> - {{if $response.list_part}} - <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$item.id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> - {{else}} - <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$item.id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> - {{/if}} - {{if $response.list_part}} + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</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> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title">{{$response.title}}</h4> </div> <div class="modal-body response-list"> - <ul class="nav nav-pills nav-stacked">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + <ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul> </div> <div class="modal-footer clear"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> + {{else}} + <div class="dropdown-menu">{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}</div> {{/if}} </div> {{/if}} {{/foreach}} </div> {{/if}} - <div class="clear"></div> </div> - <div class="clear"></div> </div> - <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> {{if $item.toplevel}} {{foreach $item.children as $child}} @@ -244,10 +240,9 @@ {{/foreach}} {{/if}} {{if $item.comment}} - <div class="wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" > + <div class="p-2 wall-item-comment-wrapper{{if $item.children}} wall-item-comment-wrapper-wc{{/if}}" > {{$item.comment}} </div> - <div class="clear"></div> {{/if}} </div> {{if $item.comment_lastcollapsed}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index b1080af34..59153e41f 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -4,10 +4,10 @@ </div> <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> {{/if}} - <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper conv-list-mode{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}"> - <a name="{{$item.id}}" ></a> - <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > - <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> + <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}} item_{{$item.submid}}"> + <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}}"> {{if $item.photo}} <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> {{$item.photo}} @@ -18,39 +18,48 @@ {{$item.event}} </div> {{/if}} - <div class="wall-item-head"> + {{if $item.title && !$item.event}} + <div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}"> + {{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}} + </div> + {{if ! $item.is_new}} + <hr class="m-0"> + {{/if}} + {{/if}} + <div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > - <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> - <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> + <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> + <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> </div> - <div class="wall-item-photo-end" style="clear:both"></div> </div> - {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> - <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> - </div> - {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> - <i class="fa fa-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + <i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i> + <div id="panel-{{$item.id}}" class="dropdown-menu"></div> </div> {{/if}} <div class="wall-item-author"> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}} </div> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> - {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span 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}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> - <div class="clear"></div> </div> - <div class="{{if $item.is_photo}}wall-photo-item{{else}}wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}"> - <div class="wall-item-body" id="wall-item-body-{{$item.id}}" > + + {{if $item.body}} + <div class="p-2 wall-item-content clearfix" id="wall-item-content-{{$item.id}}"> + <div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" > {{$item.body}} </div> - <div class="clear"></div> </div> + {{/if}} {{if $item.has_tags}} - <div class="wall-item-tools"> + <div class="p-2 wall-item-tools clearfix"> + + <div class="body-tags"> + <span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span> + </div> + {{** {{if $item.mentions}} <div class="body-tags" id="item-mentions"> <span class="tag">{{$item.mentions}}</span> @@ -63,7 +72,7 @@ {{/if}} {{if $item.categories}} <div class="body-tags" id="item-categories"> - <span class="tag">{{$item.categories}}</span> + <span class="tag p-category">{{$item.categories}}</span> </div> {{/if}} {{if $item.folders}} @@ -71,101 +80,134 @@ <span class="tag">{{$item.folders}}</span> </div> {{/if}} - <div class="clear"></div> + **}} </div> {{/if}} - - <div class="wall-item-tools"> - <div class="wall-item-tools-right btn-group pull-right"> - {{if $item.like}} - <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false"> - <i class="fa fa-thumbs-o-up" title="{{$item.like.0}}"></i> - </button> - {{/if}} - {{if $item.dislike}} - <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false"> - <i class="fa fa-thumbs-o-down" title="{{$item.dislike.0}}"></i> - </button> - {{/if}} - - {{if $item.isevent}} - <button type="button" title="{{$item.attend.0}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;"> - <i class="fa fa-check" ></i> - </button> - <button type="button" title="{{$item.attend.1}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendno'); return false;"> - <i class="fa fa-times" ></i> - </button> - <button type="button" title="{{$item.attend.2}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;"> - <i class="fa fa-question" ></i> - </button> - {{/if}} - - {{if $item.canvote}} - <button type="button" title="{{$item.conlabels.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'agree'); return false;"> - <i class="fa fa-check" ></i> - </button> - <button type="button" title="{{$item.conlabels.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'disagree'); return false;"> - <i class="fa fa-times" ></i> - </button> - <button type="button" title="{{$item.conlabels.2}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'abstain'); return false;"> - <i class="fa fa-question" ></i> - </button> + <div class="p-2 clearfix wall-item-tools"> + <div class="wall-item-tools-right pull-right"> + {{if $item.toplevel && $item.emojis && $item.reactions}} + <div class="btn-group dropdown"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}"> + <i class="fa fa-smile-o"></i> + </button> + <div class="dropdown-menu dropdown-menu-right"> + {{foreach $item.reactions as $react}} + <a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a> + {{/foreach}} + </div> + </div> {{/if}} - - <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> - <i class="fa fa-caret-down"></i> - </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> - {{if $item.share}} - <li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="fa fa-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li> - {{/if}} - {{if $item.plink}} - <li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="fa fa-external-link"></i> {{$item.plink.title}}</a></li> - {{/if}} - {{if $item.edpost}} - <li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost fa fa-pencil"></i> {{$item.edpost.1}}</a></li> - {{/if}} - {{if $item.tagger}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="fa fa-tag" title="{{$item.tagger.tagit}}"></i> {{$item.tagger.tagit}}</a></li> - {{/if}} - {{if $item.filer}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="fa fa-folder-open" title="{{$item.filer}}"></i> {{$item.filer}}</a></li> - {{/if}} - {{if $item.bookmark}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="fa fa-bookmark" title="{{$item.bookmark}}"></i> {{$item.bookmark}}</a></li> - {{/if}} - {{if $item.addtocal}} - <li role="presentation"><a role="menuitem" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="fa fa-calendar" title="{{$item.addtocal}}"></i> {{$item.addtocal}}</a></li> + <div class="btn-group dropdown"> + {{if $item.like}} + <button type="button" title="{{$item.like.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'like'); return false;"> + <i class="fa fa-thumbs-o-up{{if $item.my_responses.like}} ivoted{{/if}}" ></i> + </button> {{/if}} - {{if $item.star}} - <li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="fa fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li> + {{if $item.dislike}} + <button type="button" title="{{$item.dislike.0}}" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;"> + <i class="fa fa-thumbs-o-down{{if $item.my_responses.dislike}} ivoted{{/if}}" ></i> + </button> {{/if}} - {{if $item.drop.dropping}} - <li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li> + {{if $item.isevent}} + <div class="btn-group dropdown"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}"> + <i class="fa fa-calendar-check-o"></i> + </button> + <div class="dropdown-menu"> + <a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;"> + <i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}} + </a> + <a class="dropdown-item" href="#" title="{{$item.attend.1}}" onclick="itemAddToCal({{$item.id}}), dolike({{$item.id}},'attendno'); return false;"> + <i class="item-act-list fa fa-times{{if $item.my_responses.attendno}} ivoted{{/if}}" ></i> {{$item.attend.1}} + </a> + <a class="dropdown-item" href="#" title="{{$item.attend.2}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;"> + <i class="item-act-list fa fa-question{{if $item.my_responses.attendmaybe}} ivoted{{/if}}" ></i> {{$item.attend.2}} + </a> + </div> + </div> {{/if}} - {{if $item.item_photo_menu}} - <li role="presentation" class="divider"></li> - {{$item.item_photo_menu}} + {{if $item.canvote}} + <div class="btn-group dropdown"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}"> + <i class="fa fa-check-square-o"></i> + </button> + <div class="dropdown-menu" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}"> + <a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;"> + <i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}} + </a> + <a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;"> + <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}} + </a> + <a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;"> + <i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}} + </a> + </div> + </div> {{/if}} - - </ul> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> + <i class="fa fa-cog"></i> + </button> + <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> + {{if $item.share}} + <a class="dropdown-item" href="#" onclick="jotShare({{$item.id}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a> + {{/if}} + {{if $item.plink}} + <a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav fa fa-fw fa-external-link"></i>{{$item.plink.title}}</a> + {{/if}} + {{if $item.edpost}} + <a class="dropdown-item" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="generic-icons-nav fa fa-fw fa-pencil"></i>{{$item.edpost.1}}</a> + {{/if}} + {{if $item.tagger}} + <a class="dropdown-item" href="#" onclick="itemTag({{$item.id}}); return false;"><i id="tagger-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-tag" title="{{$item.tagger.tagit}}"></i>{{$item.tagger.tagit}}</a> + {{/if}} + {{if $item.filer}} + <a class="dropdown-item" href="#" onclick="itemFiler({{$item.id}}); return false;"><i id="filer-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-folder-open" title="{{$item.filer}}"></i>{{$item.filer}}</a> + {{/if}} + {{if $item.bookmark}} + <a class="dropdown-item" href="#" onclick="itemBookmark({{$item.id}}); return false;"><i id="bookmarker-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-bookmark" title="{{$item.bookmark}}"></i>{{$item.bookmark}}</a> + {{/if}} + {{if $item.addtocal}} + <a class="dropdown-item" href="#" onclick="itemAddToCal({{$item.id}}); return false;"><i id="addtocal-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-calendar" title="{{$item.addtocal}}"></i>{{$item.addtocal}}</a> + {{/if}} + {{if $item.star}} + <a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="generic-icons-nav fa fa-fw fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a> + {{/if}} + {{if $item.thread_action_menu}} + {{foreach $item.thread_action_menu as $mitem}} + <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="generic-icons-nav fa fa-fw fa-{{$mitem.icon}}"></i>{{$mitem.title}}</a> + {{/foreach}} + {{/if}} + {{if $item.drop.dropping}} + <a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a> + {{/if}} + {{if $item.thread_author_menu}} + <div class="dropdown-divider"></div> + {{foreach $item.thread_author_menu as $mitem}} + <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> + {{/foreach}} + {{/if}} + {{if $item.edpost && $item.dreport}} + <a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a> + {{/if}} + </div> + </div> </div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}"> {{if $item.attachments}} <div class="btn-group"> - <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> + <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> <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"> - <button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;"> + <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}} - </button> + </a> </div> {{if $item.unseen_comments}} <div class="unseen-wall-indicator-{{$item.id}} btn-group"> - <button class="btn btn-default btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"> <i class="fa fa-check-square-o"></i> </button> </div> @@ -174,40 +216,34 @@ {{foreach $item.responses as $verb=>$response}} {{if $response.count}} <div class="btn-group"> - <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button> - {{if $response.list_part}} - <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$item.id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> - {{else}} - <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$item.id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> - {{/if}} - {{if $response.list_part}} + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</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> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title">{{$response.title}}</h4> </div> - <div class="modal-body"> - <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> + <div class="modal-body response-list"> + <ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul> </div> <div class="modal-footer clear"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> + {{else}} + <div class="dropdown-menu">{{foreach $response.list as $liker}}{{$liker}}{{/foreach}}</div> {{/if}} </div> {{/if}} {{/foreach}} {{/if}} </div> - <div class="clear"></div> </div> - <div class="clear"></div> </div> - <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> {{if $item.comment_lastcollapsed}} diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index bc1f421bd..a9c384d2f 100755 --- a/view/tpl/cover_photo_widget.tpl +++ b/view/tpl/cover_photo_widget.tpl @@ -12,12 +12,9 @@ if($('#cover-photo').length && $(window).width() > 755) { if($(window).scrollTop() < $('#cover-photo').height()) { + $('.navbar').removeClass('fixed-top'); $('main').css('margin-top', - $('nav').outerHeight(true) + 'px'); - $('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px'); - $('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px'); - $('.navbar-fixed-top').css('position', 'relative'); $('main').css('opacity', 0); - $('header').hide(); } } else { @@ -28,12 +25,9 @@ $(window).scroll(function () { if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) { - $('header').fadeIn(); - $('main').css('opacity', 1); - $('aside').css('padding-top', aside_padding_top + 'px'); - $('section').css('padding-top', section_padding_top + 'px'); - $('.navbar-fixed-top').css('position', ''); + $('.navbar').addClass('fixed-top'); $('main').css('margin-top', ''); + $('main').css('opacity', 1); coverSlid = true; } else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){ @@ -43,13 +37,9 @@ } else { if($(window).scrollTop() < $('#cover-photo').height()) { + $('.navbar').removeClass('fixed-top'); $('main').css('margin-top', - $('nav').outerHeight(true) + 'px'); - $('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px'); - $('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px'); - - $('.navbar-fixed-top').css('position', 'relative'); $('main').css('opacity', 0); - $('header').hide(); } } } @@ -61,10 +51,8 @@ $(window).resize(function () { if($('#cover-photo').length && $(window).width() < 755) { $('#cover-photo').remove(); + $('.navbar').addClass('fixed-top'); $('main').css('opacity', 1); - $('aside').css('padding-top', aside_padding_top + 'px'); - $('section').css('padding-top', section_padding_top + 'px'); - $('.navbar-fixed-top').css('position', ''); coverSlid = true; } @@ -82,11 +70,7 @@ <div id="cover-photo" title="{{$hovertitle}}"> {{$photo_html}} <div id="cover-photo-caption"> - <div class="cover-photo-title"> - {{$title}} - </div> - <div class="cover-photo-subtitle"> - {{$subtitle}} - </div> + <h1>{{$title}}</h1> + <h3>{{$subtitle}}</h3> </div> </div> diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl index dffeeafa0..bc7d46dc1 100644 --- a/view/tpl/design_tools.tpl +++ b/view/tpl/design_tools.tpl @@ -1,9 +1,9 @@ <div id="design-tools" class="widget design-tools"> -<h3>{{$title}}</h3> -<ul class="nav nav-pills nav-stacked"> -<li><a href="blocks/{{$who}}">{{$blocks}}</a></li> -<li><a href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a></li> -<li><a href="layouts/{{$who}}">{{$layout}}</a></li> -<li><a href="webpages/{{$who}}">{{$pages}}</a></li> -</ul> + <h3>{{$title}}</h3> + <div class="nav nav-pills flex-column"> + <a class="nav-link" href="blocks/{{$who}}">{{$blocks}}</a> + <a class="nav-link" href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a> + <a class="nav-link" href="layouts/{{$who}}">{{$layout}}</a> + <a class="nav-link" href="webpages/{{$who}}">{{$pages}}</a> + </div> </div> diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index c82fada45..71e991f3a 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,24 +1,22 @@ <div class="generic-content-wrapper"> - <div class="section-title-wrapper"> + <div class="section-title-wrapper clearfix"> <div class="btn-group pull-right"> - <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> <i class="fa fa-sort"></i> </button> - <ul class="dropdown-menu"> - <li><a href="directory?f=&order=date{{$suggest}}">{{$date}}</a></li> - <li><a href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a></li> - <li><a href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a></li> - <li><a href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a></li> - </ul> + <div class="dropdown-menu dropdown-menu-right"> + <a class="dropdown-item" href="directory?f=&order=date{{$suggest}}">{{$date}}</a> + <a class="dropdown-item" href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a> + <a class="dropdown-item" href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a> + <a class="dropdown-item" href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a> + </div> </div> <h2>{{$dirlbl}}{{if $search}}: {{$safetxt}}{{/if}}</h2> - <div class="clear"></div> </div> {{foreach $entries as $entry}} {{include file="direntry.tpl"}} {{/foreach}} <div id="page-end"></div> - <div class="clear"></div> </div> <script>$(document).ready(function() { loadingPage = false;});</script> <div id="page-spinner"></div> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index c9940a347..f7ec7db23 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,17 +1,17 @@ <div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" > - <div class="section-subtitle-wrapper"> + <div class="section-subtitle-wrapper clearfix"> <div class="pull-right"> {{if $entry.viewrate}} - {{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}} + {{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-outline-secondary btn-sm">{{$entry.total_ratings}}</a>{{/if}} {{/if}} {{if $entry.ignlink}} - <a class="directory-ignore btn btn-warning btn-xs" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a> + <a class="directory-ignore btn btn-warning btn-sm" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a> {{/if}} {{if $entry.connect}} - <a class="btn btn-success btn-xs" href="{{$entry.connect}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conn_label}}</a> + <a class="btn btn-success btn-sm" href="{{$entry.connect}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conn_label}}</a> {{/if}} {{if $entry.viewrate}} - {{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="fa fa-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" > *</span></button>{{/if}} + {{if $entry.canrate}}<button class="btn btn-outline-secondary btn-sm" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="fa fa-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" > *</span></button>{{/if}} {{/if}} </div> <h3>{{if $entry.public_forum}}<i class="fa fa-comments-o" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i> {{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="fa fa-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3> diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl index 8aa5e2cd1..1f5915609 100644 --- a/view/tpl/dreport.tpl +++ b/view/tpl/dreport.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> {{if $table == 'item'}} <div class="dropdown pull-right"> - <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$options}}"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$options}}"> <i class="fa fa-sort-desc"></i> </button> <ul class="dropdown-menu"> diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index 79a8f347f..b2ab5db4e 100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> {{if $delete}} <div class="pull-right"> - <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a> + <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-sm btn-danger" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a> </div> {{/if}} <h2>{{$title}}</h2> diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl index fe3cfc517..cc0bfc1c7 100755 --- a/view/tpl/event.tpl +++ b/view/tpl/event.tpl @@ -6,9 +6,9 @@ </div> {{$event.html}} <div class="event-buttons"> - {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="fa fa-external-link btn btn-default" ></i></a>{{/if}} - {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="fa fa-pencil btn btn-default"></i></a>{{/if}} - {{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="fa fa-trash-o btn btn-default"></i></a>{{/if}} + {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}} + {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="fa fa-pencil btn btn-outline-secondary"></i></a>{{/if}} + {{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a>{{/if}} </div> <div class="clear"></div> </div> diff --git a/view/tpl/event_cal.tpl b/view/tpl/event_cal.tpl index a88df6d18..d7662786b 100755 --- a/view/tpl/event_cal.tpl +++ b/view/tpl/event_cal.tpl @@ -6,7 +6,7 @@ </div> {{$event.html}} <div class="event-buttons"> - {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="fa fa-external-link btn btn-default" ></i></a>{{/if}} + {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="fa fa-external-link btn btn-outline-secondary" ></i></a>{{/if}} </div> <div class="clear"></div> </div> diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 8a06567c1..d07a06b67 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -32,35 +32,37 @@ {{/if}} <div class="form-group"> - <div id="event-desc-text"><b>{{$d_text}}</b></div> - <textarea id="comment-edit-text-desc" class="form-control" name="desc" >{{$d_orig}}</textarea> + <div class="form-group"> + <div id="event-desc-text"><b>{{$d_text}}</b></div> + <textarea id="comment-edit-text-desc" class="form-control" name="desc" >{{$d_orig}}</textarea> + </div> <div id="comment-tools-desc" class="comment-tools" style="display: block;" > <div id="comment-edit-bb-desc" class="btn-toolbar"> - <div class='btn-group'> - <button type="button" class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'desc');"> + <div class='btn-group mr-2'> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'desc');"> <i class="fa fa-bold comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'desc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'desc');"> <i class="fa fa-italic comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'desc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'desc');"> <i class="fa fa-underline comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('none','quote','desc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('none','quote','desc');"> <i class="fa fa-quote-left comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'desc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'desc');"> <i class="fa fa-terminal comment-icon"></i> </button> </div> <div class='btn-group'> - <button type="button" class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'desc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'desc');"> <i class="fa fa-camera comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'desc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'desc');"> <i class="fa fa-link comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'desc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'desc');"> <i class="fa fa-video-camera comment-icon"></i> </button> </div> @@ -68,38 +70,40 @@ </div> </div> <div class="form-group"> - <div id="event-location-text"><b>{{$l_text}}</b></div> - <textarea id="comment-edit-text-loc" class="form-control" name="location">{{$l_orig}}</textarea> + <div class="form-group"> + <div id="event-location-text"><b>{{$l_text}}</b></div> + <textarea id="comment-edit-text-loc" class="form-control" name="location">{{$l_orig}}</textarea> + </div> <div id="comment-tools-loc" class="comment-tools" style="display: block;" > <div id="comment-edit-bb-loc" class="btn-toolbar"> - <div class='btn-group'> - <button type="button" class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'loc');"> + <div class='btn-group mr-2'> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'loc');"> <i class="fa fa-bold comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'loc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$editalic}}" onclick="insertbbcomment('none','i', 'loc');"> <i class="fa fa-italic comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'loc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$eduline}}" onclick="insertbbcomment('none','u', 'loc');"> <i class="fa fa-underline comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('none','quote','loc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edquote}}" onclick="insertbbcomment('none','quote','loc');"> <i class="fa fa-quote-left comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'loc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edcode}}" onclick="insertbbcomment('none','code', 'loc');"> <i class="fa fa-terminal comment-icon"></i> </button> </div> <div class='btn-group'> - <button type="button" class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'loc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edimg}}" onclick="insertbbcomment('none','img', 'loc');"> <i class="fa fa-camera comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'loc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edurl}}" onclick="insertbbcomment('none','url', 'loc');"> <i class="fa fa-link comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'loc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edvideo}}" onclick="insertbbcomment('none','video', 'loc');"> <i class="fa fa-video-camera comment-icon"></i> </button> - <button type="button" class="btn btn-default btn-xs" title="{{$mapper}}" onclick="insertbbcomment('none','map','loc');"> + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$mapper}}" onclick="insertbbcomment('none','map','loc');"> <i class="fa fa-globe comment-icon"></i> </button> </div> @@ -111,13 +115,13 @@ <div class="clear"></div> - <button type="button" class="btn btn-default" onclick="openClose('advanced');">{{$advanced}}</button> - <div class="btn-group pull-right"> - <button id="event-edit-preview-btn" class="btn btn-default" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button> + <button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('advanced');">{{$advanced}}</button> + <div class="btn-group float-right"> + <button id="event-edit-preview-btn" class="btn btn-outline-secondary btn-sm" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button> {{if ! $eid}} - <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> {{/if}} - <button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button> + <button id="event-submit" class="btn btn-primary btn-sm" type="submit" name="submit">{{$submit}}</button> </div> </form> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 1d1b6f15b..3b2cb5041 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -50,6 +50,7 @@ $('#events-calendar').fullCalendar({ events: '{{$baseurl}}{{$module_url}}/json', header: false, + eventTextColor: 'white', lang: '{{$lang}}', firstDay: {{$first_day}}, diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 6299242ce..9d32c76be 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -2,20 +2,20 @@ <div class="section-title-wrapper"> <div class="pull-right"> <div class="dropdown"> - <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><i class="fa fa-caret-down"></i> {{$view_label}}</button> - <ul class="dropdown-menu"> - <li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li> - <li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li> - <li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li> - </ul> - <button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> {{$view_label}}</button> + <div class="dropdown-menu"> + <a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a> + <a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a> + <a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a> + </div> + <button class="btn btn-success btn-sm" onclick="openClose('form');">{{$new_event.1}}</button> <div class="btn-group"> - <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button> - <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button> - <button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button> + <button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button> + <button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button> + <button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button> </div> - <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> - <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> + <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> + <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> </div> </div> <h2 id="title"></h2> diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl index b7836cfab..ba9e16dd6 100755 --- a/view/tpl/events_cal-js.tpl +++ b/view/tpl/events_cal-js.tpl @@ -3,12 +3,12 @@ <div class="section-title-wrapper"> <div class="pull-right"> <div class="btn-group"> - <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button> - <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button> - <button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button> + <button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button> + <button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button> + <button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button> </div> - <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> - <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> + <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> + <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> </div> <h2 id="title"></h2> <div class="clear"></div> diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl index 4f5ef2eb0..e22f95c1e 100755 --- a/view/tpl/events_tools_side.tpl +++ b/view/tpl/events_tools_side.tpl @@ -1,15 +1,17 @@ <div class="widget"> <h3>{{$title}}</h3> - <ul class="nav nav-pills nav-stacked"> - <li><a href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i> {{$export}}</a></li> - <li><a href="#" onclick="openClose('event-upload-form'); return false;"><i class="fa fa-arrow-circle-o-up"></i> {{$import}}</a></li> + <ul class="nav nav-pills flex-column"> + <li class="nav-item"><a class="nav-link" href="#" onclick="exportDate(); return false;"><i class="fa fa-arrow-circle-o-down"></i> {{$export}}</a></li> + <li class="nav-item"><a class="nav-link" href="#" onclick="openClose('event-upload-form'); return false;"><i class="fa fa-arrow-circle-o-up"></i> {{$import}}</a></li> </ul> - <div id="event-upload-form" style="display: none;"> - <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form"> - <div class="form-group"> - <input id="event-upload-choose" type="file" name="userfile" /> - </div> - <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit" >{{$submit}}</button> - </form> + <div id="event-upload-form" class="sub-menu-wrapper"> + <div class="sub-menu"> + <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form"> + <div class="form-group"> + <input id="event-upload-choose" class="form-control-file w-100" type="file" name="userfile" /> + </div> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + </form> + </div> </div> </div> diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index 6785e522a..f779f937c 100755 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,6 +1,5 @@ - <div id="{{$field.0}}_container" class="form-group field checkbox"> + <div id="{{$field.0}}_container" class="clearfix form-group checkbox"> <label for="id_{{$field.0}}">{{$field.1}}</label> - <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> - <span class="help-block">{{$field.3}}</span> + <div class="float-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> + <small class="form-text text-muted">{{$field.3}}</small> </div> - <div class="clear"></div> diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl index 523595c0b..12d00a08d 100755 --- a/view/tpl/field_combobox.tpl +++ b/view/tpl/field_combobox.tpl @@ -1,17 +1,18 @@ - <div class='field combobox input form-group'> - <label class="mainlabel" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> - {{* - <input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" > - <datalist id="data_{{$field.0}}" > - {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}} - </datalist>*}} - - <input id="id_{{$field.0}}" class="form-control" type="text" value="{{$field.2}}"> - <select id="select_{{$field.0}}" class="form-control" onChange="$('#id_{{$field.0}}').val($(this).val())"> - <option value="">{{$field.5}}</option> - {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}} - </select> - - <span class='field_help'>{{$field.3}}</span> - </div> +<div class="form-group"> + <label class="" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> + <input class="form-control" id="id_{{$field.0}}" type="text" list="data_{{$field.0}}"{{if $field.5}} {{$field.5}}{{/if}}> + <datalist id="data_{{$field.0}}" > + {{foreach $field.4 as $opt=>$val}} + <option value="{{$val}}"> + {{/foreach}} + </datalist> + {{** + <input id="id_{{$field.0}}" class="form-control" type="text" value="{{$field.2}}"> + <select id="select_{{$field.0}}" class="form-control" onChange="$('#id_{{$field.0}}').val($(this).val())"> + <option value="">{{$field.5}}</option> + {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}} + </select> + **}} + <span class='field_help'>{{$field.3}}</span> +</div> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index d6a7f56b2..65a837e5f 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,6 +1,5 @@ - <div id="id_{{$field.0}}_wrapper" class='form-group field input'> - <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> - <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> - <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> - <div class="clear"></div> + <div id="id_{{$field.0}}_wrapper" class="form-group"> + <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> + <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> + <small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index 565f97760..abfe6e189 100755 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,6 +1,5 @@ - <div class="form-group field checkbox"> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.5}}{{$field.5.1}}{{/if}}' data-off='{{if $field.5}}{{$field.5.0}}{{/if}}'></span><span class="onoffswitch-switch"></span> </label></div> - <span class='help-block'>{{$field.4}}</span> + <div class="clearfix form-group checkbox"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <div class="pull-right"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for="id_{{$field.0}}"> <span class="onoffswitch-inner" data-on="{{if $field.5}}{{$field.5.1}}{{/if}}" data-off="{{if $field.5}}{{$field.5.0}}{{/if}}"></span><span class="onoffswitch-switch"></span> </label></div> + <small class="form-text text-muted">{{$field.4}}</small> </div> - <div class="clear"></div> diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index 1643fa855..fa5e14582 100755 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,5 +1,5 @@ - <div class='form-group field password'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <input class="form-control" type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} - <span id="help_{{$field.0}}" class="help-block">{{$field.3}}</span> + <div class="form-group"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 762447290..cda9a823a 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,7 +1,7 @@ - <div class='form-group field select'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> + <div class="form-group"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> - <span class='help-block'>{{$field.3}}</span> + <small class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index 01fdc23f5..437dece93 100755 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,5 +1,5 @@ - <div class='form-group field textarea'> - <label for='id_{{$field.0}}'>{{$field.1}}</label> - <textarea class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> - <span class='help-block'>{{$field.3}}</span> + <div class="form-group"> + <label for="id_{{$field.0}}">{{$field.1}}</label> + <textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> + <small class="form-text text-muted">{{$field.3}}</small> </div> diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl index f5a909833..8a4cda55b 100755 --- a/view/tpl/field_yesno.tpl +++ b/view/tpl/field_yesno.tpl @@ -1,4 +1,4 @@ - <div class='field yesno'> + <div class='clearfix form-group'> <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <div class='onoff' id="id_{{$field.0}}_onoff"> <input type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> @@ -9,5 +9,5 @@ {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}} </a> </div> - <span class='field_help'>{{$field.3}}</span> + <small class='form-text text-muted'>{{$field.3}}</small> </div> diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl index a92440cb0..a6a69b89c 100755 --- a/view/tpl/fileas_widget.tpl +++ b/view/tpl/fileas_widget.tpl @@ -2,10 +2,10 @@ <h3>{{$title}}</h3> <div id="nets-desc">{{$desc}}</div> - <ul class="nav nav-pills nav-stacked"> - <li><a href="{{$base}}"{{if $sel_all}} class="fileas-selected"{{/if}}>{{$all}}</a></li> + <ul class="nav nav-pills flex-column"> + <li class="nav-item"><a class="nav-link{{if $sel_all}} active{{/if}}" href="{{$base}}">{{$all}}</a></li> {{foreach $terms as $term}} - <li><a href="{{$base}}?f=&file={{$term.name}}"{{if $term.selected}} class="fileas-selected"{{/if}}>{{$term.name}}</a></li> + <li class="nav-item"><a class="nav-link{{if $term.selected}} active{{/if}}" href="{{$base}}?f=&file={{$term.name}}">{{$term.name}}</a></li> {{/foreach}} </ul> diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl index 71e075958..61860d10f 100755 --- a/view/tpl/filer_dialog.tpl +++ b/view/tpl/filer_dialog.tpl @@ -1,6 +1,19 @@ -<div class="item-filer-dialog"> -{{include file="field_combobox.tpl"}} -<div class="settings-submit-wrapper" > - <input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" /> -</div> +<div class="modal" id="item-filer-dialog"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <h4 class="modal-title">{{$title}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + </div> + <div class="modal-body"> + {{include file="field_combobox.tpl"}} + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-secondary" data-dismiss="modal">{{$cancel}}</button> + <button id="filer_save" type="button" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> </div> diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index a211a65b6..4def1415d 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -2,9 +2,9 @@ <h3>{{$connect}}</h3> <form action="follow" method="post" /> <div class="input-group"> - <input class="form-control input-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" /> + <input class="form-control form-control-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" /> <div class="input-group-btn"> - <button class="btn btn-success btn-sm" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button> + <button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button> </div> </div> </form> diff --git a/view/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl index d7c234a84..67801e666 100755 --- a/view/tpl/generic_links_widget.tpl +++ b/view/tpl/generic_links_widget.tpl @@ -2,9 +2,9 @@ {{if $title}}<h3>{{$title}}</h3>{{/if}} {{if $desc}}<div class="desc">{{$desc}}</div>{{/if}} - <ul class="nav nav-pills nav-stacked"> + <ul class="nav nav-pills flex-column"> {{foreach $items as $item}} - <li><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li> + <li class="nav-item"><a href="{{$item.url}}" class="nav-link{{if $item.selected}} active{{/if}}">{{$item.label}}</a></li> {{/foreach}} </ul> diff --git a/view/tpl/generic_modal.tpl b/view/tpl/generic_modal.tpl index 2bbea42b3..18279b6f7 100644 --- a/view/tpl/generic_modal.tpl +++ b/view/tpl/generic_modal.tpl @@ -2,12 +2,12 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h4 class="modal-title" id="generic-modal-title-{{$id}}">{{$title}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body" id="generic-modal-body-{{$id}}"></div> <div class="modal-footer"> - <button id="generic-modal-cancel-{{$id}}" type="button" class="btn btn-default" data-dismiss="modal">{{$cancel}}</button> + <button id="generic-modal-cancel-{{$id}}" type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$cancel}}</button> {{if $ok}} <button id="generic-modal-ok-{{$id}}" type="button" class="btn btn-primary">{{$ok}}</button> {{/if}} diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl index 34d0096e0..627debc80 100755 --- a/view/tpl/group_drop.tpl +++ b/view/tpl/group_drop.tpl @@ -2,6 +2,6 @@ <a href="group/drop/{{$id}}?t={{$form_security_token}}" onclick="return confirmDelete();" id="group-delete-icon-{{$id}}" - class="group-delete-icon btn btn-default" title="{{$delete}}" ><i class="fa fa-trash-o drop-icons"></i></a> + class="group-delete-icon btn btn-outline-secondary" title="{{$delete}}" ><i class="fa fa-trash-o drop-icons"></i></a> </div> <div class="group-delete-end"></div> diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 35f79a07e..14f714ae9 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -1,20 +1,20 @@ <div class="widget" id="group-sidebar"> <h3>{{$title}}</h3> <div> - <ul class="nav nav-pills nav-stacked"> + <ul class="nav nav-pills flex-column"> {{foreach $groups as $group}} - <li> + <li class="nav-item nav-item-hack"> {{if $group.cid}} - <i id="group-{{$group.id}}" class="widget-nav-pills-checkbox fa {{if $group.ismember}}fa-check-square-o{{else}}fa-square-o{{/if}}" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"></i> + <i id="group-{{$group.id}}" class="widget-nav-pills-checkbox fa fa-fw {{if $group.ismember}}fa-check-square-o{{else}}fa-square-o{{/if}}" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"></i> {{/if}} {{if $group.edit}} - <a href="{{$group.edit.href}}" class="widget-nav-pills-icons" title="{{$edittext}}"><i class="fa fa-pencil"></i></a> + <a href="{{$group.edit.href}}" class="nav-link{{if $group.selected}} active{{/if}} widget-nav-pills-icons" title="{{$edittext}}"><i class="fa fa-fw fa-pencil"></i></a> {{/if}} - <a{{if $group.selected}} class="group-selected"{{/if}} href="{{$group.href}}">{{$group.text}}</a> + <a class="nav-link{{if $group.selected}} active{{/if}}" href="{{$group.href}}">{{$group.text}}</a> </li> {{/foreach}} - <li> - <a href="group/new" title="{{$createtext}}" ><i class="fa fa-plus-circle"></i> {{$createtext}}</a> + <li class="nav-item"> + <a class="nav-link" href="group/new" title="{{$createtext}}" ><i class="fa fa-plus-circle"></i> {{$createtext}}</a> </li> </ul> diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index 577269b6f..cccee2229 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,3 @@ -<div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> - -<ul id="nav-notifications-template" rel="template"> - <li class="{5}"><a href="{0}" title="{2} {3}"><img class="dropdown-menu-img-sm" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span><div class="clear"></div></a></li> -</ul> +<div id="nav-notifications-template" rel="template"> + <a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}"><img class="menu-img-3" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a> +</div> diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index 10e0a4957..43b061dcc 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -5,7 +5,7 @@ <div class="section-content-wrapper" id="doco-content"> <h3 id="doco-top-toc-heading"> <span class="fakelink" onclick="docoTocToggle(); return false;"> - <i class="fakelink fa fa-caret-right" id="doco-toc-toggle"></i> + <i class="fa fa-fw fa-caret-right fakelink" id="doco-toc-toggle"></i> {{$tocHeading}} </span> </h3> @@ -22,7 +22,7 @@ function docoTocToggle() { if($('#doco-top-toc').is(':visible')) { - $('#doco-toc-toggle').removeClass('fa-caret-down').addClass('fa-caret-right'); + $('#doco-toc-toggle').removeClass('fa-cog').addClass('fa-caret-right'); } else { $('#doco-toc-toggle').removeClass('fa-caret-right').addClass('fa-caret-down'); } diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl index 83cc9a3cd..95e38c0bd 100644 --- a/view/tpl/item_attach.tpl +++ b/view/tpl/item_attach.tpl @@ -1,5 +1,5 @@ {{if $attaches}} {{foreach $attaches as $a}} -<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="fa {{$a.icon}} attach-icons"></i> {{$a.label}}</a></li> +<a class="dropdown-item" href="{{$a.url}}" title="{{$a.title}}"><i class="fa {{$a.icon}} attach-icons"></i> {{$a.label}}</a> {{/foreach}} {{/if}} diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl index 9ff291747..e1b183c0d 100644 --- a/view/tpl/item_categories.tpl +++ b/view/tpl/item_categories.tpl @@ -1,8 +1,8 @@ {{if $categories}} -<div class="categorytags"> +<!--div class="categorytags"--> {{foreach $categories as $cat}} -<span class="item-category"><i class="fa fa-asterisk cat-icons"></i>{{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span> +<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i> {{if $cat.url}}<a class="text-white" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span> {{/foreach}} -</div> +<!--/div--> {{/if}} diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl index 0cde5caf7..4eb621f93 100644 --- a/view/tpl/item_filer.tpl +++ b/view/tpl/item_filer.tpl @@ -1,8 +1,8 @@ {{if $categories}} -<div class="filesavetags"> +<!--div class="filesavetags"--> {{foreach $categories as $cat}} -<span class="item-category"><i class="fa fa-folder cat-icons"></i> {{$cat.term}} <a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="fa fa-trash-o drop-icons"></i></a></span> +<span class="item-category badge badge-pill badge-danger"><i class="fa fa-folder-o"></i> {{$cat.term}} <a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}"><i class="fa fa-close"></i></a></span> {{/foreach}} -</div> +<!--/div--> {{/if}} diff --git a/view/tpl/item_import.tpl b/view/tpl/item_import.tpl index 65de7fcaf..e976417e1 100755 --- a/view/tpl/item_import.tpl +++ b/view/tpl/item_import.tpl @@ -1,7 +1,7 @@ <h2>{{$title}}</h2> <form action="import_items" method="post" enctype="multipart/form-data" id="import-channel-form"> - + <input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <div id="import-desc" class="descriptive-paragraph">{{$desc}}</div> <label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label> @@ -10,6 +10,4 @@ <input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" /> <div id="import-submit-end" class="import-field-end"></div> - </form> - diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index d846f3e34..1cc5a898a 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -10,7 +10,7 @@ function initEditor(cb){ {{$geotag}} if(plaintext == 'none') { $("#profile-jot-text-loading").spin(false).hide(); - $("#profile-jot-text").css({ 'height': 200, 'color': '#000', 'line-height': 'inherit' }); + $("#profile-jot-text").css({ 'height': 200 }); {{if $bbco_autocomplete}} $("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode {{/if}} @@ -340,18 +340,12 @@ function enableOnUser(){ } function itemFiler(id) { - - var bordercolor = $("input").css("border-color"); + if($('#item-filer-dialog').length) + $('#item-filer-dialog').remove(); $.get('filer/', function(data){ - $.colorbox({html:data}); - $("#id_term").keypress(function(){ - $(this).css("border-color",bordercolor); - }) - $("#select_term").change(function(){ - $("#id_term").css("border-color",bordercolor); - }) - + $('body').append(data); + $('#item-filer-dialog').modal('show'); $("#filer_save").click(function(e){ e.preventDefault(); reply = $("#id_term").val(); @@ -362,9 +356,7 @@ function enableOnUser(){ // if(timer) clearTimeout(timer); // timer = setTimeout(NavUpdate,3000); liking = 1; - $.colorbox.close(); - } else { - $("#id_term").css("border-color","#FF0000"); + $('#item-filer-dialog').modal('hide'); } return false; }); @@ -428,7 +420,7 @@ function enableOnUser(){ }); getPhotoAlbumList(); $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal(); + $('#embedPhotoModal').modal('show'); }; var choosePhotoFromAlbum = function (album) { @@ -437,13 +429,13 @@ function enableOnUser(){ if (data['status']) { $('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); $('#embedPhotoModalBodyAlbumDialog').html('\ - <div><ul class="nav">\n\ - <li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ + <div><div class="nav nav-pills flex-column">\n\ + <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ <i class="fa fa-chevron-left"></i> \n\ {{$modaldiffalbum}}\n\ </a>\n\ </li>\n\ - </ul><br></div>') + </div><br></div>') $('#embedPhotoModalBodyAlbumDialog').append(data['content']); $('#embedPhotoModalBodyAlbumDialog').click(function (evt) { evt.preventDefault(); @@ -453,8 +445,8 @@ function enableOnUser(){ $(imageparent).toggleClass('embed-photo-selected-photo'); } }); - $('#embedPhotoModalBodyAlbumListDialog').addClass('hide'); - $('#embedPhotoModalBodyAlbumDialog').removeClass('hide'); + $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); + $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); $('#embed-photo-OKButton').click(function () { $('.embed-photo-selected-photo').each(function (index) { var href = $(this).attr('href'); @@ -487,17 +479,17 @@ function enableOnUser(){ if (data['status']) { var albums = data['albumlist']; //JSON.parse(data['albumlist']); $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}"); - $('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>'); + $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>'); for(var i=0; i<albums.length; i++) { var albumName = albums[i].text; var jsAlbumName = albums[i].jstext; - var albumLink = '<li>'; - albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; + var albumLink = '<li class="nav-item">'; + albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; albumLink += '</li>'; $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); } - $('#embedPhotoModalBodyAlbumDialog').addClass('hide'); - $('#embedPhotoModalBodyAlbumListDialog').removeClass('hide'); + $('#embedPhotoModalBodyAlbumDialog').addClass('d-none'); + $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none'); } else { window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 991873daa..dbbb470c5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -6,7 +6,7 @@ <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} </div> {{/if}} - <div id="profile-jot-wrapper"> + <div class="mb-4" id="profile-jot-wrapper"> {{if $parent}} <input type="hidden" name="parent" value="{{$parent}}" /> {{/if}} @@ -31,7 +31,7 @@ </div> {{/if}} <div id="jot-title-wrap" class="jothidden"> - <input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex=1 value="{{$title}}"> + <input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}"> </div> {{if $catsenabled}} <div id="jot-category-wrap" class="jothidden"> @@ -39,147 +39,150 @@ </div> {{/if}} <div id="jot-text-wrap"> - <textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex=2 placeholder="{{$share}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$content}}</textarea> + <textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$share}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$content}}</textarea> </div> {{if $attachment}} <div id="jot-attachment-wrap"> <input class="jot-attachment" name="attachment" id="jot-attachment" type="text" value="{{$attachment}}" readonly="readonly" onclick="this.select();"> </div> {{/if}} - <div id="profile-jot-submit-wrapper" class="jothidden"> - <div id="profile-jot-submit-left" class="btn-toolbar pull-left"> + <div id="profile-jot-submit-wrapper" class="clearfix p-2 jothidden"> + <div id="profile-jot-submit-left" class="btn-toolbar float-left"> {{if $bbcode}} - <div class="btn-group"> - <button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;"> + <div class="btn-group mr-2"> + <button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;"> <i class="fa fa-bold jot-icons"></i> </button> - <button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;"> + <button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;"> <i class="fa fa-italic jot-icons"></i> </button> - <button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;"> + <button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;"> <i class="fa fa-underline jot-icons"></i> </button> - <button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;"> + <button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;"> <i class="fa fa-quote-left jot-icons"></i> </button> - <button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;"> + <button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;"> <i class="fa fa-terminal jot-icons"></i> </button> </div> {{/if}} {{if $visitor}} - <div class="btn-group hidden-xs hidden-sm"> + <div class="btn-group mr-2 d-none d-lg-flex"> {{if $writefiles}} - <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" > + <button id="wall-file-upload" class="btn btn-outline-secondary btn-sm" title="{{$attach}}" > <i id="wall-file-upload-icon" class="fa fa-paperclip jot-icons"></i> </button> {{/if}} {{if $weblink}} - <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"> + <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;"> <i id="profile-link" class="fa fa-link jot-icons"></i> </button> {{/if}} {{if $embedPhotos}} - <button id="embed-photo-wrapper" class="btn btn-default btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;"> + <button id="embed-photo-wrapper" class="btn btn-outline-secondary btn-sm" 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 hidden-xs hidden-sm"> + <div class="btn-group mr-2 d-none d-lg-flex"> {{if $setloc}} - <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> + <button id="profile-location-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> <i id="profile-location" class="fa fa-globe jot-icons"></i> </button> {{/if}} {{if $clearloc}} - <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> + <button id="profile-nolocation-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$clearloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> <i id="profile-nolocation" class="fa fa-circle-o jot-icons"></i> </button> {{/if}} {{else}} - <div class="btn-group hidden-xs hidden-sm"> + <div class="btn-group d-none d-lg-flex"> {{/if}} {{if $feature_expire}} - <button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> + <button id="profile-expire-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> <i id="profile-expires" class="fa fa-eraser jot-icons"></i> </button> {{/if}} {{if $feature_future}} - <button id="profile-future-wrapper" class="btn btn-default btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;"> + <button id="profile-future-wrapper" class="btn btn-outline-secondary btn-sm" 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 id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"> + <button id="profile-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"> <i id="profile-encrypt" class="fa fa-key jot-icons"></i> </button> {{/if}} {{if $feature_voting}} - <button id="profile-voting-wrapper" class="btn btn-default btn-sm" title="{{$voting}}" onclick="toggleVoting();return false;"> + <button id="profile-voting-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$voting}}" onclick="toggleVoting();return false;"> <i id="profile-voting" class="fa fa-square-o jot-icons"></i> </button> {{/if}} {{if $feature_nocomment}} - <button id="profile-nocomment-wrapper" class="btn btn-default btn-sm" title="{{$nocommenttitle}}" onclick="toggleNoComment();return false;"> + <button id="profile-nocomment-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$nocommenttitle}}" onclick="toggleNoComment();return false;"> <i id="profile-nocomment" class="fa fa-comments jot-icons"></i> </button> {{/if}} </div> {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}} - <div class="btn-group visible-xs visible-sm"> - <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> - <i id="more-tools-icon" class="fa fa-caret-down jot-icons"></i> + <div class="btn-group d-lg-none"> + <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + <i id="more-tools-icon" class="fa fa-cog jot-icons"></i> </button> - <ul class="dropdown-menu" role="menu"> + <div class="dropdown-menu"> {{if $visitor}} {{if $writefiles}} - <li><a id="wall-file-upload-sub" href="#" ><i class="fa fa-paperclip"></i> {{$attach}}</a></li> + <a class="dropdown-item" id="wall-file-upload-sub" href="#" ><i class="fa fa-paperclip"></i> {{$attach}}</a> {{/if}} {{if $weblink}} - <li><a href="#" onclick="jotGetLink(); return false;"><i class="fa fa-link"></i> {{$weblink}}</a></li> + <a class="dropdown-item" href="#" onclick="jotGetLink(); return false;"><i class="fa fa-link"></i> {{$weblink}}</a> + {{/if}} + {{if $embedPhotos}} + <a class="dropdown-item" href="#" onclick="initializeEmbedPhotoDialog(); return false;"><i class="fa fa-file-image-o jot-icons"></i> {{$embedPhotos}}</a> {{/if}} {{if $setloc}} - <li><a href="#" onclick="jotGetLocation(); return false;"><i class="fa fa-globe"></i> {{$setloc}}</a></li> + <a class="dropdown-item" href="#" onclick="jotGetLocation(); return false;"><i class="fa fa-globe"></i> {{$setloc}}</a> {{/if}} {{if $clearloc}} - <li><a href="#" onclick="jotClearLocation(); return false;"><i class="fa fa-circle-o"></i> {{$clearloc}}</a></li> + <a class="dropdown-item" href="#" onclick="jotClearLocation(); return false;"><i class="fa fa-circle-o"></i> {{$clearloc}}</a> {{/if}} {{/if}} {{if $feature_expire}} - <li><a href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i> {{$expires}}</a></li> + <a class="dropdown-item" href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i> {{$expires}}</a> {{/if}} {{if $feature_future}} - <li><a href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i> {{$future_txt}}</a></li> + <a class="dropdown-item" href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i> {{$future_txt}}</a> {{/if}} {{if $feature_encrypt}} - <li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i> {{$encrypt}}</a></li> + <a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i> {{$encrypt}}</a> {{/if}} {{if $feature_voting}} - <li><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="fa fa-square-o"></i> {{$voting}}</a></li> + <a class="dropdown-item" href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="fa fa-square-o"></i> {{$voting}}</a> {{/if}} {{if $feature_nocomment}} - <li><a href="#" onclick="toggleNoComment(); return false;"><i id="profile-nocomment-sub" class="fa fa-comments"></i> {{$nocommenttitlesub}}</a></li> + <a class="dropdown-item" href="#" onclick="toggleNoComment(); return false;"><i id="profile-nocomment-sub" class="fa fa-comments"></i> {{$nocommenttitlesub}}</a> {{/if}} - </ul> + </div> </div> {{/if}} </div> - <div id="profile-rotator-wrapper"> + <div id="profile-rotator-wrapper" class="float-left"> <div id="profile-rotator"></div> </div> - <div id="profile-jot-submit-right" class="btn-group pull-right"> + <div id="profile-jot-submit-right" class="btn-group float-right"> {{if $preview}} - <button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}"> + <button class="btn btn-outline-secondary btn-sm" onclick="preview_post();return false;" title="{{$preview}}"> <i class="fa fa-eye jot-icons" ></i> </button> {{/if}} {{if $jotnets}} - <button id="dbtn-jotnets" class="btn btn-default btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}"> + <button id="dbtn-jotnets" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}"> <i class="fa fa-share-alt jot-icons"></i> </button> {{/if}} {{if $showacl}} - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons{{if $bang}} jot-lock-warn{{/if}}"></i> </button> {{/if}} @@ -187,7 +190,7 @@ </div> <div class="clear"></div> {{if $jotplugins}} - <div id="profile-jot-plugin-wrapper"> + <div id="profile-jot-plugin-wrapper" class="mt-2"> {{$jotplugins}} </div> {{/if}} @@ -196,22 +199,20 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body"> {{$jotnets}} </div> <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> {{/if}} </div> - <div id="profile-jot-text-loading"></div> - <div id="profile-jot-end" class="clear"></div> </div> </form> @@ -225,8 +226,8 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body form-group" style="width:90%"> <div class="date"> @@ -239,7 +240,7 @@ </script> </div> <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button> <button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> </div> </div><!-- /.modal-content --> @@ -252,8 +253,8 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body form-group" style="width:90%"> <div class="date"> @@ -266,7 +267,7 @@ </script> </div> <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button> <button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> </div> </div><!-- /.modal-content --> @@ -279,17 +280,17 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body" id="embedPhotoModalBody" > - <div id="embedPhotoModalBodyAlbumListDialog" class="hide"> + <div id="embedPhotoModalBodyAlbumListDialog" class="d-none"> <div id="embedPhotoModalBodyAlbumList"></div> </div> - <div id="embedPhotoModalBodyAlbumDialog" class="hide"></div> + <div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> <button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button> </div> </div><!-- /.modal-content --> diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl index d0b81af0c..1bbe14893 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -2,8 +2,8 @@ <div class="section-title-wrapper"> {{if $editor}} <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('layout-editor');"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> - <a href="{{$help.url}}" target="_blank" class="btn btn-xs btn-warning" title="{{$help.title}}"><i class="fa fa-info"></i> {{$help.text}}</a> + <button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('layout-editor');"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> + <a href="{{$help.url}}" target="_blank" class="btn btn-sm btn-warning" title="{{$help.title}}"><i class="fa fa-info"></i> {{$help.text}}</a> </div> {{/if}} <h2>{{$title}}</h2> @@ -24,8 +24,8 @@ <th width="1%"></th> <th width="1%"></th> <th width="1%"></th> - <th width="1%" class="hidden-xs">{{$created}}</th> - <th width="1%" class="hidden-xs">{{$edited}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$created}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$edited}}</th> </tr> {{foreach $pages as $key => $items}} {{foreach $items as $item}} @@ -55,10 +55,10 @@ <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a> {{/if}} </td> - <td class="hidden-xs"> + <td class="d-none d-md-table-cell"> {{$item.created}} </td> - <td class="hidden-xs"> + <td class="d-none d-md-table-cell"> {{$item.edited}} </td> </tr> diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl index 67f5868cb..e83b885fe 100755 --- a/view/tpl/like_noshare.tpl +++ b/view/tpl/like_noshare.tpl @@ -1,5 +1,5 @@ <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}"> - <i class="fa fa-thumbs-o-up item-tool btn btn-default" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i> - <i class="fa fa-thumbs-o-down item-tool btn btn-default" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i> + <i class="fa fa-thumbs-o-up item-tool btn btn-outline-secondary" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i> + <i class="fa fa-thumbs-o-down item-tool btn btn-outline-secondary" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i> <div id="like-rotator-{{$id}}" class="like-rotator"></div> </div> diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index fe2d5ec84..a8c75b6a8 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -8,7 +8,7 @@ $.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; }); } </script> - <button class="btn btn-success btn-xs pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="fa fa-refresh"></i> {{$sync}}</button> + <button class="btn btn-success btn-sm pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="fa fa-refresh"></i> {{$sync}}</button> <h2>{{$header}}</h2> </div> <div class="section-content-wrapper-np"> @@ -22,7 +22,7 @@ <table id="locs-index"> <tr> <th>{{$addr}}</th> - <th class="hidden-xs hidden-sm">{{$loc}}</th> + <th class="d-none d-md-table-cell">{{$loc}}</th> <th>{{$mkprm}}</th> <th>{{$drop}}</th> </tr> @@ -30,7 +30,7 @@ {{if ! $hub.deleted }} <tr class="locs-index-row"> <td>{{$hub.hubloc_addr}}</td> - <td class="hidden-xs hidden-sm">{{$hub.hubloc_url}}</td> + <td class="d-none d-md-table-cell">{{$hub.hubloc_url}}</td> <td>{{if $hub.primary}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o primehub" onclick="primehub({{$hub.hubloc_id}}); return false;"></i>{{/if}}</td> <td><i class="fa fa-trash-o drophub" onclick="drophub({{$hub.hubloc_id}}); return false;"></i></td> </tr> diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index 249e13a04..759517b7f 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -1,47 +1,38 @@ -<div id="mail-{{$mail.id}}" class="mail-conv-outside-wrapper"> - <div class="mail-conv-sender" > - <a href="{{$mail.from_url}}"><img class="mail-conv-sender-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a> - </div> - <div class="mail-conv-detail"> - {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}} - <div class="mail-conv-sender-name"><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div> - <div class="mail-conv-date autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div> +<div id="mail-{{$mail.id}}" class="mb-2 clearfix mail-conv-outside-wrapper"> + <div class="mb-2 clearfix wall-item-head"> + <div class="wall-item-info" > + <a href="{{$mail.from_url}}"><img class="wall-item-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a> + </div> + <div class="mail-conv-detail"> + {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}} + <div class="wall-item-name"><a class="wall-item-name-link" href="{{$mail.from_url}}">{{$mail.from_name}}</a></div> + <div class="autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div> + </div> </div> - <div class="clear"></div> - <div class="mail-conv-content"> - <div class="mail-conv-body"> + <div class="clearfix mail-conv-content"> + <div class="clearfix mail-conv-body"> {{$mail.body}} - <div class="clear"></div> </div> {{if $mail.attachments}} - <div class="dropdown pull-left"> - <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-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}}">{{$mail.attachments}}</ul> + <div class="dropdown float-left"> + <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-fw fa-paperclip"></i></button> + <div class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</div> </div> {{/if}} - <div class="pull-right dropdown"> - <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}"> - <i class="fa fa-caret-down"></i> + <div class="float-right dropdown"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}"> + <i class="fa fa-cog"></i> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}"> + <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}"> {{if $mail.can_recall}} - <li> - <a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-undo mail-icons"></i> {{$mail.recall}}</a> - </li> + <a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i> {{$mail.recall}}</a> {{/if}} - <li> - <a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-trash-o mail-icons"></i> {{$mail.delete}}</a> - </li> + <a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i> {{$mail.delete}}</a> {{if $mail.can_recall}} - <li class="divider"></li> - <li> - <a href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a> - </li> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a> {{/if}} - </ul> - + </div> </div> - <div class="clear"></div> </div> - <div class="clear"></div> </div> diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 748c118ef..e8549a49b 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,10 +1,10 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> - <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> - <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> + <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> + <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> {{if $mailbox == 'combined'}} - <a class="btn btn-xs btn-danger" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a> + <a class="btn btn-sm btn-danger" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a> {{/if}} </div> <h2>{{$prvmsg_header}}</h2> diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl index d52fa40e0..aac592a5f 100755 --- a/view/tpl/mail_head.tpl +++ b/view/tpl/mail_head.tpl @@ -1,6 +1,6 @@ <div class="widget"> <h3>{{$header}}</h3> - <ul class="nav nav-pills nav-stacked"> + <ul class="nav nav-pills flex-column"> {{foreach $messages as $message}} {{include file="mail_list.tpl"}} {{/foreach}} diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index fc9b5afa8..827c7628f 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,5 +1,5 @@ -<li> - <a href="mail/{{$message.mailbox}}/{{$message.id}}" class="{{if $message.selected}}active{{/if}}"> +<li class="nav-item"> + <a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}"> <span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br> <span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br> <span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span> diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 28236ff15..84b16dc0b 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -3,7 +3,7 @@ <div class="section-title-wrapper"> {{if $menu_edit_link}} <div class="pull-right"> - <a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="fa fa-pencil-square-o"></i> {{$editcontents}}</a> + <a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-sm btn-success"><i class="fa fa-pencil-square-o"></i> {{$editcontents}}</a> </div> {{/if}} <h2>{{$header}}</h2> diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index f38619923..e23035062 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="fa fa-pencil-square-o"></i> {{$hintnew}}</button> + <button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-creator');"><i class="fa fa-pencil-square-o"></i> {{$hintnew}}</button> </div> <h2>{{$title}}</h2> <div class="clear"></div> @@ -19,8 +19,8 @@ <th width="1%"></th> <th width="1%"></th> <th width="1%"></th> - <th width="1%" class="hidden-xs">{{$created}}</th> - <th width="1%" class="hidden-xs">{{$edited}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$created}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$edited}}</th> </tr> {{foreach $menus as $m }} <tr id="menu-list-item-{{$m.menu_id}}"> @@ -30,8 +30,8 @@ <td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td> <td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a></td> <td class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> - <td class="hidden-xs">{{$m.menu_created}}</td> - <td class="hidden-xs">{{$m.menu_edited}}</td> + <td class="d-none d-md-table-cell">{{$m.menu_created}}</td> + <td class="d-none d-md-table-cell">{{$m.menu_edited}}</td> </tr> {{/foreach}} </table> diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index 6ea63c21e..2ac61bf76 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -1,9 +1,9 @@ <div class="widget"> <h3>{{$title}}</h3> - <ul class="nav nav-pills nav-stacked"> - <li><a href="{{$combined.url}}"{{if $combined.sel}} class="active"{{/if}}>{{$combined.label}}</a></li> - <li><a href="{{$inbox.url}}"{{if $inbox.sel}} class="active"{{/if}}>{{$inbox.label}}</a></li> - <li><a href="{{$outbox.url}}"{{if $outbox.sel}} class="active"{{/if}}>{{$outbox.label}}</a></li> - <li><a href="{{$new.url}}"{{if $new.sel}} class="active"{{/if}}>{{$new.label}}</a></li> + <ul class="nav nav-pills flex-column"> + <li class="nav-item"><a href="{{$combined.url}}" class="nav-link{{if $combined.sel}} active{{/if}}">{{$combined.label}}</a></li> + <li class="nav-item"><a href="{{$inbox.url}}" class="nav-link{{if $inbox.sel}} active{{/if}}">{{$inbox.label}}</a></li> + <li class="nav-item"><a href="{{$outbox.url}}" class="nav-link{{if $outbox.sel}} active{{/if}}">{{$outbox.label}}</a></li> + <li class="nav-item"><a href="{{$new.url}}" class="nav-link{{if $new.sel}} active{{/if}}">{{$new.label}}</a></li> </ul> </div> diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index a06203244..9f696fc23 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -24,7 +24,7 @@ {{include file="field_checkbox.tpl" field=$newwin}} <div class="pull-right form-group"> <div class="btn-group"> - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{if $submit_more}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 90388ece2..b28cdfc7e 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="fa fa-pencil-square-o"></i> {{$hintnew}}</button> + <button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-element-creator');"><i class="fa fa-pencil-square-o"></i> {{$hintnew}}</button> </div> <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2> <div class="clear"></div> @@ -23,7 +23,7 @@ <tr id="mitem-list-item-{{$m.mitem_id}}"> <td width="1%">{{$m.mitem_desc}}</td> <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> - <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> + <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td> <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> </tr> diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index d0c741bf4..dd2a67a63 100755 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -1,18 +1,17 @@ <div class="generic-content-wrapper"> - <div class="section-title-wrapper"> + <div class="section-title-wrapper clearfix"> {{if $authed}} {{if $create}} - <a href="appman" class="pull-right btn btn-success btn-xs"><i class="fa fa-pencil-square-o"></i> {{$create}}</a> + <a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i> {{$create}}</a> {{else}} - <a href="apps/edit{{if $cat}}/?f=&cat={{$cat}}{{/if}}" class="pull-right btn btn-primary btn-xs">{{$manage}}</a> + <a href="apps/edit{{if $cat}}/?f=&cat={{$cat}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a> {{/if}} {{/if}} <h2>{{$title}}{{if $cat}} - {{$cat}}{{/if}}</h2> </div> - <div class="section-content-wrapper"> + <div class="clearfix section-content-wrapper"> {{foreach $apps as $ap}} {{$ap}} {{/foreach}} - <div class="clear"></div> </div> </div> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 0581989ec..5c301b4d2 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,215 +1,246 @@ -<div class="container-fluid"> - <div class="navbar-header dropdown"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-2"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> +{{if $nav.login && !$userinfo}} +<div class="d-md-none p-1"> + <a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login"> + {{$nav.loginmenu.1.1}} + </a> + {{if $nav.register}} + <a class="btn btn-warning btn-sm text-white" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" > + {{$nav.register.1}} + </a> + {{/if}} +</div> +{{/if}} +{{if $userinfo}} +<div class="dropdown usermenu"> + <div class="fakelink" data-toggle="dropdown"> + <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> + <i class="fa fa-caret-down"></i> + </div> + {{if $localuser}} + <div class="dropdown-menu"> + {{foreach $nav.usermenu as $usermenu}} + <a class="dropdown-item" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a> + {{/foreach}} + {{if $nav.manage}} + <a class="dropdown-item" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a> + {{/if}} + {{if $nav.channels}} + {{foreach $nav.channels as $chan}} + <a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a> + {{/foreach}} + {{/if}} + {{if $nav.profiles}} + <a class="dropdown-item" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a> + {{/if}} + {{if $nav.settings}} + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a> + {{/if}} + {{if $nav.admin}} + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a> + {{/if}} + {{if $nav.logout}} + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a> + {{/if}} + </div> + {{else}} + {{if $nav.rusermenu}} + <div class="dropdown-menu" role="menu" aria-labelledby="avatar"> + <a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a> + <a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a> + </div> + {{/if}} + {{/if}} +</div> +{{/if}} +<div class="navbar-toggler-right"> + {{if $nav.help.6}} + <button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;"> + <i class="fa fa-question-circle"></i> + </button> + {{/if}} + <button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1"> + <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> + </button> + {{if $localuser}} + <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1"> + <i class="fa fa-exclamation-circle"></i> + </button> + {{/if}} + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> + <i class="fa fa-bars"></i> + </button> +</div> +<div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="navbar-nav mr-auto"> + {{if $nav.network}} + <li class="nav-item dropdown net-button" style="display: none;"> + <a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu"> + <i class="fa fa-fw fa-th"></i> + <span class="badge badge-pill badge-default net-update"></span> + </a> + <div id="nav-network-menu" class="dropdown-menu" rel="network"> + <a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a> + <a class="dropdown-item" id="nav-network-mark-all"href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a> + {{$emptynotifications}} + </div> + </li> + {{/if}} + {{if $nav.home}} + <li class="nav-item dropdown home-button" style="display: none;"> + <a class="nav-link" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu"> + <i class="fa fa-fw fa-home"></i> + <span class="badge badge-pill badge-danger home-update"></span> + </a> + <div id="nav-home-menu" class="dropdown-menu" rel="home"> + <a class="dropdown-item" id="nav-home-see-all" href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a> + <a class="dropdown-item" id="nav-home-mark-all" href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a> + {{$emptynotifications}} + </div> + </li> + {{/if}} + {{if $nav.messages}} + <li class="nav-item dropdown mail-button" style="display: none;"> + <a class="nav-link" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu"> + <i class="fa fa-fw fa-envelope"></i> + <span class="badge badge-pill badge-danger mail-update"></span> + </a> + <div id="nav-messages-menu" class="dropdown-menu" rel="messages"> + <a class="dropdown-item" id="nav-messages-see-all" href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a> + <a class="dropdown-item" id="nav-messages-mark-all" href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a> + {{$emptynotifications}} + </div> + </li> + {{/if}} + {{if $nav.all_events}} + <li class="nav-item dropdown all_events-button" style="display: none;"> + <a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu"> + <i class="fa fa-fw fa-calendar"></i> + <span class="badge badge-pill badge-default all_events-update"></span> + </a> + <div id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> + <a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a> + <a class="dropdown-item" id="nav-all_events-mark-all" href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a> + {{$emptynotifications}} + </div> + </li> + {{/if}} + {{if $nav.intros}} + <li class="nav-item dropdown intro-button" style="display: none;"> + <a class="nav-link" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu"> + <i class="fa fa-fw fa-users"></i> + <span class="badge badge-pill badge-danger intro-update"></span> + </a> + <div id="nav-intros-menu" class="dropdown-menu" rel="intros"> + <a class="dropdown-item" id="nav-intros-see-all" href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a> + {{$emptynotifications}} + </div> + </li> + {{/if}} + {{if $nav.notifications}} + <li class="nav-item dropdown notify-button" style="display: none;"> + <a class="nav-link" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu"> + <i class="fa fa-fw fa-exclamation"></i> + <span class="badge badge-pill badge-danger notify-update"></span> + </a> + <div id="nav-notify-menu" class="dropdown-menu" rel="notify"> + <a class="dropdown-item" id="nav-notify-see-all" href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a> + <a class="dropdown-item" id="nav-notify-mark-all" href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a> + {{$emptynotifications}} + </div> + </li> + {{/if}} {{if $nav.login && !$userinfo}} - <button type="button" class="navbar-toggle navbar-toggle-extra-left" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login"> - {{$nav.loginmenu.1.1}} - </button> + <li class="nav-item"> + <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a> + </li> + {{/if}} {{if $nav.register}} - <a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" class="navbar-toggle navbar-toggle-extra-left"> - {{$nav.register.1}} - </a> + <li class="nav-item {{$nav.register.2}} d-none d-md-flex"> + <a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a> + </li> {{/if}} + {{if $nav.alogout}} + <li class="nav-item {{$nav.alogout.2}} d-none d-md-flex"> + <a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a> + </li> {{/if}} - {{if $localuser}} - <button id="notifications-btn" type="button" class="navbar-toggle navbar-toggle-extra" data-toggle="collapse" data-target="#navbar-collapse-1" style="color: grey;"> - <i class="fa fa-exclamation-circle"></i> - </button> - {{/if}} - <button id="expand-tabs" type="button" class="navbar-toggle navbar-toggle-extra" data-toggle="collapse" data-target="#tabs-collapse-1"> - <i class="fa fa-arrow-circle-down" id="expand-tabs-icon"></i> - </button> - <button id="expand-aside" type="button" class="navbar-toggle navbar-toggle-extra" data-toggle="offcanvas" data-target="#region_1"> - <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> - </button> + </ul> + + <div id="banner" class="navbar-text d-none d-md-flex">{{$banner}}</div> + + <ul id="nav-right" class="navbar-nav ml-auto d-none d-md-flex"> + <li class="nav-item collapse clearfix" id="nav-search"> + <form class="form-inline" method="get" action="search" role="search"> + <input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder=" {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/> + </form> + <div id="nav-search-spinner"></div> + </li> + <li class="nav-item" id="nav-search-btn"> + <a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a> + </li> {{if $nav.help.6}} - <button id="context-help-btn" class="navbar-toggle navbar-toggle-extra" type="button" onclick="contextualHelp(); return false;"> - <i class="fa fa-question-circle"></i> - </button> - {{/if}} - {{if $userinfo}} - <div class="usermenu-head dropdown-toggle fakelink" data-toggle="dropdown"> - <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> - <span class="caret" id="usermenu-caret"></span> + <li class="nav-item dropdown {{$sel.help}}"> + <a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a> + </li> + {{/if}} + <li class="nav-item dropdown" id="app-menu"> + <a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a> + <div id="dropdown-menu" class="dropdown-menu dropdown-menu-right"> + {{if $channel_apps.0}} + {{foreach $channel_apps as $channel_app}} + {{$channel_app}} + {{/foreach}} + <div class="dropdown-header sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');"> + {{$sysapps_toggle}} + </div> + <div id="sys_apps" style="display:none;"> + {{/if}} + {{foreach $nav_apps as $nav_app}} + {{$nav_app}} + {{/foreach}} + {{if $channel_apps.0}} + </div> + {{/if}} + {{if $localuser}} + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> + {{/if}} + </div> + </li> + </ul> +</div> +<div class="collapse d-md-none" id="navbar-collapse-2"> + <div class="navbar-nav mr-auto"> + {{if $channel_apps.0}} + {{foreach $channel_apps as $channel_app}} + {{$channel_app|replace:'dropdown-item':'nav-link'}} + {{/foreach}} + <div class="dropdown-header sys-apps-toggle" onclick="openClose('sys-apps-collapsed');"> + {{$sysapps_toggle}} </div> - {{if $localuser}} - <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> - {{foreach $nav.usermenu as $usermenu}} - <li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a></li> - {{/foreach}} - {{if $nav.manage}} - <li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a></li> - {{/if}} - {{if $nav.channels}} - {{foreach $nav.channels as $chan}} - <li role="presentation" class="nav-channel-select"><a href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a></li> - {{/foreach}} - {{/if}} - <li role="presentation" class="divider"></li> - {{if $nav.profiles}} - <li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a></li> - {{/if}} - {{if $nav.settings}} - <li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a></li> - {{/if}} - {{if $nav.admin}} - <li role="presentation" class="divider"></li> - <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a></li> - {{/if}} - {{if $nav.logout}} - <li role="presentation" class="divider"></li> - <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a></li> - {{/if}} - </ul> - {{else}} - {{if $nav.rusermenu}} - <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> - <li role="presentation"><a href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a></li> - <li role="presentation"><a href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a></li> - </ul> + <div id="sys-apps-collapsed" style="display:none;"> {{/if}} + {{foreach $nav_apps as $nav_app}} + {{$nav_app|replace:'dropdown-item':'nav-link'}} + {{/foreach}} + {{if $channel_apps.0}} + </div> {{/if}} + {{if $localuser}} + <div class="dropdown-divider"></div> + <a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> {{/if}} </div> - <div class="collapse navbar-collapse" id="navbar-collapse-1"> - <ul class="nav navbar-nav navbar-left"> - {{if $nav.network}} - <li class="{{$sel.network}} net-button" style="display: none;"> - <a href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu"> - <i class="fa fa-fw fa-th"></i> - <span class="net-update badge"></span> - </a> - <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network"> - <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> - <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - {{if $nav.home}} - <li class="{{$sel.home}} home-button" style="display: none;"> - <a class="{{$nav.home.2}}" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu"> - <i class="fa fa-fw fa-home"></i> - <span class="home-update badge"></span> - </a> - <ul id="nav-home-menu" class="dropdown-menu" rel="home"> - <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> - <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - {{if $nav.messages}} - <li class="{{$sel.messages}} mail-button" style="display: none;"> - <a class="{{$nav.messages.2}}" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu"> - <i class="fa fa-fw fa-envelope"></i> - <span class="mail-update badge"></span> - </a> - <ul id="nav-messages-menu" class="dropdown-menu" rel="messages"> - <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> - <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - {{if $nav.all_events}} - <li class="{{$sel.all_events}} all_events-button" style="display: none;"> - <a class="{{$nav.all_events.2}}" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu"> - <i class="fa fa-fw fa-calendar"></i> - <span class="all_events-update badge"></span> - </a> - <ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> - <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> - <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - {{if $nav.intros}} - <li class="{{$sel.intros}} intro-button" style="display: none;"> - <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu"> - <i class="fa fa-fw fa-users"></i> - <span class="intro-update badge"></span> - </a> - <ul id="nav-intros-menu" class="dropdown-menu" rel="intros"> - <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - {{if $nav.notifications}} - <li class="{{$sel.notifications}} notify-button" style="display: none;"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu"> - <i class="fa fa-fw fa-exclamation"></i> - <span class="notify-update badge"></span> - </a> - <ul id="nav-notify-menu" class="dropdown-menu" rel="notify"> - <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> - <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - {{if $nav.login && !$userinfo}} - <li class=""> - <a href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a> - </li> - {{/if}} - {{if $nav.register}} - <li class="{{$nav.register.2}} hidden-xs"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a></li> - {{/if}} - {{if $nav.alogout}} - <li class="{{$nav}}-alogout.2 hidden-xs"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a></li> - {{/if}} - </ul> - <ul class="nav navbar-nav navbar-right hidden-xs"> - <li class=""> - <form method="get" action="search" role="search"> - <div id="nav-search-spinner"></div><input class="fa-search" id="nav-search-text" type="text" value="" placeholder=" {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/> - </form> - </li> - {{if $nav.help.6}} - <li class="{{$sel.help}}"> - <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-question-circle"></i></a> - </li> - {{/if}} - <li class=""> - <a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a> - <ul class="dropdown-menu"> - {{foreach $navapps as $navapp}} - {{$navapp}} - {{/foreach}} - {{if $localuser}} - <li class="divider"></li> - <li><a href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a></li> - {{/if}} - </ul> - </li> - </ul> - </div> - <div class="collapse navbar-collapse" id="navbar-collapse-2"> - <ul class="nav navbar-nav navbar-left hidden-sm hidden-md hidden-lg"> - {{foreach $navapps as $navapp}} - {{$navapp}} - {{/foreach}} - {{if $localuser}} - <li class="divider"></li> - <li><a href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a></li> - {{/if}} - </ul> - </div> - - {{if $nav.help.6}} - <div id="contextual-help-content" class="contextual-help-content"> - {{$nav.help.5}} - <div class="pull-right"> - <a class="btn btn-primary btn-xs" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-fw fa-question"></i> {{$fulldocs}}</a> - <a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-times"></i></a> - </div> +</div> +{{if $nav.help.6}} +<div id="contextual-help-content" class="contextual-help-content"> + {{$nav.help.5}} + <div class="float-right"> + <a class="btn btn-primary btn-sm" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i> {{$fulldocs}}</a> + <a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a> </div> - {{/if}} </div> +{{/if}} diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl index 8f106b41c..b361b1a14 100644 --- a/view/tpl/nav_login.tpl +++ b/view/tpl/nav_login.tpl @@ -3,8 +3,8 @@ <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-header"> + <h4 class="modal-title">{{$nav.loginmenu.1.1}}</h4> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h3 class="modal-title">{{$nav.loginmenu.1.1}}</h3> </div> <div class="modal-body"> <div class="form-group"> diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index 0b24da7c3..53ff8de52 100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,11 +1,11 @@ -<div class="generic-content-wrapper-styled"> - -<h1>{{$notif_header}}</h1> - -{{if $notifications_available}} -<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a> -{{/if}} -<div class="notif-network-wrapper"> - {{$notif_content}} -</div> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper clearfix"> + {{if $notifications_available}} + <a href="#" class="btn btn-outline-secondary btn-sm float-right" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a> + {{/if}} + <h2>{{$notif_header}}</h2> + </div> + <div class="section-content-wrapper"> + {{$notif_content}} + </div> </div> diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl index d3c79be82..ae6e160b1 100755 --- a/view/tpl/notify.tpl +++ b/view/tpl/notify.tpl @@ -1,3 +1,3 @@ -<div class="notif-item"> - <a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> +<div class="mb-2 notif-item"> + <a href="{{$item_link}}"><img src="{{$item_image}}" class="menu-img-1">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div> diff --git a/view/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl index d99f83863..b1c6c9284 100644 --- a/view/tpl/nwiki_page_history.tpl +++ b/view/tpl/nwiki_page_history.tpl @@ -39,17 +39,17 @@ background:rgb(224,255,224); } </style> -<table class="table-striped table-responsive table-hover" style="width: 100%;"> +<table class="" style="width: 100%;"> {{foreach $pageHistory as $commit}} - <tr><td> - <table id="rev-{{$commit.revision}}" onclick="$('#details-{{$commit.revision}}').show()" width="100%"> + <tr class="wikis-index-row"><td> + <table id="rev-{{$commit.revision}}" onclick="$('#details-{{$commit.revision}}').show()" style="width: 100%;"> <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td> <td rowspan="3" width="20%" align="right"> {{if $permsWrite}} - <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-xs" onclick="wiki_revert_page('{{$commit.revision}}')">Revert</button> + <button id="revert-{{$commit.revision}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.revision}}')">Revert</button> <br><br> {{/if}} - <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-xs" onclick="wiki_compare_page('{{$commit.revision}}')">Compare</button> + <button id="compare-{{$commit.revision}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.revision}}')">Compare</button> </td></tr> <tr><td>{{$name_lbl}}</td><td>{{$commit.name}}</td></tr> <tr><td>{{$msg_label}}</td><td>{{$commit.title}}</td></tr> diff --git a/view/tpl/page_display_empty.tpl b/view/tpl/page_display_empty.tpl new file mode 100644 index 000000000..9f000dee8 --- /dev/null +++ b/view/tpl/page_display_empty.tpl @@ -0,0 +1 @@ +{{$body}}
\ No newline at end of file diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 8318f050d..2ecfbaff9 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -2,16 +2,16 @@ <h3>{{$findpeople}}</h3> <form action="directory" method="post" /> <div class="input-group form-group"> - <input class="form-control input-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> + <input class="form-control form-control-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> <div class="input-group-btn"> - <button class="btn btn-default btn-sm" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button> + <button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button> </div> </div> </form> - <ul class="nav nav-pills nav-stacked"> - {{if $similar}}<li><a href="match" >{{$similar}}</a></li>{{/if}} - {{if $loggedin}}<li><a href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}} - <li><a href="randprof" >{{$random}}</a></li> - {{if $loggedin}}{{if $inv}}<li><a href="invite" >{{$inv}}</a></li>{{/if}}{{/if}} + <ul class="nav nav-pills flex-column"> + {{if $similar}}<li class="nav-item"><a class="nav-link" href="match" >{{$similar}}</a></li>{{/if}} + {{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}} + <li class="nav-item"><a class="nav-link" href="randprof" >{{$random}}</a></li> + {{if $loggedin}}{{if $inv}}<li class="nav-item"><a class="nav-link" href="invite" >{{$inv}}</a></li>{{/if}}{{/if}} </ul> </div> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 6289f5321..8bacb1575 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -2,14 +2,14 @@ <div class="section-title-wrapper"> <div class="pull-right"> {{if $order}} - <a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a> + <a class="btn btn-outline-secondary btn-sm" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a> {{/if}} <div class="btn-group btn-group"> {{if $album_edit.1}} - <i class="fa fa-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i> + <i class="fa fa-pencil btn btn-outline-secondary btn-sm" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i> {{/if}} {{if $can_post}} - <button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> + <button class="btn btn-sm btn-success btn-sm" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> {{/if}} </div> </div> diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index de1105bbc..a238e61bc 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 nav-stacked"> - <li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li> + <ul class="nav nav-pills flex-column"> + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent}}</a></li> {{if $albums}} {{foreach $albums as $al}} - {{if $al.text}} - <li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-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}} diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl index 9c0a65d1c..664e5338c 100755 --- a/view/tpl/photo_drop.tpl +++ b/view/tpl/photo_drop.tpl @@ -1,3 +1,3 @@ <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" > - <a class="btn btn-default btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="fa fa-trash-o"></i></a> + <a class="btn btn-outline-secondary btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="fa fa-trash-o"></i></a> </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 967abea71..2431329ec 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -4,44 +4,36 @@ <div class="pull-right"> {{if $tools || $map || $edit}} <div class="btn-group"> - <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> - <i class="fa fa-caret-down"></i> {{$tools_label}} + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> + <i class="fa fa-cog"></i> {{$tools_label}} </button> - <ul class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-right flex-column"> {{if $tools}} - <li class="nav-item"> - <a class="nav-link" href="{{$tools.profile.0}}"><i class="fa fa-user"></i> {{$tools.profile.1}}</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i> {{$tools.cover.1}}</a> - </li> + <a class="dropdown-item" href="{{$tools.profile.0}}"><i class="fa fa-user"></i> {{$tools.profile.1}}</a> + <a class="dropdown-item" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i> {{$tools.cover.1}}</a> {{/if}} {{if $map}} - <li class="nav-item"> - <a class="nav-link" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i> {{$map_text}}</a> - </li> + <a class="dropdown-item" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i> {{$map_text}}</a> {{/if}} {{if $edit}} - <li class="nav-item"> - <a class="nav-link acl-form-trigger" href="#" title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i> {{$edit.edit}}</a> - </li> + <a class="dropdown-item acl-form-trigger" href="#" title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i> {{$edit.edit}}</a> {{/if}} - </ul> + </div> </div> {{/if}} {{if $lock}} <div class="btn-group"> - <button id="lockview" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="fa fa-lock"></i></button> + <button id="lockview" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="fa fa-lock"></i></button> <ul id="panel-{{$id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> </div> {{/if}} {{if $prevlink || $nextlink}} <div class="btn-group"> {{if $prevlink}} - <a href="{{$prevlink.0}}" class="btn btn-default btn-xs" title="{{$prevlink.1}}"><i class="fa fa-backward"></i></a> + <a href="{{$prevlink.0}}" class="btn btn-outline-secondary btn-sm" title="{{$prevlink.1}}"><i class="fa fa-backward"></i></a> {{/if}} {{if $nextlink}} - <a href="{{$nextlink.0}}" class="btn btn-default btn-xs" title="{{$nextlink.1}}"><i class="fa fa-forward"></i></a> + <a href="{{$nextlink.0}}" class="btn btn-outline-secondary btn-sm" title="{{$nextlink.1}}"><i class="fa fa-forward"></i></a> {{/if}} </div> {{/if}} @@ -96,7 +88,7 @@ </div> <div class="form-group btn-group pull-right"> {{if $edit.aclselect}} - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$edit.lockstate}}"></i> </button> {{/if}} @@ -124,7 +116,7 @@ {{foreach $responses as $verb=>$response}} {{if $response.count}} <div class="btn-group"> - <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button> {{if $response.list_part}} <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> {{else}} @@ -142,7 +134,7 @@ <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> </div> <div class="modal-footer clear"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$modal_dismiss}}</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> @@ -156,10 +148,10 @@ {{/if}} {{if $likebuttons}} <div class="photo-item-tools-right btn-group pull-right"> - <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false"> + <button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false"> <i class="fa fa-thumbs-o-up" title="{{$likebuttons.likethis}}"></i> </button> - <button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false"> + <button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false"> <i class="fa fa-thumbs-o-down" title="{{$likebuttons.nolike}}"></i> </button> </div> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 92e70692f..8fe631ca6 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> <div class="pull-right"> {{if $can_post}} - <button class="btn btn-xs btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> + <button class="btn btn-sm btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> {{/if}} </div> <h2>{{$title}}</h2> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 90cd0e84a..d52bad5a2 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -26,7 +26,7 @@ <div class="pull-right btn-group"> <div class="btn-group"> {{if $lockstate}} - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{/if}} @@ -45,7 +45,7 @@ </div> <div id="photos-upload-perms" class="btn-group pull-right"> {{if $lockstate}} - <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{/if}} diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 8b442e4b9..fb43c744b 100755 --- a/view/tpl/posted_date_widget.tpl +++ b/view/tpl/posted_date_widget.tpl @@ -3,12 +3,12 @@ function toggle_posted_date_button() { if($('#posted-date-dropdown').is(':visible')) { $('#posted-date-icon').removeClass('fa-caret-up'); - $('#posted-date-icon').addClass('fa-caret-down'); + $('#posted-date-icon').addClass('fa-cog'); $('#posted-date-dropdown').hide(); } else { $('#posted-date-icon').addClass('fa-caret-up'); - $('#posted-date-icon').removeClass('fa-caret-down'); + $('#posted-date-icon').removeClass('fa-cog'); $('#posted-date-dropdown').show(); } } @@ -18,21 +18,21 @@ function toggle_posted_date_button() { <div id="datebrowse-sidebar" class="widget"> <h3>{{$title}}</h3> <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> - <ul id="posted-date-selector" class="nav nav-pills nav-stacked"> + <ul id="posted-date-selector" class="nav nav-pills flex-column"> {{foreach $dates as $y => $arr}} {{if $y == $cutoff_year}} </ul> <div id="posted-date-dropdown" style="display: none;"> - <ul id="posted-date-selector-drop" class="nav nav-pills nav-stacked"> + <ul id="posted-date-selector-drop" class="nav nav-pills flex-column"> {{/if}} - <li id="posted-date-selector-year-{{$y}}"> - <a href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a> + <li class="nav-item" id="posted-date-selector-year-{{$y}}"> + <a class="nav-link" href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a> </li> <div id="posted-date-selector-{{$y}}" style="display: none;"> - <ul class="posted-date-selector-months nav nav-pills nav-stacked"> + <ul class="posted-date-selector-months nav nav-pills flex-column"> {{foreach $arr as $d}} - <li> - <a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}{{if $showend}}&dbegin={{$d.2}}{{/if}}'); return false;">{{$d.0}}</a> + <li class="nav-item"> + <a class="nav-link" href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}{{if $showend}}&dbegin={{$d.2}}{{/if}}'); return false;">{{$d.0}}</a> </li> {{/foreach}} </ul> @@ -40,7 +40,7 @@ function toggle_posted_date_button() { {{/foreach}} {{if $cutoff}} </div> - <button class="btn btn-default btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="fa fa-caret-down"></i></button> + <button class="btn btn-outline-secondary btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="fa fa-cog"></i></button> {{/if}} </ul> </div> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 4000f39d6..c56062459 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -1,9 +1,9 @@ <div id="profile-content-wrapper" class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-right"> {{if $profile.like_count}} <div class="btn-group"> - <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button> {{if $profile.likers}} <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="dropdown-menu-img-xs" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul> {{/if}} @@ -11,32 +11,32 @@ {{/if}} {{if $profile.canlike}} <div class="btn-group"> - <button type="button" class="btn btn-success btn-xs" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" > + <button type="button" class="btn btn-success btn-sm" onclick="doprofilelike('profile/' + '{{$profile.profile_guid}}','like'); return false;" title="{{$profile.likethis}}" > <i class="fa fa-thumbs-o-up" title="{{$profile.likethis}}"></i> </button> </div> {{/if}} {{if $editmenu.multi}} <div class="btn-group"> - <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i> {{$editmenu.edit.3}}</a> - <ul class="dropdown-menu dropdown-menu-right" role="menu"> + <a class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i> {{$editmenu.edit.3}}</a> + <div class="dropdown-menu dropdown-menu-right"> {{foreach $editmenu.menu.entries as $e}} - <li> - <a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> - </li> + <a class="dropdown-item" href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'> {{$e.profile_name}}</a> {{/foreach}} - <li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li> - {{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}} - </ul> + <a class="dropdown-item" href="profile_photo" >{{$editmenu.menu.chg_photo}}</a> + {{if $editmenu.menu.cr_new}} + <a class="dropdown-item" href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a> + {{/if}} + </div> </div> {{elseif $editmenu}} <div class="btn-group"> - <a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i> {{$editmenu.edit.3}}</a> + <a class="btn btn-primary btn-sm" href="{{$editmenu.edit.0}}" ><i class="fa fa-pencil"></i> {{$editmenu.edit.3}}</a> </div> {{/if}} {{if $exportlink}} <div class="btn-group"> - <a class="btn btn-default btn-xs" href="{{$exportlink}}" ><i class="fa fa-vcard"></i> {{$export}}</a> + <a class="btn btn-outline-secondary btn-sm" href="{{$exportlink}}" ><i class="fa fa-vcard"></i> {{$export}}</a> </div> {{/if}} </div> @@ -47,6 +47,28 @@ {{foreach $fields as $f}} + + + + + + + + + + + + + + + + + + + + + + {{if $f == 'name'}} <dl id="aprofile-fullname" class="aprofile"> <dt>{{$profile.fullname.0}}</dt> @@ -297,13 +319,13 @@ <li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" class="profile-thing-img" width="100" height="100" alt="{{$item.term}}" /></a>{{/if}} <a href="{{$item.editurl}}" >{{$item.term}}</a> {{if $profile.canlike}}<br /> - <button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" > + <button type="button" class="btn btn-outline-secondary btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" > <i class="fa fa-thumbs-o-up" title="{{$likethis}}"></i> </button> {{/if}} {{if $item.like_count}} <div class="btn-group"> - <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button> {{if $item.likes}} <ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}"><img class="dropdown-menu-img-xs" src="{{$liker.xchan_photo_s}}" alt="{{$liker.name}}" /> {{$liker.xchan_name}}</a></li>{{/foreach}}</ul> {{/if}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index b0211d697..05137479f 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,53 +1,34 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="dropdown pull-right" id="profile-edit-links"> - <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="fa fa-caret-down"></i> {{$tools_label}} + <div class="dropdown float-right" id="profile-edit-links"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <i class="fa fa-cog"></i> {{$tools_label}} </button> - <ul class="dropdown-menu"> - <li class="nav-item"> - <a class="nav-link" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-user"></i> {{$profpic}}</a> - </li> + <div class="dropdown-menu"> + <a class="dropdown-item" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-fw fa-user"></i> {{$profpic}}</a> {{if $is_default}} - <li class="nav-item"> - <a href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="fa fa-picture-o"></i> {{$coverpic}}</a> - </li> + <a class="dropdown-item" href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="fa fa-fw fa-picture-o"></i> {{$coverpic}}</a> {{/if}} {{if ! $is_default}} - <li class="nav-item"> - <a href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-pencil"></i> {{$editvis}}</a> - </li> + <a class="dropdown-item" href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-fw fa-pencil"></i> {{$editvis}}</a> {{/if}} - <li class="nav-item"> - <a href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="fa fa-plus-circle"></i> {{$addthing}}</a> - </li> - <li class="divider"></li> - <li class="nav-item"> - <a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a> - </li> - + <a class="dropdown-item" href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="fa fa-fw fa-plus-circle"></i> {{$addthing}}</a> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a> {{if $profile_clone_link}} - <li class="divider"></li> - <li class="nav-item"> - <a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a> - </li> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a> {{/if}} {{if $exportable}} - <li class="divider"></li> - <li class="nav-item"> - <a href="profiles/export/{{$profile_id}}">{{$lbl_export}}</a> - </li> - <li class="nav-item"> - <a href="#" onClick="openClose('profile-upload-form'); return false;">{{$lbl_import}}</a> - </li> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="profiles/export/{{$profile_id}}">{{$lbl_export}}</a> + <a class="dropdown-item" href="#" onClick="openClose('profile-upload-form'); return false;">{{$lbl_import}}</a> {{/if}} {{if ! $is_default}} - <li class="divider"></li> - <li class="nav-item"> - <a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$del_prof}}</a> - </li> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$del_prof}}</a> {{/if}} - <ul> + </div> </div> <h2>{{$banner}}</h2> <div class="clear"></div> @@ -108,6 +89,128 @@ </div> </div> </div> + + {{if $fields.comms }} + + <div id="template-form-vcard-tel" class="form-group form-vcard-tel"> + <select name="tel_type[]"> + <option value="CELL">{{$mobile}}</option> + <option value="HOME">{{$home}}</option> + <option value="WORK">{{$work}}</option> + <option value="OTHER">{{$other}}</option> + </select> + <input type="text" name="tel[]" value="" placeholder="{{$tel_label}}"> + <i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + + <div id="template-form-vcard-email" class="form-group form-vcard-email"> + <select name="email_type[]"> + <option value="HOME">{{$home}}</option> + <option value="WORK">{{$work}}</option> + <option value="OTHER">{{$other}}</option> + </select> + <input type="text" name="email[]" value="" placeholder="{{$email_label}}"> + <i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + + <div id="template-form-vcard-impp" class="form-group form-vcard-impp"> + <select name="impp_type[]"> + <option value="HOME">{{$home}}</option> + <option value="WORK">{{$work}}</option> + <option value="OTHER">{{$other}}</option> + </select> + <input type="text" name="impp[]" value="" placeholder="{{$impp_label}}"> + <i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + + <div class="section-content-wrapper-np"> + <div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div> + <div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field"> + <button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button> + <ul class="dropdown-menu"> + <li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li> + <li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li> + <li class="add-vcard-impp"><a href="#" data-add="vcard-impp" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$impp_label}}</a></li> + </ul> + </div> + <div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open"> + <i class="vcard-fn-preview fa fa-address-card-o"></i> + <span id="vcard-preview-{{$vcard.id}}" class="vcard-preview"> + {{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}} + {{if $vcard.emails.0.address}}<span class="vcard-email-preview hidden-xs"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}} + {{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}}{{if $is_mobile}} <a class="btn btn-outline-secondary btn-sm" href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</span>{{/if}} + </span> + <input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}"> + </div> + </div> + <div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper"> + + <div class="vcard-tel form-group"> + <div class="form-vcard-tel-wrapper"> + {{if $vcard.tels}} + {{foreach $vcard.tels as $tel}} + <div class="form-group form-vcard-tel"> + <select name="tel_type[]"> + <option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option> + <option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option> + <option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> + <option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option> + <option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option> + </select> + <input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}"> + <i data-remove="vcard-tel" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + {{/foreach}} + {{/if}} + </div> + </div> + + + <div class="vcard-email form-group"> + <div class="form-vcard-email-wrapper"> + {{if $vcard.emails}} + {{foreach $vcard.emails as $email}} + <div class="form-group form-vcard-email"> + <select name="email_type[]"> + <option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option> + <option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> + <option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option> + <option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option> + </select> + <input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}"> + <i data-remove="vcard-email" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + {{/foreach}} + {{/if}} + </div> + </div> + + <div class="vcard-impp form-group"> + <div class="form-vcard-impp-wrapper"> + {{if $vcard.impps}} + {{foreach $vcard.impps as $impp}} + <div class="form-group form-vcard-impp"> + <select name="impp_type[]"> + <option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option> + <option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> + <option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option> + <option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option> + </select> + <input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}"> + <i data-remove="vcard-impp" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> + </div> + {{/foreach}} + {{/if}} + </div> + </div> + + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + {{/if}} + + {{if $fields.address || $fields.locality || $fields.postal_code || $fields.region || $fields.country_name || $fields.hometown}} <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="location"> @@ -150,7 +253,9 @@ </div> </div> </div> + {{/if}} + {{if $fields.marital || $fields.sexual}} <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="relation"> @@ -270,7 +375,7 @@ {{/if}} {{if $fields.employment}} - {{include file="field_textarea.tpl" field=$work}} + {{include file="field_textarea.tpl" field=$employ}} {{/if}} {{if $fields.education}} diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index fade7be7c..42abf2735 100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a class="btn btn-success btn-xs pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="fa fa-plus-circle"></i> {{$cr_new}}</a> + <a class="btn btn-success btn-sm pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="fa fa-plus-circle"></i> {{$cr_new}}</a> <h2>{{$header}}</h2> </div> <div class="section-content-wrapper"> diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl new file mode 100644 index 000000000..49b74bb8f --- /dev/null +++ b/view/tpl/profile_tabs.tpl @@ -0,0 +1,5 @@ +<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}:</div> +{{foreach $tabs as $tab}} +<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a> +{{/foreach}} +<div class="dropdown-divider"></div> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index e4e923ddb..925447ff2 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -28,69 +28,69 @@ {{/if}} <div class="form-group"> <label for="prvmail-text">{{$yourmessage}}</label> - <textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea> + <textarea class="form-control" id="prvmail-text" name="body"{{if $new}} style="height: 10em;"{{/if}}>{{$text}}</textarea> </div> <div id="prvmail-submit-wrapper" class="form-group"> - <div id="prvmail-submit" class="pull-right btn-group"> - <button class="btn btn-default btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button> + <div id="prvmail-submit" class="float-right btn-group"> + <button class="btn btn-outline-secondary btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button> <button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button> </div> - <div id="prvmail-tools" class="btn-toolbar pull-left"> - <div class="btn-group"> - <button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;"> + <div id="prvmail-tools" class="btn-toolbar float-left"> + <div class="btn-group mr-2"> + <button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;"> <i class="fa fa-bold jot-icons"></i> </button> - <button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;"> + <button id="main-editor-italic" class="btn btn-outline-secondary btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;"> <i class="fa fa-italic jot-icons"></i> </button> - <button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;"> + <button id="main-editor-underline" class="btn btn-outline-secondary btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;"> <i class="fa fa-underline jot-icons"></i> </button> - <button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;"> + <button id="main-editor-quote" class="btn btn-outline-secondary btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;"> <i class="fa fa-quote-left jot-icons"></i> </button> - <button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;"> + <button id="main-editor-code" class="btn btn-outline-secondary btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;"> <i class="fa fa-terminal jot-icons"></i> </button> </div> - <div class="btn-group hidden-xs"> - <button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" > + <div class="btn-group d-none d-lg-flex mr-2"> + <button id="prvmail-attach-wrapper" class="btn btn-outline-secondary btn-sm" > <i id="prvmail-attach" class="fa fa-paperclip jot-icons" title="{{$attach}}"></i> </button> - <button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" > + <button id="prvmail-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailJotGetLink(); return false;" > <i id="prvmail-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i> </button> </div> {{if $feature_expire || $feature_encrypt}} - <div class="btn-group hidden-sm hidden-xs"> + <div class="btn-group d-none d-lg-flex mr-2"> {{if $feature_expire}} - <button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" > + <button id="prvmail-expire-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailGetExpiry();return false;" > <i id="prvmail-expires" class="fa fa-eraser jot-icons" title="{{$expires}}" ></i> </button> {{/if}} {{if $feature_encrypt}} - <button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"> + <button id="prvmail-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"> <i id="prvmail-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i> </button> {{/if}} </div> {{/if}} - <div class="btn-group visible-xs visible-sm"> - <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> - <i id="more-tools-icon" class="fa fa-caret-down jot-icons"></i> + <div class="btn-group d-lg-none"> + <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + <i id="more-tools-icon" class="fa fa-cog jot-icons"></i> </button> - <ul class="dropdown-menu dropdown-menu-right" role="menu"> - <li class="visible-xs"><a href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i> {{$attach}}</a></li> - <li class="visible-xs"><a href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i> {{$insert}}</a></li> + <div class="dropdown-menu dropdown-menu-right" role="menu"> + <a class="dropdown-item" href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i> {{$attach}}</a> + <a class="dropdown-item" href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i> {{$insert}}</a> {{if $feature_expire || $feature_encrypt}} - <li class="divider visible-xs"></li> - <li class="visible-sm visible-xs"><a href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="fa fa-eraser"></i> {{$expires}}</a></li> - <li class="visible-sm visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="fa fa-key"></i> {{$encrypt}}</a></li> + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="fa fa-eraser"></i> {{$expires}}</a> + <a class="dropdown-item" href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="fa fa-key"></i> {{$encrypt}}</a> {{/if}} - </ul> + </div> </div> </div> - <div id="prvmail-rotator-wrapper" class="pull-left"> + <div id="prvmail-rotator-wrapper" class="float-left"> <div id="prvmail-rotator"></div> </div> <div class="clear"></div> diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index 2065cd714..ff2d044ef 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -1,14 +1,12 @@ -<div class="widget saved-search-widget"> +<div class="widget saved-search-widget clearfix"> <h3 id="search">{{$title}}</h3> {{$searchbox}} - - <ul id="saved-search-list" class="nav nav-pills nav-stacked"> + <ul id="saved-search-list" class="nav nav-pills flex-column"> {{foreach $saved as $search}} - <li id="search-term-{{$search.id}}"> - <a class="pull-right group-edit-tool" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropfa-floppy-od-search-term-{{$search.id}}" class="group-edit-icon fa fa-trash-o" ></i></a> - <a id="saved-search-term-{{$search.id}}"{{if $search.selected}} class="search-selected"{{/if}} href="{{$search.srchlink}}">{{$search.displayterm}}</a> + <li class="nav-item nav-item-hack" id="search-term-{{$search.id}}"> + <a class="nav-link widget-nav-pills-icons" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropfa-floppy-od-search-term-{{$search.id}}" class="fa fa-trash-o drop-icons" ></i></a> + <a id="saved-search-term-{{$search.id}}" class="nav-link{{if $search.selected}} active{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a> </li> {{/foreach}} </ul> - <div class="clear"></div> </div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index a490cb473..66618a216 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -1,7 +1,7 @@ -<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}"> +<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} mb-4 clearfix generic-content-wrapper{{/if}}"> <a name="{{$item.id}}" ></a> - <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > - <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> + <div class="clearfix wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > + <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}"> {{if $item.photo}} <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> {{$item.photo}} @@ -12,21 +12,23 @@ {{$item.event}} </div> {{/if}} - <div class="wall-item-head"> + {{if $item.title && !$item.event}} + <div class="p-2{{if $item.is_new}} bg-primary text-white{{/if}} wall-item-title h3{{if !$item.photo}} rounded-top{{/if}}" id="wall-item-title-{{$item.id}}"> + {{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}} + </div> + {{if ! $item.is_new}} + <hr class="m-0"> + {{/if}} + {{/if}} + <div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> </div> - <div class="wall-item-photo-end" style="clear:both"></div> - </div> - {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> - <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> </div> - {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> - <i class="fa fa-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + <i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> </div> {{/if}} <div class="wall-item-author"> @@ -35,16 +37,20 @@ <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> {{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="fa fa-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> - <div class="clear"></div> </div> - <div class="{{if $item.is_photo}}wall-photo-item{{else}}wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}"> + {{if $item.body}} + <div class="p-2 clrearfix {{if $item.is_photo}} wall-photo-item{{else}} wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}"> <div class="wall-item-body" id="wall-item-body-{{$item.id}}" > {{$item.body}} </div> - <div class="clear"></div> </div> + {{/if}} {{if $item.has_tags}} - <div class="wall-item-tools"> + <div class="p-2 wall-item-tools clearfix"> + <div class="body-tags"> + <span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span> + </div> + {{** {{if $item.mentions}} <div class="body-tags" id="item-mentions"> <span class="tag">{{$item.mentions}}</span> @@ -65,48 +71,44 @@ <span class="tag">{{$item.folders}}</span> </div> {{/if}} - <div class="clear"></div> + **}} </div> {{/if}} - <div class="wall-item-tools"> + <div class="p-2 clearfix wall-item-tools"> <div class="wall-item-tools-right btn-group pull-right"> - <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> - <i class="fa fa-caret-down"></i> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> + <i class="fa fa-cog"></i> </button> - <ul class="dropdown-menu"> + <div class="dropdown-menu dropdown-menu-right"> {{if $item.thread_action_menu}} {{foreach $item.thread_action_menu as $mitem}} - <li role="presentation"><a role="menuitem" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-{{$mitem.icon}}"></i> {{$mitem.title}}</a></li> + <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-{{$mitem.icon}}"></i> {{$mitem.title}}</a></li> {{/foreach}} {{/if}} {{if $item.drop.dropping}} - <li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li> + <a class="dropdown-item" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li> {{/if}} {{if $item.thread_author_menu}} - <li role="presentation" class="divider"></li> + <div class="dropdown-divider"></div> {{foreach $item.thread_author_menu as $mitem}} - <li role="presentation"><a role="menuitem" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li> + <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li> {{/foreach}} {{/if}} - </ul> + </div> </div> {{if $item.attachments}} <div class="wall-item-tools-left btn-group"> - <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-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> + <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}} - <div class="clear"></div> </div> - <div class="clear"></div> </div> - <div class="wall-item-wrapper-end"></div> {{if $item.conv}} - <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" > + <div class="p-2 wall-item-conv" id="wall-item-conv-{{$item.id}}" > <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a> </div> {{/if}} - <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl index 8eb169b4a..8f7ac5162 100644 --- a/view/tpl/searchbox.tpl +++ b/view/tpl/searchbox.tpl @@ -1,11 +1,11 @@ <form action="{{$action_url}}" method="get" > <input type="hidden" name="f" value="" /> <div id="{{$id}}" class="input-group"> - <input class="widget-input" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" /> + <input class="form-control form-control-sm" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" /> <div class="input-group-btn"> - <button type="submit" name="submit" class="btn btn-default btn-sm" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button> + <button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button> {{if $savedsearch}} - <button type="submit" name="searchsave" class="btn btn-default btn-sm" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button> + <button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button> {{/if}} </div> </div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 19c2b42d5..dd5fecb43 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - {{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="fa fa-trash-o"></i> {{$removeme}}</a>{{/if}} + {{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-sm pull-right" href="removeme"><i class="fa fa-trash-o"></i> {{$removeme}}</a>{{/if}} <h2>{{$ptitle}}</h2> <div class="clear"></div> </div> @@ -11,12 +11,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="basic-settings"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse" aria-expanded="true" aria-controls="basic-settings-collapse"> + <a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse"> {{$h_basic}} </a> </h3> </div> - <div id="basic-settings-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="basic-settings"> + <div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings"> <div class="section-content-tools-wrapper"> {{include file="field_input.tpl" field=$username}} {{include file="field_select_grouped.tpl" field=$timezone}} @@ -37,12 +37,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="privacy-settings"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse" aria-expanded="true" aria-controls="privacy-settings-collapse"> + <a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse"> {{$h_prv}} </a> </h3> </div> - <div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings"> + <div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings"> <div class="section-content-tools-wrapper"> {{if $server_role != 'basic'}} {{include file="field_select_grouped.tpl" field=$role}} @@ -51,7 +51,7 @@ {{if $server_role != 'basic'}} <div class="form-group"> - <button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> + <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> </div> <div class="modal" id="apsModal"> <div class="modal-dialog"> @@ -66,14 +66,14 @@ {{/foreach}} </div> <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> {{/if}} <div id="settings-default-perms" class="form-group" > - <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i> {{$permissions}}</button> + <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i> {{$permissions}}</button> </div> {{$group_select}} {{include file="field_checkbox.tpl" field=$hide_presence}} @@ -100,12 +100,12 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="notification-settings"> <h3> - <a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse" aria-expanded="true" aria-controls="notification-settings-collapse"> + <a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse"> {{$h_not}} </a> </h3> </div> - <div id="notification-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="notification-settings"> + <div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings"> <div class="section-content-tools-wrapper"> <div id="settings-notifications"> <h3>{{$activity_options}}</h3> @@ -162,7 +162,7 @@ </a> </h3> </div> - <div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings"> + <div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings"> <div class="section-content-tools-wrapper"> {{if $menus}} <div class="form-group channel-menu"> diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 8ff846518..b7fdfb9a9 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a title="{{$removeaccount}}" class="btn btn-danger btn-xs pull-right" href="removeaccount"><i class="fa fa-trash-o"></i> {{$removeme}}</a> + <a title="{{$removeaccount}}" class="btn btn-danger btn-sm pull-right" href="removeaccount"><i class="fa fa-trash-o"></i> {{$removeme}}</a> <h2>{{$title}}</h2> <div class="clear"></div> </div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index a85a067be..d8c1ac7aa 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -15,7 +15,7 @@ </a> </h3> </div> - <div id="theme-settings-content" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="theme-settings"> + <div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings"> <div class="section-content-tools-wrapper"> {{if $theme}} {{include file="field_themeselect.tpl" field=$theme}} @@ -41,7 +41,7 @@ </a> </h3> </div> - <div id="custom-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings"> + <div id="custom-settings-content" class="collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings"> <div class="section-content-tools-wrapper"> {{if $theme_config}} {{$theme_config}} @@ -57,7 +57,7 @@ </a> </h3> </div> - <div id="content-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings"> + <div id="content-settings-content" class="collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings"> <div class="section-content-wrapper"> {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} @@ -72,7 +72,7 @@ {{include file="field_checkbox.tpl" field=$manual_update}} {{if $expert}} <div class="form-group"> - <a class="btn btn-default "href="pdledit">{{$layout_editor}}</a> + <a class="btn btn-outline-secondary "href="pdledit">{{$layout_editor}}</a> </div> {{/if}} <div class="settings-submit-wrapper" > diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 75eb34fb9..dfe049a7a 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -14,7 +14,7 @@ </a> </h3> </div> - <div id="{{$g}}-settings-content" class="panel-collapse collapse{{if $g == 'general'}} in{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title"> + <div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title"> <div class="section-content-tools-wrapper"> {{foreach $f.1 as $fcat}} {{include file="field_checkbox.tpl" field=$fcat}} diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 9582ef52d..811cfcec5 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -25,8 +25,8 @@ {{/if}} {{/if}} {{if $app.my}} - <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-default"></i></a> - <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-default"></i></a> + <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a> + <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a> {{/if}} </div> {{/foreach}} diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl index c764dc4f0..68bdd6faa 100644 --- a/view/tpl/sharedwithme.tpl +++ b/view/tpl/sharedwithme.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="fa fa-trash-o"></i> {{$dropall}}</a> + <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-sm btn-outline-secondary pull-right"><i class="fa fa-trash-o"></i> {{$dropall}}</a> <h2>{{$header}}</h2> </div> <div class="section-content-wrapper-np"> @@ -9,16 +9,16 @@ <th width="1%"></th> <th width="92%">{{$name}}</th> <th width="1%"></th> - <th width="1%" class="hidden-xs">{{$size}}</th> - <th width="1%" class="hidden-xs">{{$lastmod}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$size}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th> </tr> {{foreach $items as $item}} <tr id="cloud-index-{{$item.id}}"> <td><i class="fa {{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td> <td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}} <span class="label label-success">{{$label_new}}</span>{{/if}}</td> <td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> - <td class="hidden-xs">{{$item.objfilesize}}</td> - <td class="hidden-xs">{{$item.objedited}}</td> + <td class="d-none d-md-table-cell">{{$item.objfilesize}}</td> + <td class="d-none d-md-table-cell">{{$item.objedited}}</td> </tr> {{/foreach}} </table> diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl index 85d7934b5..d738c9fc9 100644 --- a/view/tpl/show_thing.tpl +++ b/view/tpl/show_thing.tpl @@ -6,8 +6,8 @@ </div> {{if $canedit}} <div class="thing-edit-links"> -<a href="thing/edit/{{$thing.obj_obj}}" title="{{$edit}}" class="btn btn-default" ><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-default" ><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}} diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl index 26d9da7ce..95f24cd63 100755 --- a/view/tpl/suggest_friends.tpl +++ b/view/tpl/suggest_friends.tpl @@ -4,13 +4,13 @@ <img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" /> </a> </div> - <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="fa fa-times drop-icons btn btn-default"></i></a> + <a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="fa fa-times drop-icons btn btn-outline-secondary"></i></a> <div class="profile-match-break"></div> <div class="profile-match-name"> <a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a> </div> <div class="profile-match-end"></div> {{if $entry.connlnk}} - <div class="profile-match-connect btn btn-default"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conntxt}}</a></div> + <div class="profile-match-connect btn btn-outline-secondary"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$entry.conntxt}}</a></div> {{/if}} </div> diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl index b23584fe1..62a7c02c8 100644 --- a/view/tpl/thing_edit.tpl +++ b/view/tpl/thing_edit.tpl @@ -30,7 +30,7 @@ <div class="thing-end"></div> {{if $lockstate}} - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{/if}} diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl index 3e178925c..90fb093e4 100644 --- a/view/tpl/thing_input.tpl +++ b/view/tpl/thing_input.tpl @@ -30,7 +30,7 @@ <div class="thing-end"></div> {{if $lockstate}} - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{/if}} diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index 547c5f308..c51728c34 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -5,10 +5,10 @@ <h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3> {{/if}} {{if $items}} - <ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills nav-stacked{{elseif !$wrap || $class}} {{$class}}{{/if}}"> + <ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills flex-column{{elseif !$wrap || $class}} {{$class}}{{/if}}"> {{foreach $items as $mitem }} - <li id="pmenu-item-{{$mitem.mitem_id}}" class="pmenu-item{{if $mitem.submenu}} dropdown{{/if}}"> - <a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}"{{if $mitem.submenu}} class="dropdown-toggle" data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a> + <li id="pmenu-item-{{$mitem.mitem_id}}" class="nav-item pmenu-item{{if $mitem.submenu}} dropdown{{/if}}"> + <a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}" class="nav-link {{if $mitem.submenu}} dropdown-toggle{{/if}}"{{if $mitem.submenu}} data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a> {{if $mitem.submenu}}{{$mitem.submenu}}{{/if}} </li> {{/foreach }} diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl index 83cd80959..2b7144450 100755 --- a/view/tpl/viewcontact_template.tpl +++ b/view/tpl/viewcontact_template.tpl @@ -1,15 +1,13 @@ -<div class="generic-content-wrapper generic-content-wrapper-styled"> -<h3>{{$title}}</h3> - - -<div id="connections-wrapper"> -{{foreach $contacts as $contact}} - {{include file="contact_template.tpl"}} -{{/foreach}} -<div id="page-end"></div> -</div> -<div id="view-contact-end"></div> -{{$paginate}} +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper clearfix"> + {{foreach $contacts as $contact}} + {{include file="contact_template.tpl"}} + {{/foreach}} + <div id="page-end"></div> + </div> </div> <script>$(document).ready(function() { loadingPage = false;});</script> <div id="page-spinner"></div> diff --git a/view/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl index 1d28f62df..b22b3818a 100644 --- a/view/tpl/webpage_export_list.tpl +++ b/view/tpl/webpage_export_list.tpl @@ -10,7 +10,7 @@ </div> <div id="import-website-content-wrapper" class="section-content-wrapper"> <div class="pull-left"> - <button id="toggle-select-all" class="btn btn-xs btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i> Toggle Select All</button> + <button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i> Toggle Select All</button> </div> <div class="clear"></div> <hr> diff --git a/view/tpl/webpage_import.tpl b/view/tpl/webpage_import.tpl index fdc983932..955288c1e 100644 --- a/view/tpl/webpage_import.tpl +++ b/view/tpl/webpage_import.tpl @@ -10,7 +10,7 @@ </div> <div id="import-website-content-wrapper" class="section-content-wrapper"> <div class="pull-left"> - <button id="toggle-select-all" class="btn btn-xs btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i> Toggle Select All</button> + <button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i> Toggle Select All</button> </div> <div class="clear"></div> <h4>Scanned Pages</h4> diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 4dec7518f..fcf9de75a 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> {{if $editor}} <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> + <button id="webpage-create-btn" class="btn btn-sm btn-success acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> </div> {{/if}} <h2>{{$listtitle}}</h2> @@ -23,8 +23,8 @@ <th width="1%"></th> <th width="1%"></th> <th width="1%"></th> - <th width="1%" class="hidden-xs">{{$created_txt}}</th> - <th width="1%" class="hidden-xs">{{$edited_txt}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$created_txt}}</th> + <th width="1%" class="d-none d-md-table-cell">{{$edited_txt}}</th> </tr> {{foreach $pages as $key => $items}} {{foreach $items as $item}} @@ -41,7 +41,7 @@ </td> <td class="webpage-list-tool dropdown"> {{if $item.lockstate=='lock'}} - <i class="fa fa-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i> + <i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i> <ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul> {{/if}} </td> @@ -60,10 +60,10 @@ <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#webpage-list-item-{{$item.url}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a> {{/if}} </td> - <td class="hidden-xs"> + <td class="d-none d-md-table-cell"> {{$item.created}} </td> - <td class="hidden-xs"> + <td class="d-none d-md-table-cell"> {{$item.edited}} </td> </tr> diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl index 10468b64e..0d131cb17 100644 --- a/view/tpl/website_portation_tools.tpl +++ b/view/tpl/website_portation_tools.tpl @@ -1,72 +1,60 @@ <div id="website-portation-tools" class="widget"> - <ul class="nav nav-pills nav-stacked"> - <li> - <a href="#" onclick="openClose('import-form'); - return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a> - </li> - <li style="margin-left: 12px;" > - <form id="import-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu"> - - <input type="hidden" name="action" value="scan"> - - <p style="margin-top: 10px;" class="descriptive-text">{{$file_import_text}}</p> - <div class="form-group"> - <div class="input-group"> - <input class="widget-input" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" /> - <div class="input-group-btn"> - <button class="btn btn-default btn-sm" type="submit" name="cloudsubmit" value="{{$select}}"><i class="fa fa-folder-open generic-icons"></i></button> - </div> - </div> - </div> - - <!-- Or upload a zipped file containing the website --> - <p class="descriptive-text">{{$file_upload_text}}</p> - <div class="form-group"> - - <div class="input-group"> - <input class="widget-input" type="file" name="zip_file" /> - <div class="input-group-btn"> - <button class="btn btn-default btn-sm" type="submit" name="w_upload" value="w_upload"><i class="fa fa-file-archive-o generic-icons"></i></button> - </div> - </div> - </div> - </form> - </li> - </ul> - <ul class="nav nav-pills nav-stacked"> - <li> - <a href="#" onclick="openClose('export-form'); openClose('export-cloud-form'); - return false;"><i class="fa fa-share-square-o generic-icons"></i> {{$export_label}}</a> - </li> - <li style="margin-left: 12px;" > - <form id="export-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu"> - <input type="hidden" name="action" value="exportzipfile"> - <!-- Or download a zipped file containing the website --> - <p style="margin-top: 10px;" class="descriptive-text">{{$file_download_text}}</p> - <div class="form-group"> - - <div class="input-group"> - <input class="widget-input" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" /> - <div class="input-group-btn"> - <button class="btn btn-default btn-sm" type="submit" name="w_download" value="w_download"><i class="fa fa-download generic-icons"></i></button> - </div> - </div> - </div> - </form> - <form id="export-cloud-form" enctype="multipart/form-data" method="post" action="" style="display: none;" class="sub-menu"> - <input type="hidden" name="action" value="exportcloud"> - <!-- Or export the website elements to a cloud files folder --> - <p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p> - <div class="form-group"> - - <div class="input-group"> - <input class="widget-input" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" /> - <div class="input-group-btn"> - <button class="btn btn-default btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}"><i class="fa fa-folder-open generic-icons"></i></button> - </div> - </div> - </div> - </form> - </li> - </ul> + <div class="nav nav-pills flex-column"> + <a class="nav-link" href="#" onclick="openClose('import-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a> + <div id="import-form" class="sub-menu-wrapper"> + <div class="sub-menu"> + <form enctype="multipart/form-data" method="post" action=""> + <input type="hidden" name="action" value="scan"> + <p class="descriptive-text">{{$file_import_text}}</p> + <div class="form-group"> + <input class="form-control" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" /> + </div> + <div class="form-group"> + <button class="btn btn-primary btn-sm" type="submit" name="cloudsubmit" value="{{$select}}">Submit</button> + </div> + <!-- Or upload a zipped file containing the website --> + <p class="descriptive-text">{{$file_upload_text}}</p> + <div class="form-group"> + <input class="form-control-file w-100" type="file" name="zip_file" /> + </div> + <div class="form-group"> + <button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Submit</button> + </div> + </form> + </div> + </div> + </div> + <div class="nav nav-pills flex-column"> + <a class="nav-link" href="#" onclick="openClose('export-form'); openClose('export-cloud-form'); return false;"><i class="fa fa-share-square-o generic-icons"></i> {{$export_label}}</a> + <div id="export-form" class="sub-menu-wrapper"> + <div class="sub-menu"> + <form enctype="multipart/form-data" method="post" action=""> + <input type="hidden" name="action" value="exportzipfile"> + <!-- Or download a zipped file containing the website --> + <p class="descriptive-text">{{$file_download_text}}</p> + <div class="form-group"> + <input class="form-control" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" /> + </div> + <div class="form-group"> + <button class="btn btn-primary btn-sm" type="submit" name="w_download" value="w_download">Submit</button> + </div> + </form> + </div> + </div> + <div id="export-cloud-form" class="sub-menu-wrapper"> + <div class="sub-menu"> + <form enctype="multipart/form-data" method="post" action=""> + <input type="hidden" name="action" value="exportcloud"> + <!-- Or export the website elements to a cloud files folder --> + <p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p> + <div class="form-group"> + <input class="form-control" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" /> + </div> + <div class="form-group"> + <button class="btn btn-primary btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}">Submit</button> + </div> + </form> + </div> + </div> + </div> </div> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index ea31c23a3..564db3324 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -3,23 +3,19 @@ <div class="pull-right"> {{if $showPageControls}} <div id="page-tools" class="btn-group" style="display: none;"> - <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> - <i class="fa fa-caret-down"></i> {{$tools_label}} + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> + <i class="fa fa-cog"></i> {{$tools_label}} </button> - <ul class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-right"> {{if $renamePage}} - <li class="nav-item"> - <a class="nav-link rename-page" href="#"><i class="fa fa-edit"></i> {{$renamePage}}</a> - </li> + <a class="dropdown-item rename-page" href="#"><i class="fa fa-fw fa-edit"></i> {{$renamePage}}</a> {{/if}} - <li class="nav-item"> - <a id="embed-image" class="nav-link" href="#"><i class="fa fa-picture-o"></i> Embed Image</a> - </li> - </ul> + <a id="embed-image" class="dropdown-item" href="#"><i class="fa fa-fw fa-picture-o"></i> Embed Image</a> + </div> </div> {{/if}} - <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button> - <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button> + <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button> + <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button> </div> <h2> <span id="wiki-header-name">{{$wikiheaderName}}</span>: @@ -35,7 +31,7 @@ <button id="rename-page-submit" class="btn btn-primary" type="submit" name="submit">Submit</button> </div> <div> - <button class="btn btn-default rename-page" type="button">Cancel</button> + <button class="btn btn-outline-secondary rename-page" type="button">Cancel</button> </div> <div class="clear"></div> </div> @@ -43,12 +39,12 @@ </div> <div id="wiki-content-container" class="section-content-wrapper"> <ul class="nav nav-tabs" id="wiki-nav-tabs"> - <li id="edit-pane-tab"><a data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li> - <li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li> - <li><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li> + <li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li> + <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li> + <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li> </ul> <div class="tab-content" id="wiki-page-tabs"> - <div id="edit-pane" class="tab-pane fade"> + <div id="edit-pane" class="tab-pane"> {{if !$mimeType || $mimeType == 'text/markdown'}} <div id="ace-editor"></div> {{else}} @@ -60,21 +56,21 @@ <div> <div id="id_{{$commitMsg.0}}_wrapper" class="field input"> <div class="input-group"> - <input class="widget-input" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> + <input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> <div class="input-group-btn"> - <button id="save-page" type="button" class="btn btn-primary btn-sm disabled">Save</button> + <button id="save-page" type="button" class="btn btn-primary disabled">Save</button> </div> </div> </div> </div> {{/if}} </div> - <div id="preview-pane" class="tab-pane fade in active"> + <div id="preview-pane" class="tab-pane active"> <div id="wiki-preview"> {{$renderedContent}} </div> </div> - <div id="page-history-pane" class="tab-pane fade"> + <div id="page-history-pane" class="tab-pane"> <div id="page-history-list"></div> </div> </div> @@ -87,17 +83,17 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body" id="embedPhotoModalBody" > - <div id="embedPhotoModalBodyAlbumListDialog" class="hide"> + <div id="embedPhotoModalBodyAlbumListDialog" class="d-none"> <div id="embedPhotoModalBodyAlbumList"></div> </div> - <div id="embedPhotoModalBodyAlbumDialog" class="hide"></div> + <div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> <button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button> </div> </div><!-- /.modal-content --> @@ -107,7 +103,7 @@ <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_commit = '{{$commit}}'; $("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary'); @@ -370,8 +366,8 @@ if (data['status']) { $('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); $('#embedPhotoModalBodyAlbumDialog').html('\ - <div><ul class="nav">\n\ - <li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ + <div><ul class="nav nav-pills flex-column">\n\ + <li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\ <i class="fa fa-chevron-left"></i> \n\ {{$modaldiffalbum}}\n\ </a>\n\ @@ -386,8 +382,8 @@ $(imageparent).toggleClass('embed-photo-selected-photo'); } }); - $('#embedPhotoModalBodyAlbumListDialog').addClass('hide'); - $('#embedPhotoModalBodyAlbumDialog').removeClass('hide'); + $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); + $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); $('#embed-photo-OKButton').click(function () { $('.embed-photo-selected-photo').each(function (index) { var href = $(this).attr('href'); @@ -426,17 +422,17 @@ if (data['status']) { var albums = data['albumlist']; //JSON.parse(data['albumlist']); $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}"); - $('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>'); + $('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>'); for(var i = 0; i < albums.length; i++) { var albumName = albums[i].text; var jsAlbumName = albums[i].jstext; - var albumLink = '<li>'; - albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; + var albumLink = '<li class="nav-item">'; + albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>'; albumLink += '</li>'; $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); } - $('#embedPhotoModalBodyAlbumDialog').addClass('hide'); - $('#embedPhotoModalBodyAlbumListDialog').removeClass('hide'); + $('#embedPhotoModalBodyAlbumDialog').addClass('d-none'); + $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none'); } else { window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); } diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl index ca16e8333..9e5ba0f9c 100644 --- a/view/tpl/wiki_page_history.tpl +++ b/view/tpl/wiki_page_history.tpl @@ -46,10 +46,10 @@ <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td> <td rowspan="3" width="20%" align="right"> {{if $permsWrite}} - <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-xs" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button> + <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button> <br><br> {{/if}} - <button id="compare-{{$commit.hash}}" class="btn btn-warning btn-xs" onclick="wiki_compare_page('{{$commit.hash}}')">Compare</button> + <button id="compare-{{$commit.hash}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.hash}}')">Compare</button> </td></tr> <tr><td>Name</td><td>{{$commit.name}} <{{$commit.email}}></td></tr> <tr><td>Message</td><td>{{$commit.title}}</td></tr> diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index 78657ec10..44fba15cc 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -1,19 +1,19 @@ {{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}} <div id="wiki_page_list" class="widget" > <h3>{{$header}}</h3> - <ul class="nav nav-pills nav-stacked"> + <ul class="nav nav-pills flex-column"> {{if $pages}} {{foreach $pages as $page}} - <li id="{{$page.link_id}}"> + <li class="nav-item nav-item-hack" id="{{$page.link_id}}"> {{if $page.resource_id && $candel}} - <i class="widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.url}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i> + <i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.url}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i> {{/if}} - <a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a> + <a class="nav-link" href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a> </li> {{/foreach}} {{/if}} {{if $canadd}} - <li><a href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i> {{$addnew}}</a></li> + <li class="nav-item"><a class="nav-link" href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i> {{$addnew}}</a></li> {{/if}} </ul> {{if $canadd}} diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index 916552e03..2deec76c0 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> - <div class="section-title-wrapper"> + <div class="section-title-wrapper clearfix"> {{if $owner}} - <button type="button" class="btn btn-success btn-xs pull-right acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i> {{$create}}</button> + <button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i> {{$create}}</button> {{/if}} <h2>{{$header}}</h2> </div> @@ -13,7 +13,7 @@ {{include file="field_checkbox.tpl" field=$notify}} <div> <div class="btn-group pull-right"> - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i> </button> <button id="new-wiki-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> @@ -41,7 +41,7 @@ <td>{{$wiki.mimeType}}</td> <td class="wiki-index-tool dropdown"> {{if $wiki.lock}} - <i class="fa fa-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i></button> + <i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i></button> <ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> {{/if}} </td> diff --git a/view/tpl/wikilist_widget.tpl b/view/tpl/wikilist_widget.tpl index 1f92b5807..9853f9850 100644 --- a/view/tpl/wikilist_widget.tpl +++ b/view/tpl/wikilist_widget.tpl @@ -1,8 +1,8 @@ <div id="wiki_list" class="widget"> <h3>{{$header}}</h3> - <ul class="nav nav-pills nav-stacked"> + <ul class="nav nav-pills flex-column"> {{foreach $wikis as $wiki}} - <li><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a></li> + <li class="nav-item"><a class="nav-link" href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a></li> {{/foreach}} </ul> </div> |