From 65a420b22755f774dc2422f7fdf3709e01289945 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Sat, 18 Sep 2010 21:11:18 -0700 Subject: [PATCH] theme cleanup --- home.html | 11 +++++ images/mistpark-net.jpg | Bin 0 -> 3532 bytes include/auth.php | 2 + include/nav.php | 1 + mod/contacts.php | 1 + mod/directory.php | 1 + mod/home.php | 2 + mod/message.php | 1 + mod/network.php | 2 + mod/notifications.php | 1 + mod/profile.php | 1 + mod/profiles.php | 1 + mod/settings.php | 5 +- view/default.php | 2 +- view/directory_header.tpl | 2 +- view/profile.php | 2 +- view/profile_edit.tpl | 2 +- view/settings.tpl | 2 +- view/theme/clean/style.css | 6 +++ view/theme/darkness/style.css | 15 +++--- view/theme/default/style.css | 81 +++++++++++++++++++++++---------- view/theme/goldenrod/style.css | 4 ++ view/theme/shady/style.css | 70 ++++++++++++++++++++++++++++ 23 files changed, 179 insertions(+), 36 deletions(-) create mode 100644 home.html create mode 100644 images/mistpark-net.jpg create mode 100644 view/theme/shady/style.css diff --git a/home.html b/home.html new file mode 100644 index 0000000000..83fe0f3ccf --- /dev/null +++ b/home.html @@ -0,0 +1,11 @@ +mistpark network logo +

+Bring your privacy back home - where it belongs. +

+

+Share your life with your friends and family - privately, securely. +

+

+Join the mistpark "dispersed" social network. +

+
diff --git a/images/mistpark-net.jpg b/images/mistpark-net.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c3be16b815f9df6dc2b17d65ac02045869856c0a GIT binary patch literal 3532 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['nav'] .= "\r\n\r\n"; + $a->page['nav'] .= ''; diff --git a/mod/contacts.php b/mod/contacts.php index 2469e0c6fc..45f792d30f 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -72,6 +72,7 @@ function contacts_post(&$a) { function contacts_content(&$a) { + $o .= ''; if(! local_user()) { notice( t('Permission denied.') . EOL); return; diff --git a/mod/directory.php b/mod/directory.php index 9cce167605..4e36576733 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -4,6 +4,7 @@ function directory_init(&$a) { } function directory_content(&$a) { + $o .= ''; $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : ''); diff --git a/mod/home.php b/mod/home.php index 3a1aa212a1..4406576a34 100644 --- a/mod/home.php +++ b/mod/home.php @@ -15,6 +15,8 @@ function home_content(&$a) { $a->page['footer'] .= "
Powered by mistpark
"; $o .= '

Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '

'; + if(file_exists('home.html')) + $o .= file_get_contents('home.html'); $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1); return $o; diff --git a/mod/message.php b/mod/message.php index 2048cff1fd..6119e894fe 100644 --- a/mod/message.php +++ b/mod/message.php @@ -82,6 +82,7 @@ function message_post(&$a) { } function message_content(&$a) { + $o .= ''; if(! local_user()) { notice( t('Permission denied.') . EOL); diff --git a/mod/network.php b/mod/network.php index afe44dabf5..c5845f63c8 100644 --- a/mod/network.php +++ b/mod/network.php @@ -19,6 +19,8 @@ function network_content(&$a, $update = false) { $group = 0; if(! $update) { + $o .= ''; + // pull out the group here because the updater might have different args if($a->argc > 1) { $group = intval($a->argv[1]); diff --git a/mod/notifications.php b/mod/notifications.php index 6422b3b008..96f50d90be 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -57,6 +57,7 @@ function notifications_content(&$a) { } $o = ''; + $o .= ''; if(($a->argc > 1) && ($a->argv[1] == 'all')) $sql_extra = ''; diff --git a/mod/profile.php b/mod/profile.php index c42291d963..6923b09232 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -89,6 +89,7 @@ function profile_content(&$a, $update = false) { $a->profile['profile_uid'] = $_SESSION['profile_uid']; } else { + $o .= ''; // set the uid so we can pick it up during update $_SESSION['profile_uid'] = $a->profile['uid']; } diff --git a/mod/profiles.php b/mod/profiles.php index 5ee9a3e965..c9dc4c80c7 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -157,6 +157,7 @@ function profiles_post(&$a) { function profiles_content(&$a) { + $o .= ''; if(! local_user()) { notice( t('Permission denied.') . EOL); return; diff --git a/mod/settings.php b/mod/settings.php index fbeee77685..2e14fcee5f 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -155,6 +155,7 @@ function settings_post(&$a) { if(! function_exists('settings_content')) { function settings_content(&$a) { + $o .= ''; if(! local_user()) { notice( t('Permission denied.') . EOL ); @@ -229,9 +230,9 @@ function settings_content(&$a) { '$basepath' => $a->get_hostname(), '$baseurl' => $a->get_baseurl())); - $o = file_get_contents('view/settings.tpl'); + $stpl = file_get_contents('view/settings.tpl'); - $o = replace_macros($o,array( + $o .= replace_macros($stpl,array( '$baseurl' => $a->get_baseurl(), '$uid' => $_SESSION['uid'], '$username' => $username, diff --git a/view/default.php b/view/default.php index 47adf4a769..2d45d946a8 100644 --- a/view/default.php +++ b/view/default.php @@ -6,7 +6,7 @@
- +
diff --git a/view/directory_header.tpl b/view/directory_header.tpl index c4217ac488..ba39236f2f 100644 --- a/view/directory_header.tpl +++ b/view/directory_header.tpl @@ -1,6 +1,6 @@

Site Directory

- + $finding diff --git a/view/profile.php b/view/profile.php index e2c190da00..a07a452202 100644 --- a/view/profile.php +++ b/view/profile.php @@ -6,7 +6,7 @@
- +