diff --git a/include/ConversationObject.php b/include/ConversationObject.php
index 7e412803b..307cb2d17 100644
--- a/include/ConversationObject.php
+++ b/include/ConversationObject.php
@@ -90,6 +90,11 @@ class Conversation extends BaseObject {
return $this->profile_owner;
}
+ public function set_profile_owner($uid) {
+ $this->profile_owner = $uid;
+ }
+
+
/**
* Add a thread to the conversation
*
diff --git a/include/conversation.php b/include/conversation.php
index e8c391967..0d539c2e2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -658,6 +658,12 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
$conv = new Conversation($mode, $preview);
+ // In the display mode we don't have a profile owner.
+
+ if($mode === 'display' && $items)
+ $conv->set_profile_owner($items[0]['uid']);
+
+
// get all the topmost parents
// this shouldn't be needed, as we should have only them in our array
// But for now, this array respects the old style, just in case
diff --git a/include/nav.php b/include/nav.php
index 6ad7b58d0..5e5243f67 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -71,7 +71,7 @@ EOT;
$nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
// user menu
- $nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Status'), "", t('Your posts and conversations'));
+ $nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations'));
$nav['usermenu'][] = Array('profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'));
if(feature_enabled(local_user(),'multi_profiles'))
$nav['usermenu'][] = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit Profiles'));
@@ -128,7 +128,7 @@ EOT;
$nav['search'] = array('search', t('Search'), "", t('Search site content'));
- $nav['directory'] = array('directory', t('Channel Directory'), "", t('Channel Locator'));
+ $nav['directory'] = array('directory', t('Directory'), "", t('Channel Locator'));
/**
@@ -139,24 +139,24 @@ EOT;
if(local_user()) {
- $nav['network'] = array('network', t('Network'), "", t('Conversations from your friends'));
- $nav['network']['all']=array('notifications/network', t('See all network notifications'), "", "");
- $nav['network']['mark'] = array('', t('Mark all network notifications seen'), '','');
+ $nav['network'] = array('network', t('Matrix'), "", t('Conversations from your grid'));
+ $nav['network']['all']=array('notifications/network', t('See all matrix notifications'), "", "");
+ $nav['network']['mark'] = array('', t('Mark all matrix notifications seen'), '','');
$nav['home'] = array('channel/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations'));
$nav['home']['all']=array('notifications/channel', t('See all channel notifications'), "", "");
$nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '','');
- $nav['intros'] = array('connections/pending', t('Introductions'), "", t('New Connections'));
+ $nav['intros'] = array('connections/pending', t('Intros'), "", t('New Connections'));
$nav['intros']['all']=array('intro', t('See all channel introductions'), "", "");
- $nav['notifications'] = array('notifications/system', t('Notifications'), "", t('Notifications'));
+ $nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications'));
$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
$nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '','');
- $nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
+ $nav['messages'] = array('message', t('Mail'), "", t('Private mail'));
$nav['messages']['all']=array('message', t('See all private messages'), "", "");
$nav['messages']['mark'] = array('', t('Mark all private messages seen'), '','');
$nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox'));
diff --git a/mod/wfinger.php b/mod/wfinger.php
index 3fda96181..33d2fe478 100644
--- a/mod/wfinger.php
+++ b/mod/wfinger.php
@@ -24,8 +24,6 @@ function wfinger_init(&$a) {
header('Content-type: application/jrd+json');
- $pubkey = get_config('system','site_pubkey');
-
$r = null;
if($resource) {
@@ -82,7 +80,7 @@ function wfinger_init(&$a) {
array(
'rel' => 'http://purl.org/zot/protocol',
- 'href' => z_root() . '/well-known/zot-info' . '?zaddr=' . $r[0]['xchan_addr'],
+ 'href' => z_root() . '/.well-known/zot-info' . '?zaddr=' . $r[0]['xchan_addr'],
)
);
diff --git a/version.inc b/version.inc
index 264a9b161..55541a658 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-03-04.242
+2013-03-05.243
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index be715488a..f02f79c2e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -10,7 +10,7 @@
body {
font-family: arial,freesans,clean,sans-serif;
font-size: 12px;
- background-color: #ffffff;
+ background-color: #FFFFFF;
color: #000000;
margin: 0px;
}
@@ -229,10 +229,11 @@ header #site-location {
}
header #banner {
+
overflow: hidden;
text-align: center;
width: 100%;
- font-size: 2.2em;
+ font-size: 1.4em;
font-family: tahoma, "Lucida Sans", sans;
color: #eec;
font-weight: bold;
@@ -303,15 +304,16 @@ nav #nav-link-wrapper .nav-link {
height: 28px;
border-bottom: 1px solid #aaaaaa;
padding:0px;
- margin-right: 10px;
+ width: 90%;
+/* margin-right: 10px; */
}
.tabs li { margin: 0px; list-style: none; }
.tab {
display:block;
float:left;
- padding: 0.4em;
- margin-right: 3px ;
+/* padding: 0.4em; */
+ margin-right: 15px ;
}
.tab.active {
@@ -324,6 +326,7 @@ ul.tabs {
margin-bottom: 0px;
list-style-type: none;
padding: 0px;
+ padding-right: 8px;
}
/* footer */
@@ -385,7 +388,7 @@ footer {
width: 530px;
margin-bottom: 5px;
font-weight: bold;
- border: solid 1px #ccc;
+ border: solid 1px #ffffff;
border-radius: 5px;
}
@@ -2430,6 +2433,8 @@ aside input[type='text'] {
}
#nav-search-text {
+ margin-top: -2px;
+ font-size: 0.9em;
border-radius: 14px;
background-color: #AAAAAA;
color: #eec;
@@ -2444,6 +2449,7 @@ aside input[type='text'] {
#nav-user-linkmenu img {
border-radius: 5px;
+ margin-top: -4px;
}
.location-label, .gender-label, .marital-label, .homepage-label {
@@ -3329,14 +3335,15 @@ div.jGrowl div.info {
.slider {
margin-top: 10px;
- margin-bottom: 30px;
+ margin-bottom: 45px;
}
#main-slider {
position: relative;
- left: 5%;
+ left: 5px;
width: 90%;
+
}
@@ -3349,7 +3356,7 @@ div.jGrowl div.info {
/* nav */
nav {
width: 100%;
- height: 32px;
+ height: 24px;
position: fixed;
// opacity: 0.6;
// filter:alpha(opacity=60);
@@ -3401,13 +3408,17 @@ color-stop(0.82, #b00)
nav a,
nav a:active,
nav a:visited,
-nav a:link,
-nav a:hover {
+nav a:link {
color: #ffffff;
text-decoration: none;
outline: none;
}
+nav a:hover {
+ color: #0000FF;
+}
+nav .fakelink:hover { text-decoration: none; }
+
#profiles-menu li a {
color: #ffffff;
}
@@ -3431,11 +3442,16 @@ nav ul li .menu-popup {
right: auto;
top: 33px;
}
+
+#nav-user-linkmenu {
+ margin-left: 5px;
+}
+
nav .nav-menu-icon {
position: relative;
height: 22px;
padding: 5px;
- margin: 3px 10px;
+/* margin: 3px 10px; */
-moz-border-radius: 5px 5px 0 0;
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
@@ -3454,17 +3470,17 @@ nav .nav-menu {
position: relative;
height: 16px;
padding: 5px;
- margin: 3px 15px 0px;
- font-size: 14px;
- border-bottom: 3px solid #f88;
+ margin: 3px 5px 0px;
+ font-size: 1.0em;
+/* border-bottom: 3px solid #f88; */
}
nav:hover .nav-menu {
- border-bottom: 3px solid #f00;
+/* border-bottom: 3px solid #f00; */
}
nav .nav-menu.selected {
- border-bottom: 4px solid #CCCCCC;
+ color: #0000FF;
}
nav .nav-notify {
@@ -3473,6 +3489,9 @@ nav .nav-notify {
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
+ opacity: 0.6;
+ filter:alpha(opacity=60);
+
}
nav .nav-notify.show {
display: block;
@@ -3481,9 +3500,7 @@ nav #nav-help-link,
nav #nav-login-link,
nav #nav-search-link,
nav #nav-directory-link,
-nav #nav-apps-link,
-nav #nav-user-linkmenu,
-nav #nav-site-linkmenu {
+nav #nav-apps-link {
float: right;
}
nav #nav-help-link .menu-popup,
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index cc7153ebb..a9a71cc8e 100644
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -10,7 +10,6 @@
-