Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge with quitta-gsoc-2013

Browse Source 
--HG--
branch : rc-botanic-webdev
hg/feature/sse2
Botanic 12 years ago
parent af6dac032b 9f6349843c
commit 7f7c2cfb44
4 changed files with 142 additions and 123 deletions
Show Stats Download Patch File Download Diff File

3
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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

39
code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl
Unescape Escape View File

@ -1,15 +1,20 @@
{config_load file="ams_lib.conf" section="setup"} {extends file="layout.tpl"}
<div class="title"> {block name=content}
{$title}
</div> <div class="row-fluid">
<div class="span12 center login-header">
<div> <img src="img/mainlogo.png"/>
</div><!--/span-->
</div><!--/row-->
<div class="row-fluid">
<div class="well span5 center login-box">
<div class="alert alert-info">
{$welcome_message} {$welcome_message}
</div> </div>
<form name="Page1"
method="post" <form name="Page1"method="post">
>
<table> <table>
<tr> <tr>
<td width="33%" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} id="caption-Username">{$username_tag} </td> <td width="33%" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} id="caption-Username">{$username_tag} </td>
@ -78,7 +83,7 @@
value="1" value="1"
onfocus="javascript:showTooltip('', this);" /><span id= onfocus="javascript:showTooltip('', this);" /><span id=
"caption-TaC">{$tac_tag}</span></td> "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> <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> </tr>
</table> </table>
@ -96,20 +101,30 @@
inset=""></div> inset=""></div>
<div id="tooltip-Username"> <div id="tooltip-Username">
<div class="alert alert-danger">
{$username_tooltip} {$username_tooltip}
</div> </div>
</div>
<div id="tooltip-Password"> <div id="tooltip-Password">
<div class="alert alert-danger">
{$password_message} {$password_message}
</div> </div>
</div>
<div id="tooltip-ConfirmPass"> <div id="tooltip-ConfirmPass">
<div class="alert alert-danger">
{$cpassword_message} {$cpassword_message}
</div> </div>
</div>
<div id="tooltip-Email"> <div id="tooltip-Email">
<div class="alert alert-danger">
{$email_message} {$email_message}
</div> </div>
</div>
<div id="tooltip-TaC"></div> </div><!--/span-->
</div><!--/row-->
{/block}

Write Preview
Loading…
Cancel
Save