From e06c3e5a911176bd2afc5d9d391e629f282122b8 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Thu, 9 Oct 2014 14:54:04 +0000 Subject: [PATCH] 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}}
{{$actions_txt}}{{$pagelink_txt}}{{$title_txt}}{{$created_txt}}{{$edited_txt}}