From 7f081821c51e704c2720b993ca5364fa5e7e3663 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 15 Feb 2014 00:42:05 +0100 Subject: Extend showuseras config with username_link uses the user interwiki link as profile link --- lib/plugins/config/lang/en/lang.php | 9 +++++---- lib/plugins/config/settings/config.metadata.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index cdef85a85..66d4dc356 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -245,10 +245,11 @@ $lang['xsendfile_o_2'] = 'Standard X-Sendfile header'; $lang['xsendfile_o_3'] = 'Proprietary Nginx X-Accel-Redirect header'; /* Display user info */ -$lang['showuseras_o_loginname'] = 'Login name'; -$lang['showuseras_o_username'] = "User's full name"; -$lang['showuseras_o_email'] = "User's e-mail addresss (obfuscated according to mailguard setting)"; -$lang['showuseras_o_email_link'] = "User's e-mail addresss as a mailto: link"; +$lang['showuseras_o_loginname'] = 'Login name'; +$lang['showuseras_o_username'] = "User's full name"; +$lang['showuseras_o_username_link'] = "User's full name as interwiki user link"; +$lang['showuseras_o_email'] = "User's e-mail addresss (obfuscated according to mailguard setting)"; +$lang['showuseras_o_email_link'] = "User's e-mail addresss as a mailto: link"; /* useheading options */ $lang['useheading_o_0'] = 'Never'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index f9dabfeb0..69cc0df01 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -116,7 +116,7 @@ $meta['fullpath'] = array('onoff','_caution' => 'security'); $meta['typography'] = array('multichoice','_choices' => array(0,1,2)); $meta['dformat'] = array('string'); $meta['signature'] = array('string'); -$meta['showuseras'] = array('multichoice','_choices' => array('loginname','username','email','email_link')); +$meta['showuseras'] = array('multichoice','_choices' => array('loginname','username','username_link','email','email_link')); $meta['toptoclevel'] = array('multichoice','_choices' => array(1,2,3,4,5)); // 5 toc levels $meta['tocminheads'] = array('multichoice','_choices' => array(0,1,2,3,4,5,10,15,20)); $meta['maxtoclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); -- cgit v1.2.3 From 6198904b0be1a338f774922e09c4b0d5050d853e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 16 Feb 2014 19:55:14 +0000 Subject: generalised link colour in header, making interwiki links blue as well (to fit design) --- lib/tpl/dokuwiki/css/design.less | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index 42292de49..235f6d6bc 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -48,6 +48,12 @@ margin-bottom: 0; font-size: 0.875em; } + + /* make all links in header (including breadcrumb and interwiki) same colour as the rest */ + a { + color: @ini_link; + background-color: inherit; + } } [dir=rtl] #dokuwiki__header h1 img { @@ -260,11 +266,6 @@ border-bottom: 1px solid @ini_border; } - a { - color: @ini_link; - background-color: inherit; - } - .bcsep { font-size: 0.75em; } -- cgit v1.2.3 From 6384941886832589f7bb3c13bc18115499cf9369 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Mon, 10 Mar 2014 22:29:53 +0100 Subject: added user.png for interwiki links --- lib/images/interwiki/user.png | Bin 0 -> 741 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/images/interwiki/user.png (limited to 'lib') diff --git a/lib/images/interwiki/user.png b/lib/images/interwiki/user.png new file mode 100644 index 000000000..79f35ccbd Binary files /dev/null and b/lib/images/interwiki/user.png differ -- cgit v1.2.3 From c18baa7e07ae2f57b2fcaaef64e3bb338cef85ae Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Mar 2014 20:08:44 +0100 Subject: override user link icon in header --- lib/tpl/dokuwiki/css/design.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index 60a66f069..66607b5e9 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -106,7 +106,8 @@ margin-left: 0; } -#dokuwiki__usertools a.action { +#dokuwiki__usertools a.action, +#dokuwiki__usertools a.iw_user { padding-left: 20px; background: transparent url(images/usertools.png) no-repeat 0 0; } @@ -143,6 +144,7 @@ background-position: left 0; } + a.iw_user, a.action.profile { background-position: left -32px; } -- cgit v1.2.3