diff options
| -rw-r--r-- | mod/bookmarks.php | 4 | ||||
| -rw-r--r-- | mod/profiles.php | 3 | ||||
| -rw-r--r-- | mod/webpages.php | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 11 | ||||
| -rwxr-xr-x | view/tpl/channels.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/cloud_actionspanel.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/connections.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/directory_header.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/direntry.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/events-js.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/menulist.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/notifications.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_entry.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/profile_listing_header.tpl | 3 | ||||
| -rw-r--r-- | 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 .= '<div class="generic-content-wrapper">'; + $o .= '<h3>' . t('My Bookmarks') . '</h3>'; $x = menu_list(local_user(),'',MENU_BOOKMARK); @@ -78,7 +80,7 @@ function bookmarks_content(&$a) { } } - + $o .= '</div>'; 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)); : '<a href="' . $a->get_baseurl(true) . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>') )); } + + $o .= '</div>'; + } 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 .= '<div class="generic-content-wrapper">'; + $o .= '<h2>' . t('Webpages') . '</h2>'; $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 .= '</div>'; } 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 @@ +<div class="generic-content-wrapper"> <h3>{{$header}}</h3> - {{if $links}} {{foreach $links as $l}} <a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a> @@ -30,3 +30,5 @@ </div> <div class="channels-end all"></div> + +</div> 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 @@ </form> </td> </tr> -</table>
\ No newline at end of file +</table> + +</div> 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 @@ +<div class="generic-content-wrapper"> <h1>{{$header}}</h1> <table id="cloud-index"> <tr> @@ -40,4 +41,4 @@ {{if $quota.limit || $quota.used}} <p><strong>{{$total}}</strong> {{$quota.desc}}</p> -{{/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 @@ +<div class="generic-content-wrapper"> + <h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1> {{if $finding}}<h4>{{$finding}}</h4>{{/if}} @@ -20,10 +22,6 @@ <div id="page-end"></div> </div> <div id="contact-edit-end"></div> +</div> <script>$(document).ready(function() { loadingPage = false;});</script> <div id="page-spinner"></div> - - - - - 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 @@ +<div class="generic-content-wrapper"> <h1>{{$dirlbl}}</h1> {{if $search}} @@ -8,9 +9,8 @@ {{include file="direntry.tpl"}} {{/foreach}} - <div id="page-end"></div> <div class="directory-end"></div> +</div> <script>$(document).ready(function() { loadingPage = false;});</script> <div id="page-spinner"></div> - 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 @@ <div class="directory-item lframe" id="directory-item-{{$entry.id}}" > -<div class="generic-content-wrapper"> <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > <div class="contact-photo" id="directory-photo-{{$entry.id}}" > @@ -13,4 +12,3 @@ {{/if}} <div class="contact-details">{{$entry.details}}</div> </div> -</div> 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 @@ +<div class="generic-content-wrapper"> + <h3>{{$title}}</h3> <p> @@ -147,4 +149,4 @@ }); }); </script> - +</div> 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}} +<div class="generic-content-wrapper"> <h2>{{$title}}</h2> <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div> <div id="events-calendar"></div> +</div> 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 @@ +<div class="generic-content-wrapper"> + <h1>{{$title}}</h1> <a href="menu/new" title="{{$hintnew}}">{{$hintnew}}</a> @@ -12,5 +14,4 @@ </ul> {{/if}} - - +</div> 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 @@ +<div class="generic-content-wrapper"> + <h1>{{$notif_header}}</h1> + {{if $notifications_available}} <a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a> {{/if}} <div class="notif-network-wrapper"> {{$notif_content}} </div> +</div> 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 @@ <div class="clear"></div> </div> -<div id="photo-album-contents"> +<div id="photo-album-contents" class="generic-content-wrapper"> {{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 @@ <div id="live-photos"></div> +<div class="generic-content-wrapper"> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> @@ -97,5 +98,7 @@ <div class="clear"></div> +</div> + {{$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 @@ <h2>{{$title}}</h2> <div class="clear"></div> </div> -<div id="photo-album-contents"> +<div id="photo-album-contents" class="generic-content-wrapper"> {{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 @@ <div class="clear"></div> </div> -<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" > +<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="generic-content-wrapper"> <input type="hidden" id="photos-upload-source" name="source" value="photos" /> <div id="photos-upload-new-wrapper" > <div id="photos-upload-newalbum-div"> 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 @@ <div class="profile-listing-visible">{{$visible}}</div> </div> <div class="profile-listing-end"></div> - 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 @@ +<div class="generic-content-wrapper"> <h1>{{$header}}</h1> <p id="profile-listing-desc" class="btn btn-default" > <a href="profile_photo" >{{$chg_photo}}</a> @@ -7,5 +8,3 @@ </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> - 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}} - <div id="pagelist-content-wrapper" class="generic-content-wrapper"> + <div id="pagelist-content-wrapper"> <table class="webpage-list-table"> <tr><td>{{$actions_txt}}</td><td>{{$pagelink_txt}}</td><td>{{$title_txt}}</td><td>{{$created_txt}}</td><td>{{$edited_txt}}</td></tr> {{foreach $pages as $key => $items}} |