Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-10-02 19:04:11 -07:00
commit 297ab898b7
3 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mod/message.php
View file

@ -45,13 +45,21 @@ function message_content(&$a) {
$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname']; $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'); $tpl = get_markup_template('mail_head.tpl');
$header = replace_macros($tpl, array( $header = replace_macros($tpl, array(
'$messages' => t('Messages'), '$messages' => t('Messages'),
'$inbox' => t('Inbox'), '$inbox' => t('Inbox'),
'$outbox' => t('Outbox'), '$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')) { if(($a->argc > 1) && ($a->argv[1] === 'new')) {
$o .= $header;
$tpl = get_markup_template('msg-header.tpl'); $tpl = get_markup_template('msg-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array( $a->page['htmlhead'] .= replace_macros($tpl, array(
@ -114,7 +124,6 @@ function message_content(&$a) {
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),
'$insert' => t('Insert web link'), '$insert' => t('Insert web link'),
'$wait' => t('Please wait') '$wait' => t('Please wait')
)); ));
return $o; return $o;
@ -248,7 +257,6 @@ function message_content(&$a) {
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),
'$insert' => t('Insert web link'), '$insert' => t('Insert web link'),
'$wait' => t('Please wait') '$wait' => t('Please wait')
)); ));
return $o; return $o;

6
view/theme/testbubble/mail_head.tpl
View file

@ -1,7 +1,7 @@
<h3>$messages</h3> <h3>$messages</h3>
<ul class="tabs-wrapper"> <ul class="tabs-wrapper">
<li><a href="message" class="tabs button">$inbox</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">$outbox</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">$new</a></li> <li><a href="message/new" class="tabs button {{if $activetab==new}}active{{endif}}">$new</a></li>
</ul> </ul>

17
view/theme/testbubble/style.css
View file

@ -361,7 +361,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
#notifications { #notifications {
height: 32px; height: 32px;
position: absolute; position: absolute;
top:10px; left: 650px; top:10px; left: 40%;
} }
.nav-ajax-update { .nav-ajax-update {
width: 44px; 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; padding-top: 0.5em;
float: left; float: left;
padding-left: 11px; padding-left: 11px;
display: none; /*display: none;*/
} }
#net-update { background-position: 0px 0px; } #net-update { background-position: 0px 0px; }
#mail-update { background-position: 0px -42px; } #mail-update { background-position: 0px -40px; }
#notify-update { background-position: 0px -84px; } #notify-update { background-position: 0px -84px; }
#home-update { background-position: 0px -126px; } #home-update { background-position: 0px -126px; }
@ -1146,11 +1146,14 @@ profile-jot-banner-wrapper {
} }
.wall-item-body code { .wall-item-body code {
border-color: #CCCCCC; font-family: Courier, monospace;
border-style: solid; white-space: pre;
display: block;
overflow: auto;
border: 1px solid #cccccc;
border-width: 1px 1px 1px 10px; border-width: 1px 1px 1px 10px;
display: block; padding-left: 10px;
padding-left: 10px; margin-top: 20px;
} }
/* =========== */ /* =========== */