diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/mod_cloud.js | 2 | ||||
| -rw-r--r-- | view/js/mod_network.js | 1 | ||||
| -rw-r--r-- | view/php/default.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 14 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/blocklist.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/chat.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 12 | ||||
| -rwxr-xr-x | view/tpl/common_tabs.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/layoutlist.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/locmanage.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/menulist.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 12 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/sharedwithme.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/webpagelist.tpl | 8 |
17 files changed, 49 insertions, 64 deletions
diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index 8b8a3ba3f..8af90863e 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -91,7 +91,7 @@ function prepareHtml(f, i) { '<td><i class="fa ' + getIconFromType(f.type) + '" title="' + f.type + '"></i></td>' + '<td>' + f.name + '</td>' + '<td id="upload-progress-' + i + '"></td><td></td><td></td><td></td><td></td>' + - '<td class="hidden-xs">' + formatSizeUnits(f.size) + '</td><td class="hidden-xs"></td>' + + '<td class="d-none d-md-table-cell">' + formatSizeUnits(f.size) + '</td><td class="d-none d-md-table-cell"></td>' + '</tr>' + '<tr id="new-upload-progress-bar-' + i + '" class="new-upload">' + '<td id="upload-progress-bar-' + i + '" colspan="9" class="upload-progress-bar"></td>' + diff --git a/view/js/mod_network.js b/view/js/mod_network.js index cd36786df..2899bbacd 100644 --- a/view/js/mod_network.js +++ b/view/js/mod_network.js @@ -1,5 +1,4 @@ $(document).ready(function() { $("#search-text").contact_autocomplete(baseurl + '/search_ac','',true); - $('.jslider-scale ins').addClass('hidden-xs'); }); diff --git a/view/php/default.php b/view/php/default.php index b8233ca32..950dfbc99 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -15,7 +15,7 @@ <div id="page-footer"></div> <div id="pause"></div> </section> - <aside id="region_3" class="hidden-lg-down"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> + <aside id="region_3" class="d-none d-xl-table-cell"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> </main> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> </body> diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index db06d39c3..b689b3209 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1435,10 +1435,6 @@ blockquote { border-radius: $radius; } -.btn-outline-secondary:hover { - color: $font_colour; -} - /* .navbar-inverse { background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%); @@ -1510,16 +1506,6 @@ blockquote { left: 0px; } - .thread-wrapper.toplevel_item { - width: 100%; - border:1px; - } - - .acl-list-item { - width: 98%; /* fallback if browser does not support calc() */ - width: calc(100% - 10px); - } - } .shareable_element_text { diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 79a6f338f..9fb5c4b18 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -208,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-outline-secondary btn-sm" 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> diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index bdb71ed9d..7f400bba2 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -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/chat.tpl b/view/tpl/chat.tpl index d07adb6b6..6a285dba4 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -60,13 +60,13 @@ <i class="fa fa-terminal jot-icons"></i> </button> </div> - <div class="btn-group hidden-xs"> + <div class="btn-group d-none d-md-table-cell"> <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"> + <div class="btn-group d-none d-md-table-cell"> <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> 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/common_tabs.tpl b/view/tpl/common_tabs.tpl index e78f54a3c..29c46369b 100755 --- a/view/tpl/common_tabs.tpl +++ b/view/tpl/common_tabs.tpl @@ -1,11 +1,11 @@ -<div class="mb-4 hidden-sm-down"> +<div class="mb-4 d-none d-md-block"> <ul class="nav nav-tabs nav-fill"> {{foreach $tabs as $tab}} <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="hidden-md-up dropdown clearfix" style="position:fixed; right:7px; top:4.5rem; z-index:1020"> +<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> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index e9e66a83b..0ed63a7c0 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -68,7 +68,7 @@ </div> {{/if}} {{if $visitor}} - <div class="btn-group mr-2 hidden-md-down"> + <div class="btn-group mr-2 d-none d-lg-flex"> {{if $writefiles}} <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> @@ -85,7 +85,7 @@ </button> {{/if}} </div> - <div class="btn-group mr-2 hidden-md-down"> + <div class="btn-group mr-2 d-none d-lg-flex"> {{if $setloc}} <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> @@ -97,7 +97,7 @@ </button> {{/if}} {{else}} - <div class="btn-group hidden-md-down"> + <div class="btn-group d-none d-lg-flex"> {{/if}} {{if $feature_expire}} <button id="profile-expire-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> @@ -126,7 +126,7 @@ {{/if}} </div> {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}} - <div class="btn-group hidden-lg-up"> + <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> diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl index 96c795a3b..1bbe14893 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -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/locmanage.tpl b/view/tpl/locmanage.tpl index fe24ac460..a8c75b6a8 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -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/menulist.tpl b/view/tpl/menulist.tpl index df3cce7bf..e23035062 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -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/nav.tpl b/view/tpl/nav.tpl index 3c9de483d..3dad4fd5e 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,5 +1,5 @@ {{if $nav.login && !$userinfo}} -<div class="hidden-md-up"> +<div class="d-md-none"> <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> @@ -158,20 +158,20 @@ </li> {{/if}} {{if $nav.register}} - <li class="nav-item {{$nav.register.2}} hidden-xs-down"> + <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 hidden-xs-down"> + <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}} </ul> - <div id="banner" class="navbar-text text-white font-weight-bold hidden-sm-down">{{$banner}}</div> + <div id="banner" class="navbar-text text-white font-weight-bold d-none d-md-flex">{{$banner}}</div> - <ul id="nav-right" class="navbar-nav hidden-sm-down ml-auto"> + <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');"/> @@ -200,7 +200,7 @@ </li> </ul> </div> -<div class="collapse hidden-md-up" id="navbar-collapse-2"> +<div class="collapse" id="navbar-collapse-2"> <div class="navbar-nav"> {{foreach $navapps as $navapp}} {{$navapp|replace:'dropdown-item':'nav-link'}} diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 881bf1a55..20b8ac209 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -53,7 +53,7 @@ <i class="fa fa-terminal jot-icons"></i> </button> </div> - <div class="btn-group hidden-md-down mr-2"> + <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> @@ -62,7 +62,7 @@ </button> </div> {{if $feature_expire || $feature_encrypt}} - <div class="btn-group hidden-md-down mr-2"> + <div class="btn-group d-none d-lg-flex mr-2"> {{if $feature_expire}} <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> @@ -75,7 +75,7 @@ {{/if}} </div> {{/if}} - <div class="btn-group hidden-lg-up"> + <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> diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl index 6ddf28b2d..68bdd6faa 100644 --- a/view/tpl/sharedwithme.tpl +++ b/view/tpl/sharedwithme.tpl @@ -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/webpagelist.tpl b/view/tpl/webpagelist.tpl index 5826e2c51..52942ddf8 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -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}} @@ -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> |