aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-02 19:04:11 -0700
committerFriendika <info@friendika.com>2011-10-02 19:04:11 -0700
commit297ab898b7642cf8251405cb60e787222f4e5974 (patch)
tree9f836b33f5dd16b829b6ae6b1b3df6707443b37b
parent9c681de7876bcedd1414f7246250c1f9bfac6c3c (diff)
parent13007716d2f9168628905cdc4eb073471d7917e1 (diff)
downloadvolse-hubzilla-297ab898b7642cf8251405cb60e787222f4e5974.tar.gz
volse-hubzilla-297ab898b7642cf8251405cb60e787222f4e5974.tar.bz2
volse-hubzilla-297ab898b7642cf8251405cb60e787222f4e5974.zip
Merge branch 'pull'
-rw-r--r--mod/message.php16
-rw-r--r--view/theme/testbubble/mail_head.tpl6
-rw-r--r--view/theme/testbubble/style.css17
3 files changed, 25 insertions, 14 deletions
diff --git a/mod/message.php b/mod/message.php
index 1bee45d48..d4772d026 100644
--- 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 2a4fc42ea..2a4596cd6 100644
--- 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 36fe1bbc1..8ef2b6619 100644
--- 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;
}
/* =========== */