added user page link
This commit is contained in:
parent
f4d2720104
commit
5b4c3e6049
6 changed files with 33 additions and 11 deletions
|
|
@ -6,5 +6,6 @@
|
||||||
|
|
||||||
$conf['tagline'] = 'This is the tagline - explaining what this site is about.';
|
$conf['tagline'] = 'This is the tagline - explaining what this site is about.';
|
||||||
$conf['discussionNS'] = 'discussion';
|
$conf['discussionNS'] = 'discussion';
|
||||||
|
$conf['userNS'] = 'user';
|
||||||
$conf['sidebarID'] = 'sidebar';
|
$conf['sidebarID'] = 'sidebar';
|
||||||
$conf['hideTools'] = 0;
|
$conf['hideTools'] = 0;
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
$meta['tagline'] = array('string');
|
$meta['tagline'] = array('string');
|
||||||
$meta['discussionNS'] = array('string');
|
$meta['discussionNS'] = array('string');
|
||||||
|
$meta['userNS'] = array('string');
|
||||||
$meta['sidebarID'] = array('string');
|
$meta['sidebarID'] = array('string');
|
||||||
$meta['hideTools'] = array('onoff');
|
$meta['hideTools'] = array('onoff');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,3 +5,5 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$lang['btn_discussion'] = "Discussion";
|
$lang['btn_discussion'] = "Discussion";
|
||||||
|
$lang['btn_back2article'] = "Back to article";
|
||||||
|
$lang['btn_userpage'] = "User page";
|
||||||
|
|
|
||||||
|
|
@ -6,5 +6,6 @@
|
||||||
|
|
||||||
$lang['foo'] = 'Tagline';
|
$lang['foo'] = 'Tagline';
|
||||||
$lang['discussionNS'] = 'Discussion namespace (leave empty to disable discussions)';
|
$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['sidebarID'] = 'page name of page included in sidebar';
|
||||||
$lang['hideTools'] = 'Hide tools when not logged in?';
|
$lang['hideTools'] = 'Hide tools when not logged in?';
|
||||||
|
|
|
||||||
5
main.php
5
main.php
|
|
@ -67,6 +67,11 @@ $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && $_SERVER
|
||||||
tpl_action('admin', 1, 'li');
|
tpl_action('admin', 1, 'li');
|
||||||
tpl_action('profile', 1, 'li', 0, '', '', $INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')');
|
tpl_action('profile', 1, 'li', 0, '', '', $INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')');
|
||||||
// this partly replaces tpl_userinfo()
|
// 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');
|
tpl_action('login', 1, 'li');
|
||||||
?>
|
?>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -4,22 +4,34 @@
|
||||||
if (!defined('DOKU_INC')) die();
|
if (!defined('DOKU_INC')) die();
|
||||||
if (!defined('DOKU_LF')) define('DOKU_LF',"\n");
|
if (!defined('DOKU_LF')) define('DOKU_LF',"\n");
|
||||||
|
|
||||||
|
/* @todo: fix label of buttons */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create link/button to discussion page and back
|
* Create link/button to discussion page and back
|
||||||
*/
|
*/
|
||||||
function _tpl_discussion($discussNS='discussion:',$link=0) {
|
function _tpl_discussion($discussNS='discussion:',$link=0) {
|
||||||
global $ID;
|
global $ID;
|
||||||
global $lang;
|
|
||||||
if(substr($ID,0,strlen($discussNS))==$discussNS) {
|
if(substr($ID,0,strlen($discussNS))==$discussNS) {
|
||||||
$backID = substr(strstr($ID,':'),1);
|
$backID = substr(strstr($ID,':'),1);
|
||||||
if ($link)
|
if ($link)
|
||||||
tpl_pagelink(':'.$backID,$lang['btn_back']);
|
tpl_link(wl($backID),tpl_getLang('btn_back2article'));
|
||||||
else
|
else
|
||||||
echo html_btn('back',$backID,'',array());
|
echo html_btn('back2article',$backID,'',array());
|
||||||
} else {
|
} else {
|
||||||
if ($link)
|
if ($link)
|
||||||
tpl_pagelink($discussNS.$ID,tpl_getLang('btn_discussion'));
|
tpl_link(wl($discussNS.$ID),tpl_getLang('btn_discussion'));
|
||||||
else
|
else
|
||||||
echo html_btn('discussion',$discussNS.$ID,'',array());
|
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());
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue