From cc2bef67dd17ac2d9352442aeac39963470ba67f Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 26 Aug 2014 19:09:00 +0100 Subject: HTML doesn't work without ACCOUNT_ROLE_ALLOWCODE, so don't offer it as an option. --- include/text.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index d3d8b84a6..42fad13b5 100755 --- a/include/text.php +++ b/include/text.php @@ -1552,7 +1552,6 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { $x = array( 'text/bbcode', - 'text/html', 'text/markdown', 'text/plain' ); @@ -1564,8 +1563,10 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { if($r) { if($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) { - if(local_user() && get_account_id() == $r[0]['account_id']) + if(local_user() && get_account_id() == $r[0]['account_id']) { + $x[] = 'text/html'; $x[] = 'application/x-php'; + } } } -- cgit v1.2.3 From 450434a6903790aacf70864633cd3ccb57b739f0 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 26 Aug 2014 20:13:27 +0100 Subject: Revert - see comments. --- include/text.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 include/text.php diff --git a/include/text.php b/include/text.php old mode 100755 new mode 100644 index 42fad13b5..410d9bc96 --- a/include/text.php +++ b/include/text.php @@ -1552,6 +1552,7 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { $x = array( 'text/bbcode', + 'text/html', 'text/markdown', 'text/plain' ); @@ -1563,10 +1564,8 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { if($r) { if($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) { - if(local_user() && get_account_id() == $r[0]['account_id']) { - $x[] = 'text/html'; + if(local_user() && get_account_id() == $r[0]['account_id']) $x[] = 'application/x-php'; - } } } @@ -2023,3 +2022,4 @@ function normalise_openid($s) { return trim(str_replace(array('http://','https://'),array('',''),$s),'/'); } + -- cgit v1.2.3 From c703d833508a43f559a6031bac8b040070e6b2f9 Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 26 Aug 2014 22:35:00 +0200 Subject: add background color to widgets --- view/css/default.css | 2 +- view/css/widgets.css | 34 ++++++---------------------------- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/php/style.php | 2 +- 4 files changed, 9 insertions(+), 31 deletions(-) diff --git a/view/css/default.css b/view/css/default.css index d47fdfe80..40d5cfc59 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -31,5 +31,5 @@ section { width: 100%; display: table-cell; vertical-align: top; - padding: 65px 10px 200px 10px; + padding: 65px 7px 200px 7px; } diff --git a/view/css/widgets.css b/view/css/widgets.css index 8607cb562..8bf5a9e97 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -2,12 +2,14 @@ /* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */ .widget { - margin-left: 10px; - padding: 0 8px 8px 8px; + margin-bottom: 10px; + padding: 10px 10px 10px 20px; } .widget h3 { margin-left: -10px; + margin-top: 0px; + margin-bottom: 10px; } /* suggest */ @@ -109,34 +111,10 @@ /* group */ -#group-sidebar { - margin-bottom: 10px; -} - -#sidebar-new-group { +#sidebar-group-list { margin-bottom: 10px; } -#sidebar-group-list .icon, #sidebar-group-list .iconspacer { - display: inline-block; - height: 12px; - width: 12px; -} - -.sidebar-group-name { - display: block; - width: 170px; - overflow: hidden; -} - -#sidebar-group-ul { - margin-bottom: 10px; -} - -#sidebar-group-list li { - margin-top: 3px; -} - .sidebar-group-li input { float: right; } @@ -175,4 +153,4 @@ li:hover .group-edit-icon { .chatroomlist td { padding: 0 5px 0; -} \ No newline at end of file +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 478f1efee..c001b3b5f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2118,6 +2118,7 @@ img.mail-list-sender-photo { /* widgets */ .widget { + background-color: $comment_item_colour; border-bottom: 1px solid $widget_brdrcolour; -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; @@ -2408,7 +2409,6 @@ blockquote { background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%); } - @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index ee9c6d4d0..4ffdcbef8 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -140,7 +140,7 @@ if(! $a->install) { if (! $selected_active_deco) $selected_active_deco = "none"; if (! $widget_brdrcolour) - $widget_brdrcolour = "#eec"; + $widget_brdrcolour = "rgba(238,238,238,0.8)"; if (! $blockquote_colour) $blockquote_colour = "#000"; if (! $blockquote_bgcolour) -- cgit v1.2.3 From 2df4c44de5601053635e23a7af01a57bdc4fa9fa Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 27 Aug 2014 00:59:07 +0200 Subject: make vcard and contact block widget look-alike --- view/theme/redbasic/css/style.css | 80 ++++++++++++++++++--------------------- view/tpl/profile_vcard.tpl | 4 +- 2 files changed, 38 insertions(+), 46 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c001b3b5f..209e32c52 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -410,37 +410,35 @@ aside li { .fn { - padding: 0px 0px 5px 0px; - font-size: 120%; font-weight: bold; + font-size: 16px; color: #444444; } .vcard { - padding: 8px; + margin-bottom: 10px; + padding: 10px; + background-color: $comment_item_colour; + border-bottom: 1px solid $widget_brdrcolour; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; } .vcard .title { - margin-bottom: 5px; -} + margin-bottom: 10px; -.vcard dl { - clear: both; - word-wrap:break-word; } -.vcard-profile-edit-icon { - font-size: 1.2em; +.vcard dl { + margin-top: 10px; + margin-bottom: 0px; } + .vcard-profile-edit-icon:hover { text-decoration: none; } -.vcard .dropdown-menu { - position: absolute; - left: 200px; - top: 18px; -} #profile-extra-links { clear: both; @@ -454,21 +452,22 @@ aside li { #profile-extra-links li { - margin-top: 5px; + margin-top: 10px; } .profile-edit-side-link { - opacity: 0.3; + opacity: 0; filter:alpha(opacity=30); float: right; - margin-top: -3px; } -.profile-edit-side-link:hover { - opacity: 1.0; + +.vcard:hover .profile-edit-side-link { + opacity: 1; filter:alpha(opacity=100); } + .view-contact-wrapper { margin-top: 20px; float: left; @@ -494,9 +493,9 @@ aside li { #profile-photo-wrapper img { - padding: 12px; - width: 201px; - height: 201px; + padding: 10px; + width: 197px; + height: 197px; } #profile-in-dir-yes-label, @@ -777,19 +776,25 @@ aside li { } #contact-block { - margin-top: 25px; - padding: 8px; + float: left; + background-color: $comment_item_colour; + border-bottom: 1px solid $widget_brdrcolour; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; + padding: 10px; + margin-bottom:10px; } #contact-block-numcontacts { font-weight: bold; - margin-bottom:8px; + margin-bottom:10px; } .contact-block-div { float: left; - width: 50px; - height: 50px; + width: 49px; + height: 49px; } .contact-block-textdiv { float: left; @@ -804,8 +809,8 @@ aside li { float: left; } .contact-block-img { - width:48px; - height:48px; + width:47px; + height:47px; } #tag-remove { @@ -886,19 +891,6 @@ aside li { font-family: FontAwesome; } -.location-label, .gender-label, .marital-label, .homepage-label { - float: left; - display: block; - width: 70px; - -} - -.adr, .x-gender, .marital-text, .homepage-url { - float: left; - display: block; - width: 130px; -} - .profile-clear { clear: both; } @@ -1722,7 +1714,7 @@ header { } .contact-block-content { - margin-top: 8px; + margin-top: 10px; } .contact-block-img.archived { opacity: 0.3; diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 7dff8fdeb..3c83cd685 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -2,7 +2,7 @@ {{if $profile.edit}}
- +
{{/if}} -
{{$profile.name}}{{if $profile.online}} {{/if}}
+
{{$profile.name}}{{if $profile.online}} {{/if}}
{{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
{{$profile.name}}
-- cgit v1.2.3