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... --- Zotlabs/Lib/ThreadItem.php | 4 +- Zotlabs/Module/Lockview.php | 22 ++++----- include/conversation.php | 4 +- 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 +-- 19 files changed, 148 insertions(+), 150 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 799a606d6..6534a5345 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -183,7 +183,7 @@ class ThreadItem { $like_list = ((x($conv_responses['like'],$item['mid'])) ? $conv_responses['like'][$item['mid'] . '-l'] : ''); if (count($like_list) > MAX_LIKERS) { $like_list_part = array_slice($like_list, 0, MAX_LIKERS); - array_push($like_list_part, '' . t('View all') . ''); + array_push($like_list_part, '' . t('View all') . ''); } else { $like_list_part = ''; } @@ -195,7 +195,7 @@ class ThreadItem { $dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun'); if (count($dislike_list) > MAX_LIKERS) { $dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS); - array_push($dislike_list_part, '' . t('View all') . ''); + array_push($dislike_list_part, '' . t('View all') . ''); } else { $dislike_list_part = ''; } diff --git a/Zotlabs/Module/Lockview.php b/Zotlabs/Module/Lockview.php index fc7d5c7c8..466d16997 100644 --- a/Zotlabs/Module/Lockview.php +++ b/Zotlabs/Module/Lockview.php @@ -72,7 +72,7 @@ class Lockview extends \Zotlabs\Web\Controller { } if($uid != local_channel()) { - echo '
  • ' . t('Remote privacy information not available.') . '
    • '; + echo '
    ' . t('Remote privacy information not available.') . '
    '; killme(); } @@ -84,7 +84,7 @@ class Lockview extends \Zotlabs\Web\Controller { // as unknown specific recipients. The sender will have the visibility list and will fall through to the // next section. - echo '
  • ' . translate_scope((! $item['public_policy']) ? 'specific' : $item['public_policy']) . '
    • '; + echo '
    ' . translate_scope((! $item['public_policy']) ? 'specific' : $item['public_policy']) . '
    '; killme(); } @@ -93,7 +93,7 @@ class Lockview extends \Zotlabs\Web\Controller { $deny_users = expand_acl($item['deny_cid']); $deny_groups = expand_acl($item['deny_gid']); - $o = '
  • ' . t('Visible to:') . '
    • '; + $o = '
    ' . t('Visible to:') . '
    '; $l = array(); stringify_array_elms($allowed_groups,true); @@ -114,24 +114,24 @@ class Lockview extends \Zotlabs\Web\Controller { $r = q("SELECT profile_name FROM profile WHERE profile_guid IN ( " . implode(', ', $profile_groups) . " )"); if($r) foreach($r as $rr) - $l[] = '
  • ' . t('Profile','acl') . ' ' . $rr['profile_name'] . '
    • '; + $l[] = '
    ' . t('Profile','acl') . ' ' . $rr['profile_name'] . '
    '; } if(count($allowed_groups)) { $r = q("SELECT gname FROM groups WHERE hash IN ( " . implode(', ', $allowed_groups) . " )"); if($r) foreach($r as $rr) - $l[] = '
  • ' . $rr['gname'] . '
    • '; + $l[] = '
    ' . $rr['gname'] . '
    '; } if(count($allowed_users)) { $r = q("SELECT xchan_name FROM xchan WHERE xchan_hash IN ( " . implode(', ',$allowed_users) . " )"); if($r) foreach($r as $rr) - $l[] = '
  • ' . $rr['xchan_name'] . '
    • '; + $l[] = '
    ' . $rr['xchan_name'] . '
    '; if($atokens) { foreach($atokens as $at) { if(in_array("'" . $at['xchan_hash'] . "'",$allowed_users)) { - $l[] = '
  • ' . $at['xchan_name'] . '
    • '; + $l[] = '
    ' . $at['xchan_name'] . '
    '; } } } @@ -150,7 +150,7 @@ class Lockview extends \Zotlabs\Web\Controller { $r = q("SELECT profile_name FROM profile WHERE profile_guid IN ( " . implode(', ', $profile_groups) . " )"); if($r) foreach($r as $rr) - $l[] = '
  • ' . t('Profile','acl') . ' ' . $rr['profile_name'] . '
    • '; + $l[] = '
    ' . t('Profile','acl') . ' ' . $rr['profile_name'] . '
    '; } @@ -159,18 +159,18 @@ class Lockview extends \Zotlabs\Web\Controller { $r = q("SELECT gname FROM groups WHERE hash IN ( " . implode(', ', $deny_groups) . " )"); if($r) foreach($r as $rr) - $l[] = '
  • ' . $rr['gname'] . '
    • '; + $l[] = '
    ' . $rr['gname'] . '
    '; } if(count($deny_users)) { $r = q("SELECT xchan_name FROM xchan WHERE xchan_hash IN ( " . implode(', ', $deny_users) . " )"); if($r) foreach($r as $rr) - $l[] = '
  • ' . $rr['xchan_name'] . '
    • '; + $l[] = '
    ' . $rr['xchan_name'] . '
    '; if($atokens) { foreach($atokens as $at) { if(in_array("'" . $at['xchan_hash'] . "'",$deny_users)) { - $l[] = '
  • ' . $at['xchan_name'] . '
    • '; + $l[] = '
    ' . $at['xchan_name'] . '
    '; } } } diff --git a/include/conversation.php b/include/conversation.php index a1acc456a..45b3a53e8 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1176,8 +1176,8 @@ function builtin_activity_puller($item, &$conv_responses) { if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); $url = (($item['author_xchan'] && $item['author']['xchan_photo_s']) - ? '' . '' . urlencode($name) . '' . $name . '' - : '' . $name . '' + ? '' . '' . urlencode($name) . '' . $name . '' + : '' . $name . '' ); if(! $item['thr_parent']) 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 @@ - -
    +
    {{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}}
    -
    {{/if}}
    @@ -33,7 +32,8 @@
    {{if $item.lock}}
    -   +   +
    {{/if}}
    @@ -85,11 +85,11 @@ - +
    {{/if}}
    @@ -108,17 +108,17 @@ - +
    + + {{$item.attend.0}} + + + {{$item.attend.1}} + + + {{$item.attend.2}} + +
    {{/if}} {{if $item.canvote}} @@ -126,69 +126,69 @@ - +
    {{/if}} - +
    @@ -198,7 +198,7 @@ {{if $item.attachments}}
    - +
    {{$item.attachments}}
    {{/if}} {{foreach $item.responses as $verb=>$response}} @@ -206,9 +206,9 @@
    {{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}}
    -
      {{foreach $response.list as $liker}}
    • {{$liker}}
      • {{/foreach}}
    +
      {{foreach $response.list as $liker}}
    • {{$liker}}
      • {{/foreach}}
    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 @@
    -
    +
    - +
    + {{$date}} + {{$normal}} + {{$reversedate}} + {{$reverse}} +

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

    -
    {{foreach $entries as $entry}} {{include file="direntry.tpl"}} {{/foreach}}
    -
    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 @@

    {{$connect}}

    - +
    - +
    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 $nav.help.6}} - {{/if}} - - {{/if}} @@ -37,7 +37,7 @@ {{$userinfo.name}}
    {{if $localuser}} -