Fixed layout for register.tpl and login.tpl, it now uses also layout.tpl but with a parameter 'no_visible_elements' => 'TRUE'
--HG-- branch : quitta-gsoc-2013
This commit is contained in:
Quitta
parent
260315d1ef
commit
9f6349843c
4 changed files with 120 additions and 101 deletions
|
|
@ -49,7 +49,8 @@ class Helpers{
|
|||
}else{
|
||||
$inherited = "layout_user.tpl";
|
||||
}
|
||||
$smarty -> display( 'extends:' . $inherited .'|home.tpl' );
|
||||
//extends:' . $inherited .'|register.tpl
|
||||
$smarty -> display( 'register.tpl' );
|
||||
}
|
||||
|
||||
public function create_folders(){
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@ if ( isset( $_GET["page"] ) ){
|
|||
$page = $_GET["page"];
|
||||
}
|
||||
//temporary set permission to 1 which = admin mode
|
||||
$return = array('permission' => 1);
|
||||
$return = array('permission' => 1, 'no_visible_elements' => 'TRUE');
|
||||
|
||||
helpers :: loadTemplate( 'home' , $return );
|
||||
helpers :: loadTemplate( 'register' , $return );
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
</head>
|
||||
|
||||
<body>
|
||||
{if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"}
|
||||
<!-- topbar starts -->
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
|
|
@ -102,9 +103,10 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
|
||||
{if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"}
|
||||
<!-- left menu starts -->
|
||||
<div class="span2 main-menu-span">
|
||||
<div class="well nav-collapse sidebar-nav">
|
||||
|
|
@ -125,13 +127,14 @@
|
|||
|
||||
<div id="content" class="span10">
|
||||
<!-- content starts -->
|
||||
{/if}
|
||||
|
||||
{block name=content}{/block}
|
||||
|
||||
{if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"}
|
||||
</div><!--/#content.span10-->
|
||||
|
||||
{/if}
|
||||
</div><!--/fluid-row-->
|
||||
|
||||
{if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"}
|
||||
<hr>
|
||||
|
||||
<div class="modal hide fade" id="myModal">
|
||||
|
|
@ -152,7 +155,7 @@
|
|||
<p class="pull-left">© <a href="http://usman.it" target="_blank">Muhammad Usman</a> <?php echo date('Y') ?></p>
|
||||
<p class="pull-right">Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>
|
||||
</footer>
|
||||
|
||||
{/if}
|
||||
</div><!--/.fluid-container-->
|
||||
|
||||
<!-- external javascript
|
||||
|
|
|
|||
|
|
@ -1,115 +1,130 @@
|
|||
{config_load file="ams_lib.conf" section="setup"}
|
||||
<div class="title">
|
||||
{$title}
|
||||
</div>
|
||||
{extends file="layout.tpl"}
|
||||
{block name=content}
|
||||
|
||||
<div>
|
||||
{$welcome_message}
|
||||
</div>
|
||||
<div class="row-fluid">
|
||||
<div class="span12 center login-header">
|
||||
<img src="img/mainlogo.png"/>
|
||||
</div><!--/span-->
|
||||
</div><!--/row-->
|
||||
|
||||
<form name="Page1"
|
||||
method="post"
|
||||
>
|
||||
<table>
|
||||
<tr>
|
||||
<td width="33%" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} id="caption-Username">{$username_tag} </td>
|
||||
|
||||
<td width="25%">
|
||||
<input type="text"
|
||||
name="Username"
|
||||
value="{if isset($Username)}{$Username}{/if}"
|
||||
maxlength="12"
|
||||
onfocus=
|
||||
"javascript:showTooltip('{$username_tooltip}', this);" />
|
||||
</td>
|
||||
|
||||
<td id="comment-Username" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($Username)}{$Username}{/if}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td width="33%" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Password">{$password_tag}</td>
|
||||
|
||||
<td width="25%">
|
||||
<input type="password"
|
||||
name="Password"
|
||||
value=""
|
||||
maxlength="20"
|
||||
onkeyup=
|
||||
"testPassword(document.Page1.Password.value, 'comment-Password')"
|
||||
onfocus="javascript:showTooltip('{$password_message}', this);" />
|
||||
</td>
|
||||
|
||||
<td id="comment-Password" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}{$Password}{/if}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-ConfirmPass">{$cpassword_tag}</td>
|
||||
|
||||
<td width="25%"><input type="password"
|
||||
name="ConfirmPass"
|
||||
value=""
|
||||
maxlength="20"
|
||||
onfocus="javascript:showTooltip('{$cpassword_message}', this);" />
|
||||
</td>
|
||||
|
||||
<td id="comment-ConfirmPass" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}{$ConfirmPass}{/if}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Email">{$email_tag}</td>
|
||||
|
||||
<td width="25%">
|
||||
<input type="text"
|
||||
name="Email"
|
||||
value=""
|
||||
maxlength="255"
|
||||
onfocus=
|
||||
"javascript:showTooltip('{$email_message}', this);" />
|
||||
</td>
|
||||
|
||||
<td id="comment-Email" {if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}{$Email}{/if}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td width=
|
||||
"33%" {if isset($TAC_ERROR) && $TAC_ERROR eq "TRUE"}class="error"{/if}
|
||||
colspan="2"><input type="checkbox"
|
||||
name="TaC"
|
||||
value="1"
|
||||
onfocus="javascript:showTooltip('', this);" /><span id=
|
||||
"caption-TaC">{$tac_tag}</span></td>
|
||||
<td id="comment-TaC" {if isset($TAC_ERROR) && $TAC_ERROR eq "TRUE"}class="error"{/if} width="42%">{$tac_message}</td>
|
||||
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<div class="c1">
|
||||
<input type="submit"
|
||||
name="Submit"
|
||||
value="Continue" />
|
||||
</div>
|
||||
<input type="hidden" name="function" value="add_user">
|
||||
</form>
|
||||
|
||||
<div id="signupTooltip"
|
||||
class="c2"
|
||||
inset=""></div>
|
||||
|
||||
<div id="tooltip-Username">
|
||||
{$username_tooltip}
|
||||
</div>
|
||||
<div class="row-fluid">
|
||||
<div class="well span5 center login-box">
|
||||
<div class="alert alert-info">
|
||||
{$welcome_message}
|
||||
</div>
|
||||
|
||||
|
||||
<div id="tooltip-Password">
|
||||
{$password_message}
|
||||
</div>
|
||||
<form name="Page1"method="post">
|
||||
<table>
|
||||
<tr>
|
||||
<td width="33%" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} id="caption-Username">{$username_tag} </td>
|
||||
|
||||
<div id="tooltip-ConfirmPass">
|
||||
{$cpassword_message}
|
||||
</div>
|
||||
<td width="25%">
|
||||
<input type="text"
|
||||
name="Username"
|
||||
value="{if isset($Username)}{$Username}{/if}"
|
||||
maxlength="12"
|
||||
onfocus=
|
||||
"javascript:showTooltip('{$username_tooltip}', this);" />
|
||||
</td>
|
||||
|
||||
<div id="tooltip-Email">
|
||||
{$email_message}
|
||||
</div>
|
||||
<td id="comment-Username" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($Username)}{$Username}{/if}</td>
|
||||
</tr>
|
||||
|
||||
<div id="tooltip-TaC"></div>
|
||||
<tr>
|
||||
<td width="33%" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Password">{$password_tag}</td>
|
||||
|
||||
<td width="25%">
|
||||
<input type="password"
|
||||
name="Password"
|
||||
value=""
|
||||
maxlength="20"
|
||||
onkeyup=
|
||||
"testPassword(document.Page1.Password.value, 'comment-Password')"
|
||||
onfocus="javascript:showTooltip('{$password_message}', this);" />
|
||||
</td>
|
||||
|
||||
<td id="comment-Password" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}{$Password}{/if}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-ConfirmPass">{$cpassword_tag}</td>
|
||||
|
||||
<td width="25%"><input type="password"
|
||||
name="ConfirmPass"
|
||||
value=""
|
||||
maxlength="20"
|
||||
onfocus="javascript:showTooltip('{$cpassword_message}', this);" />
|
||||
</td>
|
||||
|
||||
<td id="comment-ConfirmPass" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}{$ConfirmPass}{/if}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Email">{$email_tag}</td>
|
||||
|
||||
<td width="25%">
|
||||
<input type="text"
|
||||
name="Email"
|
||||
value=""
|
||||
maxlength="255"
|
||||
onfocus=
|
||||
"javascript:showTooltip('{$email_message}', this);" />
|
||||
</td>
|
||||
|
||||
<td id="comment-Email" {if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}{$Email}{/if}</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td width=
|
||||
"33%" {if isset($TAC_ERROR) && $TAC_ERROR eq "TRUE"}class="error"{/if}
|
||||
colspan="2"><input type="checkbox"
|
||||
name="TaC"
|
||||
value="1"
|
||||
onfocus="javascript:showTooltip('', this);" /><span id=
|
||||
"caption-TaC">{$tac_tag}</span></td>
|
||||
<td id="comment-TaC" {if isset($TAC_ERROR) && $TAC_ERROR eq "TRUE"}class="error"{/if} width="42%"><div class="alert alert-danger">{$tac_message}</div></td>
|
||||
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<div class="c1">
|
||||
<input type="submit"
|
||||
name="Submit"
|
||||
value="Continue" />
|
||||
</div>
|
||||
<input type="hidden" name="function" value="add_user">
|
||||
</form>
|
||||
|
||||
<div id="signupTooltip"
|
||||
class="c2"
|
||||
inset=""></div>
|
||||
|
||||
<div id="tooltip-Username">
|
||||
<div class="alert alert-danger">
|
||||
{$username_tooltip}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="tooltip-Password">
|
||||
<div class="alert alert-danger">
|
||||
{$password_message}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="tooltip-ConfirmPass">
|
||||
<div class="alert alert-danger">
|
||||
{$cpassword_message}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="tooltip-Email">
|
||||
<div class="alert alert-danger">
|
||||
{$email_message}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div><!--/span-->
|
||||
</div><!--/row-->
|
||||
{/block}
|
||||
|
|
|
|||
Loading…
Reference in a new issue