diff options
| -rw-r--r-- | mod/bookmarks.php | 2 | ||||
| -rw-r--r-- | mod/profiles.php | 2 | ||||
| -rw-r--r-- | mod/webpages.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 5 | ||||
| -rwxr-xr-x | view/tpl/channels.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/cloud_actionspanel.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/connections.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/directory_header.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/events-js.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/menulist.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/notifications.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/profile_entry.tpl | 2 | ||||
| -rwxr-xr-x | 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 .= '<div class="generic-content-wrapper">'; + $o .= '<div class="generic-content-wrapper-styled">'; $o .= '<h3>' . t('My Bookmarks') . '</h3>'; 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 .= '</div>'; - } 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 .= '<div class="generic-content-wrapper">'; + $o .= '<div class="generic-content-wrapper-styled">'; $o .= '<h2>' . t('Webpages') . '</h2>'; 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 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h3>{{$header}}</h3> {{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 @@ +<div class="generic-content-wrapper-styled"> + <table> <tr> <td><strong>{{$folder_header}}</strong> </td> 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 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$header}}</h1> <table id="cloud-index"> <tr> @@ -42,3 +42,4 @@ {{if $quota.limit || $quota.used}} <p><strong>{{$total}}</strong> {{$quota.desc}}</p> {{/if}} +</div> 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 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1> 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 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$dirlbl}}</h1> {{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 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h3>{{$title}}</h3> 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}} -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h2>{{$title}}</h2> <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div> 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 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> 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 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$notif_header}}</h1> 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 @@ <div id="live-photos"></div> -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index b369e1d25..81d7b6dc0 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -4,7 +4,8 @@ <div class="clear"></div> </div> -<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> +<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form"> <input type="hidden" id="photos-upload-source" name="source" value="photos" /> <div id="photos-upload-new-wrapper" > <div id="photos-upload-newalbum-div"> @@ -40,4 +41,4 @@ <div class="photos-upload-end" ></div> </form> - +</div> 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 @@ +<div class="generic-content-wrapper-styled"> <div class="profile-listing" > <div class="profile-listing-photo-wrapper" > <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a> @@ -7,3 +8,4 @@ <div class="profile-listing-visible">{{$visible}}</div> </div> <div class="profile-listing-end"></div> +</div> 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 @@ -<div class="generic-content-wrapper"> +<div class="generic-content-wrapper-styled"> <h1>{{$header}}</h1> <p id="profile-listing-desc" class="btn btn-default" > <a href="profile_photo" >{{$chg_photo}}</a> @@ -8,3 +8,4 @@ </p> <p id="profile-listing-new-link-wrapper" class="btn btn-default" > <a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a> +</div> |