theme cleanup

diff --git a/home.html b/home.html
new file mode 100644 (file)
index 0000000..83fe0f3
--- /dev/null
+++ b/home.html
@@ -0,0 +1,11 @@
+<img src="images/mistpark-net.jpg" alt="mistpark network logo" align="left" style="margin-right: 30px;" />
+<p>
+Bring your privacy back home - where it belongs.
+</p>
+<p>
+Share your life with your friends and family - privately, securely. 
+</p>
+<p>
+Join the mistpark "dispersed" social network.
+</p>
+<div style="height: 30px;" ></div>

diff --git a/images/mistpark-net.jpg b/images/mistpark-net.jpg
new file mode 100644 (file)
index 0000000..c3be16b
Binary files /dev/null and b/images/mistpark-net.jpg differ

diff --git a/include/auth.php b/include/auth.php
index 78e2bb8e042132dc9428eb04aad07fd072500389..b856379f118a716f14b1aa6dc4cc8ded4042f83a 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -42,6 +42,8 @@ else {
        unset($_SESSION['visitor_id']);
        unset($_SESSION['administrator']);
        unset($_SESSION['cid']);
+       unset($_SESSION['theme']);
+
        $encrypted = hash('whirlpool',trim($_POST['password']));
 
        if((x($_POST,'auth-params')) && $_POST['auth-params'] == 'login') {

diff --git a/include/nav.php b/include/nav.php
index 4833ed7db5688bb68aba0793acbb19e58f307c72..94fbf36bb64bf7fdcf91042b8e33493d4f2a9515 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -40,3 +40,4 @@ if(x($_SESSION['uid'])) {
        }
 
        $a->page['nav'] .= "</span>\r\n<span id=\"nav-end\"></span>\r\n";
+       $a->page['nav'] .= '<span id="banner">mistpark</span>';

diff --git a/mod/contacts.php b/mod/contacts.php
index 2469e0c6fc3bb610e7221779c9fbce550d1711e5..45f792d30f4f874b812def3b30cc2795da2ccc68 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -72,6 +72,7 @@ function contacts_post(&$a) {
 
 function contacts_content(&$a) {
 
+       $o .= '<script> $(document).ready(function() { $(\'#nav-contacts-link\').addClass(\'nav-selected\'); });</script>';
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;

diff --git a/mod/directory.php b/mod/directory.php
index 9cce167605178ef9b7a322edebff0690614faf94..4e365767338b66c988d7a8cc71aa91d1bf7905e6 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -4,6 +4,7 @@ function directory_init(&$a) {
 }
 
 function directory_content(&$a) {
+       $o .= '<script> $(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
 
        $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
 

diff --git a/mod/home.php b/mod/home.php
index 3a1aa212a1c90b15c57a8c4ca815958b69c70e21..4406576a34f5e08744f26fdaee9c9d56e1228edb 100644 (file)
--- a/mod/home.php
+++ b/mod/home.php
@@ -15,6 +15,8 @@ function home_content(&$a) {
 
        $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://mistpark.com\" name=\"mistpark\" >mistpark</a></div>";
        $o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>';
+       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 2048cff1fd503ce15159be137a5c9dfbc175469a..6119e894fe40c54fad98da5354fc76463718c602 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -82,6 +82,7 @@ function message_post(&$a) {
 }
 
 function message_content(&$a) {
+       $o .= '<script> $(document).ready(function() { $(\'#nav-messages-link\').addClass(\'nav-selected\'); });</script>';
 
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);

diff --git a/mod/network.php b/mod/network.php
index afe44dabf553fe28efbe15424ca38ad2733e217e..c5845f63c8c81a301b624d3f27c187130d901606 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -19,6 +19,8 @@ function network_content(&$a, $update = false) {
        $group = 0;
 
        if(! $update) {
+               $o .= '<script> $(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>';
+
                        // 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 6422b3b008c1339449e3ab6fdca224ca32ff35bb..96f50d90be6014c2d3dc140cdf448d19c71b4f17 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -57,6 +57,7 @@ function notifications_content(&$a) {
        }
 
        $o = '';
+       $o .= '<script> $(document).ready(function() { $(\'#nav-notify-link\').addClass(\'nav-selected\'); });</script>';
 
        if(($a->argc > 1) && ($a->argv[1] == 'all'))
                $sql_extra = '';

diff --git a/mod/profile.php b/mod/profile.php
index c42291d963885ce9b06791b50a821e1878a871dc..6923b092326c685657ae7edb4365b3db2179737c 100644 (file)
--- 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 .= '<script> $(document).ready(function() { $(\'#nav-home-link\').addClass(\'nav-selected\'); });</script>';
                // 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 5ee9a3e9657de2f5d28970fe5604b3bee64d8b70..c9dc4c80c7d0e6d6a901a2bf9c378141477f4fdc 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -157,6 +157,7 @@ function profiles_post(&$a) {
 
 
 function profiles_content(&$a) {
+       $o .= '<script> $(document).ready(function() { $(\'#nav-profiles-link\').addClass(\'nav-selected\'); });</script>';
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;

diff --git a/mod/settings.php b/mod/settings.php
index fbeee7768514111b62d8d3cef559b7d411063cfe..2e14fcee5fdaaeecbd82d038c1325fc323ec148d 100644 (file)
--- 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 .= '<script> $(document).ready(function() { $(\'#nav-settings-link\').addClass(\'nav-selected\'); });</script>';
 
        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 47adf4a76952a48b9c1f71ef16d3e9d1200daa9c..2d45d946a820d6853290d3f1778c6303776259e9 100644 (file)
--- a/view/default.php
+++ b/view/default.php
@@ -6,7 +6,7 @@
 </head>\r
 <body>\r
        <header><?php echo $page['header']; ?></header>\r
-       <nav><?php echo $page['nav']; ?></nav>\r
+       <nav><div id="top-margin"></div><?php echo $page['nav']; ?></nav>\r
        <aside><?php echo $page['aside']; ?></aside>\r
        <section><?php echo $page['content']; ?>\r
                <div id="page-footer"></div>\r

diff --git a/view/directory_header.tpl b/view/directory_header.tpl
index c4217ac48861ef6a93c7188ed649e5778ead90db..ba39236f2f3b1de50aab5efaee3858d7c719acc0 100644 (file)
--- a/view/directory_header.tpl
+++ b/view/directory_header.tpl
@@ -1,6 +1,6 @@
 <h1>Site Directory</h1>
 
-<ul><li><div id="global-directory-link"><a href="http://dir.dfrn.org">Global Community Directory</a></div></li></ul>
+<ul><li><div id="global-directory-link"><a href="http://dir.dfrn.org">Global Directory</a></div></li></ul>
 
 $finding
 

diff --git a/view/profile.php b/view/profile.php
index e2c190da00418751af38b492ac5d781f5dcbb830..a07a4522021923030ef9ffd2c87dda1bfe559b9a 100644 (file)
--- a/view/profile.php
+++ b/view/profile.php
@@ -6,7 +6,7 @@
 </head>\r
 <body>\r
 <header><?php echo $page['header']; ?></header>\r
-<nav><?php echo $page['nav']; ?></nav>\r
+<nav><div id="top-margin"></div><?php echo $page['nav']; ?></nav>\r
 <aside>\r
 <?php if((is_array($profile)) && count($profile)) { ?>\r
 <div class="vcard">\r

diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index 7bbd4091bc298ffcc1c996ea72dbdd462ec20ae8..8d32226bc9dc65e542bd19cd50eee07f3e71c368 100644 (file)
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -2,7 +2,7 @@
 
 <div id="profile-edit-links">
 <ul>
-<li><a href="profile/$profile_id/view" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
+<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
 <li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
 <li></li>
 <li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>

diff --git a/view/settings.tpl b/view/settings.tpl
index 84fc3892689bc8ae9871462751e2d1f24164bef3..da330bcd18717b839ddd1ccd73ba55fb92effeae 100644 (file)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -44,7 +44,7 @@ $profile_in_dir
 
 $profile_in_net_dir
 
-<div id="settings-default-perms" class="settings-default-perms" >
+<div id="settings-default-perms" class="settings-default-perms fakelink" >
        <div id="settings-default-perms-menu" onClick="openClose('settings-default-perms-select');" >$permissions</div>
        <div id="settings-default-perms-menu-end"></div>
 

diff --git a/view/theme/clean/style.css b/view/theme/clean/style.css
index f32462b3c372060d11a7b39f3874dfca968d2571..f190b3d1aa11ad349cdd471ad00e56e32b1fa624 100644 (file)
--- a/view/theme/clean/style.css
+++ b/view/theme/clean/style.css
@@ -1,5 +1,9 @@
 @import url('../default/style.css');
 
+nav {
+       background: #F4F4F4;
+}
+
 body { 
        background: #FFFFFF;
        color: #444444;
@@ -8,11 +12,13 @@ body {
 .nav-link {
        color: #444444;
        background: #EEE;
+       border: 2px solid #888888;
 }
 
 .nav-commlink {
        color: #444444;
        background: #EEE;
+       border: 2px solid #888888;
 }
 
 .profile-tabs {

diff --git a/view/theme/darkness/style.css b/view/theme/darkness/style.css
index a93f87a905c3a538321ccf8f386194f1cc13cc87..a7097d543980a6abe4897c4b300a93f7233ed383 100644 (file)
--- a/view/theme/darkness/style.css
+++ b/view/theme/darkness/style.css
@@ -4,29 +4,32 @@ body {
        background: #000000;
        color: #FF0000;
 }
+.nav-selected {
+       background: #000000 !important;
+}
 
 .nav-link {
        color: #FF0000;
-       background: #888888;
+       background: #444444;
 }
 
 .nav-commlink {
        color: #FF0000;
-       background: #888888;
+       background: #444444;
 }
 
 .profile-tabs {
        color: #FF0000;
-       background: #888888;
+       background: #444444;
 
 }
 
-a, a:visited {
-       color: #444444;
+a, a:visited, .fakelink, .fakelink:visited {
+       color: #888888;
        text-decoration: none;
 }
 
-a:hover {
+a:hover, .fakelink:hover {
        color: #FF0000;
        text-decoration: underline;
 }

diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 916b32fd2607f6e5eb111be1ab4906d0586b5ad9..9edb6424a618dad0124dcb0f8643b6a8594c33ad 100644 (file)
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -31,7 +31,21 @@ img {
 #sysmsg {
        width: 600px;
 }
-
+#top-margin {
+       height: 20px;
+}
+#banner {
+       color: lightgreen;
+       font-size: 1.4em;
+       font-weight: bold;
+       position: absolute;
+       filter:alpha(opacity=50);
+       -moz-opacity:0.5;
+       -khtml-opacity: 0.5;
+       opacity: 0.5;
+       top: 12px;
+       left: 42%;
+}
 code {
        font-family: monospace;
        white-space: pre;
@@ -49,7 +63,7 @@ blockquote:before {
 }
 
 body { 
-       background: #DDDDDD;
+       background: #FFFFFF;
        color: #444444;
        font-family: "Lucida Grande", Tahoma, sans-serif;
        font-size: 90%;
@@ -91,6 +105,7 @@ section {
        position: absolute;
        left: 270px;
        top: 60px;
+       margin-top: 25px;
        margin-left: 20px;
        margin-right: 20px;
        right: 0px;
@@ -102,10 +117,10 @@ h1 {
 nav {
        position: absolute;
        top: 0px;
-       height: 30px;
+       height: 48px;
        left: 0px;
        right: 0px;
-       margin-top: 20px;
+       background: #444;
 }
 
 footer {
@@ -136,11 +151,17 @@ footer {
        float: right;
        margin-left: 0px;
        margin-right: 10px;
-       padding: 3px;
-       border: 1px solid #AAAAAA;
-       background: #F4F4F4;
+       padding: 4px;
+       border: 2px solid #000000;
+       background: #EEE;
        font-size: 90%;
        font-weight: bold;
+       -moz-border-radius-topleft: 3px;
+       -moz-border-radius-topright: 3px;
+       -webkit-border-radius-topleft: 3px;
+       -webkit-border-radius-topright: 3px;
+       border-radius-topleft: 3px;
+       border-radius-topright: 3px;
 }
 
 
@@ -150,6 +171,20 @@ footer {
        font-size: 0.6em;
        font-weight: bold;
        color: #FF0000;
+       background: #FFFFFF;
+}
+
+
+
+.nav-selected {
+       border-bottom: none !important; 
+       background: #FFFFFF !important;
+       padding: 5px !important;
+}
+
+
+.nav-ajax-left:hover {
+       font-size: 1.5em;
 }
 
 .nav-ajax-right {
@@ -164,12 +199,19 @@ footer {
        float: left;
        margin-left: 10px;
        margin-right: 0px;
-       padding: 3px;
-       border: 1px solid #AAAAAA;
-       background: #F4F4F4;
+       padding: 4px;
+       border: 2px solid #000000;
+       background: #EEE;
        font-size: 90%;
        font-weight: bold;
        text-decoration: none;
+       -moz-border-radius-topleft: 3px;
+       -moz-border-radius-topright: 3px;
+       -webkit-border-radius-topleft: 3px;
+       -webkit-border-radius-topright: 3px;
+       border-radius-topleft: 3px;
+       border-radius-topright: 3px;
+
 }
 
 #nav-end {
@@ -639,6 +681,7 @@ input#dfrn-url {
 
 .wall-item-content-wrapper {
        margin-top: 10px;
+       border: 1px solid #CCC;
 }
 
 .wall-item-content-wrapper.comment {
@@ -701,6 +744,7 @@ input#dfrn-url {
        float: left;
        width: 450px;
        margin-left: 10px;
+       margin-bottom: 20px;
 }
 
 .wall-item-title {
@@ -1115,12 +1159,12 @@ input#dfrn-url {
 
 .profile-tabs {
        float: left;
-       padding: 3px;
+       padding: 4px;
        margin-top: 10px;
        margin-bottom: 10px;
        margin-right: 5px;
-       border: 1px solid #AAAAAA;
-       background: #F4F4F4;
+       border: 1px solid #CCC;
+       background: #F8F8F8;
        font-size: 0.8em;
        font-weight: bold;
 }
@@ -1445,20 +1489,11 @@ input#dfrn-url {
        text-decoration: underline;
        cursor: pointer;
 }
-#settings-default-perms-menu, #settings-default-perms-menu:visited {
-       color: #8888FF;
-       text-decoration: none;
-       cursor: pointer;
+#settings-default-perms-menu {
        margin-top: 15px;
        margin-bottom: 15px;
 }
 
-#settings-default-perms-menu:hover {
-       color: #0000FF;
-       text-decoration: underline;
-       cursor: pointer;
-}
-
 #photo-edit-caption-label, #photo-edit-tags-label {
        float: left; 
        width: 150px;

diff --git a/view/theme/goldenrod/style.css b/view/theme/goldenrod/style.css
index e84cf5d6472b2cedf15ee8f74cd8a4a1f1171ab0..8743dcbf595c53d95a3ca9b57b7ea1b630338514 100644 (file)
--- a/view/theme/goldenrod/style.css
+++ b/view/theme/goldenrod/style.css
@@ -15,6 +15,10 @@ body {
        background: #FFCC55;
 }
 
+.nav-selected {
+       background: #FFDDAA !important;
+}
+
 .profile-tabs {
        color: #444444;
        background: #FFCC55;

diff --git a/view/theme/shady/style.css b/view/theme/shady/style.css
new file mode 100644 (file)
index 0000000..0713105
--- /dev/null
+++ b/view/theme/shady/style.css
@@ -0,0 +1,70 @@
+@import url('../default/style.css');
+
+body { 
+       background: #DDDDDD;
+       color: #444444;
+}
+
+.nav-link {
+       color: #444444;
+       background: #F4F4F4;
+}
+.nav-selected {
+       background: #DDDDDD !important;
+}
+
+.nav-commlink {
+       color: #444444;
+       background: #F4F4F4;
+}
+
+.profile-tabs {
+       color: #444444;
+       background: #F4F4F4;
+
+}
+
+a, a:visited {
+       color: #8888FF;
+       text-decoration: none;
+}
+
+a:hover {
+       color: #0000FF;
+       text-decoration: underline;
+}
+
+.fakelink, .fakelink:visited {
+       color: #8888FF;
+}
+
+.fakelink:hover {
+       color: #0000FF;
+}
+
+.wall-item-content-wrapper.comment {
+       background: #CCCCCC;
+}
+
+.comment-edit-wrapper {
+       background: #CCCCCC;
+}
+
+.comment-wwedit-wrapper {
+       background: #CCCCCC;
+}
+
+#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
+       color: #8888FF;
+}
+
+#photos-upload-perms-menu:hover {
+       color: #0000FF;
+}
+#settings-default-perms-menu, #settings-default-perms-menu:visited {
+       color: #8888FF;
+}
+
+#settings-default-perms-menu:hover {
+       color: #0000FF;
+}