added activetab var to message.php for templates

(testbubble only) added logic to photo header to make tab 'sticky' (active class for styling)
(testbubble only) css fix for avatars in wallitems

diff --git a/mod/message.php b/mod/message.php
index 1bee45d48c92092987e8e23b0cbbda6c610a9849..d4772d026144d21cc9bea0da2cc41c8829cfd98b 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -45,13 +45,21 @@ function message_content(&$a) {
 
        $myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
-
+       if (($a->argc > 1) && ($a->argv[1] === 'new')) {
+               $tab = 'new';
+       } else if ($a->argc == 2 && $a->argv[1] === 'sent') {
+               $tab = 'sent';
+       } else {
+               $tab = 'inbox';
+       }
+       
        $tpl = get_markup_template('mail_head.tpl');
        $header = replace_macros($tpl, array(
                '$messages' => t('Messages'),
                '$inbox' => t('Inbox'),
                '$outbox' => t('Outbox'),
-               '$new' => t('New Message')
+               '$new' => t('New Message'),
+               '$activetab' => $tab
        ));
 
 
@@ -90,6 +98,8 @@ function message_content(&$a) {
 
        if(($a->argc > 1) && ($a->argv[1] === 'new')) {
                
+               $o .= $header;
+               
                $tpl = get_markup_template('msg-header.tpl');
 
                $a->page['htmlhead'] .= replace_macros($tpl, array(
@@ -114,7 +124,6 @@ function message_content(&$a) {
                        '$upload' => t('Upload photo'),
                        '$insert' => t('Insert web link'),
                        '$wait' => t('Please wait')
-
                ));
 
                return $o;
@@ -248,7 +257,6 @@ function message_content(&$a) {
                        '$upload' => t('Upload photo'),
                        '$insert' => t('Insert web link'),
                        '$wait' => t('Please wait')
-
                ));
 
                return $o;

diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl
index 2a4fc42ea2000aa916ffc6871cebca5e29b7f7e5..2a4596cd668a4f8ae3f376996fa78526d19b831e 100644 (file)
--- a/view/theme/testbubble/mail_head.tpl
+++ b/view/theme/testbubble/mail_head.tpl
@@ -1,7 +1,7 @@
 <h3>$messages</h3>
 
 <ul class="tabs-wrapper">
-<li><a href="message" class="tabs button">$inbox</a></li>
-<li><a href="message/sent" class="tabs button">$outbox</a></li>
-<li><a href="message/new" class="tabs button">$new</a></li>
+<li><a href="message" class="tabs button {{if $activetab==inbox}}active{{endif}}">$inbox</a></li>
+<li><a href="message/sent" class="tabs button {{if $activetab==sent}}active{{endif}}">$outbox</a></li>
+<li><a href="message/new" class="tabs button {{if $activetab==new}}active{{endif}}">$new</a></li>
 </ul>

diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 36fe1bbc1465ea854f014e91625126604858164a..8ef2b6619754c5e54e0df307bcba48d937dc06f0 100644 (file)
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -361,7 +361,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
 #notifications {
        height: 32px;
        position: absolute;
-       top:10px; left: 650px;
+       top:10px; left: 40%;
 }
 .nav-ajax-update {
        width: 44px;
@@ -373,10 +373,10 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
        padding-top: 0.5em;
        float: left;
        padding-left: 11px;
-    display: none;
+    /*display: none;*/
 }
 #net-update { background-position: 0px 0px; }
-#mail-update { background-position: 0px -42px; }
+#mail-update { background-position: 0px -40px; }
 #notify-update { background-position: 0px -84px; }
 #home-update { background-position: 0px -126px; }
 
@@ -1146,11 +1146,14 @@ profile-jot-banner-wrapper {
 }
 
 .wall-item-body code {
-    border-color: #CCCCCC;
-    border-style: solid;
+       font-family: Courier, monospace;
+       white-space: pre;
+       display: block;
+       overflow: auto;
+       border: 1px solid #cccccc;
     border-width: 1px 1px 1px 10px;
-    display: block;
-    padding-left: 10px;
+       padding-left: 10px;
+       margin-top: 20px; 
 }
 
 /* =========== */