started beta for mainpage

This commit is contained in:
Ulf Gebhardt 2015-12-26 05:09:45 +01:00
parent 6f26b0c4fe
commit 002dd31ebb
16 changed files with 172 additions and 9 deletions

View File

@ -4,4 +4,5 @@ require_once dirname(__FILE__).'/default_page/autoload.inc';
require_once dirname(__FILE__).'/default_start/autoload.inc';
require_once dirname(__FILE__).'/default_impressum/autoload.inc';
require_once dirname(__FILE__).'/default_login/autoload.inc';
require_once dirname(__FILE__).'/default_serverlist/autoload.inc';
require_once dirname(__FILE__).'/default_serverlist/autoload.inc';
require_once dirname(__FILE__).'/default_beta/autoload.inc';

View File

@ -0,0 +1,2 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');

View File

@ -0,0 +1,19 @@
<?php
class default_beta extends \SYSTEM\PAGE\Page {
private $key = null;
public function __construct($key=null) {
$this->key=$key;}
public function html(){
if(\SQL\BETA_CHECK_CODE::Q1(array($this->key))['count'] == 0){
$vars = \SYSTEM\PAGE\text::tag('mojotrollz');
$vars['invalid_key'] = $this->key ? '<p><font color="red">Your key is invalid or already in use!</font></p>' : '';
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta.tpl'), $vars);
}
$vars = \SYSTEM\PAGE\text::tag('basic');
$vars['key'] = $this->key;
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta_register.tpl'), $vars);
}
public static function js(){
return array( \SYSTEM\WEBPATH(new PPAGE(),'default_beta/js/default_beta.js'),
\LIB\lib_jqbootstrapvalidation::js());}
}

View File

@ -0,0 +1,31 @@
function init_beta(){
$("#btn_beta").click(function(){
system.load('beta;key.'+$('#input_beta_key').val());
});
//jqBootstrapValidation
$("#register_user_form input").not("[type=submit]").jqBootstrapValidation({
preventSubmit: true,
submitError: function (form, event, errors) {},
submitSuccess: function($form, event){
var username = document.getElementById('register_username').value;
var email = document.getElementById('register_email').value;
var password = document.getElementById('user_register_password2').value;
$.ajax({
dataType: "json",
url: './api.php?call=beta&action=register&username='+username+'&password='+$.sha1(password)+'&email='+email,
data: null,
success: function (dataCreate) {
if(dataCreate === 1){ // reload -> user will be loged in
location.reload();
}else{ // show errors
alert('Not successfull: '+dataCreate);
}
}
});
event.preventDefault();
}
});
}

View File

@ -0,0 +1,26 @@
<div class="row-fluid">
<div class="col-md-12 mojotrollz_col mojotrollz_col_content">
<div class="row">
<div class="col-md-9">
<h2>Mojotrollz Beta</h2>
${invalid_key}
</div>
<div class="col-md-3">
<h3><b>Join the Beta Here</b></h3>
</div>
<div class="col-md-9">
On this page you will find Information about our progressive Beta Content.
<br>
<b>You require a Beta-Key to register.</b>
</div>
<div class="col-md-3">
<input id="input_beta_key" type="text" maxlength="6" placeholder="Enter Your Beta Key" style="width: 95%;"/>
<br><br>
<button id="btn_beta" class="btn btn-success btn-lg" style="width: 95%;">Join the Mojotribe</button>
</div>
</div>
<hr>
${mojotrollz_progressive}
</div>
</div>

View File

@ -0,0 +1,76 @@
<div class="row-fluid">
<div class="col-md-12 mojotrollz_col mojotrollz_col_content">
<h2>Mojotrollz Beta Register Form</h2>
<p class="label label-success">Your Beta Key is: <b>${key}</b></p>
<br><br>
<form class="textbox" id="register_user_form">
<div class="control-group" id="register_username_control_group">
<table id="userRegisterTable" class="">
<tbody>
<tr>
<th style="width: 200px;">${basic_username}</th>
<td>
<div class="control-group controls">
<input type="text"
size="30"
style="margin-bottom: 15px; float: left;"
id="register_username"
placeholder="peter"
minlength="3" data-validation-minlength-message="${sai_error_username_short}"
required data-validation-required-message="${sai_error_username_miss}"/>
<br/>
</div>
</td>
</tr>
<tr>
<th>E-Mail</th>
<td>
<div class="control-group controls">
<input type="email"
size="30"
style="margin-bottom: 15px; float: left;"
id="register_email"
placeholder="${basic_placeholder_email}"
data-validation-email-message="${sai_error_email_wrong}"
required data-validation-required-message="${sai_error_email_miss}"/>
<br/>
</div>
</td>
</tr>
<tr>
<th>${basic_password}</th>
<td>
<div class="control-group" id="change_user_password">
<div class="control-group controls" style="clear: both">
<input type="password"
size="30"
style="margin-bottom: 15px; float: left;"
id="user_register_password1"
name="user_register_password1"
placeholder="${basic_placeholder_password}"
minlength="5" data-validation-minlength-message="${sai_error_password_short}"
required data-validation-required-message="${sai_error_password_miss}"/>
<br/>
</div>
<div class="control-group controls" style="clear: both">
<input type="password"
size="30"
style="margin-bottom: 15px; float: left;"
id="user_register_password2"
name="user_register_password2"
placeholder="${basic_placeholder_password}"
data-validation-matches-match="user_register_password1"
data-validation-matches-message="${sai_error_password_match}"/>
<br/>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<button class="btn-sm btn-primary" type="submit"><i class="icon-ok icon-white"></i> ${basic_register}</button>
<p class="help-block" style="float: left; margin-top: 3px;"></p>
</div>
</form>
</div>
</div>

View File

@ -1,5 +1,5 @@
<div class="row-fluid">
<div id="content_impressum" class="col-md-12 mojotrollz_col">
<div id="content_impressum" class="col-md-12 mojotrollz_col mojotrollz_col_content">
<h1>Impressum</h1>
${impressum}
</div>

View File

@ -1,5 +1,5 @@
<div class="row-fluid">
<div id="content_login" class="col-md-12 mojotrollz_col">
<div id="content_login" class="col-md-12 mojotrollz_col mojotrollz_col_content">
<h1>${basic_login}</h1>
<form class="textbox" style="padding:10px" id="login_form">
<div class="control-group">

View File

@ -73,7 +73,7 @@ mojotrollz_download_first{
#content_teamspeak{
}
#content_servers, #content_tshirts, #content_addons, #content_impressum, #content_login{
.mojotrollz_col_content{
padding-left: 50px;
padding-right: 50px;
padding-bottom: 15px;

View File

@ -47,7 +47,8 @@
<div class="collapse navbar-collapse anchor">
<ul class="nav navbar-nav navbar-left">
<li class="active" style="z-index: 3;"><a href="#content_home">${mojotrollz_mojotrollz}</a></li>
<li style="z-index: 3;"><a href="#content_servers" onClick="">${mojotrollz_servers}</a></li>
<li style="z-index: 3;"><a href="#content_servers">${mojotrollz_servers}</a></li>
<li style="z-index: 3;"><a href="#!beta">${mojotrollz_beta}</a></li>
<!--<li><a href="#content_tshirts" onClick="">${mojotrollz_tshirts}</a></li>-->
<!--<li><a href="#content_addons">${mojotrollz_addons}</a></li>-->
</ul>

View File

@ -1,5 +1,5 @@
<div class="row-fluid">
<div id="content_addons" class="col-md-12 mojotrollz_col">
<div id="content_addons" class="col-md-12 mojotrollz_col mojotrollz_col_content">
<hr>
<h3>${mojotrollz_addons}</h3>
<table style="width: 100%;" class="mojotrollz_table">

View File

@ -1,3 +1,3 @@
<div class="row-fluid">
<div id="content_servers" class="col-md-12 mojotrollz_col"></div>
<div id="content_servers" class="col-md-12 mojotrollz_col mojotrollz_col_content"></div>
</div>

View File

@ -1,5 +1,5 @@
<div class="row-fluid">
<div id="content_tshirts" class="col-md-12 mojotrollz_col">
<div id="content_tshirts" class="col-md-12 mojotrollz_col mojotrollz_col_content">
<hr>
<h3>${mojotrollz_tshirts}</h3>
</div>

View File

@ -21,4 +21,7 @@ class page_mojotrollz extends \SYSTEM\API\api_default {
public static function page_serverlist(){
return (new default_serverlist())->html();}
public static function page_beta($key=null){
return (new default_beta($key))->html();}
}

View File

@ -1,2 +1,4 @@
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (200, 0, 2, 11, 'newserver', 'address', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (205, 0, 2, 11, 'vote', 'server', 'INT');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (205, 0, 2, 11, 'vote', 'server', 'INT');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (210, 1, 3, 1, 'beta', 'key', 'STRING');

View File

@ -4,3 +4,5 @@ INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`,
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (15, 1, 'impressum', 'impressum', -1, 0, 0, '#content', './?page=impressum', 'init_impressum', 'default_impressum');
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (20, 1, 'login', 'login', -1, 0, 0, '#content', './?page=login', 'init_login', 'default_login');
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (25, 1, 'beta', 'beta', -1, 0, 0, '#content', './?page=beta&key=${key}', 'init_beta', 'default_beta');