From 08d3d766a2d7b0d3724a05b99e3ae0674b9384aa Mon Sep 17 00:00:00 2001 From: Botanic <none@none> Date: Sun, 16 Jun 2013 20:11:11 -0700 Subject: [PATCH] updated the index pages with home register and login --HG-- branch : rc-botanic-webdev --- .../ryzom_ams/ams_lib/autoload/helpers.php | 8 +- .../ryzom_ams/ams_lib/translations/en.ini | 4 + .../ryzom_ams/www/html/css/charisma-app.css | 10 +- .../server/ryzom_ams/www/html/index_old.php | 3 +- .../ryzom_ams/www/html/templates/home.tpl | 380 +++++++++++++++++- .../ryzom_ams/www/html/templates/login.tpl | 44 ++ 6 files changed, 434 insertions(+), 15 deletions(-) create mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php index ec3e55284..091a07c64 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php @@ -1,7 +1,7 @@ <?php class Helpers{ - public function loadTemplate( $template, $vars = array (), $forcelibrender = false ) + static public function loadTemplate( $template, $vars = array (), $forcelibrender = false ) { global $AMS_LIB; global $SITEBASE; @@ -50,10 +50,10 @@ class Helpers{ $inherited = "layout_user.tpl"; } //extends:' . $inherited .'|register.tpl - $smarty -> display( 'register.tpl' ); + $smarty -> display( $template.'.tpl' ); } - public function create_folders(){ + static public function create_folders(){ global $AMS_LIB; global $SITEBASE; $arr = array( $AMS_LIB . '/ingame_templates/', @@ -72,7 +72,7 @@ class Helpers{ } - public function check_if_game_client() + static public function check_if_game_client() { // if HTTP_USER_AGENT is not set then its ryzom core if ( !isset( $_SERVER['HTTP_USER_AGENT'] ) ){ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini index abaa26747..e25bfd88b 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini @@ -1,6 +1,10 @@ ; This is a sample configuration file ; Comments start with ';', as in php.ini +[home] + +[login] + [register] title = "RYZOM CORE INGAME REGISTRATION" welcome_message = "Welcome! Please fill in the following fields to get your new Ryzom Core account:" diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/charisma-app.css b/code/ryzom/tools/server/ryzom_ams/www/html/css/charisma-app.css index 1684e5fd9..239446fe7 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/css/charisma-app.css +++ b/code/ryzom/tools/server/ryzom_ams/www/html/css/charisma-app.css @@ -349,10 +349,11 @@ text-shadow:1px 1px 5px rgba(0, 0, 0, 0.5); width:166px; } .brand img{ -float:left; -height:20px; -width:20px; -margin-right:5px; + float: left; + height: 100%; + margin-bottom: -18px; + margin-top: -15px; + width: 100%; } .brand span{ float:left; @@ -411,6 +412,7 @@ min-height:80px; list-style:none; } #for-is-ajax{ +display: none; padding-left: 12px; cursor:pointer; } diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php b/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php index b9f7990ce..62d4ffabf 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php @@ -16,7 +16,8 @@ $page = 'home'; if ( isset( $_GET["page"] ) ){ $page = $_GET["page"]; } + //temporary set permission to 1 which = admin mode $return = array('permission' => 1, 'no_visible_elements' => 'TRUE'); -helpers :: loadTemplate( 'register' , $return ); +helpers :: loadTemplate( $page , $return ); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl index 357d05932..adbb04939 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl @@ -1,19 +1,387 @@ +{extends file="layout.tpl"} {block name=content} -<div class="row-fluid"> + + <!-- topbar starts --> + <div class="navbar"> + <div class="navbar-inner"> + <div class="container-fluid"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".top-nav.nav-collapse,.sidebar-nav.nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </a> + <a class="brand" href="index.php"> <img alt="Charisma Logo" src="img/mainlogo.png"></a> + + <!-- theme selector starts --> + <div class="btn-group pull-right theme-container"> + <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <i class="icon-tint"></i><span class="hidden-phone"> Change Theme / Skin</span> + <span class="caret"></span> + </a> + <ul class="dropdown-menu" id="themes"> + <li><a data-value="classic" href="#"><i class="icon-blank"></i> Classic</a></li> + <li><a data-value="cerulean" href="#"><i class="icon-blank"></i> Cerulean</a></li> + <li><a data-value="cyborg" href="#"><i class="icon-blank"></i> Cyborg</a></li> + <li><a data-value="redy" href="#"><i class="icon-blank"></i> Redy</a></li> + <li><a data-value="journal" href="#"><i class="icon-blank"></i> Journal</a></li> + <li><a data-value="simplex" href="#"><i class="icon-blank"></i> Simplex</a></li> + <li><a data-value="slate" href="#"><i class="icon-blank"></i> Slate</a></li> + <li><a data-value="spacelab" href="#"><i class="icon-blank icon-ok"></i> Spacelab</a></li> + <li><a data-value="united" href="#"><i class="icon-blank"></i> United</a></li> + </ul> + </div> + <!-- theme selector ends --> + + <!-- user dropdown starts --> + <div class="btn-group pull-right"> + <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <i class="icon-user"></i><span class="hidden-phone"> admin</span> + <span class="caret"></span> + </a> + <ul class="dropdown-menu"> + <li><a href="#">Profile</a></li> + <li class="divider"></li> + <li><a href="login.php">Logout</a></li> + </ul> + </div> + <!-- user dropdown ends --> + + + </div> + </div> + </div> + <!-- topbar ends --> + <div class="container-fluid"> + <div class="row-fluid"> + + <!-- left menu starts --> + <div class="span2 main-menu-span"> + <div class="well nav-collapse sidebar-nav"> + <ul class="nav nav-tabs nav-stacked main-menu"> + <li class="nav-header hidden-tablet">Main</li> + <li style="margin-left: -2px;" class="active"><a class="ajax-link" href="?page=home"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li> + <li class="nav-header hidden-tablet">Sample Section</li> + <li style="margin-left: -2px;"><a href="?page=login"><i class="icon-lock"></i><span class="hidden-tablet"> Login Page</span></a></li> + </ul> + <label id="for-is-ajax" class="hidden-tablet" for="is-ajax" style="visibility:hidden;"><div id="uniform-is-ajax" class="checker"><span class="checked"><input style="opacity: 0;" id="is-ajax" type="checkbox"></span></div> Ajax on menu</label> + </div><!--/.well --> + </div><!--/span--> + <!-- left menu ends --> + + <noscript> + <div class="alert alert-block span10"> + <h4 class="alert-heading">Warning!</h4> + <p>You need to have <a href="http://en.wikipedia.org/wiki/JavaScript" target="_blank">JavaScript</a> enabled to use this site.</p> + </div> + </noscript> + + <div id="content" class="span10"> + <!-- content starts --> + + + <div class="sortable row-fluid ui-sortable"> + <a data-original-title="6 new members." data-rel="tooltip" class="well span3 top-block" href="#"> + <span class="icon32 icon-red icon-user"></span> + <div>Total Members</div> + <div>507</div> + <span class="notification">6</span> + </a> + + <a data-original-title="4 new pro members." data-rel="tooltip" class="well span3 top-block" href="#"> + <span class="icon32 icon-color icon-star-on"></span> + <div>Pro Members</div> + <div>228</div> + <span class="notification green">4</span> + </a> + + <a data-original-title="$34 new sales." data-rel="tooltip" class="well span3 top-block" href="#"> + <span class="icon32 icon-color icon-cart"></span> + <div>Sales</div> + <div>$13320</div> + <span class="notification yellow">$34</span> + </a> + + <a data-original-title="12 new messages." data-rel="tooltip" class="well span3 top-block" href="#"> + <span class="icon32 icon-color icon-envelope-closed"></span> + <div>Messages</div> + <div>25</div> + <span class="notification red">12</span> + </a> + </div> + + <div class="row-fluid"> <div class="box span12"> <div class="box-header well"> - <h2><i class="icon-info-sign"></i> Ryzom Account Management System</h2> + <h2><i class="icon-info-sign"></i> Introduction</h2> + <div class="box-icon"> + <a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a> + <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a> + <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a> + </div> + </div> + <div class="box-content"> + <h1>Charisma <small>free, premium quality, responsive, multiple skin admin template.</small></h1> + <p>Its a live demo of the template. I have created Charisma to ease the repeat work I have to do on my projects. Now I re-use Charisma as a base for my admin panel work and I am sharing it with you :)</p> + <p><b>All pages in the menu are functional, take a look at all, please share this with your followers.</b></p> + + <div class="clearfix"></div> + </div> + </div> + </div> + + <div class="row-fluid sortable ui-sortable"> + + + <div class="box span4"> + <div class="box-header well" data-original-title=""> + <h2><i class="icon-user"></i> Member Activity</h2> <div class="box-icon"> <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a> <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a> </div> </div> <div class="box-content"> - <h1>Ryzom AMS</h1> - <p>Welcome to the Ryzom Account Management System!</p> - <div class="clearfix"></div> + <div class="box-content"> + <ul class="dashboard-list"> + <li> + <a href="#"> + <img class="dashboard-avatar" alt="Usman" src="http://www.gravatar.com/avatar/f0ea51fa1e4fae92608d8affee12f67b.png?s=50"></a> + <strong>Name:</strong> <a href="#">Usman + </a><br> + <strong>Since:</strong> 17/05/2012<br> + <strong>Status:</strong> <span class="label label-success">Approved</span> + </li> + <li> + <a href="#"> + <img class="dashboard-avatar" alt="Sheikh Heera" src="http://www.gravatar.com/avatar/3232415a0380253cfffe19163d04acab.png?s=50"></a> + <strong>Name:</strong> <a href="#">Sheikh Heera + </a><br> + <strong>Since:</strong> 17/05/2012<br> + <strong>Status:</strong> <span class="label label-warning">Pending</span> + </li> + <li> + <a href="#"> + <img class="dashboard-avatar" alt="Abdullah" src="http://www.gravatar.com/avatar/46056f772bde7c536e2086004e300a04.png?s=50"></a> + <strong>Name:</strong> <a href="#">Abdullah + </a><br> + <strong>Since:</strong> 25/05/2012<br> + <strong>Status:</strong> <span class="label label-important">Banned</span> + </li> + <li> + <a href="#"> + <img class="dashboard-avatar" alt="Saruar Ahmed" src="http://www.gravatar.com/avatar/564e1bb274c074dc4f6823af229d9dbb.png?s=50"></a> + <strong>Name:</strong> <a href="#">Saruar Ahmed + </a><br> + <strong>Since:</strong> 17/05/2012<br> + <strong>Status:</strong> <span class="label label-info">Updates</span> + </li> + </ul> + </div> </div> - </div> + </div><!--/span--> + + <div class="box span8"> + <div class="box-header well" data-original-title=""> + <h2><i class="icon-list-alt"></i> Realtime Traffic</h2> + <div class="box-icon"> + <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a> + <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a> + </div> + </div> + <div class="box-content"> + <div id="realtimechart" style="height: 190px; padding: 0px; position: relative;"><canvas height="190" width="466" class="base"></canvas><canvas style="position: absolute; left: 0px; top: 0px;" height="190" width="466" class="overlay"></canvas><div class="tickLabels" style="font-size:smaller"><div class="yAxis y1Axis" style="color:#545454"><div class="tickLabel" style="position:absolute;text-align:right;top:177px;right:448px;width:18px">0</div><div class="tickLabel" style="position:absolute;text-align:right;top:132px;right:448px;width:18px">25</div><div class="tickLabel" style="position:absolute;text-align:right;top:86px;right:448px;width:18px">50</div><div class="tickLabel" style="position:absolute;text-align:right;top:41px;right:448px;width:18px">75</div><div class="tickLabel" style="position:absolute;text-align:right;top:-5px;right:448px;width:18px">100</div></div></div></div> + <p class="clearfix">You can update a chart periodically to get a real-time effect by using a timer to insert the new data in the plot and redraw it.</p> + <p>Time between updates: <input id="updateInterval" value="" style="text-align: right; width:5em" type="text"> milliseconds</p> + </div> + </div><!--/span--> + </div><!--/row--> + + <div class="row-fluid sortable ui-sortable"> + <div class="box span4"> + <div class="box-header well" data-original-title=""> + <h2><i class="icon-list"></i> Buttons</h2> + <div class="box-icon"> + <a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a> + <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a> + <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a> + </div> + </div> + <div class="box-content buttons"> + <p class="btn-group"> + <button class="btn">Left</button> + <button class="btn">Middle</button> + <button class="btn">Right</button> + </p> + <p> + <button class="btn btn-small"><i class="icon-star"></i> Icon button</button> + <button class="btn btn-small btn-primary">Small button</button> + <button class="btn btn-small btn-danger">Small button</button> + </p> + <p> + <button class="btn btn-small btn-warning">Small button</button> + <button class="btn btn-small btn-success">Small button</button> + <button class="btn btn-small btn-info">Small button</button> + </p> + <p> + <button class="btn btn-small btn-inverse">Small button</button> + <button class="btn btn-large btn-primary btn-round">Round button</button> + <button class="btn btn-large btn-round"><i class="icon-ok"></i></button> + <button class="btn btn-primary"><i class="icon-edit icon-white"></i></button> + </p> + <p> + <button class="btn btn-mini">Mini button</button> + <button class="btn btn-mini btn-primary">Mini button</button> + <button class="btn btn-mini btn-danger">Mini button</button> + <button class="btn btn-mini btn-warning">Mini button</button> + </p> + <p> + <button class="btn btn-mini btn-info">Mini button</button> + <button class="btn btn-mini btn-success">Mini button</button> + <button class="btn btn-mini btn-inverse">Mini button</button> + </p> + </div> + </div><!--/span--> + + <div class="box span4"> + <div class="box-header well" data-original-title=""> + <h2><i class="icon-list"></i> Buttons</h2> + <div class="box-icon"> + <a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a> + <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a> + <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a> + </div> + </div> + <div class="box-content buttons"> + <p> + <button class="btn btn-large">Large button</button> + <button class="btn btn-large btn-primary">Large button</button> + </p> + <p> + <button class="btn btn-large btn-danger">Large button</button> + <button class="btn btn-large btn-warning">Large button</button> + </p> + <p> + <button class="btn btn-large btn-success">Large button</button> + <button class="btn btn-large btn-info">Large button</button> + </p> + <p> + <button class="btn btn-large btn-inverse">Large button</button> + </p> + <div class="btn-group"> + <button class="btn btn-large">Large Dropdown</button> + <button class="btn btn-large dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> + <ul class="dropdown-menu"> + <li><a href="#"><i class="icon-star"></i> Action</a></li> + <li><a href="#"><i class="icon-tag"></i> Another action</a></li> + <li><a href="#"><i class="icon-download-alt"></i> Something else here</a></li> + <li class="divider"></li> + <li><a href="#"><i class="icon-tint"></i> Separated link</a></li> + </ul> + </div> + + </div> + </div><!--/span--> + + <div class="box span4"> + <div class="box-header well" data-original-title=""> + <h2><i class="icon-list"></i> Weekly Stat</h2> + <div class="box-icon"> + <a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a> + <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a> + <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a> + </div> + </div> + <div class="box-content"> + <ul class="dashboard-list"> + <li> + <a href="#"> + <i class="icon-arrow-up"></i> + <span class="green">92</span> + New Comments + </a> + </li> + <li> + <a href="#"> + <i class="icon-arrow-down"></i> + <span class="red">15</span> + New Registrations + </a> + </li> + <li> + <a href="#"> + <i class="icon-minus"></i> + <span class="blue">36</span> + New Articles + </a> + </li> + <li> + <a href="#"> + <i class="icon-comment"></i> + <span class="yellow">45</span> + User reviews + </a> + </li> + <li> + <a href="#"> + <i class="icon-arrow-up"></i> + <span class="green">112</span> + New Comments + </a> + </li> + <li> + <a href="#"> + <i class="icon-arrow-down"></i> + <span class="red">31</span> + New Registrations + </a> + </li> + <li> + <a href="#"> + <i class="icon-minus"></i> + <span class="blue">93</span> + New Articles + </a> + </li> + <li> + <a href="#"> + <i class="icon-comment"></i> + <span class="yellow">254</span> + User reviews + </a> + </li> + </ul> + </div> + </div><!--/span--> + </div><!--/row--> + + + + + <!-- content ends --> + </div><!--/#content.span10--> + </div><!--/fluid-row--> + + <hr> + + <div class="modal hide fade" id="myModal"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal">�</button> + <h3>Settings</h3> </div> + <div class="modal-body"> + <p>Here settings can be configured...</p> + </div> + <div class="modal-footer"> + <a href="#" class="btn" data-dismiss="modal">Close</a> + <a href="#" class="btn btn-primary">Save changes</a> + </div> + </div> + + <footer> + <p class="pull-right">Powered by: <a href="http://usman.it/free-responsive-admin-template">Charisma</a></p> + </footer> + + </div><!--/.fluid-container--> + {/block} diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl new file mode 100644 index 000000000..2c36c3ce3 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl @@ -0,0 +1,44 @@ +{extends file="layout.tpl"} +{block name=content} + +<div class="row-fluid"> + <div class="span12 center login-header"> + <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"> + Please login with your Username and Password. + </div> + <form method="post" action="index.php" class="form-horizontal"> + <fieldset> + <div data-rel="tooltip" class="input-prepend" data-original-title="Username"> + <span class="add-on"><i class="icon-user"></i></span><input type="text" value="" id="username" name="username" class="input-large span10" autofocus=""> + </div> + <div class="clearfix"></div> + + <div data-rel="tooltip" class="input-prepend" data-original-title="Password"> + <span class="add-on"><i class="icon-lock"></i></span><input type="password" value="" id="password" name="password" class="input-large span10"> + </div> + <div class="clearfix"></div> + + <div class="input-prepend"> + <label for="remember" class="remember"><div class="checker" id="uniform-remember"><span><input type="checkbox" id="remember" style="opacity: 0;"></span></div>Remember me</label> + </div> + <div class="clearfix"></div> + + <p class="center span5"> + <button class="btn btn-primary" type="submit">Login</button> + </p> + </fieldset> + </form> + <div class="alert alert-info"> + <strong>Register</strong> + If you dont have an account yet, create one <a href="?page=register">here</a>! + </div> + </div><!--/span--> + </div> +{/block} +