Chris/ORB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename templates to make forms more obvious

Browse Source
This commit is contained in:
Chris 2016-12-31 23:35:27 +00:00
parent 5075f2eba8
commit 96c61d6fba
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
blocks/ORB/Login.pm
View File

@ -777,11 +777,11 @@ sub _generate_signin_form {
$self -> {"template"} -> load_template("login/persist_disabled.tem"); $self -> {"template"} -> load_template("login/persist_disabled.tem");
return ("{L_LOGIN_TITLE}", return ("{L_LOGIN_TITLE}",
$self -> {"template"} -> load_template("login/signin.tem", {"%(error)s" => $error, $self -> {"template"} -> load_template("login/form_signin.tem", {"%(error)s" => $error,
"%(persist)s" => $persist, "%(persist)s" => $persist,
"%(url-forgot)s" => $self -> build_url("block" => "login", "pathinfo" => [ "recover" ]), "%(url-forgot)s" => $self -> build_url("block" => "login", "pathinfo" => [ "recover" ]),
"%(target)s" => $self -> build_url("block" => "login"), "%(target)s" => $self -> build_url("block" => "login"),
"%(username)s" => $args -> {"username"}}), "%(username)s" => $args -> {"username"}}),
$self -> {"template"} -> load_template("login/extrahead.tem"), $self -> {"template"} -> load_template("login/extrahead.tem"),
$self -> {"template"} -> load_template("login/extrajs.tem")); $self -> {"template"} -> load_template("login/extrajs.tem"));
} }
@ -804,12 +804,12 @@ sub _generate_signup_form {
if($error); if($error);
return ("{L_LOGIN_SIGNUP_TITLE}", return ("{L_LOGIN_SIGNUP_TITLE}",
$self -> {"template"} -> load_template("login/signup.tem", {"%(error)s" => $error, $self -> {"template"} -> load_template("login/form_signup.tem", {"%(error)s" => $error,
"%(sitekey)s" => $self -> {"settings"} -> {"config"} -> {"Login:recaptcha_sitekey"}, "%(sitekey)s" => $self -> {"settings"} -> {"config"} -> {"Login:recaptcha_sitekey"},
"%(url-activate)s" => $self -> build_url("block" => "login", "pathinfo" => [ "activate" ]), "%(url-activate)s" => $self -> build_url("block" => "login", "pathinfo" => [ "activate" ]),
"%(target)s" => $self -> build_url("block" => "login", "pathinfo" => [ "signup" ]), "%(target)s" => $self -> build_url("block" => "login", "pathinfo" => [ "signup" ]),
"%(username)s" => $args -> {"username"}, "%(username)s" => $args -> {"username"},
"%(email)s" => $args -> {"email"}}), "%(email)s" => $args -> {"email"}}),
$self -> {"template"} -> load_template("login/signup_extrahead.tem"), $self -> {"template"} -> load_template("login/signup_extrahead.tem"),
$self -> {"template"} -> load_template("login/extrajs.tem")); $self -> {"template"} -> load_template("login/extrajs.tem"));
} }
@ -829,9 +829,9 @@ sub _generate_actcode_form {
if($error); if($error);
return ("{L_LOGIN_TITLE}", return ("{L_LOGIN_TITLE}",
$self -> {"template"} -> load_template("login/act_form.tem", {"%(error)s" => $error, $self -> {"template"} -> load_template("login/form_activate.tem", {"%(error)s" => $error,
"%(target)s" => $self -> build_url("block" => "login"), "%(target)s" => $self -> build_url("block" => "login"),
"%(url-resend)s" => $self -> build_url("block" => "login", "pathinfo" => [ "resend" ]),}), "%(url-resend)s" => $self -> build_url("block" => "login", "pathinfo" => [ "resend" ]),}),
$self -> {"template"} -> load_template("login/extrahead.tem"), $self -> {"template"} -> load_template("login/extrahead.tem"),
$self -> {"template"} -> load_template("login/extrajs.tem")); $self -> {"template"} -> load_template("login/extrajs.tem"));
} }

0
templates/default/login/act_form.tem → templates/default/login/form_activate.tem
View File

0
templates/default/login/signin.tem → templates/default/login/form_signin.tem
View File

2
templates/default/login/signup.tem → templates/default/login/form_signup.tem
View File

@ -14,7 +14,7 @@
<input type="text" id="email" name="email" size="24" maxlength="255" value="%(email)s"/> <input type="text" id="email" name="email" size="24" maxlength="255" value="%(email)s"/>
</label> </label>
</div> </div>
<div class="contextlink">(<a href="%(url-activate)s">{L_LOGIN_ACTFORM}</a>)</div> <div class="contextlink">(<a href="%(url-activate)s">{L_LOGIN_ACTIVATE_FORM}</a>)</div>
<div class="g-recaptcha" data-sitekey="%(sitekey)s"></div> <div class="g-recaptcha" data-sitekey="%(sitekey)s"></div>
<div class="submit clearfix"> <div class="submit clearfix">
<input type="submit" class="button float-right nomargin" id="signup" name="signup" value="{L_LOGIN_SIGNUP}" /> <input type="submit" class="button float-right nomargin" id="signup" name="signup" value="{L_LOGIN_SIGNUP}" />