diff options
Diffstat (limited to 'view/tpl')
-rwxr-xr-x | view/tpl/abook_edit.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/conv_item.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/conv_list.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/events-js.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/generic_links_widget.tpl | 4 | ||||
-rwxr-xr-x | view/tpl/group_side.tpl | 14 | ||||
-rw-r--r-- | view/tpl/help.tpl | 4 | ||||
-rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/mail_conv.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/mail_head.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/mail_list.tpl | 4 | ||||
-rwxr-xr-x | view/tpl/message_side.tpl | 10 | ||||
-rwxr-xr-x | view/tpl/nav.tpl | 32 | ||||
-rwxr-xr-x | view/tpl/peoplefind.tpl | 10 | ||||
-rwxr-xr-x | view/tpl/photo_view.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/posted_date_widget.tpl | 6 | ||||
-rwxr-xr-x | view/tpl/profile_edit.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/prv_message.tpl | 2 | ||||
-rwxr-xr-x | view/tpl/search_item.tpl | 2 | ||||
-rw-r--r-- | view/tpl/wiki.tpl | 2 |
20 files changed, 54 insertions, 54 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 76d52f699..be9fcc2a3 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -4,7 +4,7 @@ <div class="pull-right"> <div class="btn-group"> <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-caret-down"></i> {{$tools_label}} + <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> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index c5e3f2ab6..dde24997d 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -139,7 +139,7 @@ </div> {{/if}} <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-caret-down"></i> + <i class="fa fa-cog"></i> </button> <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> {{if $item.share}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 51b0c41fa..d7b4a8ff4 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -113,7 +113,7 @@ {{/if}} <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-caret-down"></i> + <i class="fa fa-cog"></i> </button> <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> {{if $item.share}} diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index f70027144..936b10970 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> <div class="pull-right"> <div class="dropdown"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-caret-down"></i> {{$view_label}}</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> <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> 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/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/help.tpl b/view/tpl/help.tpl index 10e0a4957..61c2b44b2 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -22,9 +22,9 @@ 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'); + $('#doco-toc-toggle').removeClass('fa-caret-right').addClass('fa-cog'); } $('#doco-top-toc').toggle(); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index d26e5ff86..5b64867aa 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -128,7 +128,7 @@ {{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-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> - <i id="more-tools-icon" class="fa fa-caret-down jot-icons"></i> + <i id="more-tools-icon" class="fa fa-cog jot-icons"></i> </button> <ul class="dropdown-menu" role="menu"> {{if $visitor}} diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index a0904ea6c..ad13ba96d 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -21,7 +21,7 @@ {{/if}} <div class="pull-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-caret-down"></i> + <i class="fa fa-cog"></i> </button> <ul class="dropdown-menu" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}"> {{if $mail.can_recall}} 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/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/nav.tpl b/view/tpl/nav.tpl index 8d2feb616..ae12271b9 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -75,7 +75,7 @@ {{/if}} </div> {{/if}} -<div class="collapse navbar-collapse " id="navbar-collapse-1"> +<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;"> @@ -154,21 +154,21 @@ </div> </li> {{/if}} - {{if $nav.login && !$userinfo}} - <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}} - <li class="nav-item {{$nav.register.2}} hidden-xs-down"> - <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 hidden-xs-down"> - <a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a> - </li> - {{/if}} + {{if $nav.login && !$userinfo}} + <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}} + <li class="nav-item {{$nav.register.2}} hidden-xs-down"> + <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 hidden-xs-down"> + <a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a> + </li> + {{/if}} </ul> <!--div class="navbar-text hidden-lg-down">Hubzilla</div--> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 10d99913a..f412533b5 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -8,10 +8,10 @@ </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_view.tpl b/view/tpl/photo_view.tpl index a5c1ec119..ed726d027 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -5,7 +5,7 @@ {{if $tools || $map || $edit}} <div class="btn-group"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> - <i class="fa fa-caret-down"></i> {{$tools_label}} + <i class="fa fa-cog"></i> {{$tools_label}} </button> <ul class="dropdown-menu dropdown-menu-right"> {{if $tools}} diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 6f6363a8c..3ad58cc28 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(); } } @@ -40,7 +40,7 @@ function toggle_posted_date_button() { {{/foreach}} {{if $cutoff}} </div> - <button class="btn btn-outline-secondary 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_edit.tpl b/view/tpl/profile_edit.tpl index 9c16b734f..28510d0a1 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> <div class="dropdown pull-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-caret-down"></i> {{$tools_label}} + <i class="fa fa-cog"></i> {{$tools_label}} </button> <ul class="dropdown-menu"> <li class="nav-item"> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 2ee5757ab..ba09edcf0 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -77,7 +77,7 @@ {{/if}} <div class="btn-group visible-xs visible-sm"> <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-caret-down jot-icons"></i> + <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> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index ea753fe5d..aa7e3aa5d 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -71,7 +71,7 @@ <div class="wall-item-tools"> <div class="wall-item-tools-right btn-group pull-right"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> - <i class="fa fa-caret-down"></i> + <i class="fa fa-cog"></i> </button> <ul class="dropdown-menu"> {{if $item.thread_action_menu}} diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index a5c0397ab..50ccdf4cd 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -4,7 +4,7 @@ {{if $showPageControls}} <div id="page-tools" class="btn-group" style="display: none;"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> - <i class="fa fa-caret-down"></i> {{$tools_label}} + <i class="fa fa-cog"></i> {{$tools_label}} </button> <ul class="dropdown-menu dropdown-menu-right"> {{if $renamePage}} |