webcraftmedia/u-vote.eu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cover implemented, minor style fixes, started table for strings

Browse Source
This commit is contained in:
Nael 2014-01-23 02:20:44 +01:00
parent 42b0799004
commit 1a20531d4b
17 changed files with 79 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.php
View File

@ -15,5 +15,5 @@ $uvote_config = array( array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTIN
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'mojotrollz - Admin Area'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, '<a href="http://www.mojotrollz.eu/web/uVote/" target="_blank">uVote</a>, &copy; WebCraft Media 2013'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS', 'huHU')),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS')),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'));

11
uVote/api/votes/votes.php
View File

@ -2,16 +2,7 @@
class votes {
public static function getAllVotesOfGroup($groupid){
$con = new \SYSTEM\DB\Connection(new \DBD\uVote());
$res = $con->prepare( 'selVoteByGrp',
'SELECT * FROM `uvote_votes` WHERE `group` = ?;',
array($groupid));
$result = array();
while($r = $res->next()){
$result[] = $r;}
return $result;
}
return \DBD\UVOTE_GENERATE_VOTELIST::QA(array($groupid));}
public static function getVoteOfGroup($poll_ID){
$con = new \SYSTEM\DB\Connection(new \DBD\uVote());

1
uVote/dbd/autoload.inc.php
View File

@ -1,6 +1,7 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/','DBD');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl/','DBD');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq/','DBD');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');

11
uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php Normal file
View File

@ -0,0 +1,11 @@
<?php
namespace DBD;
class UVOTE_GENERATE_VOTELIST extends \SYSTEM\DB\QP {
protected static function query(){
return new \SYSTEM\DB\QQuery(get_class(),
//pg
'',
//mys
'SELECT * FROM `uvote_votes` WHERE `group` = ?;'
);}}

BIN
uVote/img/frontend_logos/cover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 385 KiB

BIN
uVote/img/frontend_logos/cover.psd Normal file
View File

Binary file not shown.

2
uVote/page/default_cover/cover.tpl Normal file
View File

@ -0,0 +1,2 @@
<img src="${frontend_logos}cover.png"/>

14
uVote/page/default_cover/default_cover.php Normal file
View File

@ -0,0 +1,14 @@
<?php
class default_cover extends SYSTEM\PAGE\Page {
public function html(){
$vars = array();
$vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
$vars = array_merge($vars, \SYSTEM\locale::getStrings(150));
$vars = array_merge($vars, \SYSTEM\locale::getStrings(100));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_cover/cover.tpl'), $vars);
}
}

9
uVote/page/default_page/default_page.php
View File

@ -57,6 +57,9 @@ class default_page extends SYSTEM\PAGE\Page {
}
return $result;
}
public function get_coverpage(){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_cover/cover.tpl'), array());}
public function getloggedinform(){
@ -75,12 +78,14 @@ class default_page extends SYSTEM\PAGE\Page {
$vars = array();
$vars['js'] = $this->js();
$vars['css'] = $this->css();
$vars['votelist'] = $this->generate_votelist();
$vars['votelist'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->generate_votelist() : $this->get_coverpage() ;
$vars['vote'] = $this->generate_vote();
$vars['registerform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->getloggedinform() : $this->exchange_registerform();
$vars['loginform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->exchange_loginform() : $this->getloginform() ;
$vars['PIC_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/pics/');
$vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
$vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
$vars = array_merge($vars, \SYSTEM\locale::getStrings(150));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/page.html'), $vars);
}

27
uVote/page/default_page/loginform.tpl
View File

@ -6,30 +6,31 @@
<form class="navbar-form pull-right" style="" id="form_login">
<div class="control-group">
<div class="controls" style="float: left;">
<div class="help-block"style="float: left; padding: 0;"></div>
<input type="hidden" />
<div class="controls" style="float: left; margin-right: 10px;">
<input type="text"
size="20"
style=""
id="bt_login_user"
placeholder="${sai_mod_login_username}"
minlength="3" data-validation-minlength-message="${sai_error_mod_login_username_too_short}"
maxlength="16" data-validation-maxlength-message="${sai_error_mod_login_username_too_long}"
required data-validation-required-message="${sai_error_mod_login_username_required}"/>
placeholder="${user_name_login}"
minlength="3" data-validation-minlength-message="${register_user_name_too_short}"
maxlength="16" data-validation-maxlength-message="${register_user_name_too_long}"
required data-validation-required-message="${register_user_name_required}"/>
</div>
<div class="controls" style="float: left;">
<div class="controls" style="float: left;margin-right: 20px;">
<input type="password"
size="20"
style=""
id="bt_login_password"
placeholder="${sai_mod_login_password}"
minlength="5" data-validation-minlength-message="${sai_error_mod_login_password_too_short}"
maxlength="16" data-validation-maxlength-message="${sai_error_mod_login_password_too_long}"
required data-validation-required-message="${sai_error_mod_login_password_required}"/>
placeholder="${user_password_login}"
minlength="5" data-validation-minlength-message="${register_password_too_short}"
maxlength="16" data-validation-maxlength-message="${register_user_password_too_long}"
required data-validation-required-message="${register_user_password_required}"/>
</div>
<div class="help-block"style="float: left;"></div>
<input type="hidden" />
<button class="btn btn-primary" style="float: left; height: 32px; font-size: 13px;"
type="submit"
id="login_submit">${sai_mod_login_login}</button>
id="login_submit">${login}</button>
</div>
</form>

14
uVote/page/default_page/page.html
View File

@ -23,7 +23,7 @@
<div class="navbar navbar-inverse navbar-fixed-top" style="width: 100%">
<div class="navbar-inner" style="width: 100%">
<div class="container" style="width: 100%">
<div class="container" style="width: 90%">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -33,9 +33,9 @@
<div class="nav-collapse collapse">
<ul class="nav">
<li><a href="#" url="?action=myvote">myVote</a></li>
<!-- <li><a href="#" url="?action=myvote">myVote</a></li>
<li><a href="#" url="?action=Dokumentation">Dokumentation</a></li>
<li><a href="#" url="?action=Download">Download</a></li>
<li><a href="#" url="?action=Download">Download</a></li>-->
</ul>
@ -45,9 +45,9 @@
</div>
</div>
</div>
<div class="container" style="margin-top: 0; clear: both;">
<div class="box" style="margin-top: 0; clear: both;">
<div id="site-content" style="padding: 0; margin: 0;">
<div id="list" style="border: 2px solid #ccc; position: fixed; padding: 0px; width: 850px; top: 50px; left: 20px; bottom: 50px; overflow-y: scroll;">
<div id="list" style="padding: 0px; width: 850px; top: 50px; padding-left: 75px; bottom: 50px;">
${votelist}
</div>
<div id="user_main" style="right: 0px; position: fixed; padding: 0px; right: 70px; width: 35%; top: 50px; bottom: 50px;">
@ -55,5 +55,9 @@
</div>
</div>
</div>
<div id="wrap">
<div class="navbar navbar-inverse navbar-fixed-bottom" style="height: 30px; text-align: center; padding-top: 7px;"> copyright by mojotrollz, webcraft media and yeminy
</div>
</div>
</body>
</html>

2
uVote/page/default_page/vote.tpl
View File

@ -1,4 +1,4 @@
<div class="${vote_class}" style="padding: 5px; margin-bottom: 8px;">
<div class="${vote_class}" style="padding: 5px; margin-bottom: 8px; border: 2px solid #ccc; float: left;">
<div class="row" style="width: 100%; margin: 0; margin-top: 5px; margin-bottom: 8px;">
<div class="span6">
<h4>${vote_title}</h4>

2
uVote/page/default_register/default_register.php
View File

@ -6,6 +6,8 @@ class default_register extends SYSTEM\PAGE\Page {
public function html(){
$vars = array();
$vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
$vars = array_merge($vars, \SYSTEM\locale::getStrings(150));
$vars = array_merge($vars, \SYSTEM\locale::getStrings(100));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_register/register.tpl'), $vars);
}

BIN
uVote/page/default_register/pics/logo2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 113 KiB

86
uVote/page/default_register/register.html
View File

@ -1,86 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Sign in</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="'/lib/bootstrap/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 40px;
padding-bottom: 40px;
background-color: #f5f5f5;
}
.form-signin {
max-width: 500px;
padding: 19px 29px 29px;
margin: 0 auto 20px;
background-color: #fff;
border: 1px solid #e5e5e5;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
box-shadow: 0 1px 2px rgba(0,0,0,.05);
}
.form-signin .form-signin-heading,
.form-signin .checkbox {
margin-bottom: 10px;
}
.form-signin input[type="text"],
.form-signin input[type="name"],
.form-signin input[type="birthdate"],
.form-signin input[type="password"] {
font-size: 16px;
height: auto;
margin-bottom: 15px;
padding: 7px 9px;
}
</style>
<link href="'/lib/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="../assets/js/html5shiv.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
<div class="hero-unit" style="margin: 1px; padding: 7px 9px; margin-left: 510px; width: 545px; background: white;-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05); box-shadow: 0 1px 2px rgba(0,0,0,.05);">
<img src="${PIC_PATH}logo2.png" width="500" style="margin-bot: 20px;">
</div>
<div class="container">
<form class="form-signin" style="margin-top: 20px;">
<h2 class="form-signin-heading">Accounterstellung</h2>
<input type="text" class="input-block-level" placeholder="Name">
<input type="text" class="input-block-level" placeholder="Vorname">
<input type="text" class="input-block-level" placeholder="E-mail">
<input type="text" class="input-block-level" placeholder="Geburtsdatum">
<input type="password" class="input-block-level" placeholder="Passwort">
<input type="password" class="input-block-level" placeholder="Passwort wiederholen">
<label class="checkbox">
<input type="checkbox" value="remember-me">Ich habe die Nutzungsbedingungen gelesen und bin damit einverstanden.
</label>
<button class="btn btn-large btn-primary" type="submit">Account erstellen</button>
</form>
</div> <!-- /container -->
</body>
</html>

28
uVote/page/default_register/register.tpl
View File

@ -6,39 +6,39 @@
<table id="userRegisterTable" class="table table-striped">
<tbody>
<tr>
<th style="width: 200px;">${loginUsername}</th>
<th style="width: 200px;">${user_name_register}</th>
<td>
<div class="control-group controls">
<input type="text"
size="30"
style="margin-bottom: 15px; float: left;"
id="register_username"
placeholder="${enter_username}"
minlength="3" data-validation-minlength-message="${login_username_too_short}"
required data-validation-required-message="${login_username_required}"/>
placeholder="${ari_name}"
minlength="3" data-validation-minlength-message="${register_user_name_too_short}"
required data-validation-required-message="${register_user_name_required}"/>
<br/>
<div id="register-help-block-username" class="help-block" style="float: left; margin-top: 3px;"></div>
</div>
</td>
</tr>
<tr>
<th>E-Mail</th>
<th>${user_email_register}</th>
<td>
<div class="control-group controls">
<input type="email"
size="30"
style="margin-bottom: 15px; float: left;"
id="register_email"
placeholder="${enter_email}"
data-validation-email-message="${check_mail_format}"
required data-validation-required-message="${email_required}"/>
placeholder="${ari_mail}"
data-validation-email-message="${mail_format_wrong}"
required data-validation-required-message="${register_email_required}"/>
<br/>
<div id="register-help-block-email" class="help-block" style="float: left; margin-top: 3px;"></div>
</div>
</td>
</tr>
<tr>
<th>${loginPassword}</th>
<th>${user_password_register}</th>
<td>
<div class="control-group" id="change_user_password">
<div class="control-group controls" style="clear: both">
@ -47,9 +47,9 @@
style="margin-bottom: 15px; float: left;"
id="user_register_password1"
name="user_register_password1"
placeholder="${enter_password}"
minlength="5" data-validation-minlength-message="${login_password_too_short}"
required data-validation-required-message="${login_password_required}"/>
placeholder="${ari_pass}"
minlength="5" data-validation-minlength-message="${register_password_too_short}"
required data-validation-required-message="${register_password_required}"/>
<br/>
<div class="help-block" style="float: left; margin-top: 3px;"></div>
</div>
@ -59,9 +59,9 @@
style="margin-bottom: 15px; float: left;"
id="user_register_password2"
name="user_register_password2"
placeholder="${retype_password}"
placeholder="${ari_pass}"
data-validation-matches-match="user_register_password1"
data-validation-matches-message="${register_password_dont_math}"/>
data-validation-matches-message="${register_password_dont_match}"/>
<br/>
<div class="help-block" style="float: left; margin-top: 3px;"></div>
</div>

3
uVote/page/register_page_classes.php
View File

@ -6,4 +6,5 @@ SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_register','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_openinfo','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_bulletin','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_uVote','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_uVote','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_cover','');