From 4e9bd8b8f0a2629cf1ad7c7274369e795852a8ab Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 10 Oct 2014 15:52:56 +0200 Subject: This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme. adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet. Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing. --- mod/bookmarks.php | 2 +- mod/profiles.php | 2 -- mod/webpages.php | 2 +- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/php/style.php | 5 +++-- view/tpl/channels.tpl | 2 +- view/tpl/cloud_actionspanel.tpl | 2 ++ view/tpl/cloud_directory.tpl | 3 ++- view/tpl/connections.tpl | 2 +- view/tpl/directory_header.tpl | 2 +- view/tpl/event_form.tpl | 2 +- view/tpl/events-js.tpl | 2 +- view/tpl/menulist.tpl | 2 +- view/tpl/notifications.tpl | 2 +- view/tpl/photo_view.tpl | 2 +- view/tpl/photos_upload.tpl | 5 +++-- view/tpl/profile_entry.tpl | 2 ++ view/tpl/profile_listing_header.tpl | 3 ++- 18 files changed, 25 insertions(+), 19 deletions(-) diff --git a/mod/bookmarks.php b/mod/bookmarks.php index 6225c0980..6b2476a8e 100644 --- a/mod/bookmarks.php +++ b/mod/bookmarks.php @@ -55,7 +55,7 @@ function bookmarks_content(&$a) { $o = profile_tabs($a,true,$channel['channel_address']); - $o .= '
'; + $o .= '
'; $o .= '

' . t('My Bookmarks') . '

'; diff --git a/mod/profiles.php b/mod/profiles.php index cde768b1e..5d0416e9a 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -767,8 +767,6 @@ logger('extra_fields: ' . print_r($extra_fields,true)); )); } - $o .= '
'; - } return $o; } diff --git a/mod/webpages.php b/mod/webpages.php index 341e75a0c..2c3cc36ea 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -81,7 +81,7 @@ function webpages_content(&$a) { require_once('include/conversation.php'); $o = profile_tabs($a,true); - $o .= '
'; + $o .= '
'; $o .= '

' . t('Webpages') . '

'; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 57e24e746..c448c877f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1868,7 +1868,7 @@ img.mail-list-sender-photo { border-top-left-radius: $radiuspx; } -.generic-content-wrapper { +.generic-content-wrapper-styled { background-color: $genericcontent_bgcolour; padding: 10px; border-radius: $radiuspx; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 045ddc309..495095fe2 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,12 +122,12 @@ if(! $a->install) { $bgcolour = "#fdfdfd"; if (! $background_image) $background_image =''; + if (! $genericcontent_bgcolour) + $genericcontent_bgcolour ='rgba(254,254,254,0.8)'; if (! $item_colour) $item_colour = "rgba(238,238,238,0.8)"; if (! $comment_item_colour) $comment_item_colour = "rgba(254,254,254,0.4)"; - if (! $genericcontent_bgcolour) - $genericcontent_bgcolour = $comment_item_colour; if (! $comment_border_colour) $comment_border_colour = "rgba(238,238,238,0.8)"; if (! $toolicon_colour) diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 5f00b1535..0dec68a53 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,4 +1,4 @@ -
+

{{$header}}

{{if $links}} diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 3d4867f7e..00f243c1e 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -1,3 +1,5 @@ +
+ diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 40599aad3..639a6bf61 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,4 +1,4 @@ -
+

{{$header}}

{{$folder_header}}   
@@ -42,3 +42,4 @@ {{if $quota.limit || $quota.used}}

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

{{/if}} + diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 534a198cd..8e5266978 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,4 +1,4 @@ -
+

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

diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index f7bbe9184..477df8a63 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,4 +1,4 @@ -
+

{{$dirlbl}}

{{if $search}} diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index a5ba69bc8..2a580e3b8 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,4 +1,4 @@ -
+

{{$title}}

diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 342afb36f..69a248512 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,5 +1,5 @@ {{$tabs}} -
+

{{$title}}

diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 083b56805..2feb75d90 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,4 +1,4 @@ -
+

{{$title}}

diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index 076b4e763..0b24da7c3 100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,4 +1,4 @@ -
+

{{$notif_header}}

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 08d7e79f0..f895b3129 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,5 +1,5 @@
-
+

{{$album.1}}

-
+
+
@@ -40,4 +41,4 @@
- +
diff --git a/view/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl index 709730a47..ab81a7fbc 100755 --- a/view/tpl/profile_entry.tpl +++ b/view/tpl/profile_entry.tpl @@ -1,3 +1,4 @@ +
{{$alt}} @@ -7,3 +8,4 @@
{{$visible}}
+
diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index 0b3505f34..09d00f982 100755 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -1,4 +1,4 @@ -
+

{{$header}}

{{$chg_photo}} @@ -8,3 +8,4 @@

-- cgit v1.2.3