diff options
| author | friendica <info@friendica.com> | 2013-06-08 16:30:50 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-06-08 16:30:50 -0700 |
| commit | 80be209bce5c2a6fbe8cd00dcaf4b1dfbcdfe2a6 (patch) | |
| tree | 0172975b7bd36e849aafd9bf02f7fb288a93f963 | |
| parent | ee1ecd8ea29e41f70f8ee233ff6859e2e45e28b7 (diff) | |
| parent | 4132cab862608f05c7a5b1467e5a66df9070b01b (diff) | |
| download | volse-hubzilla-80be209bce5c2a6fbe8cd00dcaf4b1dfbcdfe2a6.tar.gz volse-hubzilla-80be209bce5c2a6fbe8cd00dcaf4b1dfbcdfe2a6.tar.bz2 volse-hubzilla-80be209bce5c2a6fbe8cd00dcaf4b1dfbcdfe2a6.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | mod/import.php | 1 | ||||
| -rw-r--r-- | mod/message.php | 9 | ||||
| -rwxr-xr-x | view/tpl/message_side.tpl | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/mod/import.php b/mod/import.php index a36519a0c..bf55b3104 100644 --- a/mod/import.php +++ b/mod/import.php @@ -5,6 +5,7 @@ require_once('include/Contact.php'); require_once('include/zot.php'); +require_once('include/identity.php'); function import_post(&$a) { diff --git a/mod/message.php b/mod/message.php index 93b5c2494..54615f081 100644 --- a/mod/message.php +++ b/mod/message.php @@ -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'), ) + ))); } diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl index 7da22ee3e..4db427fa7 100755 --- a/view/tpl/message_side.tpl +++ b/view/tpl/message_side.tpl @@ -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"> |