From cd188cb70d22836c9886768862168771495d69c2 Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 9 Oct 2014 10:53:30 +0200 Subject: css fixes --- view/css/widgets.css | 11 +++++++++++ view/theme/redbasic/css/style.css | 18 +++--------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/view/css/widgets.css b/view/css/widgets.css index b5dc7e6f8..2bb6a125b 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -23,9 +23,20 @@ margin-top: 15px; } +/* search */ + +#search-text { + border: 1px solid #ccc; + padding: 5px; + line-height: 1.5; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; +} + /* notes */ #note-text { + padding: 5px; width: 100%; resize: vertical; height: 150px; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1d5fcaa1a..f8305e32b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -894,18 +894,6 @@ footer { font-family: FontAwesome; } -#search-text { - border: 1px solid #ccc; - font-size: 1em; - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; -} - -#netsearch-box .btn-sm { - padding: 2.78px 10px; -} - - .profile-clear { clear: both; } @@ -2288,12 +2276,12 @@ blockquote { } aside .nav > li > a:hover, aside .nav > li > a:focus { - text-decoration: $navtabs_decohover; - background-color: $navaside_bghover; + text-decoration: $navtabs_decohover; + background-color: $navaside_bghover; } aside .nav-pills > li > a { - padding: 6px 10px; + padding: 6px 10px; } .dropdown-menu img { -- cgit v1.2.3 From a8df8165eae2abf8db3a40b5d4aae9368ee081a6 Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 9 Oct 2014 11:21:13 +0200 Subject: more css fixes --- view/css/widgets.css | 4 ++++ view/theme/redbasic/css/style.css | 1 + 2 files changed, 5 insertions(+) diff --git a/view/css/widgets.css b/view/css/widgets.css index 2bb6a125b..5176c6934 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -73,6 +73,10 @@ margin: 2px 0px 0px 10px; } +#posted-date-selector li:not(:first-child) { + margin-top: 2px; +} + /* categories */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f8305e32b..b5fccc1b9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1526,6 +1526,7 @@ div.jGrowl div.jGrowl-notification { margin-left: $radiuspx; border: 1px solid #ccc; border-top: none; + width: calc(197px - $radiuspx * 2) !important; } #recip-ac .autocomplete, -- cgit v1.2.3 From f9200027d0c5ccbffa9b406eca3e72ab2a071f05 Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 9 Oct 2014 11:31:48 +0200 Subject: fix userinfo icon size --- include/nav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/nav.php b/include/nav.php index 7c9abce49..4f7d609aa 100644 --- a/include/nav.php +++ b/include/nav.php @@ -130,7 +130,7 @@ EOT; if($observer) { $userinfo = array( - 'icon' => $observer['xchan_photo_m'], + 'icon' => $observer['xchan_photo_s'], 'name' => $observer['xchan_addr'], ); } -- cgit v1.2.3 From 156c317a0abef0e7fe3bd53b305fcc645aaaa8c2 Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 9 Oct 2014 12:05:22 +0200 Subject: fix css for [code] --- view/css/conversation.css | 8 ++++++++ view/theme/redbasic/css/style.css | 6 +----- view/theme/redbasic/php/style.php | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index 03df5d4f3..9fb4093ca 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -1,3 +1,11 @@ +/* common */ + +code { + font-family: Courier, monospace; + display: block; + overflow: auto; +} + /* jot */ #jot-title, diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b5fccc1b9..4e0f9641c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -118,15 +118,11 @@ pre code { } code { - font-family: Courier, monospace; font-size: 1em; - display: block; - overflow: auto; + padding: 5px; border: 1px solid $code_borderc; background: $code_bgcolour; color: $code_txtcolour; - padding: 10px; - margin-top: 20px; } pre { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 01ca5a7b9..9e9ae17cd 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -152,11 +152,11 @@ if(! $a->install) { if (! $blockquote_bordercolour) $blockquote_bordercolour = "#ccc"; if (! $code_borderc) - $code_borderc = "#444"; + $code_borderc = "#ccc"; if (! $code_bgcolour) - $code_bgcolour = "#EEE"; + $code_bgcolour = "#ccc"; if (! $code_txtcolour) - $code_txtcolour = "#444"; + $code_txtcolour = "#000"; if (! $pre_borderc) $pre_borderc = "#ccc"; if (! $pre_bgcolour) -- cgit v1.2.3 From d16d026e56cd0837310a6e2d3050814962a9a3df Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 9 Oct 2014 12:28:54 +0200 Subject: remove some cruft - revert if you find any regressions --- view/theme/redbasic/css/style.css | 112 -------------------------------------- 1 file changed, 112 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4e0f9641c..c7c9fa526 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1227,21 +1227,6 @@ footer { text-decoration: underline; } -#lang-select-icon { - cursor: pointer; - position: absolute; - left: 4px; -/*because of the shape, if this is lined up properly it looks like it's lined up wrong... -lining it up too high is the only way to make it look correctly aligned. The human -brain is weird like that */ - top: 2px; -} - -#lang-select-icon:hover { - opacity: 1; - filter:alpha(opacity=100); -} - .notif-image { height: 80px; width: 80px; @@ -1331,38 +1316,6 @@ brain is weird like that */ .field.radio .field_help { margin-left: 0px; } - - -/* - * UPDATE - */ -.popup { - width: 100%; height: 100%; - top:0px; left:0px; - position: absolute; - display: none; -} - -.popup .background { - background-color: rgba(0,0,0,128); - opacity: 0.5; - width: 100%; height: 100%; - position: absolute; - top:0px; left:0px; -} -.popup .panel { - top:25%;left:25%;width:50%;height:50%; - padding: 1em; - position: absolute; - border: 4px solid #000000; - background-color: #FFFFFF; -} -.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } -.popup .panel .panel_in { width: 100%; height: 100%; position: relative; } -.popup .panel .panel_actions { width: 100%; bottom: 4px; left: 0px; position: absolute; } -.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px} -.panel_text .progress span {float: right; display: block; width: 25%; background-color: #eeeeee; text-align: right;} - /** * OAuth */ @@ -1390,63 +1343,6 @@ brain is weird like that */ float: left; } -/** - * ICONS - */ -.iconspacer { - display: block; width: 16px; height: 16px; -/* visibility: hidden; */ -} - -.iconspacer:hover { -/* visibility: visible; */ -} - -.icon { - display: block; width: 16px; height: 16px; - background-image: url('../../../../images/icons.png'); -} -.article { background-position: 0px 0px;} -.audio { background-position: -16px 0px;} -.block { background-position: -32px 0px;} -.drop { background-position: -48px 0px;} -.drophide { background-position: -64px 0px;} -.delete { background-position: -64px 0px;} -.edit { background-position: -80px 0px;} -.camera { background-position: -96px 0px;} -.dislike { background-position: -112px 0px;} -.like { background-position: -128px 0px;} -.link { background-position: -144px 0px;} - -.globe { background-position: 0px -16px;} -.noglobe { background-position: -16px -16px;} -.no { background-position: -32px -16px;} -.pause { background-position: -48px -16px;} -.play { background-position: -64px -16px;} -.pencil { background-position: -80px -16px;} -.small-pencil { background-position: -96px -16px;} -.recycle { background-position: -112px -16px;} -.remote-link { background-position: -128px -16px;} -.share { background-position: -144px -16px;} - -.tools { background-position: 0px -32px;} -.lock { background-position: -16px -32px;} -.unlock { background-position: -32px -32px; } -.video { background-position: -48px -32px;} -.youtube { background-position: -64px -32px;} -.attach { background-position: -80px -32px; } -.language { background-position: -96px -32px; } -.prev { background-position: -112px -32px; } -.next { background-position: -128px -32px; } -.on { background-position: -144px -32px; } - -.off { background-position: 0px -48px; } -.tagged { background-position: -48px -48px; } -.yellow { background-position: -64px -48px; } - -.icon.dim { opacity: 0.3;filter:alpha(opacity=30); } - - .body-attach { margin-top: 10px; @@ -1582,14 +1478,6 @@ a.rconnect:hover { color: #0080FF; } -#profiles-menu li a { - color: #ffffff; -} - -#profiles-menu li a:hover { - color: #000000; -} - /* header */ header { -- cgit v1.2.3 From 6806888fa41a88df698d834e6edafde383ef03ad Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Oct 2014 03:36:50 -0700 Subject: return of the missing diaspora wall-to-wall attribution --- include/bb2diaspora.php | 12 ++++++++++++ include/items.php | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 65f4311a0..a80b3343b 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -263,8 +263,15 @@ function bb2dmention_callback($match) { function bb2diaspora_itemwallwall(&$item) { + $author_exists = true; if(! array_key_exists('author',$item)) { + $author_exists = false; logger('bb2diaspora_itemwallwall: no author'); + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['author_xchan']) + ); + if($r) + $item['author'] = $r[0]; } if(($item['mid'] == $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (is_array($item['author']))) { @@ -279,6 +286,11 @@ function bb2diaspora_itemwallwall(&$item) { . '[url=' . $item['author']['xchan_url'] . ']' . $item['author']['xchan_name'] . '[/url]' . "\n\n" . $item['body']; } + // $item['author'] might cause a surprise further down the line if it wasn't expected to be here. + + if(! $author_exists) + $unset($item['author']); + } diff --git a/include/items.php b/include/items.php index c9810bb7c..a930a7c3e 100755 --- a/include/items.php +++ b/include/items.php @@ -2522,12 +2522,6 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id) // since Diaspora doesn't handle edits we can only do this for the original text and not update it. - $enabled = intval(get_config('system','diaspora_enabled')); - if(! $enabled) { - logger('mod_item: diaspora support disabled, not storing comment signature', LOGGER_DEBUG); - return; - } - require_once('include/bb2diaspora.php'); $signed_body = bb2diaspora_itembody($datarray); @@ -2552,12 +2546,6 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id) intval($post_id) ); - $r = q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", - intval($post_id), - dbesc($signed_text), - dbesc(base64_encode($authorsig)), - dbesc($diaspora_handle) - ); if(! $r) logger('store_diaspora_comment_sig: DB write failed'); -- cgit v1.2.3 From e06c3e5a911176bd2afc5d9d391e629f282122b8 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Thu, 9 Oct 2014 14:54:04 +0000 Subject: Added and changed on some places div class generic-content-wrapper. And added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it. --- mod/bookmarks.php | 4 +++- mod/profiles.php | 3 +++ mod/webpages.php | 6 ++++-- view/theme/redbasic/css/style.css | 11 +++++++---- view/tpl/channels.tpl | 4 +++- view/tpl/cloud_actionspanel.tpl | 4 +++- view/tpl/cloud_directory.tpl | 3 ++- view/tpl/connections.tpl | 8 +++----- view/tpl/directory_header.tpl | 4 ++-- view/tpl/direntry.tpl | 2 -- view/tpl/event_form.tpl | 4 +++- view/tpl/events-js.tpl | 2 ++ view/tpl/menulist.tpl | 5 +++-- view/tpl/notifications.tpl | 4 ++++ view/tpl/photo_album.tpl | 2 +- view/tpl/photo_view.tpl | 3 +++ view/tpl/photos_recent.tpl | 2 +- view/tpl/photos_upload.tpl | 2 +- view/tpl/profile_entry.tpl | 1 - view/tpl/profile_listing_header.tpl | 3 +-- view/tpl/webpagelist.tpl | 2 +- 21 files changed, 50 insertions(+), 29 deletions(-) diff --git a/mod/bookmarks.php b/mod/bookmarks.php index 9ccc171fe..6225c0980 100644 --- a/mod/bookmarks.php +++ b/mod/bookmarks.php @@ -55,6 +55,8 @@ function bookmarks_content(&$a) { $o = profile_tabs($a,true,$channel['channel_address']); + $o .= '
'; + $o .= '

' . t('My Bookmarks') . '

'; $x = menu_list(local_user(),'',MENU_BOOKMARK); @@ -78,7 +80,7 @@ function bookmarks_content(&$a) { } } - + $o .= '
'; return $o; diff --git a/mod/profiles.php b/mod/profiles.php index 063e714e7..cde768b1e 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -766,6 +766,9 @@ logger('extra_fields: ' . print_r($extra_fields,true)); : '' . t('Edit visibility') . '') )); } + + $o .= ''; + } return $o; } diff --git a/mod/webpages.php b/mod/webpages.php index efaf3c4bf..341e75a0c 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -81,6 +81,8 @@ function webpages_content(&$a) { require_once('include/conversation.php'); $o = profile_tabs($a,true); + $o .= '
'; + $o .= '

' . t('Webpages') . '

'; $x = array( @@ -95,7 +97,7 @@ function webpages_content(&$a) { 'mimetype' => $mimetype, 'layout' => $layout, ); - + if($_REQUEST['title']) $x['title'] = $_REQUEST['title']; if($_REQUEST['body']) @@ -105,7 +107,6 @@ function webpages_content(&$a) { $o .= status_editor($a,$x); - // Get a list of webpages. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link. //TODO - this should be replaced with pagelist_widget @@ -142,5 +143,6 @@ function webpages_content(&$a) { )); + $o .= '
'; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c7c9fa526..802daa6c9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1861,16 +1861,19 @@ img.mail-list-sender-photo { max-width: $converse_width; } -.wall-item-content-wrapper { +.wall-item-content-wrapper, .generic-content-wrapper { background-color: $item_colour; padding: 10px; -} - -.wall-item-content-wrapper { border-top-right-radius: $radiuspx; border-top-left-radius: $radiuspx; } +.generic-content-wrapper { + border-bottom-right-radius: $radiuspx; + border-bottom-left-radius: $radiuspx; +} + + .comment .wall-item-body { padding-left: $comment_padding; } diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 2c31cb498..5f00b1535 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,6 +1,6 @@ +

{{$header}}

- {{if $links}} {{foreach $links as $l}} {{$l.2}} @@ -30,3 +30,5 @@
+ + diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 69931b292..3d4867f7e 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -20,4 +20,6 @@ - \ No newline at end of file + + + diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 5d22e4a16..40599aad3 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,3 +1,4 @@ +

{{$header}}

@@ -40,4 +41,4 @@ {{if $quota.limit || $quota.used}}

{{$total}} {{$quota.desc}}

-{{/if}} \ No newline at end of file +{{/if}} diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 1429576b1..534a198cd 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,3 +1,5 @@ +
+

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

{{if $finding}}

{{$finding}}

{{/if}} @@ -20,10 +22,6 @@
+
- - - - - diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 01356597e..f7bbe9184 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,3 +1,4 @@ +

{{$dirlbl}}

{{if $search}} @@ -8,9 +9,8 @@ {{include file="direntry.tpl"}} {{/foreach}} -
+
- diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index e5f12944e..a6252bb9a 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,5 +1,4 @@
-
@@ -13,4 +12,3 @@ {{/if}}
{{$entry.details}}
-
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index b2455e26c..a5ba69bc8 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,3 +1,5 @@ +
+

{{$title}}

@@ -147,4 +149,4 @@ }); }); - +

diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index c87d20529..342afb36f 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,6 +1,8 @@ {{$tabs}} +

{{$title}}

+
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 271bace82..083b56805 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,3 +1,5 @@ +
+

{{$title}}

{{$hintnew}} @@ -12,5 +14,4 @@ {{/if}} - - +
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index 285efbae0..076b4e763 100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,7 +1,11 @@ +
+

{{$notif_header}}

+ {{if $notifications_available}} {{$notif_link_mark_seen}} {{/if}}
{{$notif_content}}
+
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index d23f7e817..0c878b950 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -12,7 +12,7 @@
-
+
{{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index a0ca7e0f9..08d7e79f0 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,4 +1,5 @@
+

{{$album.1}}

+ {{$paginate}} diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 6b0f555b6..91b088c93 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -5,7 +5,7 @@

{{$title}}

-
+
{{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index c0e891547..b369e1d25 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -4,7 +4,7 @@
-
+
diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl index cc0f3477c..709730a47 100755 --- a/view/tpl/profile_entry.tpl +++ b/view/tpl/profile_entry.tpl @@ -7,4 +7,3 @@
{{$visible}}
- diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index c4bc367ba..0b3505f34 100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -1,3 +1,4 @@ +

{{$header}}

{{$chg_photo}} @@ -7,5 +8,3 @@

- diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 4ae153423..85c4b723e 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,6 +1,6 @@ {{if $pages}} -
+
{{foreach $pages as $key => $items}} -- cgit v1.2.3 From 77fc267f738727ec1c503bd68470014a14c1b621 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Thu, 9 Oct 2014 20:55:44 +0000 Subject: Added the display setting for generic (other) content wrapper. Also did set the default a bit lighter. See if that's ok. --- view/theme/redbasic/css/style.css | 8 ++++---- view/theme/redbasic/php/config.php | 3 +++ view/theme/redbasic/php/style.php | 4 ++++ view/theme/redbasic/schema/dark.php | 2 ++ view/theme/redbasic/schema/simple_black_on_white.php | 4 +++- view/theme/redbasic/schema/simple_green_on_black.php | 2 ++ view/theme/redbasic/schema/simple_white_on_black.php | 2 ++ view/theme/redbasic/tpl/theme_settings.tpl | 3 ++- 8 files changed, 22 insertions(+), 6 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 802daa6c9..57e24e746 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1861,7 +1861,7 @@ img.mail-list-sender-photo { max-width: $converse_width; } -.wall-item-content-wrapper, .generic-content-wrapper { +.wall-item-content-wrapper { background-color: $item_colour; padding: 10px; border-top-right-radius: $radiuspx; @@ -1869,11 +1869,11 @@ img.mail-list-sender-photo { } .generic-content-wrapper { - border-bottom-right-radius: $radiuspx; - border-bottom-left-radius: $radiuspx; + background-color: $genericcontent_bgcolour; + padding: 10px; + border-radius: $radiuspx; } - .comment .wall-item-body { padding-left: $comment_padding; } diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index bfef8216c..4c889008a 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -25,6 +25,7 @@ function theme_content(&$a) { $arr['comment_indent'] = get_pconfig(local_user(),'redbasic', 'comment_indent' ); $arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour'); $arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour'); + $arr['genericcontent_bgcolour'] = get_pconfig(local_user(),'redbasic', 'genericcontent_bgcolour' ); $arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' ); $arr['body_font_size'] = get_pconfig(local_user(),'redbasic', 'body_font_size' ); $arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' ); @@ -63,6 +64,7 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'comment_indent', $_POST['redbasic_comment_indent']); set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']); set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']); + set_pconfig(local_user(), 'redbasic', 'genericcontent_bgcolour', $_POST['redbasic_genericcontent_bgcolour']); set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']); set_pconfig(local_user(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']); set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']); @@ -120,6 +122,7 @@ if(feature_enabled(local_user(),'expert')) '$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']), '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']), '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']), + '$genericcontent_bgcolour' => array('redbasic_genericcontent_bgcolour',t('Set the background color of other content'),$arr['genericcontent_bgcolour']), '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']), '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']), '$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']), diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 9e9ae17cd..104d9d51e 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -24,6 +24,7 @@ if(! $a->install) { $background_image = get_pconfig($uid, "redbasic", "background_image"); $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); + $genericcontent_bgcolour = get_pconfig($uid, "redbasic", "genericcontent_bgcolour"); $item_colour = get_pconfig($uid, "redbasic", "item_colour"); $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour"); $comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour"); @@ -121,6 +122,8 @@ if(! $a->install) { $bgcolour = "#fdfdfd"; if (! $background_image) $background_image =''; + if (! $genericcontent_bgcolour) + $genericcontent_bgcolour ='rgba(247,247,247,0.8)'; if (! $item_colour) $item_colour = "rgba(238,238,238,0.8)"; if (! $comment_item_colour) @@ -331,6 +334,7 @@ $options = array ( '$search_background' => $search_background, '$bgcolour' => $bgcolour, '$background_image' => $background_image, +'$genericcontent_bgcolour' => $genericcontent_bgcolour, '$item_colour' => $item_colour, '$comment_item_colour' => $comment_item_colour, '$comment_border_colour' => $comment_border_colour, diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 96600f9f6..f4222c07b 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -50,6 +50,8 @@ $search_background = "#999"; if (! $bgcolour) $bgcolour = "#111"; + if (! $genericcontent_bgcolour) + $genericcontent_bgcolour ='rgba(28,28,28,0.8)'; if (! $item_colour) $item_colour = "rgba(28,28,28,0.8)"; if (! $comment_item_colour) diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 42a62c5ba..2bf002bca 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -34,7 +34,7 @@ $navtabs_bgchover = "#fff"; if (! $navtabs_decohover) $navtabs_decohover = "underline"; -if (! $navaside_bghover) + if (! $navaside_bghover) $navaside_bghover = "#F5F5F5"; if (! $link_colour) $link_colour = "#000"; @@ -50,6 +50,8 @@ if (! $navaside_bghover) $search_background = "#F5F5F5"; if (! $bgcolour) $bgcolour = "#fff"; + if (! $genericcontent_bgcolour) + $genericcontent_bgcolour = 'rgba(255,255,255,0.8)'; if (! $item_colour) $item_colour = "rgba(255,255,255,0.8)"; if (! $comment_item_colour) diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 641a46668..15adcf198 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -50,6 +50,8 @@ if (! $navaside_bghover) $search_background = "#000"; if (! $bgcolour) $bgcolour = "#000"; + if (! $genericcontent_bgcolour) + $genericcontent_bgcolour = 'rgba(0,0,0,0.8)'; if (! $item_colour) $item_colour = "rgba(0,0,0,0.8)"; if (! $comment_item_colour) diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index 50379dfe4..96450d835 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -50,6 +50,8 @@ $search_background = "#000"; if (! $bgcolour) $bgcolour = "#000"; + if (! $genericcontent_bgcolour) + $genericcontent_bgcolour ='rgba(0,0,0,0.8)'; if (! $item_colour) $item_colour = "rgba(0,0,0,0.8)"; if (! $comment_item_colour) diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 70b42b6cd..73e0f3476 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -24,6 +24,7 @@ {{include file="field_input.tpl" field=$comment_indent}} {{include file="field_colorinput.tpl" field=$toolicon_colour}} {{include file="field_colorinput.tpl" field=$toolicon_activecolour}} +{{include file="field_colorinput.tpl" field=$genericcontent_bgcolour}} {{include file="field_input.tpl" field=$body_font_size}} {{include file="field_input.tpl" field=$font_size}} {{include file="field_colorinput.tpl" field=$font_colour}} @@ -40,7 +41,7 @@ $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker(); $('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker(); $('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker(); - $('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'}); + $('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour,#id_redbasic_genericcontent_bgcolour').colorpicker({format: 'rgba'}); }); -- cgit v1.2.3 From 1adb7a2eefd55b95644997f87a64608f69672cab Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Oct 2014 15:22:21 -0700 Subject: allow a site to over-ride the system app list without causing git issues --- include/apps.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/apps.php b/include/apps.php index 91012b0ef..cd0c2984e 100644 --- a/include/apps.php +++ b/include/apps.php @@ -11,7 +11,10 @@ require_once('include/identity.php'); function get_system_apps() { $ret = array(); - $files = glob('app/*.apd'); + if(is_dir('apps')) + $files = glob('apps/*.apd'); + else + $files = glob('app/*.apd'); if($files) { foreach($files as $f) { $x = parse_app_description($f); -- cgit v1.2.3 From 9a7d1aa4887e515b2a6e8742904eebbf73bd71c9 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Oct 2014 15:25:08 -0700 Subject: add site apps directory to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index df7ca3549..a12143ef5 100755 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,9 @@ compiled/ custom/ /store/ +# site apps +apps/ + # patch attempts *.orig *.rej -- cgit v1.2.3 From effc8960c3f55f687806b890fdf6252852b08011 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Oct 2014 18:12:53 -0700 Subject: OK this is important. So read it carefully. This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that. --- include/zot.php | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/include/zot.php b/include/zot.php index 3d59f00f3..9ea92aed8 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1402,6 +1402,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) { $perm = (($arr['mid'] == $arr['parent_mid']) ? 'send_stream' : 'post_comments'); + // This is our own post, possibly coming from a channel clone if($arr['owner_xchan'] == $d['hash']) { @@ -1420,6 +1421,30 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) { continue; } + if(($arr['mid'] != $arr['parent_mid']) && (! $relay)) { + + // check source route. + // We are only going to accept comments from this sender if the comment has the same route as the top-level-post, + // this is so that permissions mismatches between senders apply to the entire conversation + // As a side effect we will also do a preliminary check that we have the top-level-post, otherwise + // processing it is pointless. + + $r = q("select route from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['parent_mid']), + intval($channel['channel_id']) + ); + if(! $r) { + $result[] = array($d['hash'],'comment parent not found',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); + continue; + } + $current_route = (($arr['route']) ? $arr['route'] . ',' : '') . $sender['hash']; + + if($r[0]['route'] != $current_route) { + $result[] = array($d['hash'],'comment route mismatch',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); + continue; + } + } + if($arr['item_restrict'] & ITEM_DELETED) { // remove_community_tag is a no-op if this isn't a community tag activity @@ -1446,8 +1471,11 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) { $arr['id'] = $r[0]['id']; $arr['uid'] = $channel['channel_id']; update_imported_item($sender,$arr,$channel['channel_id']); - } - $result[] = array($d['hash'],'updated',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); + $result[] = array($d['hash'],'updated',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); + } + else { + $result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); + } $item_id = $r[0]['id']; } else { @@ -1459,7 +1487,9 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) { $item_id = $item_result['item_id']; $parr = array('item_id' => $item_id,'item' => $arr,'sender' => $sender,'channel' => $channel); call_hooks('activity_received',$parr); - add_source_route($item_id,$sender['hash']); + // don't add a source route if it's a relay or later recipients will get a route mismatch + if(! $relay) + add_source_route($item_id,$sender['hash']); } $result[] = array($d['hash'],(($item_id) ? 'posted' : 'storage failed:' . $item_result['message']),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); } -- cgit v1.2.3
{{$actions_txt}}{{$pagelink_txt}}{{$title_txt}}{{$created_txt}}{{$edited_txt}}