Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with quitta-gsoc-2013

Browse source
This commit is contained in:
Botanic 2013-06-16 00:59:10 -07:00
parent 2180be89d7
commit ffe60f1790
4 changed files with 120 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php
View file

@ -49,7 +49,8 @@ class Helpers{
}else{ }else{
$inherited = "layout_user.tpl"; $inherited = "layout_user.tpl";
} }
$smarty -> display( 'extends:' . $inherited .'|home.tpl' ); //extends:' . $inherited .'|register.tpl
$smarty -> display( 'register.tpl' );
} }
public function create_folders(){ public function create_folders(){

4
code/ryzom/tools/server/ryzom_ams/www/html/index_old.php
View file

@ -17,6 +17,6 @@ if ( isset( $_GET["page"] ) ){
$page = $_GET["page"]; $page = $_GET["page"];
} }
//temporary set permission to 1 which = admin mode //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 );

13
code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
View file

@ -55,6 +55,7 @@
</head> </head>
<body> <body>
{if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"}
<!-- topbar starts --> <!-- topbar starts -->
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
@ -102,9 +103,10 @@
</div> </div>
</div> </div>
</div> </div>
{/if}
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
{if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"}
<!-- left menu starts --> <!-- left menu starts -->
<div class="span2 main-menu-span"> <div class="span2 main-menu-span">
<div class="well nav-collapse sidebar-nav"> <div class="well nav-collapse sidebar-nav">
@ -125,13 +127,14 @@
<div id="content" class="span10"> <div id="content" class="span10">
<!-- content starts --> <!-- content starts -->
{/if}
{block name=content}{/block} {block name=content}{/block}
{if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"}
</div><!--/#content.span10--> </div><!--/#content.span10-->
{/if}
</div><!--/fluid-row--> </div><!--/fluid-row-->
{if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"}
<hr> <hr>
<div class="modal hide fade" id="myModal"> <div class="modal hide fade" id="myModal">
@ -152,7 +155,7 @@
<p class="pull-left">&copy; <a href="http://usman.it" target="_blank">Muhammad Usman</a> <?php echo date('Y') ?></p> <p class="pull-left">&copy; <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> <p class="pull-right">Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p>
</footer> </footer>
{/if}
</div><!--/.fluid-container--> </div><!--/.fluid-container-->
<!-- external javascript <!-- external javascript

201
code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl
View file

@ -1,115 +1,130 @@
{config_load file="ams_lib.conf" section="setup"} {extends file="layout.tpl"}
<div class="title"> {block name=content}
{$title}
</div>
<div> <div class="row-fluid">
{$welcome_message} <div class="span12 center login-header">
</div> <img src="img/mainlogo.png"/>
</div><!--/span-->
</div><!--/row-->
<form name="Page1" <div class="row-fluid">
method="post" <div class="well span5 center login-box">
> <div class="alert alert-info">
<table> {$welcome_message}
<tr> </div>
<td width="33%" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} id="caption-Username">{$username_tag} </td>
<td width="25%"> <form name="Page1"method="post">
<input type="text" <table>
name="Username" <tr>
value="{if isset($Username)}{$Username}{/if}" <td width="33%" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} id="caption-Username">{$username_tag} </td>
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="25%">
<td width="33%" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Password">{$password_tag}</td> <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>
<td width="25%"> <tr>
<input type="password" <td width="33%" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Password">{$password_tag}</td>
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> <td width="25%">
</tr> <input type="password"
name="Password"
value=""
maxlength="20"
onkeyup=
"testPassword(document.Page1.Password.value, 'comment-Password')"
onfocus="javascript:showTooltip('{$password_message}', this);" />
</td>
<tr> <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>
<td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-ConfirmPass">{$cpassword_tag}</td> </tr>
<td width="25%"><input type="password" <tr>
name="ConfirmPass" <td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-ConfirmPass">{$cpassword_tag}</td>
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> <td width="25%"><input type="password"
</tr> name="ConfirmPass"
value=""
maxlength="20"
onfocus="javascript:showTooltip('{$cpassword_message}', this);" />
</td>
<tr> <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>
<td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Email">{$email_tag}</td> </tr>
<td width="25%"> <tr>
<input type="text" <td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Email">{$email_tag}</td>
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> <td width="25%">
</tr> <input type="text"
name="Email"
value=""
maxlength="255"
onfocus=
"javascript:showTooltip('{$email_message}', this);" />
</td>
<tr> <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>
<td width= </tr>
"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> <tr>
</table> <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>
<div class="c1"> </tr>
<input type="submit" </table>
name="Submit"
value="Continue" />
</div>
<input type="hidden" name="function" value="add_user">
</form>
<div id="signupTooltip" <div class="c1">
class="c2" <input type="submit"
inset=""></div> name="Submit"
value="Continue" />
</div>
<input type="hidden" name="function" value="add_user">
</form>
<div id="tooltip-Username"> <div id="signupTooltip"
{$username_tooltip} class="c2"
</div> inset=""></div>
<div id="tooltip-Username">
<div class="alert alert-danger">
{$username_tooltip}
</div>
</div>
<div id="tooltip-Password"> <div id="tooltip-Password">
{$password_message} <div class="alert alert-danger">
</div> {$password_message}
</div>
</div>
<div id="tooltip-ConfirmPass"> <div id="tooltip-ConfirmPass">
{$cpassword_message} <div class="alert alert-danger">
</div> {$cpassword_message}
</div>
</div>
<div id="tooltip-Email"> <div id="tooltip-Email">
{$email_message} <div class="alert alert-danger">
</div> {$email_message}
</div>
</div>
<div id="tooltip-TaC"></div>
</div><!--/span-->
</div><!--/row-->
{/block}