From b1ff5367e7e853d7e0e24c91aecc3a8f80d0ba87 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 23 Feb 2017 19:07:01 -0800 Subject: more work on profile vcards - still a lot of work to go --- view/js/mod_connedit.js | 2 +- view/js/mod_profiles.js | 4 +- view/tpl/profile_advanced.tpl | 22 ++++++++ view/tpl/profile_edit.tpl | 126 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 150 insertions(+), 4 deletions(-) (limited to 'view') diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index 4739c490c..7100e0d07 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -82,7 +82,7 @@ $(document).ready(function() { function doRemove() { var what = $(this).data('remove'); var element = $(this).parents('div.form-' + what); - var where = '#abook_edit_form' + $(this).data('id'); + var where = '#abook-edit-form' + $(this).data('id'); if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') { $(where + ' .add-' + what).show() diff --git a/view/js/mod_profiles.js b/view/js/mod_profiles.js index acc9f9953..784f64458 100644 --- a/view/js/mod_profiles.js +++ b/view/js/mod_profiles.js @@ -38,7 +38,7 @@ $(document).ready(function() { var what = $(this).data('add'); var id = $(this).data('id'); var element = '#template-form-' + what; - var where = '#abook-edit-form'; + var where = '#profile-edit-form'; $(element + ' .remove-field').attr('data-id', id) @@ -58,7 +58,7 @@ $(document).ready(function() { function doRemove() { var what = $(this).data('remove'); var element = $(this).parents('div.form-' + what); - var where = '#abook_edit_form' + $(this).data('id'); + var where = '#profile-edit-form' + $(this).data('id'); if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') { $(where + ' .add-' + what).show() diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 4000f39d6..ba0efe999 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -47,6 +47,28 @@ {{foreach $fields as $f}} + + + + + + + + + + + + + + + + + + + + + + {{if $f == 'name'}}
{{$profile.fullname.0}}
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index b0211d697..a50d11136 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -108,6 +108,128 @@ + + {{if $fields.comms }} + +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+
+ +
+ + + {{if $vcard.fn}}{{$vcard.fn}}{{/if}} + {{if $vcard.emails.0.address}}{{/if}} + {{if $vcard.tels.0}}{{/if}} + + +
+
+
+ +
+
+ {{if $vcard.tels}} + {{foreach $vcard.tels as $tel}} +
+ + + +
+ {{/foreach}} + {{/if}} +
+
+ + +
+
+ {{if $vcard.emails}} + {{foreach $vcard.emails as $email}} +
+ + + +
+ {{/foreach}} + {{/if}} +
+
+ +
+
+ {{if $vcard.impps}} + {{foreach $vcard.impps as $impp}} +
+ + + +
+ {{/foreach}} + {{/if}} +
+
+ +
+ +
+
+ {{/if}} + + {{if $fields.address || $fields.locality || $fields.postal_code || $fields.region || $fields.country_name || $fields.hometown}}
+ {{/if}} + {{if $fields.marital || $fields.sexual}}
- +
@@ -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 @@
{{if $editor}}
- -  {{$help.text}} + +  {{$help.text}}
{{/if}}

{{$title}}

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; }); } - +

{{$header}}

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.like_count}}
- + {{if $profile.likers}} {{/if}} @@ -11,14 +11,14 @@ {{/if}} {{if $profile.canlike}}
-
{{/if}} {{if $editmenu.multi}}
-  {{$editmenu.edit.3}} +  {{$editmenu.edit.3}}
{{elseif $editmenu}}
-  {{$editmenu.edit.3}} +  {{$editmenu.edit.3}}
{{/if}} {{if $exportlink}}
-  {{$export}} +  {{$export}}
{{/if}}
@@ -319,13 +319,13 @@
  • {{if $item.img}}{{$item.term}}{{/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}}

    {{$header}}

    @@ -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 @@
    • {{$tools.view.label}}
      • diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index c5e3f2ab6..dde24997d 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -139,7 +139,7 @@
    {{/if}}