harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-06-08 16:30:50 -07:00
commit 80be209bce
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/import.php
View File

@ -5,6 +5,7 @@
require_once('include/Contact.php');
require_once('include/zot.php');
require_once('include/identity.php');
function import_post(&$a) {

9
mod/message.php
View File

@ -9,13 +9,20 @@ require_once('include/Contact.php');
function message_aside(&$a) {
$a->set_widget('newmessage',replace_macros(get_markup_template('message_side.tpl'), array(
$a->set_widget('msgaside',replace_macros(get_markup_template('message_side.tpl'), array(
'$tabs'=> array(),
'$check'=>array(
'label' => t('Check Mail'),
'url' => $a->get_baseurl(true) . '/message',
'sel' => (argv(1) == ''),
),
'$new'=>array(
'label' => t('New Message'),
'url' => $a->get_baseurl(true) . '/message/new',
'sel'=> (argv(1) == 'new'),
)
)));
}

6
view/tpl/message_side.tpl
View File

@ -1,9 +1,5 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
<div id="message-sidebar" class="widget">
<div id="message-check"><a href="{{$check.url}}" class="{{if $check.sel}}checkmessage-selected{{/if}}">{{$check.label}}</a> </div>
<div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
<ul class="message-ul">