diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-02-21 18:53:51 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-02-21 18:53:51 +0100 |
| commit | d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526 (patch) | |
| tree | 7c90009354601ab34473b4d6d376e4b73c45e3f7 /inc/html.php | |
| parent | 84a355b61e53b5d8969c030679612a7b456777e9 (diff) | |
| parent | 3240c7a0b3414f926ee76b2c4fff0a95ab33e916 (diff) | |
| download | rpg-d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526.tar.gz rpg-d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Conflicts:
inc/lang/bg/lang.php
Diffstat (limited to 'inc/html.php')
| -rw-r--r-- | inc/html.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/inc/html.php b/inc/html.php index c91888494..080beb01a 100644 --- a/inc/html.php +++ b/inc/html.php @@ -62,17 +62,11 @@ function html_login(){ $form->endFieldset(); if(actionOK('register')){ - $form->addElement('<p>' - . $lang['reghere'] - . ': <a href="'.wl($ID,'do=register').'" rel="nofollow" class="wikilink1">'.$lang['register'].'</a>' - . '</p>'); + $form->addElement('<p>'.$lang['reghere'].': '.tpl_actionlink('register','','','',true).'</p>'); } if (actionOK('resendpwd')) { - $form->addElement('<p>' - . $lang['pwdforget'] - . ': <a href="'.wl($ID,'do=resendpwd').'" rel="nofollow" class="wikilink1">'.$lang['btn_resendpwd'].'</a>' - . '</p>'); + $form->addElement('<p>'.$lang['pwdforget'].': '.tpl_actionlink('resendpwd','','','',true).'</p>'); } html_form('login', $form); @@ -1111,7 +1105,7 @@ function html_register(){ print p_locale_xhtml('register'); print '<div class="centeralign">'.NL; $form = new Doku_Form(array('id' => 'dw__register')); - $form->startFieldset($lang['register']); + $form->startFieldset($lang['btn_register']); $form->addHidden('do', 'register'); $form->addHidden('save', '1'); $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], null, 'block', array('size'=>'50'))); @@ -1121,7 +1115,7 @@ function html_register(){ } $form->addElement(form_makeTextField('fullname', $_POST['fullname'], $lang['fullname'], '', 'block', array('size'=>'50'))); $form->addElement(form_makeTextField('email', $_POST['email'], $lang['email'], '', 'block', array('size'=>'50'))); - $form->addElement(form_makeButton('submit', '', $lang['register'])); + $form->addElement(form_makeButton('submit', '', $lang['btn_register'])); $form->endFieldset(); html_form('register', $form); |