Browse Source

theme cleanup

pull/1/head
Mike Macgirvin 11 years ago
parent
commit
65a420b227
23 changed files with 179 additions and 36 deletions
  1. +11
    -0
      home.html
  2. BIN
      images/mistpark-net.jpg
  3. +2
    -0
      include/auth.php
  4. +1
    -0
      include/nav.php
  5. +1
    -0
      mod/contacts.php
  6. +1
    -0
      mod/directory.php
  7. +2
    -0
      mod/home.php
  8. +1
    -0
      mod/message.php
  9. +2
    -0
      mod/network.php
  10. +1
    -0
      mod/notifications.php
  11. +1
    -0
      mod/profile.php
  12. +1
    -0
      mod/profiles.php
  13. +3
    -2
      mod/settings.php
  14. +1
    -1
      view/default.php
  15. +1
    -1
      view/directory_header.tpl
  16. +1
    -1
      view/profile.php
  17. +1
    -1
      view/profile_edit.tpl
  18. +1
    -1
      view/settings.tpl
  19. +6
    -0
      view/theme/clean/style.css
  20. +9
    -6
      view/theme/darkness/style.css
  21. +58
    -23
      view/theme/default/style.css
  22. +4
    -0
      view/theme/goldenrod/style.css
  23. +70
    -0
      view/theme/shady/style.css

+ 11
- 0
home.html View File

@ -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>

BIN
images/mistpark-net.jpg View File

Before After
Width: 100  |  Height: 100  |  Size: 3.4 KiB

+ 2
- 0
include/auth.php View File

@ -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') {


+ 1
- 0
include/nav.php View File

@ -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>';

+ 1
- 0
mod/contacts.php View File

@ -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;


+ 1
- 0
mod/directory.php View File

@ -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'])) : '');


+ 2
- 0
mod/home.php View File

@ -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;


+ 1
- 0
mod/message.php View File

@ -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);


+ 2
- 0
mod/network.php View File

@ -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]);


+ 1
- 0
mod/notifications.php View File

@ -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 = '';


+ 1
- 0
mod/profile.php View File

@ -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'];
}


+ 1
- 0
mod/profiles.php View File

@ -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;


+ 3
- 2
mod/settings.php View File

@ -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,


+ 1
- 1
view/default.php View File

@ -6,7 +6,7 @@
</head>
<body>
<header><?php echo $page['header']; ?></header>
<nav><?php echo $page['nav']; ?></nav>
<nav><div id="top-margin"></div><?php echo $page['nav']; ?></nav>
<aside><?php echo $page['aside']; ?></aside>
<section><?php echo $page['content']; ?>
<div id="page-footer"></div>


+ 1
- 1
view/directory_header.tpl View File

@ -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


+ 1
- 1
view/profile.php View File

@ -6,7 +6,7 @@
</head>
<body>
<header><?php echo $page['header']; ?></header>
<nav><?php echo $page['nav']; ?></nav>
<nav><div id="top-margin"></div><?php echo $page['nav']; ?></nav>
<aside>
<?php if((is_array($profile)) && count($profile)) { ?>
<div class="vcard">


+ 1
- 1
view/profile_edit.tpl View File

@ -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>


+ 1
- 1
view/settings.tpl View File

@ -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>


+ 6
- 0
view/theme/clean/style.css View File

@ -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 {


+ 9
- 6
view/theme/darkness/style.css View File

@ -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;
}

+ 58
- 23
view/theme/default/style.css View File

@ -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;


+ 4
- 0
view/theme/goldenrod/style.css View File

@ -15,6 +15,10 @@ body {
background: #FFCC55;
}
.nav-selected {
background: #FFDDAA !important;
}
.profile-tabs {
color: #444444;
background: #FFCC55;


+ 70
- 0
view/theme/shady/style.css View File

@ -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;
}

Loading…
Cancel
Save