adrian/tcm-in-guestrow-tpl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added user page link

Browse source
This commit is contained in:
Anika Henke 2010-11-05 10:34:56 +00:00
parent f4d2720104
commit 5b4c3e6049
6 changed files with 33 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
conf/default.php
View file

@ -6,5 +6,6 @@
$conf['tagline'] = 'This is the tagline - explaining what this site is about.';
$conf['discussionNS'] = 'discussion';
$conf['userNS'] = 'user';
$conf['sidebarID'] = 'sidebar';
$conf['hideTools'] = 0;

1
conf/metadata.php
View file

@ -6,6 +6,7 @@
$meta['tagline'] = array('string');
$meta['discussionNS'] = array('string');
$meta['userNS'] = array('string');
$meta['sidebarID'] = array('string');
$meta['hideTools'] = array('onoff');

4
lang/en/lang.php
View file

@ -4,4 +4,6 @@
*
*/
$lang['btn_discussion'] = "Discussion";
$lang['btn_discussion'] = "Discussion";
$lang['btn_back2article'] = "Back to article";
$lang['btn_userpage'] = "User page";

1
lang/en/settings.php
View file

@ -6,5 +6,6 @@
$lang['foo'] = 'Tagline';
$lang['discussionNS'] = 'Discussion namespace (leave empty to disable discussions)';
$lang['userNS'] = 'User namespace (leave empty to disable user pages)';
$lang['sidebarID'] = 'page name of page included in sidebar';
$lang['hideTools'] = 'Hide tools when not logged in?';

17
main.php
View file

@ -64,10 +64,15 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
<ul>
<?php /* the optional second parameter of tpl_action() switches between a link and a button,
e.g. a button inside a <li> would be: tpl_action('edit',0,'li') */
tpl_action('admin', 1, 'li');
tpl_action('profile', 1, 'li', 0, '', '', $INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')');
// this partly replaces tpl_userinfo()
tpl_action('login', 1, 'li');
tpl_action('admin', 1, 'li');
tpl_action('profile', 1, 'li', 0, '', '', $INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')');
// this partly replaces tpl_userinfo()
if (tpl_getConf('userNS') && $_SERVER['REMOTE_USER']) {
echo '<li>';
_tpl_userpage(tpl_getConf('userNS').':',1);
echo '</li>';
}
tpl_action('login', 1, 'li');
?>
</ul>
<!-- <div class="user"><?php tpl_userinfo() /* 'Logged in as ...' */ ?></div> -->
@ -80,8 +85,8 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
<?php tpl_searchform(); ?>
<ul>
<?php
tpl_action('recent', 1, 'li');
tpl_action('index', 1, 'li');
tpl_action('recent', 1, 'li');
tpl_action('index', 1, 'li');
?>
</ul>
</div>

20
tpl_functions.php
View file

@ -4,22 +4,34 @@
if (!defined('DOKU_INC')) die();
if (!defined('DOKU_LF')) define('DOKU_LF',"\n");
/* @todo: fix label of buttons */
/**
* Create link/button to discussion page and back
*/
function _tpl_discussion($discussNS='discussion:',$link=0) {
global $ID;
global $lang;
if(substr($ID,0,strlen($discussNS))==$discussNS) {
$backID = substr(strstr($ID,':'),1);
if ($link)
tpl_pagelink(':'.$backID,$lang['btn_back']);
tpl_link(wl($backID),tpl_getLang('btn_back2article'));
else
echo html_btn('back',$backID,'',array());
echo html_btn('back2article',$backID,'',array());
} else {
if ($link)
tpl_pagelink($discussNS.$ID,tpl_getLang('btn_discussion'));
tpl_link(wl($discussNS.$ID),tpl_getLang('btn_discussion'));
else
echo html_btn('discussion',$discussNS.$ID,'',array());
}
}
/**
* Create link/button to user page
*/
function _tpl_userpage($userNS='user:',$link=0) {
global $conf;
if ($link)
tpl_link(wl($userNS.$_SERVER['REMOTE_USER'].':'.$conf['start']),tpl_getLang('btn_userpage'));
else
echo html_btn('userpage',$userNS.$_SERVER['REMOTE_USER'].':'.$conf['start'],'',array());
}