From 39d56fd08f3ee2efc3d5eeddb75025034ee5e2c7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Mar 2017 10:17:57 +0100 Subject: initial commit for the bootstrap version 4 branch - upgrade lib and make nav.tpl kind of working again --- view/css/bootstrap-red.css | 10 +- view/php/default.php | 6 +- view/theme/redbasic/css/style.css | 55 +----- view/tpl/acl_selector.tpl | 3 +- view/tpl/app.tpl | 2 +- view/tpl/hdr.tpl | 6 +- view/tpl/nav.tpl | 398 +++++++++++++++++++------------------- 7 files changed, 219 insertions(+), 261 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index f1ebb204e..b29a276f0 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -2,6 +2,7 @@ /* nav overrides */ + nav .badge { position: absolute; top: 1px; @@ -14,17 +15,10 @@ nav .badge { border-radius: 10px; } -#navbar-collapse-1 i, -.navbar-header i { +#navbar-collapse-1 i { font-size: 14px; } -nav .navbar-header img { - height: 49px; - width: 49px; - margin-top: 1px; -} - /* nav overrides end */ diff --git a/view/php/default.php b/view/php/default.php index 373fa2fd0..c4ba6ae43 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -7,15 +7,15 @@ > -

- +

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c632dbc74..0b82202c7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -570,34 +570,14 @@ footer { display: none; } -#nav-searchbar { - float: right; - margin-top: 2px; - margin-right: 10px; -} - #nav-search-spinner { float: left; margin: 25px 0px 0px 25px; color: $nav_active_icon_colour; } -#nav-search-text:hover, -#nav-search-text:focus { - background-color: #fff; - color: #000; -} - #nav-search-text { - font-size: 12px; - width: 200px; - height: 20px; - margin: 15px; - padding: 0px 5px 0px 5px; - border-radius: $radiuspx; - border-color: $nav_bd; - background-color: #eee; - transition: background-color 300ms ease 0s; + width: 250px; } #nav-search-text::-webkit-input-placeholder { @@ -1568,16 +1548,14 @@ nav .dropdown-menu { margin-right: 5px; } -#usermenu-caret { - color: $nav_icon_colour; -} - -.usermenu-head { - float: left; +.usermenu { + width: 32px; + height: 32px; } -.usermenu-head:hover #usermenu-caret { - color: $nav_active_icon_colour; +.usermenu img { + width: 100%; + height: 100%; } .page-title { @@ -1827,25 +1805,6 @@ nav .badge.mail-update { background-color: $nav_active_icon_colour; } -.navbar-toggle-extra { - color: $nav_active_icon_colour; - padding: 7px 10px; -} - -.navbar-toggle-extra-left { - float: left; - margin-left: 15px; - margin-right: 0px; - color: $nav_active_icon_colour; - padding: 7px 10px; -} - -a.navbar-toggle-extra:hover, -a.navbar-toggle-extra-left:hover { - color: $nav_active_icon_colour; - text-decoration: none; -} - .nav-tabs.nav-justified { background-color: rgba(254,254,254,.5); border-top-left-radius: 4px; diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index c23840c16..946ab7cdb 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -54,7 +54,8 @@ @@ -266,7 +266,7 @@ @@ -289,7 +289,7 @@ diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl index d0b81af0c..96c795a3b 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -2,8 +2,8 @@

- - {{$help.text}} + + {{$help.text}}

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 @@

- - + +

diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index fe2d5ec84..fe24ac460 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; }); } - +

diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index 249e13a04..a0904ea6c 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -15,12 +15,12 @@

{{if $mail.attachments}} {{/if}} diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index ba0efe999..c176f678d 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -3,7 +3,7 @@

- + {{if $profile.likers}} {{/if}} @@ -11,14 +11,14 @@ {{/if}} {{if $profile.canlike}}

- +

- {{$editmenu.edit.3}} + {{$editmenu.edit.3}}

- {{$export}} + {{$export}}

@@ -319,13 +319,13 @@

{{/if}} {{$item.term}} {{if $profile.canlike}}
- {{/if}} {{if $item.like_count}}

- + {{if $item.likes}} {{/if}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index a50d11136..9c16b734f 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,7 +1,7 @@

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 @@ Date{{$commit.date}} {{if $permsWrite}} - +

{{/if}} - + Name{{$commit.name}} <{{$commit.email}}> Message{{$commit.title}} diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index 916552e03..15d6eff0d 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -1,7 +1,7 @@

{{if $owner}} - + {{/if}}

@@ -13,7 +13,7 @@ {{include file="field_checkbox.tpl" field=$notify}}

- -- cgit v1.2.3 From 0f9ddbf3b2509ef4651a9b58d008330d6bc8cfd9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Mar 2017 17:02:55 +0100 Subject: fixing classes --- view/css/bootstrap-red.css | 9 ++++----- view/css/widgets.css | 21 +-------------------- view/theme/redbasic/css/style.css | 26 +++++++++++++------------- view/theme/redbasic/php/style.php | 2 +- view/tpl/abook_edit.tpl | 2 +- view/tpl/conv_item.tpl | 2 +- view/tpl/conv_list.tpl | 2 +- view/tpl/events-js.tpl | 2 +- view/tpl/generic_links_widget.tpl | 4 ++-- view/tpl/group_side.tpl | 14 +++++++------- view/tpl/help.tpl | 4 ++-- view/tpl/jot.tpl | 2 +- view/tpl/mail_conv.tpl | 2 +- view/tpl/mail_head.tpl | 2 +- view/tpl/mail_list.tpl | 4 ++-- view/tpl/message_side.tpl | 10 +++++----- view/tpl/nav.tpl | 32 ++++++++++++++++---------------- view/tpl/peoplefind.tpl | 10 +++++----- view/tpl/photo_view.tpl | 2 +- view/tpl/posted_date_widget.tpl | 6 +++--- view/tpl/profile_edit.tpl | 2 +- view/tpl/prv_message.tpl | 2 +- view/tpl/search_item.tpl | 2 +- view/tpl/wiki.tpl | 2 +- 24 files changed, 73 insertions(+), 93 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 1369ea5c8..4f855ce39 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -10,6 +10,10 @@ nav .badge { } +.nav-item.nav-item-hack { + height: 1.9rem; +} + #navbar-collapse-1 i { font-size: 1rem; } @@ -17,11 +21,6 @@ nav .badge { /* nav overrides end */ -aside .nav-pills > li > a, -.response-list .nav-pills > li > a { - padding: 6px 10px; -} - nav .dropdown-menu { max-height: 70vh; overflow: auto; diff --git a/view/css/widgets.css b/view/css/widgets.css index 9b97d8bf7..8fb4ab377 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -20,34 +20,15 @@ .widget-nav-pills-icons { opacity: 0; - padding: 6px 10px; float: right; - position: relative; - z-index:1; } - .widget-nav-pills-checkbox { - padding: 6px 10px; + padding: 0.6rem 1.4rem; float: right; - position: relative; - z-index:1; cursor: pointer; } -i.widget-nav-pills-icons, -i.widget-nav-pills-checkbox { - margin-top: 2px; -} - -.widget-nav-pills-icons:hover + a { - background-color: #eee; -} - -.widget-nav-pills-checkbox:hover + a { - background-color: #eee; -} - li:hover .widget-nav-pills-icons { opacity: 1; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7250ff961..33dcfedc9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1169,9 +1169,15 @@ margin-right: 50px; } .generic-icons { - font-size: 1.2em; + font-size: 1rem; color: $toolicon_colour; - margin-right: 7px; + margin-right: 0.5rem; +} + +.generic-icons-right { + font-size: 1rem; + color: $toolicon_colour; + margin-left: 0.5rem; } .generic-icons:hover { @@ -1476,6 +1482,11 @@ img.mail-conv-sender-photo { color: $toolicon_colour; } +.widget .nav-item:hover { + background-color: #eee; + border-radius: $radiuspx; +} + #note-text { border: 1px solid #ccc; border-radius: $radiuspx; @@ -2063,17 +2074,6 @@ dl.bb-dl > dd > li { border-left: 3px solid #eee; } -.nav-pills-stacked-icons { - padding: 6px 10px; - float: right; - position: relative; - z-index:1; -} - -.nav-pills-stacked-icons:hover + a { - background-color: #eee; -} - .app-icon { font-size: 80px; color: $toolicon_colour; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 85b495792..43a973da1 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -102,7 +102,7 @@ if (! $nav_icon_colour) if (! $nav_active_icon_colour) $nav_active_icon_colour = "#fff"; if (! $link_colour) - $link_colour = "#337AB7"; + $link_colour = "#0275d8"; if (! $banner_colour) $banner_colour = "#fff"; if (! $bgcolour) 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 @@

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 @@

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}}

{{$attach}}

+ {{if $item.title}} +

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

+ {{/if}} +

- {{if $item.title}} -

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

- {{/if}} {{if $item.lock}} {{if $item.body}} -

@@ -53,7 +54,7 @@

{{/if}} {{if $item.has_tags}} -

{{$item.mentions}} @@ -77,7 +78,7 @@

{{/if}} -

-- cgit v1.2.3 From 8aabc6bc3dfccb85f44b5db4708a756124277e1e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 12 Mar 2017 21:11:28 +0100 Subject: many dropdown and class fixes. still a long way to go... --- view/css/bootstrap-red.css | 4 -- view/css/conversation.css | 17 +++---- view/css/default.css | 4 +- view/theme/redbasic/css/style.css | 35 ++++++++------ view/theme/redbasic/js/redbasic.js | 18 +++---- view/tpl/common_tabs.tpl | 17 +++++-- view/tpl/connections.tpl | 11 ++--- view/tpl/conv_item.tpl | 98 +++++++++++++++++++------------------- view/tpl/cover_photo_widget.tpl | 8 ++-- view/tpl/directory_header.tpl | 16 +++---- view/tpl/direntry.tpl | 2 +- view/tpl/follow.tpl | 4 +- view/tpl/nav.tpl | 12 ++--- view/tpl/peoplefind.tpl | 4 +- view/tpl/saved_searches.tpl | 12 ++--- view/tpl/searchbox.tpl | 6 +-- 16 files changed, 133 insertions(+), 135 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 5aa836434..4a2d49e75 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -35,10 +35,6 @@ nav .navbar-collapse.in .dropdown-menu { min-width: auto; } -.nav-tabs.nav-justified > li { - white-space: nowrap; -} - code { white-space: normal; } diff --git a/view/css/conversation.css b/view/css/conversation.css index b923e3627..7567d13eb 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -111,10 +111,6 @@ margin-left:10px; } -.lockview-panel { - padding: 3px 20px; -} - .wall-item-lock { float: left; } @@ -129,8 +125,11 @@ a.wall-item-name-link { text-overflow: ellipsis; } -.wall-item-ago .fa-check { +.wall-item-ago i { font-size: 0.75rem; +} + +.wall-item-ago .fa-check { cursor: pointer; } @@ -142,7 +141,7 @@ a.wall-item-name-link { max-width: 100%; } -.wall-item-title h3 { +.wall-item-title.h3 { font-weight: bold; margin: 0px; } @@ -191,11 +190,11 @@ a.wall-item-name-link { } .ivoted { - color: #337AB7; + color: #0275d8; } .item-highlight { - border-left: 3px solid #337AB7; + border-left: 3px solid #0275d8; } .item-highlight .wall-item-head, @@ -270,12 +269,10 @@ a.wall-item-name-link { .item-verified { color: darkgreen; - font-size: 1em !important; } .item-forged { color: #FF0000; - font-size: 1em !important; } /* event item */ diff --git a/view/css/default.css b/view/css/default.css index 0f975bd99..fc6da54f9 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -18,7 +18,7 @@ aside { position: relative; display: table-cell; vertical-align: top; - padding: 5rem 7px 0px 7px; + padding: 4.5rem 7px 0px 7px; } section { @@ -26,5 +26,5 @@ section { width: 100%; display: table-cell; vertical-align: top; - padding: 5rem 7px 200px 7px; + padding: 4.5rem 7px 200px 7px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index dd6046570..caebd04d5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -918,9 +918,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { padding-top: 2px; font-weight: bold; line-height: 1em; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; display: block; } @@ -1314,9 +1311,10 @@ img.mail-conv-sender-photo { /* conversation */ -.nsfw-wrap { - text-align: center; - font-size: $body_font_size; + +.top-radius { + border-top-right-radius: $radiuspx; + border-top-left-radius: $radiuspx; } .wall-event-item { @@ -1532,10 +1530,10 @@ nav img { } .dropdown-menu-img-sm { - float: left; - width: 36px; - height: 36px; + width: 3em; + height: 3em; margin-right: 5px; + float: left; } .dropdown-menu-img-xs { @@ -1587,8 +1585,12 @@ nav img { text-overflow: ellipsis; } +.section-subtitle-wrapper h3 { + padding: 3px; +} + .section-subtitle-wrapper { - padding: 7px 10px; + padding: 4px 10px; background-color: $item_colour; border-bottom: 3px solid $comment_item_colour; } @@ -1708,6 +1710,10 @@ nav ul li .notify-unseen /* bootstrap overrides */ +.btn { + font-size: $body_font_size; +} + .panel { background-color: transparent; border: 0px solid transparent; @@ -1792,6 +1798,8 @@ blockquote { background-color: $nav_active_icon_colour; } */ + +/* .nav-tabs.nav-justified { background-color: rgba(254,254,254,.5); border-top-left-radius: 4px; @@ -1809,16 +1817,13 @@ blockquote { .nav-tabs > li.active > a:focus { background-color: transparent; } +*/ #tabs-collapse-1 { padding: 0px; margin-bottom: 25px; } -.btn { - font-size: $body_font_size; -} - @media screen and (max-width: 767px) { aside#region_1 { @@ -1995,7 +2000,7 @@ dl.bb-dl > dd > li { .field.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; - background-color: #337AB7; + background-color: #0275d8; } .help-searchlist { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 81a95c68b..1ed5e520f 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -40,21 +40,17 @@ $(document).ready(function() { left_aside_height = $('#left_aside_wrapper').height(); } }); - - if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) { - $('#expand-aside').hide(); - } - +/* $('#expand-tabs').click(function() { - if(!$('#tabs-collapse-1').hasClass('in')){ - $('html, body').animate({ scrollTop: 0 }, 'slow'); + if($('#tabs-collapse-1').hasClass('show')){ + $('#tabs-collapse-1').removeClass('show'); } $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); }); - - $('.usermenu-head').click(function() { - if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('in')){ - $('#navbar-collapse-1, #navbar-collapse-2').removeClass('in'); +*/ + $('.usermenu').click(function() { + if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){ + $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show'); } }); diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl index fa6bfbdfa..43c66b042 100755 --- a/view/tpl/common_tabs.tpl +++ b/view/tpl/common_tabs.tpl @@ -1,8 +1,17 @@ -

{{$tab.label}}
{{$tab.label}}

{{$header}}{{if $total}} ({{$total}}){{/if}}

@@ -25,11 +25,10 @@

{{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 79317f146..1896ef66e 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -18,11 +18,10 @@ {{$item.event}}

{{/if}} - {{if $item.title}} -

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

+ {{if $item.title && !$item.event}} +

+ {{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

@@ -33,7 +32,8 @@

@@ -85,11 +85,11 @@ - +

{{/if}} {{/if}} {{if $item.canvote}} @@ -126,69 +126,69 @@ - +

{{/if}} - +

@@ -198,7 +198,7 @@ {{if $item.attachments}}

- +

{{/if}} {{foreach $item.responses as $verb=>$response}} @@ -206,9 +206,9 @@

{{if $response.list_part}} - + {{else}} - + {{/if}} {{if $response.list_part}}

diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index bc1f421bd..f0c9d916f 100755 --- a/view/tpl/cover_photo_widget.tpl +++ b/view/tpl/cover_photo_widget.tpl @@ -15,7 +15,7 @@ $('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'); + $('.navbar').removeClass('fixed-top'); $('main').css('opacity', 0); $('header').hide(); } @@ -32,7 +32,7 @@ $('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', ''); coverSlid = true; } @@ -47,7 +47,7 @@ $('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'); + $('.navbar').removeClass('fixed-top'); $('main').css('opacity', 0); $('header').hide(); } @@ -64,7 +64,7 @@ $('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'); coverSlid = true; } diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 3b439684d..71e991f3a 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,24 +1,22 @@

- +

{{$dirlbl}}{{if $search}}: {{$safetxt}}{{/if}}

diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index a4a632845..f7ec7db23 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,5 +1,5 @@

{{if $entry.viewrate}} {{if $entry.total_ratings}}{{$entry.total_ratings}}{{/if}} diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index a211a65b6..240cc7b55 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -2,9 +2,9 @@

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ae12271b9..42f331fee 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -12,18 +12,18 @@ {{/if}} {{if $localuser}} -

{{foreach $nav.usermenu as $usermenu}} {{/foreach}} diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index f412533b5..82da8b9c9 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -2,9 +2,9 @@

diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index 2065cd714..b62404fcc 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -1,14 +1,12 @@ -

+ diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl index 99abd8745..eafade405 100644 --- a/view/tpl/searchbox.tpl +++ b/view/tpl/searchbox.tpl @@ -1,11 +1,11 @@

- +

- + {{if $savedsearch}} - + {{/if}}

-- cgit v1.2.3 From 61257094b7befe12dadbd3593fcfa70d09da2fbb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 12 Mar 2017 22:21:49 +0100 Subject: fix help menu --- view/tpl/help.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index 61c2b44b2..43b061dcc 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -5,7 +5,7 @@

- + {{$tocHeading}}

@@ -24,7 +24,7 @@ if($('#doco-top-toc').is(':visible')) { $('#doco-toc-toggle').removeClass('fa-cog').addClass('fa-caret-right'); } else { - $('#doco-toc-toggle').removeClass('fa-caret-right').addClass('fa-cog'); + $('#doco-toc-toggle').removeClass('fa-caret-right').addClass('fa-caret-down'); } $('#doco-top-toc').toggle(); -- cgit v1.2.3 From 700c05a55bab34c40f24fbe4f83a0fa9882559b2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 13 Mar 2017 16:34:23 +0100 Subject: many class fixes and revive shiny class for item titles in a new way --- view/css/conversation.css | 7 ------ view/theme/redbasic/css/style.css | 9 +++---- view/theme/redbasic/js/redbasic.js | 4 +-- view/tpl/categories_widget.tpl | 6 ++--- view/tpl/common_tabs.tpl | 4 +-- view/tpl/conv_item.tpl | 19 +++++++------- view/tpl/jot.tpl | 2 +- view/tpl/nwiki_page_history.tpl | 6 ++--- view/tpl/photo_albums.tpl | 6 ++--- view/tpl/posted_date_widget.tpl | 14 +++++------ view/tpl/profile_advanced.tpl | 16 ++++++------ view/tpl/profile_edit.tpl | 51 ++++++++++++-------------------------- view/tpl/usermenu.tpl | 6 ++--- view/tpl/wiki.tpl | 26 ++++++++----------- view/tpl/wiki_page_list.tpl | 10 ++++---- view/tpl/wikilist_widget.tpl | 4 +-- 16 files changed, 78 insertions(+), 112 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 7567d13eb..78dd29741 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -73,10 +73,6 @@ height: 30px; } -#profile-jot-wrapper { - margin-bottom: 30px; -} - #profile-jot-plugin-wrapper { margin-top: 10px; } @@ -91,9 +87,6 @@ /* conversation */ -.thread-wrapper.toplevel_item { - margin-bottom: 20px; -} /* conv_item */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index caebd04d5..fe41c2bdd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1703,8 +1703,7 @@ main.fullscreen .section-content-wrapper-np { nav ul li .undefined, nav ul li .notify-seen, -nav ul li .notify-unseen - { +nav ul li .notify-unseen { max-height: 3rem; } @@ -1819,10 +1818,6 @@ blockquote { } */ -#tabs-collapse-1 { - padding: 0px; - margin-bottom: 25px; -} @media screen and (max-width: 767px) { @@ -2052,3 +2047,5 @@ dl.bb-dl > dd > li { #permcat-index { margin: 10px; } + +.shiny { background-color: red; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 1ed5e520f..4686e93db 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -18,7 +18,7 @@ $(document).ready(function() { if($(window).width() > 767) { $('#left_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true), + offset_top: $('nav').outerHeight(true) + 10, parent: '#region_1', spacer: '#left_aside_spacer' }); @@ -105,7 +105,7 @@ function toggleAside() { $('main').addClass('region_1-on') $('

').appendTo('section'); $('#left_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true) - 10, + offset_top: $('nav').outerHeight(true) + 10, parent: '#region_1', spacer: '#left_aside_spacer' }); 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 @@

{{$all}}

{{$all}}
{{$term.name}}
{{$term.name}}

{{$tab.label}}

{{/if}} -

{{$item.photo}} @@ -19,9 +19,12 @@

{{/if}} {{if $item.title && !$item.event}} -

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

+ {{if ! $item.is_new}} +

+ {{/if}} {{/if}}

@@ -78,7 +81,7 @@

{{/if}} -

{{if $item.toplevel && $item.emojis && $item.reactions}} {{/if}} -

{{if $item.toplevel}} {{foreach $item.children as $child}} @@ -245,10 +245,9 @@ {{/foreach}} {{/if}} {{if $item.comment}} -

{{if $item.comment_lastcollapsed}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 8885da7c1..b9afbd98e 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -6,7 +6,7 @@ {{$id_seltext}} {{$id_select}}

{{/if}} -

{{if $parent}} {{/if}} diff --git a/view/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl index 5d95ce105..b1c6c9284 100644 --- a/view/tpl/nwiki_page_history.tpl +++ b/view/tpl/nwiki_page_history.tpl @@ -39,10 +39,10 @@ background:rgb(224,255,224); } - +

{{foreach $pageHistory as $commit}} - - - + + {{foreach $pages as $key => $items}} {{foreach $items as $item}} @@ -60,10 +60,10 @@ {{/if}} - - -- cgit v1.2.3 From 8b0bcdb2a56ba7a8a9c55687d7dba26154fce83d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 20:13:10 +0100 Subject: minor fixes --- view/tpl/nav.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 3dad4fd5e..2544ccf52 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,5 +1,5 @@ {{if $nav.login && !$userinfo}} -

{{$nav.loginmenu.1.1}} @@ -200,7 +200,7 @@

{{foreach $navapps as $navapp}} {{$navapp|replace:'dropdown-item':'nav-link'}} -- cgit v1.2.3 From 837efcf5e73b7fbc81697bcb1257ef8cf6912cdd Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 20:59:46 +0100 Subject: fix fullscreen and bbco_autocomplete popup rendering --- view/js/autocomplete.js | 7 ++++++- view/theme/redbasic/css/style.css | 12 +++--------- view/theme/redbasic/js/redbasic.js | 9 +++------ view/tpl/wiki.tpl | 2 +- 4 files changed, 13 insertions(+), 17 deletions(-) (limited to 'view') diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index e33f6192b..313e501e2 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -70,6 +70,10 @@ function smiley_format(item) { return ""; } +function bbco_format(item) { + return ""; +} + function editor_replace(item) { if(typeof item.replace !== 'undefined') { return '$1$2' + item.replace; @@ -326,7 +330,8 @@ function string2bb(element) { else { return '\[' + element + '\] '; } - } + }, + template: bbco_format }; this.attr('autocomplete','off'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b689b3209..3548e237f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1364,19 +1364,13 @@ img.mail-conv-sender-photo { word-wrap: break-word; } -main.fullscreen { - left: 0px; - width: 100%; - height: 100vh; - max-width: none; -} - main.fullscreen .generic-content-wrapper { - position: absolute; - width: 100%; + position: fixed; top: 0px; left: 0px; + width: 100%; border-radius: 0px; + border-width: 0px; } main.fullscreen .section-title-wrapper { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index b522f8dd1..8106f913d 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -73,17 +73,14 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { - $('main').css({'transition': 'none'}).addClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').hide(); - $('#tabs-collapse-1').css({'visibility': 'hidden'}); + $('main').addClass('fullscreen'); + $('header, nav, aside, #fullscreen-btn').css({'visibility': 'hidden'}); $('#inline-btn').show(); } else { $('main').removeClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').show(); - $('#tabs-collapse-1').css({'visibility': ''}); + $('header, nav, aside, #fullscreen-btn').css({'visibility': ''}); $('#inline-btn').hide(); - $('main').css({'transition': ''}); $(document.body).trigger("sticky_kit:recalc"); } } diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index c5778a644..27592a4b4 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -56,7 +56,7 @@

- +

-- cgit v1.2.3 From cbcd1954618da8ba7013a42fcec5bff531535ba9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 22:39:29 +0100 Subject: fix webpages widgets --- view/theme/redbasic/css/style.css | 3 +- view/theme/redbasic/js/redbasic.js | 4 +- view/tpl/design_tools.tpl | 14 ++--- view/tpl/website_portation_tools.tpl | 116 ++++++++++++++--------------------- 4 files changed, 57 insertions(+), 80 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3548e237f..f233e9a76 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1672,9 +1672,10 @@ dl.bb-dl > dd > li { } .sub-menu { + width: 100%; margin-top: 10px; padding-left: 15px; - border-left: 3px solid #eee; + border-left: 0.2rem solid #eee; } .app-icon { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 8106f913d..6aba457f1 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -74,12 +74,12 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { $('main').addClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').css({'visibility': 'hidden'}); + $('header, nav, aside, #fullscreen-btn').hide(); $('#inline-btn').show(); } else { $('main').removeClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').css({'visibility': ''}); + $('header, nav, aside, #fullscreen-btn').show(); $('#inline-btn').hide(); $(document.body).trigger("sticky_kit:recalc"); } 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 @@ diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl index 2910c0e29..b59e135c2 100644 --- a/view/tpl/website_portation_tools.tpl +++ b/view/tpl/website_portation_tools.tpl @@ -1,72 +1,48 @@

- {{$import_label}} -
- - - - -
{{$file_import_text}}
-
-
- -
- -
-
-
- - -
{{$file_upload_text}}
-
- -
- -
- -
-
-
- -

- {{$export_label}} -
-
- - -
{{$file_download_text}}
-
- -
- -
- -
-
-
- -
- - -
{{$cloud_export_text}}
-
- -
- -
- -
-
-
- -

+ {{$import_label}} + + +

+ +

+ {{$export_label}} + + + +

+ +

+ + + + +

+ +

-- cgit v1.2.3 From a6f232f2b0613b8114424034da8814cffb566dd7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 23:20:14 +0100 Subject: really fix fullscreen and fix some issues in chat --- view/theme/redbasic/css/style.css | 11 +++++++++-- view/theme/redbasic/js/redbasic.js | 2 +- view/tpl/chat.tpl | 18 +++++++++--------- 3 files changed, 19 insertions(+), 12 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f233e9a76..fba5edc43 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1364,11 +1364,18 @@ img.mail-conv-sender-photo { word-wrap: break-word; } +main.fullscreen { + left: 0px; + width: 100%; + height: 100vh; + max-width: none; +} + main.fullscreen .generic-content-wrapper { - position: fixed; + position: absolute; + width: 100%; top: 0px; left: 0px; - width: 100%; border-radius: 0px; border-width: 0px; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 6aba457f1..995c7a504 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -74,7 +74,7 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { $('main').addClass('fullscreen'); - $('header, nav, aside, #fullscreen-btn').hide(); + $('header, nav, aside, #fullscreen-btn').attr('style','display:none !important');; $('#inline-btn').show(); } else { diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 6a285dba4..22f3465bf 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -27,9 +27,9 @@

- + -

- - + {{/foreach}}

- + - - + + {{foreach $items as $item}} - - + + {{/foreach}}

+ ' + '' + '' + - '' + + '' + '' + '' + '' + 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 @@

- + 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 @@ {{if $vcard.fn}}{{$vcard.fn}}{{/if}} - {{if $vcard.emails.0.address}}{{$vcard.emails.0.address}}{{/if}} - {{if $vcard.tels.0}}{{$vcard.tels.0.nr}}{{if $is_mobile}} {{/if}}{{/if}} + {{if $vcard.emails.0.address}}{{$vcard.emails.0.address}}{{/if}} + {{if $vcard.tels.0}}{{$vcard.tels.0.nr}}{{if $is_mobile}} {{/if}}{{/if}} 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 @@ - - + + {{foreach $pages as $key => $items}} {{foreach $items as $item}} @@ -53,10 +53,10 @@ {{/if}} - - 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 @@ -

{{if $feature_encrypt}} -

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 @@

- - + + {{if $parentpath}} @@ -14,8 +14,8 @@ - - + + {{/if}} {{* this is needed to append the upload files in the right order *}} @@ -33,8 +33,8 @@ {{/if}} - - + + 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 @@ -

{{$tab.label}}

- - + + {{foreach $pages as $key => $items}} {{foreach $items as $item}} @@ -55,10 +55,10 @@ {{/if}} - - 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 @@

{{$name}}						{{{{$type}}}}	{{$size}}	{{$lastmod}}	{{$lastmod}}
Date	{{$commit.date}}	{{if $permsWrite}} diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index de1105bbc..d2797aefb 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,11 +1,11 @@ {{$title}} - - Recent Photos + + Recent Photos {{if $albums}} {{foreach $albums as $al}} {{if $al.text}} - {{$al.total}}{{$al.text}} + {{$al.total}}{{$al.text}} {{/if}} {{/foreach}} {{/if}} diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 3ad58cc28..fb43c744b 100755 --- a/view/tpl/posted_date_widget.tpl +++ b/view/tpl/posted_date_widget.tpl @@ -18,21 +18,21 @@ function toggle_posted_date_button() { {{$title}} - + {{foreach $dates as $y => $arr}} {{if $y == $cutoff_year}} - + {{/if}} - - {{$y}} + + {{$y}} - + {{foreach $arr as $d}} - - {{$d.0}} + + {{$d.0}} {{/foreach}} diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index c176f678d..c56062459 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -1,6 +1,6 @@ - + {{if $profile.like_count}} @@ -19,15 +19,15 @@ {{if $editmenu.multi}} {{$editmenu.edit.3}} - + {{foreach $editmenu.menu.entries as $e}} - - {{$e.profile_name}} - + {{$e.profile_name}} {{/foreach}} - {{$editmenu.menu.chg_photo}} - {{if $editmenu.menu.cr_new}} {{$editmenu.menu.cr_new}} {{/if}} - + {{$editmenu.menu.chg_photo}} + {{if $editmenu.menu.cr_new}} + {{$editmenu.menu.cr_new}} + {{/if}} + {{elseif $editmenu}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 28510d0a1..05137479f 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,53 +1,34 @@ - + - - - {{$profpic}} - + + {{$profpic}} {{if $is_default}} - - {{$coverpic}} - + {{$coverpic}} {{/if}} {{if ! $is_default}} - - {{$editvis}} - + {{$editvis}} {{/if}} - - {{$addthing}} - - - - {{$viewprof}} - - + {{$addthing}} + + {{$viewprof}} {{if $profile_clone_link}} - - - {{$cl_prof}} - + + {{$cl_prof}} {{/if}} {{if $exportable}} - - - {{$lbl_export}} - - - {{$lbl_import}} - + + {{$lbl_export}} + {{$lbl_import}} {{/if}} {{if ! $is_default}} - - - {{$del_prof}} - + + {{$del_prof}} {{/if}} - + {{$banner}} 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 @@ {{$menu.menu_desc}}{{if $edit}} {{/if}} {{/if}} {{if $items}} - + {{foreach $items as $mitem }} - - {{$mitem.mitem_desc}}{{if $mitem.submenu}}{{/if}} + + {{$mitem.mitem_desc}}{{if $mitem.submenu}}{{/if}} {{if $mitem.submenu}}{{$mitem.submenu}}{{/if}} {{/foreach }} diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 50ccdf4cd..c5778a644 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -6,16 +6,12 @@ - + {{if $renamePage}} - - {{$renamePage}} - + {{$renamePage}} {{/if}} - - Embed Image - - + Embed Image + {{/if}} @@ -43,12 +39,12 @@ - {{$editOrSourceLabel}} - View - History + {{$editOrSourceLabel}} + View + History - + {{if !$mimeType \|\| $mimeType == 'text/markdown'}} {{else}} @@ -62,19 +58,19 @@ - + {{/if}} - + {{$renderedContent}} - + 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}} {{/if}} {{$header}} - + {{if $pages}} {{foreach $pages as $page}} - + {{if $page.resource_id && $candel}} - + {{/if}} - {{$page.title}} + {{$page.title}} {{/foreach}} {{/if}} {{if $canadd}} - {{$addnew}} + {{$addnew}} {{/if}} {{if $canadd}} 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 @@ {{$header}} - + {{foreach $wikis as $wiki}} - {{$wiki.title}} + {{$wiki.title}} {{/foreach}} -- cgit v1.2.3 From 7b9df1d40101cff801208b8dbcf8c8c0bc42365e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Mar 2017 14:12:44 +0100 Subject: css fixes --- view/css/bootstrap-red.css \| 1 - view/css/mod_mail.css \| 8 ++++++-- view/theme/redbasic/css/style.css \| 23 ++++++----------------- view/tpl/hdr.tpl \| 2 +- 4 files changed, 13 insertions(+), 21 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 4a2d49e75..356d0ae9c 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -3,7 +3,6 @@ /* nav overrides / nav .badge { - font-size: 100%; position: absolute; top: 1px; left: 1px; diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css index c1874edac..3ca75d0e4 100644 --- a/view/css/mod_mail.css +++ b/view/css/mod_mail.css @@ -1,3 +1,7 @@ +.mail-conv-detail { + line-height: 1.2; +} + .mail-conv-sender { float: left; margin-right: 10px; @@ -5,8 +9,8 @@ } .mail-conv-sender img{ - width: 32px; - height: 32px; + width: 2.2rem; + height: 2.2rem; } .mail-conv-sender-name { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fe41c2bdd..498e816db 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -921,17 +921,14 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { display: block; } -.dropdown-sub-text { +.dropdown-notification { line-height: 1em; + font-size: 0.75rem; overflow: hidden; text-overflow: ellipsis; display: block; } -.notify-seen a { - background: #ddd; -} - #page-spinner { color: #777; margin: 24px; @@ -1470,11 +1467,6 @@ img.mail-conv-sender-photo { color: $toolicon_colour; } -.widget .nav-item:hover { - background-color: #eee; - border-radius: $radiuspx; -} - #note-text { border: 1px solid #ccc; border-radius: $radiuspx; @@ -1537,8 +1529,8 @@ nav img { } .dropdown-menu-img-xs { - height: 18px; - width: 18px; + height: 1em; + width: 1em; margin-right: 5px; } @@ -1701,12 +1693,9 @@ main.fullscreen .section-content-wrapper-np { background-color: $item_colour; } -nav ul li .undefined, -nav ul li .notify-seen, -nav ul li .notify-unseen { - max-height: 3rem; +.notify-seen { + background-color: $item_colour; } - / bootstrap overrides / .btn { diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index 261d3056f..fa2996be6 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,5 @@ {{$banner}} - {2}{3} {4} + {2}{3} {4} -- cgit v1.2.3 From a0a376e95e78e4c1ac9fb5da30f46cea0b4d0de5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Mar 2017 18:31:19 +0100 Subject: hide nav search behind a button, css fixes and cleanup --- view/css/bootstrap-red.css \| 15 ++++-------- view/js/autocomplete.js \| 2 +- view/js/main.js \| 4 +-- view/php/default.php \| 2 +- view/theme/redbasic/css/style.css \| 51 ++++++--------------------------------- view/tpl/follow.tpl \| 2 +- view/tpl/hdr.tpl \| 2 -- view/tpl/nav.tpl \| 17 +++++++------ view/tpl/peoplefind.tpl \| 2 +- view/tpl/searchbox.tpl \| 2 +- 10 files changed, 29 insertions(+), 70 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 356d0ae9c..77ec1f5cb 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -17,18 +17,17 @@ nav .badge { font-size: 1rem; } -/ nav overrides end / - +#navbar-collapse-2.show { + max-height: 100vh; + overflow: auto; +} nav .dropdown-menu { max-height: 70vh; overflow: auto; } -nav .navbar-collapse.in .dropdown-menu { - max-height: none; - overflow: none; -} +/ nav overrides end / .wall-item-tools .dropdown-menu { min-width: auto; @@ -38,10 +37,6 @@ code { white-space: normal; } -.form-control { - font-size: unset; -} - .panel-group { margin-bottom: 0px; } diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 5a616b6fc..4de9f9c6b 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -60,7 +60,7 @@ function contact_format(item) { var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick); if(typeof desc === 'undefined') desc = ''; if(desc) desc = ' ('+desc+')'; - return " {2}{3} ".format(item.taggable, item.photo, item.name, desc, item.link); + return " {2}{3} ".format(item.taggable, item.photo, item.name, desc, item.link); } else return " " + item.text + " "; diff --git a/view/js/main.js b/view/js/main.js index db7ad110b..5e3a04abb 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -369,10 +369,10 @@ function NavUpdate() { updateCountsOnly = false; if(data.network \|\| data.home \|\| data.intros \|\| data.mail \|\| data.all_events \|\| data.notify) { - $('#notifications-btn').css('color', 'white').prop('disabled', false); + $('#notifications-btn').removeClass('text-muted').addClass('text-white'); } else { - $('#notifications-btn').css('color', 'grey').prop('disabled', true); + $('#notifications-btn').removeClass('text-white').addClass('text-muted'); $('#navbar-collapse-1').removeClass('in'); } diff --git a/view/php/default.php b/view/php/default.php index c4ba6ae43..b8233ca32 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -7,7 +7,7 @@ > - + diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 498e816db..0e9eab16a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -108,34 +108,7 @@ a:focus, cursor: pointer; } -input[type="text"], -input[type="password"], -input[type="submit"], -input[type="file"], -select, -textarea { - font-family: sans-serif, arial, freesans; - font-size: $body_font_size; -} - -input { - padding: 5px; - line-height: 1.5; - border: 1px solid #ccc; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - -input[type="submit"] { - background-color: #F0F0F0; - font-weight: bold; - color: #0080FF; - text-decoration: none; - padding: 6px 12px; -} - input, optgroup, select, textarea { - color: #333; resize: vertical; } @@ -570,24 +543,16 @@ footer { } #nav-search-spinner { - float: left; - margin: 25px 0px 0px 25px; - color: $nav_active_icon_colour; + float: right; + margin-top: -0.85rem; + margin-right: 1.1rem; } -/ + #nav-search-text { - font-size: 12px; - width: 200px; - height: 20px; - margin-right: 15px; - padding: 0px 5px 0px 5px; - border-radius: $radiuspx; - border-color: $nav_bd; - background-color: #eee; - transition: background-color 300ms ease 0s; + width: 280px; } -/ + #nav-search-text::-webkit-input-placeholder { font-family: FontAwesome, sans-serif; } @@ -1535,8 +1500,8 @@ nav img { } .usermenu { - width: 2rem; - height: 2rem; + width: 2.2rem; + height: 2.2rem; } .usermenu img { diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index 240cc7b55..4def1415d 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -2,7 +2,7 @@ {{$connect}} - + diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index fa2996be6..5ab7d68fd 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,3 @@ - {{$banner}} - {2}{3} {4} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index d3ead3cfe..ab9698d49 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -19,11 +19,8 @@ - {{if $localuser}} - {{/if}} @@ -171,13 +168,17 @@ {{/if}} - + {{$banner}} - - + + - + + + + + {{if $nav.help.6}} diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 82da8b9c9..2ecfbaff9 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -2,7 +2,7 @@ {{$findpeople}} - + diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl index eafade405..8f7ac5162 100644 --- a/view/tpl/searchbox.tpl +++ b/view/tpl/searchbox.tpl @@ -1,7 +1,7 @@ - + {{if $savedsearch}} -- cgit v1.2.3 From 3b2398ed015f1ada35b4098f6cc7f4431c65423d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Mar 2017 18:59:27 +0100 Subject: css fixes --- view/css/bootstrap-red.css \| 5 ----- view/theme/redbasic/css/style.css \| 14 ++++++-------- view/tpl/nav.tpl \| 4 ++-- 3 files changed, 8 insertions(+), 15 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 77ec1f5cb..95d3b0e86 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -17,11 +17,6 @@ nav .badge { font-size: 1rem; } -#navbar-collapse-2.show { - max-height: 100vh; - overflow: auto; -} - nav .dropdown-menu { max-height: 70vh; overflow: auto; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0e9eab16a..d81c8a75d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -545,7 +545,7 @@ footer { #nav-search-spinner { float: right; margin-top: -0.85rem; - margin-right: 1.1rem; + margin-right: 1.6rem; } @@ -880,14 +880,12 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { } .contactname { - padding-top: 2px; font-weight: bold; - line-height: 1em; display: block; } .dropdown-notification { - line-height: 1em; + line-height: 1.1em; font-size: 0.75rem; overflow: hidden; text-overflow: ellipsis; @@ -1487,15 +1485,15 @@ nav img { } .dropdown-menu-img-sm { - width: 3em; - height: 3em; + width: 3.3em; + height: 3.3em; margin-right: 5px; float: left; } .dropdown-menu-img-xs { - height: 1em; - width: 1em; + height: 1.1em; + width: 1.1em; margin-right: 5px; } diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ab9698d49..003c17fa7 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -168,12 +168,12 @@ {{/if}} - {{$banner}} + {{$banner}} - + -- cgit v1.2.3 From 0c973cc9fa4034ae894dfac841987b3f9e8ec335 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Mar 2017 12:41:37 +0100 Subject: various fixes --- view/css/conversation.css \| 4 ++++ view/tpl/conv_item.tpl \| 4 ++-- view/tpl/nav.tpl \| 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 78dd29741..9f9c1fd42 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -94,6 +94,10 @@ line-height: 1.2; } +.wall-item-head-new { + border-top: 3px solid #0275d8; +} + .wall-item-info { display: block; float: left; diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 4a4ae7273..8eb2cf754 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -4,7 +4,7 @@ {{/if}} - + @@ -26,7 +26,7 @@ {{/if}} {{/if}} - + diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 003c17fa7..5903df689 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -173,12 +173,12 @@ - + - + {{if $nav.help.6}} -- cgit v1.2.3 From aa33cacb62ef25cbab7c6ee1b253ed58072e6e44 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Mar 2017 16:42:55 +0100 Subject: style hashtags, mentions and categories. hide expand-aside button if not needed. css and class fixes --- view/css/conversation.css \| 9 +-------- view/css/mod_mail.css \| 4 ---- view/theme/redbasic/css/style.css \| 5 ++--- view/theme/redbasic/js/redbasic.js \| 7 +++++++ view/theme/redbasic/php/style.php \| 4 ++-- view/tpl/common_tabs.tpl \| 4 ++-- view/tpl/conv_item.tpl \| 17 ++++++++++------- view/tpl/item_categories.tpl \| 6 +++--- 8 files changed, 27 insertions(+), 29 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index 9f9c1fd42..b167e3961 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -90,10 +90,6 @@ / conv_item / -.wall-item-head { - line-height: 1.2; -} - .wall-item-head-new { border-top: 3px solid #0275d8; } @@ -122,6 +118,7 @@ a.wall-item-name-link { text-overflow: ellipsis; } +.wall-item-ago, .wall-item-ago i { font-size: 0.75rem; } @@ -151,10 +148,6 @@ a.wall-item-name-link { word-wrap: break-word; } -.body-tags { - margin-top: 5px; -} - .item-tool { cursor: pointer; } diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css index 3ca75d0e4..6a98267f0 100644 --- a/view/css/mod_mail.css +++ b/view/css/mod_mail.css @@ -1,7 +1,3 @@ -.mail-conv-detail { - line-height: 1.2; -} - .mail-conv-sender { float: left; margin-right: 10px; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d81c8a75d..ba12bf3bd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1292,7 +1292,7 @@ img.mail-conv-sender-photo { } .wall-item-footer { - font-size: $body_font_size; + font-size: 0.75rem; margin-top: 2em; } @@ -1367,8 +1367,7 @@ img.mail-conv-sender-photo { .mail-conv-body, .page-body, .chat-item-text, -.chat-item-text-self, -#doco-content { +.chat-item-text-self { font-size: $font_size; clear: both; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 4686e93db..45d80186d 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -16,6 +16,8 @@ $(document).ready(function() { } $('#css3-calc').remove(); // Remove the test element + + if($(window).width() > 767) { $('#left_aside_wrapper').stick_in_parent({ offset_top: $('nav').outerHeight(true) + 10, @@ -24,6 +26,11 @@ $(document).ready(function() { }); } + if($('#region_1 .widget').length > 0) + $('#expand-aside').show(); + else + $('#expand-aside').hide(); + $('#expand-aside').on('click', toggleAside); $('section').on('click', function() { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6e8a43a47..08efcda4c 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -134,11 +134,11 @@ if (! $shadow) if (! $converse_width) $converse_width = '790'; if(! $top_photo) - $top_photo = '2.2rem'; + $top_photo = '2.3rem'; if(! $comment_indent) $comment_indent = '0px'; if(! $reply_photo) - $reply_photo = '2.2rem'; + $reply_photo = '2.3rem'; if($nav_min_opacity === false \|\| $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; $nav_percent_min_opacity = 100; diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl index e78f54a3c..65a8b6a9e 100755 --- a/view/tpl/common_tabs.tpl +++ b/view/tpl/common_tabs.tpl @@ -5,8 +5,8 @@ {{/foreach}} - - diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 8eb2cf754..6f42521ae 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -19,14 +19,14 @@ {{/if}} {{if $item.title && !$item.event}} - + {{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}} {{if ! $item.is_new}} {{/if}} {{/if}} - + @@ -45,19 +45,22 @@ {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} - {{if $item.body}} - + {{$item.body}} - {{/if}} {{if $item.has_tags}} - + + + + {{$item.mentions}}{{$item.tags}}{{$item.categories}} + + {{* {{if $item.mentions}} {{$item.mentions}} @@ -73,12 +76,12 @@ {{$item.categories}} {{/if}} + *}} {{if $item.folders}} {{$item.folders}} {{/if}} - {{/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}} - + {{foreach $categories as $cat}} -{{if $cat.url}}{{$cat.term}}{{else}}{{$cat.term}}{{/if}} + {{if $cat.url}}{{$cat.term}}{{else}}{{$cat.term}}{{/if}} {{/foreach}} - + {{/if}} -- cgit v1.2.3 From e7a5aa7b9cbe0ff9a3840500c4e7eebf6896dc93 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Mar 2017 17:28:00 +0100 Subject: js fixes --- view/theme/redbasic/css/style.css \| 2 +- view/theme/redbasic/js/redbasic.js \| 17 +++-------------- 2 files changed, 4 insertions(+), 15 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ba12bf3bd..bcf987b2b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1850,7 +1850,7 @@ dl.bb-dl > dd > li { font-weight: normal; font-style: normal; text-decoration: inherit; - content:"\f069"; + content:"\f069 "; } / Modified original CSS to match input in Redbasic / diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 45d80186d..07412151f 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -26,7 +26,7 @@ $(document).ready(function() { }); } - if($('#region_1 .widget').length > 0) + if(($(window).width() < 767) && ($('#left_aside_wrapper .widget').length > 0)) $('#expand-aside').show(); else $('#expand-aside').hide(); @@ -47,26 +47,15 @@ $(document).ready(function() { left_aside_height = $('#left_aside_wrapper').height(); } }); -/ - $('#expand-tabs').click(function() { - if($('#tabs-collapse-1').hasClass('show')){ - $('#tabs-collapse-1').removeClass('show'); - } - $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); - }); -/ + $('.usermenu').click(function() { if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){ $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show'); } }); - - if($('#tabs-collapse-1').length === 0) { - $('#expand-tabs').hide(); - } $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'label label-primary' + tagClass: 'badge badge-pill badge-warning' }); var doctitle = document.title; -- cgit v1.2.3 From a73ea134cd09af039e01e4f6ae7f455ecb76279e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 Mar 2017 21:22:16 +0100 Subject: re-add spaces between tags --- view/tpl/conv_item.tpl \| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 6f42521ae..1868f926d 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -58,7 +58,7 @@ - {{$item.mentions}}{{$item.tags}}{{$item.categories}} + {{$item.mentions}} {{$item.tags}} {{$item.categories}} {{* {{if $item.mentions}} -- cgit v1.2.3 From d10525a375884850b1b643796b839747cbc623b2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 17 Mar 2017 14:22:10 +0100 Subject: fix item_list and item_search templates. make item filer use a bootdtrap modal and some css and class fixes --- view/css/conversation.css \| 4 - view/js/autocomplete.js \| 2 +- view/theme/redbasic/css/style.css \| 75 ++---------- view/tpl/admin_aside.tpl \| 18 +-- view/tpl/chat.tpl \| 32 ++--- view/tpl/chatroomlist.tpl \| 6 +- view/tpl/conv_item.tpl \| 19 ++- view/tpl/conv_list.tpl \| 241 ++++++++++++++++++++++---------------- view/tpl/field_combobox.tpl \| 33 +++--- view/tpl/fileas_widget.tpl \| 6 +- view/tpl/filer_dialog.tpl \| 23 +++- view/tpl/hdr.tpl \| 2 +- view/tpl/item_attach.tpl \| 2 +- view/tpl/item_filer.tpl \| 6 +- view/tpl/jot-header.tpl \| 18 +-- view/tpl/search_item.tpl \| 58 ++++----- 16 files changed, 265 insertions(+), 280 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index b167e3961..e2adf8658 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -140,10 +140,6 @@ a.wall-item-name-link { margin: 0px; } -.wall-item-title-end { - clear: both; -} - .wall-item-body { word-wrap: break-word; } diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 4de9f9c6b..9673312a7 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -60,7 +60,7 @@ function contact_format(item) { var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick); if(typeof desc === 'undefined') desc = ''; if(desc) desc = ' ('+desc+')'; - return " {2}{3} ".format(item.taggable, item.photo, item.name, desc, item.link); + return " {2}{3} ".format(item.taggable, item.photo, item.name, desc, item.link); } else return " " + item.text + " "; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bcf987b2b..f0b08a738 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -358,10 +358,6 @@ footer { filter:alpha(opacity=100); } -#view-contact-end { - clear: both; -} - #profile-photo-wrapper img { width: 100%; height: 100%; @@ -502,10 +498,6 @@ footer { height: 34px; } -#contact-block-end { - clear: both; -} - .contact-block-img { width:47px; height:47px; @@ -529,15 +521,9 @@ footer { } .wall-item-conv { - padding: 7px 10px; background-color: $comment_item_colour; } - -#conversation-end { - clear: both; -} - #nav-notifications-template { display: none; } @@ -622,11 +608,6 @@ nav .acpopup { text-align: center; } -.profile-match-break, -.profile-match-end { - clear: both; -} - .profile-match-connect { text-align: center; font-weight: bold; @@ -645,9 +626,6 @@ nav .acpopup { float: right; } -#profile-match-wrapper-end { - clear: both; -} .side-link { margin-bottom: 15px; } @@ -660,10 +638,6 @@ nav .acpopup { border: 1px solid #ddd; } -#group-members-end { - clear: both; -} - #group-separator { margin-top: 10px; margin-bottom: 10px; @@ -676,11 +650,6 @@ nav .acpopup { border: 1px solid #ddd; } -#group-all-contacts-end { - clear: both; - margin-bottom: 10px; -} - #group-edit-desc { margin-top: 15px; } @@ -694,10 +663,6 @@ nav .acpopup { border: 1px solid #ddd; } -#prof-members-end { - clear: both; -} - #prof-separator { margin-top: 10px; margin-bottom: 10px; @@ -710,11 +675,6 @@ nav .acpopup { border: 1px solid #ddd; } -#prof-all-contacts-end { - clear: both; - margin-bottom: 10px; -} - #prof-edit-desc { margin-top: 15px; } @@ -728,10 +688,6 @@ nav .acpopup { width: 80px; margin-right: 15px; } -.notification-listing-end { - clear: both; - margin-bottom: 15px; -} /** * OAuth @@ -789,13 +745,6 @@ div.jGrowl div.jGrowl-notification { min-height: 60px; } -#id_term_label { - width:75px; -} -#id_term { - width:100px; -} - #nav-search-text-ac .autocomplete { position: fixed; top: 51px; @@ -884,7 +833,8 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { display: block; } -.dropdown-notification { +.dropdown-notification, +.member-item { line-height: 1.1em; font-size: 0.75rem; overflow: hidden; @@ -897,10 +847,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { margin: 24px; } -.tabs-end { - clear: both; -} - .modal-header .contextual-help-tool { /* Mostly duplicating ".modal-header .close" and ".close" layout settings from bootstrap / float: right; @@ -1335,11 +1281,6 @@ img.mail-conv-sender-photo { border-top: 0px solid $comment_item_colour; } -.wall-item-like, -.wall-item-dislike { - font-size: 11px; -} - .wall-item-photo { border: none; width: $top_photo !important; @@ -1369,7 +1310,6 @@ img.mail-conv-sender-photo { .chat-item-text, .chat-item-text-self { font-size: $font_size; - clear: both; } .item-tool { @@ -1483,14 +1423,21 @@ nav img { border-radius: $radiuspx; } -.dropdown-menu-img-sm { +.menu-img-3 { width: 3.3em; height: 3.3em; margin-right: 5px; float: left; } -.dropdown-menu-img-xs { +.menu-img-2 { + height: 2.2em; + width: 2.2em; + margin-right: 5px; + float: left; +} + +.menu-img-1 { height: 1.1em; width: 1.1em; margin-right: 5px; 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 @@ {{$admtxt}} - + {{foreach $admin as $link}} - {{$link.1}}{{if $link.3}}{{/if}} + {{$link.1}}{{if $link.3}}{{/if}} {{/foreach}} {{if $admin.update}} - - {{$admin.update.1}} - Important Changes + + {{$admin.update.1}} + Important Changes {{/if}} @@ -30,9 +30,9 @@ {{if $plugins}} {{$plugadmtxt}} - + {{foreach $plugins as $l}} - {{$l.1}} + {{$l.1}} {{/foreach}} @@ -40,7 +40,7 @@ {{$logtxt}} - - {{$logs.1}} + + {{$logs.1}} diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index f21f9c1bf..d07adb6b6 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -29,18 +29,18 @@ - - {{$online}} - {{$away}} - {{$leave}} - - Toggle notifications - Toggle sound + + {{$online}} + {{$away}} + {{$leave}} + + Toggle notifications + Toggle sound {{if $bookmark_link}} - - {{$bookmark}} + + {{$bookmark}} {{/if}} - + @@ -76,13 +76,13 @@ - - {{$insert}} + + {{$insert}} {{if $feature_encrypt}} - - {{$encrypt}} + + {{$encrypt}} {{/if}} - + @@ -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(' ' + '' + item.name + ' ' + item.status + ''); + $(newNode).html(' ' + '' + item.name + '' + item.status + ''); html.appendChild(newNode); }); memberChange = chatRoomMembersChange(inroom); // get list of arrivals and departures 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 @@ {{$header}} - - {{$overview}} + + {{$overview}} {{foreach $items as $item}} - {{$item.cr_inroom}}{{$item.cr_name}} + {{$item.cr_inroom}}{{$item.cr_name}} {{/foreach}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 1868f926d..80a249743 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -4,10 +4,10 @@ {{/if}} - + - - + + {{if $item.photo}} {{$item.photo}} @@ -26,12 +26,11 @@ {{/if}} {{/if}} - + - {{if $item.lock}} @@ -58,7 +57,7 @@ - {{$item.mentions}} {{$item.tags}} {{$item.categories}} + {{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}} {{* {{if $item.mentions}} @@ -76,12 +75,12 @@ {{$item.categories}} {{/if}} - }} {{if $item.folders}} {{$item.folders}} {{/if}} + }} {{/if}} @@ -93,7 +92,7 @@ {{foreach $item.reactions as $react}} - + {{/foreach}} @@ -173,24 +172,20 @@ {{if $item.star}} {{$item.star.toggle}} {{/if}} - {{if $item.thread_action_menu}} {{foreach $item.thread_action_menu as $mitem}} {{$mitem.title}} {{/foreach}} {{/if}} - {{if $item.drop.dropping}} {{$item.drop.delete}} {{/if}} - {{if $item.thread_author_menu}} {{foreach $item.thread_author_menu as $mitem}} {{$mitem.title}} {{/foreach}} {{/if}} - {{if $item.edpost && $item.dreport}} {{$item.dreport}} {{/if}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index d7b4a8ff4..e31ffea25 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -4,10 +4,10 @@ {{/if}} - - - - + + + + {{if $item.photo}} {{$item.photo}} @@ -18,39 +18,48 @@ {{$item.event}} {{/if}} - + {{if $item.title && !$item.event}} + + {{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}} + + {{if ! $item.is_new}} + + {{/if}} + {{/if}} + - - + + - - - {{if $item.title}} - - {{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}} - {{/if}} {{if $item.lock}} - + + {{/if}} {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}} - {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} - - - + + {{if $item.body}} + + {{$item.body}} - + {{/if}} {{if $item.has_tags}} - + + + + {{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}} + + {{ {{if $item.mentions}} {{$item.mentions}} @@ -63,7 +72,7 @@ {{/if}} {{if $item.categories}} - {{$item.categories}} + {{$item.categories}} {{/if}} {{if $item.folders}} @@ -71,84 +80,117 @@ {{$item.folders}} {{/if}} - + }} {{/if}} - - - - {{if $item.like}} - - {{/if}} - {{if $item.dislike}} - - {{/if}} - - {{if $item.isevent}} - - - - {{/if}} - - {{if $item.canvote}} - - - + + + {{if $item.toplevel && $item.emojis && $item.reactions}} + + + + {{foreach $item.reactions as $react}} + + {{/foreach}} + + {{/if}} - - - - {{if $item.share}} - {{$item.share.0}} - {{/if}} - {{if $item.plink}} - {{$item.plink.title}} - {{/if}} - {{if $item.edpost}} - {{$item.edpost.1}} - {{/if}} - {{if $item.tagger}} - {{$item.tagger.tagit}} - {{/if}} - {{if $item.filer}} - {{$item.filer}} - {{/if}} - {{if $item.bookmark}} - {{$item.bookmark}} - {{/if}} - {{if $item.addtocal}} - {{$item.addtocal}} + + {{if $item.like}} + {{/if}} - {{if $item.star}} - {{$item.star.toggle}} + {{if $item.dislike}} + {{/if}} - {{if $item.drop.dropping}} - {{$item.drop.delete}} + {{if $item.isevent}} + + + + + {{$item.attend.0}} + + + {{$item.attend.1}} + + + {{$item.attend.2}} + + + {{/if}} - {{if $item.item_photo_menu}} - - {{$item.item_photo_menu}} + {{if $item.canvote}} + + + + + {{$item.conlabels.0}} + + + {{$item.conlabels.1}} + + + {{$item.conlabels.2}} + + + {{/if}} - - + + + {{if $item.share}} + {{$item.share.0}} + {{/if}} + {{if $item.plink}} + {{$item.plink.title}} + {{/if}} + {{if $item.edpost}} + {{$item.edpost.1}} + {{/if}} + {{if $item.tagger}} + {{$item.tagger.tagit}} + {{/if}} + {{if $item.filer}} + {{$item.filer}} + {{/if}} + {{if $item.bookmark}} + {{$item.bookmark}} + {{/if}} + {{if $item.addtocal}} + {{$item.addtocal}} + {{/if}} + {{if $item.star}} + {{$item.star.toggle}} + {{/if}} + {{if $item.thread_action_menu}} + {{foreach $item.thread_action_menu as $mitem}} + {{$mitem.title}} + {{/foreach}} + {{/if}} + {{if $item.drop.dropping}} + {{$item.drop.delete}} + {{/if}} + {{if $item.thread_author_menu}} + + {{foreach $item.thread_author_menu as $mitem}} + {{$mitem.title}} + {{/foreach}} + {{/if}} + {{if $item.edpost && $item.dreport}} + {{$item.dreport}} + {{/if}} + + @@ -159,9 +201,9 @@ {{/if}} - + {{if $item.unseen_comments}} @@ -176,9 +218,9 @@ {{if $response.list_part}} - {{foreach $response.list_part as $liker}} {{$liker}} {{/foreach}} + {{foreach $response.list_part as $liker}}{{$liker}}{{/foreach}} {{else}} - {{foreach $response.list as $liker}} {{$liker}} {{/foreach}} + {{foreach $response.list as $liker}}{{$liker}}{{/foreach}} {{/if}} {{if $response.list_part}} @@ -188,8 +230,8 @@ {{$response.title}} - - {{foreach $response.list as $liker}} {{$liker}} {{/foreach}} + + {{foreach $response.list as $liker}} {{$liker}} {{/foreach}} @@ -203,11 +245,8 @@ {{/foreach}} {{/if}} - - - {{if $item.comment_lastcollapsed}} 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 @@ - - {{$field.1}} - {{* - - - {{foreach $field.4 as $opt=>$val}}}} - - - - - {{$field.3}} - + + {{$field.1}} + + + {{foreach $field.4 as $opt=>$val}} + + {{* + + + }} + {{$field.3}} + diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl index a92440cb0..1754a794b 100755 --- a/view/tpl/fileas_widget.tpl +++ b/view/tpl/fileas_widget.tpl @@ -2,10 +2,10 @@ {{$title}} {{$desc}} - - {{$all}} + + {{$all}} {{foreach $terms as $term}} - {{$term.name}} + {{$term.name}} {{/foreach}} 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 @@ - -{{include file="field_combobox.tpl"}} - - - + + + + + {{$title}} + + + + {{include file="field_combobox.tpl"}} + + + + + + + diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index 5ab7d68fd..cccee2229 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,3 +1,3 @@ - {2}{3} {4} + {2}{3} {4} diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl index 83cc9a3cd..711b72e76 100644 --- a/view/tpl/item_attach.tpl +++ b/view/tpl/item_attach.tpl @@ -1,5 +1,5 @@ {{if $attaches}} {{foreach $attaches as $a}} - {{$a.label}} + {{$a.label}} {{/foreach}} {{/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}} - + {{foreach $categories as $cat}} - {{$cat.term}} + {{$cat.term}} {{/foreach}} - + {{/if}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index d846f3e34..535e6c66c 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -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; }); diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index aa7e3aa5d..89ac927aa 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -1,7 +1,7 @@ - + - - + + {{if $item.photo}} {{$item.photo}} @@ -12,18 +12,20 @@ {{$item.event}} {{/if}} - + {{if $item.title && !$item.event}} + + {{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}} + + {{if ! $item.is_new}} + + {{/if}} + {{/if}} + - - - {{if $item.title}} - - {{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}} - {{/if}} {{if $item.lock}} @@ -35,16 +37,20 @@ {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} - - + {{if $item.body}} + {{$item.body}} - + {{/if}} {{if $item.has_tags}} - + + + {{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}} + + {{ {{if $item.mentions}} {{$item.mentions}} @@ -65,48 +71,44 @@ {{$item.folders}} {{/if}} - + *}} {{/if}} - + - + {{if $item.thread_action_menu}} {{foreach $item.thread_action_menu as $mitem}} - {{$mitem.title}} + {{$mitem.title}} {{/foreach}} {{/if}} {{if $item.drop.dropping}} - {{$item.drop.delete}} + {{$item.drop.delete}} {{/if}} {{if $item.thread_author_menu}} - + {{foreach $item.thread_author_menu as $mitem}} - {{$mitem.title}} + {{$mitem.title}} {{/foreach}} {{/if}} - + {{if $item.attachments}} - {{$item.attachments}} + {{$item.attachments}} {{/if}} - - - {{if $item.conv}} - + {{$item.conv.title}} {{/if}} - -- cgit v1.2.3 From 828028259c71e9454a4a5b25c88cc81672511d79 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 17 Mar 2017 20:48:06 +0100 Subject: css fixes --- view/css/bootstrap-red.css \| 4 ++++ view/theme/redbasic/css/style.css \| 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 95d3b0e86..ca715f2f2 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -9,6 +9,10 @@ nav .badge { } +.widget .badge { + font-size: 100%; +} + .nav-item.nav-item-hack { height: 2.3rem; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f0b08a738..3b0afb267 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1419,14 +1419,11 @@ img.mail-conv-sender-photo { / nav bootstrap / -nav img { - border-radius: $radiuspx; -} - .menu-img-3 { width: 3.3em; height: 3.3em; margin-right: 5px; + border-radius: $radiuspx; float: left; } @@ -1434,18 +1431,21 @@ nav img { height: 2.2em; width: 2.2em; margin-right: 5px; + border-radius: $radiuspx; float: left; } .menu-img-1 { - height: 1.1em; - width: 1.1em; + height: 1.5em; + width: 1.5em; margin-right: 5px; + border-radius: $radiuspx; } .usermenu { width: 2.2rem; height: 2.2rem; + border-radius: $radiuspx; } .usermenu img { -- cgit v1.2.3 From 92778066648b72b52787f428e1632a7eb99b14a5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 17 Mar 2017 21:42:27 +0100 Subject: fix usermenu radius --- view/theme/redbasic/css/style.css \| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3b0afb267..f7833a2bc 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1445,12 +1445,12 @@ img.mail-conv-sender-photo { .usermenu { width: 2.2rem; height: 2.2rem; - border-radius: $radiuspx; } .usermenu img { width: 100%; height: 100%; + border-radius: $radiuspx; } .page-title { -- cgit v1.2.3 From 2556d05602906bbace27c796de2f5b3cbacd4448 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 18 Mar 2017 17:28:46 +0100 Subject: bs4 fixes --- view/css/conversation.css \| 15 +-- view/js/acl.js \| 20 ++-- view/theme/redbasic/css/style.css \| 231 ++++---------------------------------- view/tpl/acl_selector.tpl \| 29 +++-- view/tpl/comment_item.tpl \| 14 +-- view/tpl/connections.tpl \| 5 +- view/tpl/jot-header.tpl \| 2 +- view/tpl/jot.tpl \| 51 ++++----- view/tpl/nav.tpl \| 8 +- 9 files changed, 85 insertions(+), 290 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index e2adf8658..a956f762b 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -60,25 +60,11 @@ } #profile-jot-text-loading { - float: left; padding: 30px 0px 0px 12px; } #profile-jot-submit-wrapper { border-top: 1px solid #ccc; - padding: 10px; -} - -#profile-jot-perms-end { - height: 30px; -} - -#profile-jot-plugin-wrapper { - margin-top: 10px; -} - -#profile-rotator-wrapper { - float: left; } #profile-rotator { @@ -121,6 +107,7 @@ a.wall-item-name-link { .wall-item-ago, .wall-item-ago i { font-size: 0.75rem; + line-height: 1; } .wall-item-ago .fa-check { diff --git a/view/js/acl.js b/view/js/acl.js index 4dd60d303..e016158e9 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -333,20 +333,20 @@ ACL.prototype.update_view = function(value) { type = itemid[0]; id = itemid.substr(1); - btshow = $(this).children(".acl-button-show").removeClass("btn-success").addClass("btn-default"); - bthide = $(this).children(".acl-button-hide").removeClass("btn-danger").addClass("btn-default"); + btshow = $(this).children(".acl-button-show").removeClass("btn-success").addClass("btn-outline-success"); + bthide = $(this).children(".acl-button-hide").removeClass("btn-danger").addClass("btn-outline-danger"); switch(type) { case "g": var uclass = ""; if (that.allow_gid.indexOf(id)>=0) { - btshow.removeClass("btn-default").addClass("btn-success"); - bthide.removeClass("btn-danger").addClass("btn-default"); + btshow.removeClass("btn-outline-success").addClass("btn-success"); + bthide.removeClass("btn-danger").addClass("btn-outline-danger"); uclass="groupshow"; } if (that.deny_gid.indexOf(id)>=0) { - btshow.removeClass("btn-success").addClass("btn-default"); - bthide.removeClass("btn-default").addClass("btn-danger"); + btshow.removeClass("btn-success").addClass("btn-outline-success"); + bthide.removeClass("btn-outline-danger").addClass("btn-danger"); uclass = "grouphide"; } $(that.group_uids[id]).each(function(i, v) { @@ -366,13 +366,13 @@ ACL.prototype.update_view = function(value) { case "c": if (that.allow_cid.indexOf(id)>=0){ if(!$(this).hasClass("grouphide") ) { - btshow.removeClass("btn-default").addClass("btn-success"); - bthide.removeClass("btn-danger").addClass("btn-default"); + btshow.removeClass("btn-outline-success").addClass("btn-success"); + bthide.removeClass("btn-danger").addClass("btn-outline-danger"); } } if (that.deny_cid.indexOf(id)>=0){ - btshow.removeClass("btn-success").addClass("btn-default"); - bthide.removeClass("btn-default").addClass("btn-danger"); + btshow.removeClass("btn-success").addClass("btn-outline-success"); + bthide.removeClass("btn-outline-danger").addClass("btn-danger"); $(this).removeClass("groupshow"); } } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f7833a2bc..e7d70d35c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -77,6 +77,11 @@ h6, .h6 { font-size: 0.75rem; } +#banner { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .jslider { font-family: sans-serif, arial, freesans; @@ -109,6 +114,7 @@ a:focus, } input, optgroup, select, textarea { + color: $font_colour; resize: vertical; } @@ -145,8 +151,7 @@ pre { color: #FF0000; } -nav, -header { +nav { opacity: $nav_float_min_opacity; filter:alpha(opacity=$nav_percent_min_opacity); } @@ -172,49 +177,8 @@ header { padding: 10px; } -nav #banner #logo-text a { - font-size: 40px; - font-weight: bold; - margin-left: 3px; - color: #000000; - -} -nav #banner #logo-text a:hover { text-decoration: none; } - .nav-channel-select { margin-left: 8px; } -header #banner { - z-index: 1040; - margin-top: 10px; - text-align: center; - text-shadow: 1px 1px 2px rgba(0,0,0,.5); - font-size: 14px; - font-family: tahoma, "Lucida Sans", sans; - color: $banner_colour; - font-weight: bold; - whitespace: nowrap; -} - -header #banner a, -header #banner a:active, -header #banner a:visited, -header #banner a:link, -header #banner a:hover { - color: $banner_colour; - text-decoration: none; - outline: none; - vertical-align: bottom; -} - -header #banner #logo-img { - height: 22px; - margin-top: 5px; -} - -header #banner #logo-text { - font-size: 22px; -} - / contextual help / .contextual-help-content { display: none; @@ -244,18 +208,18 @@ header #banner #logo-text { .contextual-help-tool { padding: 7px; filter: alpha(opacity=20); - opacity: .2; + opacity: .5; } .contextual-help-tool:hover { filter: alpha(opacity=50); - opacity: .5; + opacity: 1; text-decoration: none; } .contextual-help-tool i { - color: #000; - font-size: 16px; + color: $font_colour; + font-size: 1.05rem; } / contextual help end / @@ -847,22 +811,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { margin: 24px; } -.modal-header .contextual-help-tool { - / Mostly duplicating ".modal-header .close" and ".close" layout settings from bootstrap / - float: right; - font-size: 21px; - padding: 0; - margin-top: -4px; - margin-right: 15px; - line-height: 1; -} - -#acl-search { - padding: 4px; - border: 1px solid #ccc; - width: 100%; -} - #acl-search::-webkit-input-placeholder { / non-fontawesome fonts set a fallback for text parts of the placeholder/ font-family: FontAwesome, sans-serif, arial, freesans; @@ -873,59 +821,17 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { font-family: FontAwesome, sans-serif, arial, freesans; } -#aclModal .modal-body { - padding-top: 10px; -} - -#acl-showlimited-description { - font-size: 90%; - color: #888; - margin-left: 10px; - margin-bottom: 4px; -} - -#acl-list { - border: 1px solid #ccc; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - -#acl-search-wrapper { - padding: 7px 10px; - background-color: $item_colour; - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; - border-bottom: 1px solid #ccc; -} - -#acl-list-content-wrapper { - display: block; - overflow: auto; - clear: both; - min-height: 62px; - padding: 10px 10px 0px 0px; - -} - -#jotnets-wrapper, #jotnets-collapse { - margin-bottom: 18px; -} - -#jot-preview-content { - margin-top: 10px; -} .acl-list-item { - width: 48%; / fallback if browser does not support calc() / - width: calc(50% - 10px); + width: 100%; + padding: 0.5rem; + margin-bottom: 0.5rem; border: 1px solid #ccc; - margin: 0px 0px 10px 10px; - padding: 5px; float: left; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; border-radius: $radiuspx; - background-color: white; +} + +.acl-item-header { + width: 100%; } .acl-list-item.grouphide { @@ -936,62 +842,16 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { border: 1px solid green; } -.acl-list-item img { - width: 40px; - height: 40px; - float: left; - margin-right: 5px; - -webkit-border-radius: $radiuspx ; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; -} - .acl-list-item.taggable { background-color: #ddddff; } -.acl-list-item p { - font-size: $font_size; - margin: 0px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - .acl-button-show, .acl-button-hide { float: right; margin-left: 5px; } -#acl-showlimited-caption, -#acl-showall-caption { - font-size: 115%; -} - -#acl-radiowrapper-showall { - margin-top: 20px; - margin-bottom: 20px; -} -#acl-radiowrapper-showlimited { - margin-bottom: 0; -} - -#acl-showall + i { - font-size: 140%; -} - -#acl-info-icon, -#acl-info-icon:active { - font-size: 110%; - color: $link_colour; - text-decoration: none; -} - -#acl-showall-caption { - margin-left: 0.35em; -} - .contact-block-content { margin-top: 10px; } @@ -1208,7 +1068,7 @@ img.mail-conv-sender-photo { } .jot-icons { - color: $toolicon_colour; + //color: $toolicon_colour; } .jot-icons.jot-lock-warn { @@ -1321,11 +1181,6 @@ img.mail-conv-sender-photo { color: $toolicon_colour; } -.comment-icon { - font-size: 0.833em; - color: $toolicon_colour; -} - .comment-edit-text-empty, .comment-edit-text-full { border: 1px solid #ccc; @@ -1334,11 +1189,6 @@ img.mail-conv-sender-photo { .comment-edit-text-empty { color: gray; - font-size: 12px; -} - -.comment-edit-text-full { - color: black; } .divgrow-showmore { @@ -1447,9 +1297,9 @@ img.mail-conv-sender-photo { height: 2.2rem; } -.usermenu img { - width: 100%; - height: 100%; +#avatar { + width: 2.2rem; + height: 2.2rem; border-radius: $radiuspx; } @@ -1607,22 +1457,6 @@ main.fullscreen .section-content-wrapper-np { } / bootstrap overrides / -.btn { - font-size: $body_font_size; -} - -.panel { - background-color: transparent; - border: 0px solid transparent; - border-radius: 0px; - -webkit-box-shadow: 0 0px 0px rgba(0, 0, 0, .0); - box-shadow: 0 0px 0px rgba(0, 0, 0, .0); -} - -.panel-group .panel + .panel { - margin-top: 0px; -} - blockquote { font-size: $font_size; font-style: italic; @@ -1696,27 +1530,6 @@ blockquote { } / -/* -.nav-tabs.nav-justified { - background-color: rgba(254,254,254,.5); - border-top-left-radius: 4px; - border-top-right-radius: 4px; -} - -.nav-tabs.nav-justified > .active > a, -.nav-tabs.nav-justified > .active > a:hover, -.nav-tabs.nav-justified > .active > a:focus { - border-bottom-color: transparent; -} - -.nav-tabs > li.active > a, -.nav-tabs > li.active > a:hover, -.nav-tabs > li.active > a:focus { - background-color: transparent; -} -/ - - @media screen and (max-width: 767px) { aside#region_1 { diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 19a2a5257..e0b31162a 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -3,11 +3,13 @@ + + {{$aclModalTitle}} + {{if $helpUrl}} + + {{/if}} + - {{if $helpUrl}} - - {{/if}} - {{$aclModalTitle}} {{if $aclModalDesc}} @@ -29,22 +31,19 @@ - - - - - {{$showlimitedDesc}} - - + + {{$showlimitedDesc}} + - {1} - - + + {1} + + + - diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 8b011dcac..80bef9ef6 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -22,7 +22,7 @@ - + @@ -39,19 +39,13 @@ - - + - {{if $feature_encrypt}} - + @@ -59,7 +53,7 @@ {{/if}} {{$comment_buttons}} - + {{if $preview}} + @@ -29,6 +29,7 @@ {{foreach $contacts as $contact}} {{include file="connection_template.tpl"}} {{/foreach}} + diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 535e6c66c..66c813f1f 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}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index b9afbd98e..e9e66a83b 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -31,7 +31,7 @@ {{/if}} - + {{if $catsenabled}} @@ -39,17 +39,17 @@ {{/if}} - {{$content}} + {{$content}} {{if $attachment}} {{/if}} - - + + {{if $bbcode}} - + @@ -68,7 +68,7 @@ {{/if}} {{if $visitor}} - + {{if $writefiles}} {{/if}} - + {{if $setloc}} {{/if}} {{else}} - + {{/if}} {{if $feature_expire}} {{if $writefiles \|\| $weblink \|\| $setloc \|\| $clearloc \|\| $feature_expire \|\| $feature_encrypt \|\| $feature_voting}} - + - + {{if $visitor}} {{if $writefiles}} - {{$attach}} + {{$attach}} {{/if}} {{if $weblink}} - {{$weblink}} + {{$weblink}} + {{/if}} + {{if $embedPhotos}} + {{$embedPhotos}} {{/if}} {{if $setloc}} - {{$setloc}} + {{$setloc}} {{/if}} {{if $clearloc}} - {{$clearloc}} + {{$clearloc}} {{/if}} {{/if}} {{if $feature_expire}} - {{$expires}} + {{$expires}} {{/if}} {{if $feature_future}} - {{$future_txt}} + {{$future_txt}} {{/if}} {{if $feature_encrypt}} - {{$encrypt}} + {{$encrypt}} {{/if}} {{if $feature_voting}} - {{$voting}} + {{$voting}} {{/if}} {{if $feature_nocomment}} - {{$nocommenttitlesub}} + {{$nocommenttitlesub}} {{/if}} - + {{/if}} - + - + {{if $preview}} {{if $jotplugins}} - + {{$jotplugins}} {{/if}} @@ -210,8 +213,6 @@ {{/if}} - - diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 5903df689..41c199f2b 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -168,7 +168,7 @@ {{/if}} - {{$banner}} + {{$banner}} @@ -212,9 +212,9 @@ {{if $nav.help.6}} {{$nav.help.5}} - - {{$fulldocs}} - + + {{$fulldocs}} + {{/if}} -- cgit v1.2.3 From 82b35e27620e97eb01ab55fe97b55c9ec8e05b81 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 18 Mar 2017 20:00:32 +0100 Subject: fix abook_edit and private mail --- view/theme/redbasic/css/style.css \| 14 -------------- view/tpl/abook_edit.tpl \| 33 ++++++++++++++++----------------- view/tpl/prv_message.tpl \| 28 ++++++++++++++-------------- 3 files changed, 30 insertions(+), 45 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e7d70d35c..5e579a213 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -952,11 +952,6 @@ margin-right: 50px; margin-right: 7px; } -nav .navbar-collapse.in .generic-icons, -nav .navbar-collapse.collapsing .generic-icons { - color: $nav_active_icon_colour; -} - .admin-icons { font-size: 1.2em; color: $toolicon_colour; @@ -1267,8 +1262,6 @@ img.mail-conv-sender-photo { border-radius: $radiuspx; } -/ nav bootstrap / - .menu-img-3 { width: 3.3em; height: 3.3em; @@ -1557,13 +1550,6 @@ blockquote { } -/ release the navbar in landscape view on small devices / -@media screen and (max-height: 320px) { - .navbar-fixed-top { - position: absolute; - } -} - .shareable_element_text { height: 300px; width: 300px; diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index be9fcc2a3..e2f3f3205 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -6,32 +6,31 @@ - - {{$tools.view.label}} - {{$tools.recent.label}} + + {{$tools.view.label}} + {{$tools.recent.label}} {{if $tools.fetchvc}} - {{$tools.fetchvc.label}} + {{$tools.fetchvc.label}} {{/if}} - {{$tools.refresh.label}} - {{$tools.rephoto.label}} - - {{$tools.block.label}} - {{$tools.ignore.label}} - {{$tools.archive.label}} - {{$tools.hide.label}} - {{$tools.delete.label}} - + {{$tools.refresh.label}} + {{$tools.rephoto.label}} + + {{$tools.block.label}} + {{$tools.ignore.label}} + {{$tools.archive.label}} {{$tools.hide.label}} + {{$tools.delete.label}} + {{if $abook_prev \|\| $abook_next}} - + {{foreach $sections as $s}} - {{$s.label}} + {{$s.label}} {{/foreach}} - + {{/if}} @@ -470,7 +469,7 @@ {{/if}} - + {{if $notself}}{{$permnote}}{{/if}} diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index ba09edcf0..881bf1a55 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -31,12 +31,12 @@ {{$text}} - + - - + + @@ -53,7 +53,7 @@ - + @@ -62,7 +62,7 @@ {{if $feature_expire \|\| $feature_encrypt}} - + {{if $feature_expire}} {{/if}} - + - - {{$attach}} - {{$insert}} + + {{$attach}} + {{$insert}} {{if $feature_expire \|\| $feature_encrypt}} - - {{$expires}} - {{$encrypt}} + + {{$expires}} + {{$encrypt}} {{/if}} - + - + -- cgit v1.2.3 From b897fd8315415245729e37c9f7cd61ad6571282a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 18 Mar 2017 20:02:13 +0100 Subject: more abook_edit --- view/tpl/abook_edit.tpl \| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index e2f3f3205..cfe80403a 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -82,7 +82,7 @@ - + {{include file="field_checkbox.tpl" field=$unapproved}} @@ -384,7 +384,7 @@ - + {{if $slide}} {{$lbl_slider}}* @@ -415,7 +415,7 @@ - + {{include file="field_textarea.tpl" field=$incl}} {{include file="field_textarea.tpl" field=$excl}} -- cgit v1.2.3 From 2bdf63d069954dcdcd211f519bdc7a1d8fee1295 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 18 Mar 2017 22:01:46 +0100 Subject: more abook_edit and some css --- view/js/main.js \| 2 ++ view/theme/redbasic/css/style.css \| 2 ++ view/tpl/abook_edit.tpl \| 14 ++++++++------ 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index 5e3a04abb..150f517a9 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -939,6 +939,8 @@ function notify_popup_loader(notifyType) { window.location.href=window.location.href; } + console.log(data); + if(data.notify.length == 0){ $("#nav-" + notifyType + "-menu").html(aStr[nothingnew]); } else { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5e579a213..56047cdb4 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -795,6 +795,8 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { .contactname { font-weight: bold; display: block; + overflow: hidden; + text-overflow: ellipsis; } .dropdown-notification, diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index cfe80403a..79a6f338f 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -24,13 +24,15 @@ {{if $abook_prev \|\| $abook_next}} - - - - {{foreach $sections as $s}} - {{$s.label}} - {{/foreach}} + + + + {{foreach $sections as $s}} + {{$s.label}} + {{/foreach}} + + {{/if}} -- cgit v1.2.3 From b2ad4e8c2a41fda822fb2c52d470aaddd4dd1102 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 18 Mar 2017 23:45:55 +0100 Subject: bs4 fixes --- view/css/bootstrap-red.css \| 14 ++++++++++++-- view/theme/redbasic/css/style.css \| 3 +-- view/theme/redbasic/js/redbasic.js \| 2 +- view/tpl/connections.tpl \| 2 +- view/tpl/conv_item.tpl \| 2 +- view/tpl/nav.tpl \| 9 +++++---- view/tpl/nav_login.tpl \| 2 +- 7 files changed, 22 insertions(+), 12 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index ca715f2f2..5fc836080 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -4,9 +4,19 @@ nav .badge { position: absolute; - top: 1px; - left: 1px; + font-size: 0.75rem; +} +@media screen and (min-width: 767px) { + nav .badge { + top: -0.25rem; + left: -0.25rem; + } +} +@media screen and (max-width: 767px) { + nav .badge { + right: 0px; + } } .widget .badge { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 56047cdb4..cd5178688 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1288,8 +1288,7 @@ img.mail-conv-sender-photo { } .usermenu { - width: 2.2rem; - height: 2.2rem; + width: 3.5rem; } #avatar { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 07412151f..b522f8dd1 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -26,7 +26,7 @@ $(document).ready(function() { }); } - if(($(window).width() < 767) && ($('#left_aside_wrapper .widget').length > 0)) + if(($(window).width() < 767) && ($('#left_aside_wrapper .widget, #left_aside_wrapper .vcard').length > 0)) $('#expand-aside').show(); else $('#expand-aside').hide(); diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index a40e1fef9..13261965a 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,7 +1,7 @@ - {{$response.title}} + {{foreach $response.list as $liker}} {{$liker}} {{/foreach}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 41c199f2b..3c9de483d 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,10 +1,10 @@ {{if $nav.login && !$userinfo}} - - + {{if $nav.register}} - + {{$nav.register.1}} {{/if}} @@ -32,6 +32,7 @@ + {{if $localuser}} 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 @@ + {{$nav.loginmenu.1.1}} - {{$nav.loginmenu.1.1}} -- cgit v1.2.3 From 2a25ddff3685502e22a7de8d30bb2c423c4d0ed1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 10:51:58 +0100 Subject: bs4 fixes --- view/css/conversation.css \| 60 +++++------------- view/css/widgets.css \| 11 +--- view/js/autocomplete.js \| 9 ++- view/theme/redbasic/css/style.css \| 130 ++++++++++++++++++-------------------- view/theme/redbasic/php/style.php \| 2 +- view/tpl/comment_item.tpl \| 3 +- view/tpl/cover_photo_widget.tpl \| 22 ++----- 7 files changed, 93 insertions(+), 144 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index a956f762b..289e389fa 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -3,7 +3,7 @@ .jothidden input[type="text"] { border: 0px; margin: 0px; - height: 39px; + height: 2.5rem; width: 100%; } @@ -23,15 +23,15 @@ #jot-title-wrap input, #jot-pagetitle-wrap input { - padding: 10px; + padding: 0.5rem; } #profile-jot-text { resize: none; border-width: 0px; - height: 39px; - line-height: 19px; - padding: 10px; + height: 2.5rem; + line-height: 1.5rem; + padding: 0.5rem; width: 100%; display: inherit; } @@ -77,7 +77,7 @@ /* conv_item / .wall-item-head-new { - border-top: 3px solid #0275d8; + border-top: 0.2rem solid #0275d8; } .wall-item-info { @@ -125,6 +125,7 @@ a.wall-item-name-link { .wall-item-title.h3 { font-weight: bold; margin: 0px; + word-wrap: break-word; } .wall-item-body { @@ -167,75 +168,44 @@ a.wall-item-name-link { } .item-highlight { - border-left: 3px solid #0275d8; + border-left: 0.2rem solid #0275d8; } .item-highlight .wall-item-head, .item-highlight .wall-item-content, .item-highlight .wall-item-tools { - padding-left: 7px; + padding-left: 0.3rem; } / comment_item / .comment-edit-text-empty, .comment-edit-text-full { + padding: 0.5rem; + line-height: 1.25; width: 100%; display: inherit; } .comment-edit-text-empty { - padding: 0px 8px; - line-height: 28px; - height: 30px; + height: 2.25rem; overflow: hidden; resize: none; - } .comment-edit-text-full { - padding: 8px; - height: 150px; + height: 7rem; overflow: auto; resize: vertical; } -.qcomment { - border: 1px solid #EEE; - padding: 3px; - margin-top: 15px; - margin-left: 25px; - width: 125px; - overflow-y: auto; -} - -.qcomment option { - width: 125px; - overflow-x: hidden; -} - -.qcomment { - opacity: 0.3; - filter:alpha(opacity=30); -} - -.qcomment:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - -.comment-tools { - display: none; - margin-top: 7px; -} - +.comment-tools, .comment-edit-preview { display: none; - margin-top: 7px; } / disable link handling for unknown entries / -.dropdown-menu > li > a.disabled { +.dropdown-menu a.disabled { pointer-events: none; cursor: default; } diff --git a/view/css/widgets.css b/view/css/widgets.css index 8fb4ab377..8900b858c 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -1,19 +1,12 @@ .widget { - margin-bottom: 10px; - padding: 10px; + margin-bottom: 1rem; + padding: 0.5rem; } .widget h3 { margin-top: 0px; } -.widget-input { - width: 100%; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; - border-right: 0px; -} - .tags { word-wrap: break-word; } diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 9673312a7..e33f6192b 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -66,6 +66,10 @@ function contact_format(item) { return " " + item.text + " "; } +function smiley_format(item) { + return " " + item.icon + ' ' + item.text + " "; +} + function editor_replace(item) { if(typeof item.replace !== 'undefined') { return '$1$2' + item.replace; @@ -181,15 +185,16 @@ function string2bb(element) { index: 3, search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); }, replace: editor_replace, - template: contact_format, + template: contact_format }; smilies = { match: /(^\|\s)(:[a-z_:]{2,})$/, index: 2, search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, - template: function(item) { return item.icon + item.text; }, + //template: function(item) { return item.icon + item.text; }, replace: function(item) { return "$1" + item.text + ' '; }, + template: smiley_format }; this.attr('autocomplete','off'); this.textcomplete([contacts,smilies], {className:'acpopup', zIndex:1020}); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index cd5178688..decaf0d4e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -293,9 +293,9 @@ footer { padding: 0px 10px 10px 10px; background-color: rgba(254,254,254,0.5); border: 1px solid rgba(254,254,254,0.5); - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; + -moz-border-radius: $radius; + -webkit-border-radius: $radius; + border-radius: $radius; word-wrap: break-word; } @@ -333,7 +333,7 @@ footer { width: 251px; height: 251px; margin-bottom: 10px; - border-radius: $radiuspx; + border-radius: $radius; } #hide-friends-yes-label, @@ -387,8 +387,8 @@ footer { .photo, .contact-block-img { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; + -moz-border-radius: $radius; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } @@ -402,8 +402,8 @@ footer { .profile-match-photo img, .directory-photo-img { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; + -moz-border-radius: $radius; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } @@ -549,7 +549,7 @@ nav .acpopup { #cboxContent { padding: 3px; border: 0px solid #fff; - border-radius: $radiuspx; + border-radius: $radius; background-color: #fff; z-index: 1052; } @@ -721,8 +721,8 @@ div.jGrowl div.jGrowl-notification { #id-name-ac .autocomplete, #contact-search-ac .autocomplete { margin-top: 2px; - margin-left: $radiuspx; - margin-right: $radiuspx; + margin-left: $radius; + margin-right: $radius; border: 1px solid #666; border-top: none; @@ -734,8 +734,8 @@ div.jGrowl div.jGrowl-notification { text-align: left; max-height: 350px; overflow: auto; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; } .autocomplete .selected { @@ -829,7 +829,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { margin-bottom: 0.5rem; border: 1px solid #ccc; float: left; - border-radius: $radiuspx; + border-radius: $radius; } .acl-item-header { @@ -867,7 +867,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { .reshared-content { margin-left: 20px; } .shared_header img { - border-radius: $radiuspx; + border-radius: $radius; margin-right: 10px; } @@ -1008,8 +1008,8 @@ th,td { / mail / img.mail-conv-sender-photo { - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; + -moz-border-radius: $radius; + border-radius: $radius; } / jot / @@ -1026,25 +1026,23 @@ img.mail-conv-sender-photo { font-weight: bold; } - - #profile-jot-wrapper { background-color: rgba(254,254,254,1); border: 1px solid #ccc; - border-radius: $radiuspx; + border-radius: $radius; } #profile-jot-text { - border-radius: $radiuspx; + border-radius: $radius; } #profile-jot-text::-webkit-input-placeholder { - font-size: 16px; + font-size: 1.2rem; } #profile-jot-text::-moz-placeholder { - font-size: 16px; + font-size: 1.2rem; } #profile-jot-text:focus::-webkit-input-placeholder { @@ -1064,10 +1062,6 @@ img.mail-conv-sender-photo { color: #777; } -.jot-icons { - //color: $toolicon_colour; -} - .jot-icons.jot-lock-warn { color: darkorange; } @@ -1076,22 +1070,22 @@ img.mail-conv-sender-photo { / conversation / .top-radius { - border-top-right-radius: $radiuspx; - border-top-left-radius: $radiuspx; + border-top-right-radius: $radius; + border-top-left-radius: $radius; } .wall-event-item { padding: 10px; color: #fff; background-color: #3A87AD; / should reflect calendar color / - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; + border-top-left-radius: $radius; + border-top-right-radius: $radius; } .wall-photo-item img { max-width: 100% !important; - border-top-right-radius: $radiuspx; - border-top-left-radius: $radiuspx; + border-top-right-radius: $radius; + border-top-left-radius: $radius; } .wall-item-footer { @@ -1101,8 +1095,8 @@ img.mail-conv-sender-photo { .wall-item-content-wrapper { background-color: $item_colour; - border-top-right-radius: $radiuspx; - border-top-left-radius: $radiuspx; + border-top-right-radius: $radius; + border-top-left-radius: $radius; } .wall-item-content-wrapper.comment { @@ -1129,8 +1123,8 @@ img.mail-conv-sender-photo { padding: 7px 10px; background-color: $item_colour; border-radius: 0px; - border-bottom-right-radius: $radiuspx; - border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radius; + border-bottom-left-radius: $radius; border-top: 3px solid $comment_item_colour; } @@ -1151,8 +1145,8 @@ img.mail-conv-sender-photo { } .wall-item-photo { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; + -moz-border-radius: $radius; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } @@ -1181,7 +1175,7 @@ img.mail-conv-sender-photo { .comment-edit-text-empty, .comment-edit-text-full { border: 1px solid #ccc; - border-radius: $radiuspx; + border-radius: $radius; } .comment-edit-text-empty { @@ -1207,9 +1201,9 @@ img.mail-conv-sender-photo { .widget { background-color: rgba(254,254,254,.5); border: 1px solid rgba(254,254,254,.5); - -moz-border-radius: $radiuspx; - -webkit-border-radius: $radiuspx; - border-radius: $radiuspx; + -moz-border-radius: $radius; + -webkit-border-radius: $radius; + border-radius: $radius; } .widget h3 { @@ -1218,8 +1212,8 @@ img.mail-conv-sender-photo { #note-text { border: 1px solid #ccc; - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; + -moz-border-radius: $radius; } .fileas-ul { @@ -1228,8 +1222,8 @@ img.mail-conv-sender-photo { #datebrowse-sidebar select { border: 1px solid #ccc; - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; + border-radius: $radius; + -moz-border-radius: $radius; } .thing-show img { @@ -1251,24 +1245,24 @@ img.mail-conv-sender-photo { .chat-item-photo, .chat-item-photo-self { - border-radius: $radiuspx; + border-radius: $radius; } .chat-item-title, .chat-item-title-self { - border-radius: $radiuspx; + border-radius: $radius; background-color: $item_colour; } #chatMembers img { - border-radius: $radiuspx; + border-radius: $radius; } .menu-img-3 { width: 3.3em; height: 3.3em; margin-right: 5px; - border-radius: $radiuspx; + border-radius: $radius; float: left; } @@ -1276,7 +1270,7 @@ img.mail-conv-sender-photo { height: 2.2em; width: 2.2em; margin-right: 5px; - border-radius: $radiuspx; + border-radius: $radius; float: left; } @@ -1284,7 +1278,7 @@ img.mail-conv-sender-photo { height: 1.5em; width: 1.5em; margin-right: 5px; - border-radius: $radiuspx; + border-radius: $radius; } .usermenu { @@ -1294,7 +1288,7 @@ img.mail-conv-sender-photo { #avatar { width: 2.2rem; height: 2.2rem; - border-radius: $radiuspx; + border-radius: $radius; } .page-title { @@ -1304,20 +1298,20 @@ img.mail-conv-sender-photo { .generic-content-wrapper-styled { background-color: $bgcolour; padding: 10px; - border-radius: $radiuspx; + border-radius: $radius; } .generic-content-wrapper { border: 1px solid #ccc; box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2); - border-radius: $radiuspx; + border-radius: $radius; } .section-title-wrapper { padding: 7px 10px; background-color: $item_colour; - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; + border-top-left-radius: $radius; + border-top-right-radius: $radius; border-bottom: 3px solid $comment_item_colour; } @@ -1378,22 +1372,22 @@ img.mail-conv-sender-photo { .section-content-wrapper .section-content-danger-wrapper { margin-bottom: 10px; border-bottom: none; - border-radius: $radiuspx; + border-radius: $radius; } .section-content-wrapper { padding: 7px 10px; background-color: $comment_item_colour; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; word-wrap: break-word; } .section-content-wrapper-np { background-color: $comment_item_colour; - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; word-wrap: break-word; } @@ -1461,11 +1455,11 @@ blockquote { .dropdown-menu { font-size: $body_font_size; - border-radius: $radiuspx; + border-radius: $radius; } .dropdown-menu img { - border-radius: $radiuspx; + border-radius: $radius; } / @@ -1606,7 +1600,7 @@ dl.bb-dl > dd > li { margin-bottom: 0px; box-shadow: none; display: inline-block; - border-radius: $radiuspx; + border-radius: $radius; cursor: text; padding: 0px 10px; width: 100%; @@ -1716,8 +1710,8 @@ dl.bb-dl > dd > li { #ace-editor, #editor { - border-bottom-left-radius: $radiuspx; - border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radius; + border-bottom-right-radius: $radius; } .sub-menu { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 08efcda4c..f4e6d8046 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -128,7 +128,7 @@ if (! $body_font_size) if (! $font_colour) $font_colour = '#4d4d4d'; if (! $radius) - $radius = '4'; + $radius = '0.25rem'; if (! $shadow) $shadow = '0'; if (! $converse_width) diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 80bef9ef6..f490483b8 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -19,8 +19,7 @@ {{/foreach}} {{/if}} - - + - - -- cgit v1.2.3 From f31af3c7c0e157e375a08ce562221d91406bcef9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 17:09:21 +0100 Subject: typo --- view/tpl/item_attach.tpl \| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl index 711b72e76..95e38c0bd 100644 --- a/view/tpl/item_attach.tpl +++ b/view/tpl/item_attach.tpl @@ -1,5 +1,5 @@ {{if $attaches}} {{foreach $attaches as $a}} - {{$a.label}} + {{$a.label}} {{/foreach}} {{/if}} -- cgit v1.2.3 From 949ca844c5e580484c46fb3202a29d19049bb453 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 17:49:07 +0100 Subject: open like-modal directly if more than 10 likes --- view/tpl/conv_item.tpl \| 11 ++++------- view/tpl/conv_list.tpl \| 13 +++++-------- 2 files changed, 9 insertions(+), 15 deletions(-) (limited to 'view') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 22250781c..bcdfe3ebc 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -205,13 +205,8 @@ {{foreach $item.responses as $verb=>$response}} {{if $response.count}} - - {{if $response.list_part}} - {{foreach $response.list_part as $liker}}{{$liker}}{{/foreach}} - {{else}} - {{foreach $response.list as $liker}}{{$liker}}{{/foreach}} - {{/if}} - {{if $response.list_part}} + + {{if $response.modal}} @@ -228,6 +223,8 @@ + {{else}} + {{foreach $response.list as $liker}}{{$liker}}{{/foreach}} {{/if}} {{/if}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index e31ffea25..0f6ea22a3 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -216,19 +216,14 @@ {{foreach $item.responses as $verb=>$response}} {{if $response.count}} - - {{if $response.list_part}} - {{foreach $response.list_part as $liker}}{{$liker}}{{/foreach}} - {{else}} - {{foreach $response.list as $liker}}{{$liker}}{{/foreach}} - {{/if}} - {{if $response.list_part}} + + {{if $response.modal}} - {{$response.title}} + {{foreach $response.list as $liker}} {{$liker}} {{/foreach}} @@ -239,6 +234,8 @@ + {{else}} + {{foreach $response.list as $liker}}{{$liker}}{{/foreach}} {{/if}} {{/if}} -- cgit v1.2.3 From 79bd2ddd9cfdafa25c679efe3bd4d63f67960285 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 17:53:33 +0100 Subject: reflect count in modal --- view/tpl/conv_item.tpl \| 2 +- view/tpl/conv_list.tpl \| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index bcdfe3ebc..a3bb05e00 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -211,7 +211,7 @@ - {{$response.title}} + {{$response.count}} {{$response.button}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 0f6ea22a3..fa7b4cd46 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -222,7 +222,7 @@ - {{$response.title}} + {{$response.count}} {{$response.button}} -- cgit v1.2.3 From 8e11b2d6f0970be979d561f99c5a7a6309536e75 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 19:32:54 +0100 Subject: fix some wrapping issues --- view/css/mod_chat.css \| 4 ++++ view/css/mod_webpages.css \| 16 ++++++++++------ view/css/mod_wiki.css \| 1 + 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'view') diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css index 57aecd557..c56091102 100644 --- a/view/css/mod_chat.css +++ b/view/css/mod_chat.css @@ -16,6 +16,10 @@ text-align: right; } +#chatrooms-index td:nth-child(3){ + white-space: nowrap; +} + #chatrooms-index th:nth-child(4), #chatrooms-index td:nth-child(4){ padding: 7px 10px 7px 7px; diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css index 805d95dc2..f665800f1 100644 --- a/view/css/mod_webpages.css +++ b/view/css/mod_webpages.css @@ -6,27 +6,31 @@ width: 100%; } -#webpage-list-table th:nth-child(1){ +#webpage-list-table th:nth-child(1) { padding: 7px 3px 7px 10px; white-space: nowrap; } -#webpage-list-table td:nth-child(1){ +#webpage-list-table td:nth-child(1) { padding: 7px 3px 7px 10px; } -#webpage-list-table th:nth-child(2){ +#webpage-list-table th:nth-child(2) { + white-space: nowrap; +} + +#webpage-list-table td:nth-child(3) { white-space: nowrap; } #webpage-list-table th:nth-child(7), -#webpage-list-table td:nth-child(7){ +#webpage-list-table td:nth-child(7) { padding: 7px 3px; white-space: nowrap; } #webpage-list-table th:nth-child(8), -#webpage-list-table td:nth-child(8){ +#webpage-list-table td:nth-child(8) { padding: 7px 10px 7px 7px; white-space: nowrap; } @@ -192,4 +196,4 @@ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: alpha(opacity=100); opacity: 1; -} \ No newline at end of file +} diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css index 83f17c820..b44ec4fd8 100644 --- a/view/css/mod_wiki.css +++ b/view/css/mod_wiki.css @@ -41,6 +41,7 @@ #wikis-index th:nth-child(3), #wikis-index td:nth-child(3){ padding: 7px 10px 7px 7px; + white-space: nowrap; } #wikis-index th:nth-child(4), -- cgit v1.2.3 From 92d581a342691035acd88e27caead9082767e750 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 19:36:29 +0100 Subject: do not show the scrollbar before the animation has finished --- view/css/bootstrap-red.css \| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index bcc75a9da..d4f5b2d9b 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -42,7 +42,7 @@ nav.navbar { max-height: 100vh; } -#navbar-collapse-2 { +#navbar-collapse-2.show { overflow: auto; } -- cgit v1.2.3 From 2f3f95d3a9473d4b9c15727c960f51026c992094 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Mar 2017 19:59:45 +0100 Subject: change the btn-outline-secondary:hover color to soething sane --- view/theme/redbasic/css/style.css \| 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index de179d56e..db06d39c3 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1435,6 +1435,10 @@ 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%); -- cgit v1.2.3 From 37d350c3f589779a32ca356047d8c7244ac4878f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 11:18:23 +0100 Subject: update to latest bs4 from git and change hidden-* classes to d-* --- view/js/mod_cloud.js \| 2 +- view/js/mod_network.js \| 1 - view/php/default.php \| 2 +- view/theme/redbasic/css/style.css \| 14 -------------- view/tpl/abook_edit.tpl \| 4 ++-- view/tpl/blocklist.tpl \| 8 ++++---- view/tpl/chat.tpl \| 4 ++-- view/tpl/cloud_directory.tpl \| 12 ++++++------ view/tpl/common_tabs.tpl \| 4 ++-- view/tpl/jot.tpl \| 8 ++++---- view/tpl/layoutlist.tpl \| 8 ++++---- view/tpl/locmanage.tpl \| 4 ++-- view/tpl/menulist.tpl \| 8 ++++---- view/tpl/nav.tpl \| 12 ++++++------ view/tpl/prv_message.tpl \| 6 +++--- view/tpl/sharedwithme.tpl \| 8 ++++---- view/tpl/webpagelist.tpl \| 8 ++++---- 17 files changed, 49 insertions(+), 64 deletions(-) (limited to 'view') 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) { '		' + f.name + '					' + formatSizeUnits(f.size) + '	' + formatSizeUnits(f.size) + '
										{{$created}}	{{$edited}}	{{$created}}	{{$edited}}
+	{{$item.created}}		+	{{$item.edited}}
..					{{[{{$parent}}]}}
				{{{{$item.type}}}}	{{$item.sizeFormatted}}	{{$item.lastmodified}}	{{$item.sizeFormatted}}	{{$item.lastmodified}}
										{{$created}}	{{$edited}}	{{$created}}	{{$edited}}
+	{{$item.created}}	+	{{$item.edited}}

- + @@ -30,7 +30,7 @@ {{if ! $hub.deleted }} - + 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 @@ - - + + {{foreach $menus as $m }} @@ -30,8 +30,8 @@ - - + + {{/foreach}}

{{$addr}}	{{$loc}}	{{$loc}}	{{$mkprm}}	{{$drop}}
{{$hub.hubloc_addr}}	{{$hub.hubloc_url}}	{{$hub.hubloc_url}}	{{if $hub.primary}}{{else}}{{/if}}
			{{$created}}	{{$edited}}	{{$created}}	{{$edited}}
			{{$m.menu_created}}	{{$m.menu_edited}}	{{$m.menu_created}}	{{$m.menu_edited}}

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}} -

{{$nav.loginmenu.1.1}} @@ -158,20 +158,20 @@ {{/if}} {{if $nav.register}} -

{{/if}} {{if $nav.alogout}} -

{{/if}} - + -

@@ -62,7 +62,7 @@

{{if $feature_expire || $feature_encrypt}} -

{{/if}} -

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 @@

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 @@

{{$room.cr_expire}} min

diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index d2797aefb..4c0bd5a1b 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -5,7 +5,7 @@ {{if $albums}} {{foreach $albums as $al}} {{if $al.text}} -

{{/if}} {{/foreach}} {{/if}} -- cgit v1.2.3 From 5dc457b16c2d2cc0721fb3af1a786e8f0e32ef73 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Mar 2017 16:10:37 +0100 Subject: fix some active and hover colors --- view/theme/redbasic/css/style.css | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c38c5c4d0..3e321f54d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -766,10 +766,14 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { text-decoration: none; } -.widget .conv-participants { +.conv-participants { color: $font_colour; } +.active .conv-participants { + color: #fff; +} + .contactname { font-weight: bold; display: block; @@ -1129,10 +1133,19 @@ img.mail-conv-sender-photo { } .wall-item-ago, -.dropdown-sub-text { +a:hover .wall-item-ago, +.dropdown-sub-text, +a:hover .dropdown-sub-text { color: #777; } +.active .wall-item-ago, +a:active .wall-item-ago, +.active .dropdown-sub-text, +a:active .dropdown-sub-text { + color: #fff; +} + .wall-item-content, .mail-conv-body, .page-body, -- cgit v1.2.3 From fd23844c8dad0df4ebccc4b056a5c464cf490cde Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Mar 2017 16:50:59 +0100 Subject: remove redundant css --- view/theme/redbasic/css/style.css | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3e321f54d..e059e524f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -264,19 +264,6 @@ footer { /*TODO: we should use one class for all this. */ -.group-selected, -.fileas-selected, -.categories-selected, -.search-selected, -.active, -.group-selected:hover, -.fileas-selected:hover, -.categories-selected:hover, -.search-selected:hover, -.active:hover { - color: $font_colour; -} - #cropimage-wrapper, #cropimage-preview-wrapper { float: left; padding: 30px; -- cgit v1.2.3 From 28e0911f295f49af8f559434d119286ef7ca9d83 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Mar 2017 17:07:22 +0100 Subject: remove obsolete todo --- view/theme/redbasic/css/style.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e059e524f..d00547e36 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -262,8 +262,6 @@ footer { margin: 15px 0px; } -/*TODO: we should use one class for all this. */ - #cropimage-wrapper, #cropimage-preview-wrapper { float: left; padding: 30px; -- cgit v1.2.3 From 90ab050493184615da4b5846ca92f6dbe948e3b5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Mar 2017 19:41:58 +0100 Subject: fix active state --- view/tpl/fileas_widget.tpl | 4 ++-- view/tpl/saved_searches.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl index 1754a794b..a6a69b89c 100755 --- a/view/tpl/fileas_widget.tpl +++ b/view/tpl/fileas_widget.tpl @@ -3,9 +3,9 @@

{{$all}}
{{$all}}
{{$term.name}}
{{$term.name}}

diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index b62404fcc..ff2d044ef 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -5,7 +5,7 @@ {{foreach $saved as $search}}

- {{$search.displayterm}} + {{$search.displayterm}}

-- cgit v1.2.3 From 4f4c9bf5d658c1283d1181cd7899194df7df943c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 25 Mar 2017 09:41:35 +0100 Subject: fix full template nav --- view/php/full.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/php/full.php b/view/php/full.php index 9cf567a67..a528781c0 100644 --- a/view/php/full.php +++ b/view/php/full.php @@ -7,7 +7,7 @@

- +

-- cgit v1.2.3

{{$title}}

{{$header}}

{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}

{{$title}}{{if $cat}} - {{$cat}}{{/if}}

{{$title}}

{{$header}}

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

{{$title}}

{{$title}}

{{$title}}

{{$title}}

{{$title}}

{{$title}}

{{$header}}

{{$header}}

{{$connect}}

{{$admtxt}}

{{$plugadmtxt}}

{{$logtxt}}

{{$header}}

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

{{$title}}

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

{{$title}}

{{$header}}

{{$prvmsg_header}}

{{$header}}

{{$title}}

{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}

{{$title}}{{if $cat}} - {{$cat}}{{/if}}

{{$title}}

{{$header}}

{{$ptitle}}

{{$title}}

{{$header}}

Scanned Pages

{{$listtitle}}

{{$wikiheaderName}}: @@ -35,7 +35,7 @@ Submit

{{$header}}

{{$title}}

{{$title}}

{{$header}}

{{$title}}

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

{{$finding}}

{{$header}}{{if $total}} ({{$total}}){{/if}}

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

{{$response.title}}

{{$dirlbl}}{{if $search}}: {{$safetxt}}{{/if}}

{{$connect}}

{{$findpeople}}

{{$title}}

- + {{$tocHeading}}

{{$title}}

{{$title}}

{{$title}}

{{$banner}}

{{$menu.menu_desc}}{{if $edit}} {{/if}}

{{$header}}

{{$header}}

{{$connect}}

{{$findpeople}}

{{$admtxt}}

{{$plugadmtxt}}

{{$logtxt}}

{{$header}}

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

{{$response.title}}

{{$title}}

{{$title}}

{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}{{/if}}{{/if}}

+ {{$aclModalTitle}} + {{if $helpUrl}} + + {{/if}} +

{{$aclModalTitle}}

{{$response.title}}

{{$nav.loginmenu.1.1}}

{{$nav.loginmenu.1.1}}

{{$response.title}}

{{$response.title}}

{{$response.count}} {{$response.button}}

{{$response.title}}

{{$response.count}} {{$response.button}}

{{$title}}

{{$title}}

{{$title}}

{{$jotnets_label}}

{{$expires}}

{{$future_txt}}

{{$embedPhotosModalTitle}}

{{$embedPhotosModalTitle}}

{{$title}}

{{$title}}

{{$title}}

{{$wikiheaderName}}: @@ -35,7 +35,7 @@