included sai mod uvote edit
This commit is contained in:
parent
ee288cb1ff
commit
1d5c4b8ab3
@ -3,4 +3,5 @@ require_once dirname(__FILE__).'/path/autoload.inc';
|
||||
require_once dirname(__FILE__).'/page/autoload.inc';
|
||||
require_once dirname(__FILE__).'/sql/autoload.inc';
|
||||
require_once dirname(__FILE__).'/files/autoload.inc';
|
||||
require_once dirname(__FILE__).'/api/autoload.inc';
|
||||
require_once dirname(__FILE__).'/api/autoload.inc';
|
||||
require_once dirname(__FILE__).'/sai/autoload.inc';
|
||||
@ -4,13 +4,8 @@ SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_register','');
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_comment','');
|
||||
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_start','');
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_votelist','');
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_analysis','');
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_options','');
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_poll','');
|
||||
|
||||
|
||||
//SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_list_ended','');
|
||||
//SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main','');
|
||||
//SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_uVote','');
|
||||
//SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_list','');
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_poll','');
|
||||
@ -1,18 +1,4 @@
|
||||
#help-block {
|
||||
float: right;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#controls {
|
||||
float: right;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
#controls2 {
|
||||
float: right;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.btn btn-primary#login_submit {
|
||||
float: right;
|
||||
height: 32px;
|
||||
|
||||
@ -2,6 +2,10 @@ body {
|
||||
padding-top: 60px;
|
||||
}
|
||||
|
||||
.panel-heading :hover{
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.main_container {
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,13 @@
|
||||
<form class="navbar-form navbar-right" id="form_login">
|
||||
<div class="col-md-7">
|
||||
<form class="" id="form_login">
|
||||
<div class="form-group">
|
||||
<div id="help-block"></div>
|
||||
<input type="text"
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
<button class="btn btn-primary" type="submit" id="login_submit"><span class="glyphicon glyphicon-log-in"></span> ${login}</button>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<input type="text"
|
||||
size="20"
|
||||
style=""
|
||||
id="bt_login_user"
|
||||
@ -9,7 +15,9 @@
|
||||
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}"/>
|
||||
<input type="password"
|
||||
</div>
|
||||
<div class="col-md-5">
|
||||
<input type="password"
|
||||
size="20"
|
||||
style=""
|
||||
id="bt_login_password"
|
||||
@ -17,6 +25,12 @@
|
||||
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>
|
||||
|
||||
|
||||
</div>
|
||||
<button class="btn btn-primary" type="submit" id="login_submit"><span class="glyphicon glyphicon-log-in"></span> ${login}</button>
|
||||
</form>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
<div class="row" style="margin-bottom: 30px;">
|
||||
<ul class="nav nav-pills" id="tabs_user_main" style=" text-align: center;">
|
||||
<li class="active"><a href="#!start(user_main(u))"><span class="glyphicon glyphicon-edit"></span> Abstimmen</a></li>
|
||||
<li><a href="#!start(user_main(ur))"><span class="glyphicon glyphicon-stats"></span> Auswerten</a></li>
|
||||
<li><a href="#!start(user_main(my))"><span class="glyphicon glyphicon-cog"></span> Mithelfen</a></li>
|
||||
<li><a data-toggle="modal" class="brand" href="#impressum" id="impressum"><font size="2">Impressum</font></a></li>
|
||||
</ul>
|
||||
<ul class="nav nav-pills" id="tabs_user_main" style=" text-align: center;">
|
||||
<li class="active"><a href="#!start(user_main(start))"><span class="glyphicon glyphicon-home"></span> Start</a></li>
|
||||
<li><a href="#!start(user_main(u))"><span class="glyphicon glyphicon-edit"></span> Abstimmen</a></li>
|
||||
<li><a href="#!start(user_main(ur))"><span class="glyphicon glyphicon-stats"></span> Auswerten</a></li>
|
||||
<li><a href="#!start(user_main(my))"><span class="glyphicon glyphicon-cog"></span> Mithelfen</a></li>
|
||||
<li><a data-toggle="modal" class="brand" href="#impressum" id="impressum"><span class="glyphicon glyphicon-tags"></span> Impressum</a></li>
|
||||
<li style="float: right">${loginform}</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
<div class="row">
|
||||
|
||||
<ul>
|
||||
<li>${loginform}</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -45,12 +45,7 @@
|
||||
</div>
|
||||
<div class="row"><hr></div>
|
||||
<div class="row">
|
||||
<div class="col-md-10">
|
||||
${menu}
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
${loginform}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" id="user_main"></div>
|
||||
</div>
|
||||
|
||||
10
uvote/page/default_register/js/default_register.js
Normal file
10
uvote/page/default_register/js/default_register.js
Normal file
@ -0,0 +1,10 @@
|
||||
function init_default_register(){
|
||||
|
||||
}
|
||||
/*
|
||||
* To change this license header, choose License Headers in Project Properties.
|
||||
* To change this template file, choose Tools | Templates
|
||||
* and open the template in the editor.
|
||||
*/
|
||||
|
||||
|
||||
@ -4,18 +4,11 @@ class page_uvote extends \SYSTEM\API\api_default {
|
||||
|
||||
public static function default_page($_escaped_fragment_ = NULL){
|
||||
return (new default_page())->html($_escaped_fragment_);}
|
||||
|
||||
public static function page_open_bulletin ($poll_ID){
|
||||
|
||||
public static function page_user_main_start(){
|
||||
if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
|
||||
return (new default_register ())->html();}
|
||||
return (new default_bulletin($poll_ID))->html();}
|
||||
|
||||
|
||||
public static function page_user_main(){
|
||||
if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
|
||||
return (new default_register ())->html();}
|
||||
return (new user_main())->html();}
|
||||
|
||||
return (new user_main_start())->html();}
|
||||
|
||||
public static function page_user_main_analysis(){
|
||||
if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
|
||||
|
||||
3
uvote/page/user_main_start/js/user_main_start.js
Normal file
3
uvote/page/user_main_start/js/user_main_start.js
Normal file
@ -0,0 +1,3 @@
|
||||
function init_user_main_start(){
|
||||
|
||||
}
|
||||
31
uvote/page/user_main_start/tpl/user_main_start.tpl
Normal file
31
uvote/page/user_main_start/tpl/user_main_start.tpl
Normal file
@ -0,0 +1,31 @@
|
||||
<div class="row" style="padding-bottom: 30px;">
|
||||
<div class="row panel-group" style="margin: 0; padding:0;">
|
||||
<div class="panel panel-default panel-info">
|
||||
<div class="panel-heading">
|
||||
<h4 class="panel-title">
|
||||
Willkommen auf uvote.eu!
|
||||
</h4>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="col-md-8">
|
||||
${welcome_text}
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="row">
|
||||
${user_temp_votes}
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<br>
|
||||
<span class="badge badge-info">${user_count}</span>
|
||||
</div>
|
||||
<div class="col-md-10">
|
||||
<br>
|
||||
Nutzer auf uVote
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
19
uvote/page/user_main_start/user_main_start.php
Normal file
19
uvote/page/user_main_start/user_main_start.php
Normal file
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
class user_main_start extends SYSTEM\PAGE\Page {
|
||||
private function user_count(){
|
||||
$vars = votes::get_user_count();
|
||||
return $vars['count'];
|
||||
}
|
||||
|
||||
|
||||
public function html(){
|
||||
$vars = array();
|
||||
$vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
|
||||
$vars['user_count'] = $this->user_count();
|
||||
$vars['user_temp_votes'] = votes::get_user_temp_votes();
|
||||
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register'));
|
||||
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote'));
|
||||
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_start/tpl/user_main_start.tpl'), $vars);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,34 +1,3 @@
|
||||
<div class="row" style="padding-bottom: 30px;">
|
||||
<div class="row panel-group" style="margin: 0; padding:0;">
|
||||
<div class="panel panel-default panel-info">
|
||||
<div class="panel-heading">
|
||||
<h4 class="panel-title">
|
||||
Willkommen auf uvote.eu!
|
||||
</h4>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="col-md-8">
|
||||
${welcome_text}
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="row">
|
||||
${user_temp_votes}
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<br>
|
||||
<span class="badge badge-info">${user_count}</span>
|
||||
</div>
|
||||
<div class="col-md-10">
|
||||
<br>
|
||||
Nutzer auf uVote
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row panel-group">
|
||||
<div class="panel panel-default panel-info">
|
||||
<div class="panel-heading">
|
||||
|
||||
4
uvote/sai/autoload.inc
Normal file
4
uvote/sai/autoload.inc
Normal file
@ -0,0 +1,4 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__));
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_uvote_vote_edit', 'SAI');
|
||||
\SYSTEM\SAI\sai::register('\SAI\saimod_uvote_vote_edit');
|
||||
@ -1,3 +0,0 @@
|
||||
<?php
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__).'','');
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_uvote_vote_edit','');
|
||||
@ -1,2 +0,0 @@
|
||||
<?php
|
||||
\SYSTEM\SAI\sai::register('saimod_uvote_vote_edit');
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
namespace SAI;
|
||||
class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule {
|
||||
public static function sai_mod__SYSTEM_SAI_saimod_uvote_vote_edit_action_new_vote($data){
|
||||
new \SYSTEM\LOG\INFO('json kommt im php an');
|
||||
@ -17,30 +18,31 @@ class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule {
|
||||
public static function sai_mod_saimod_uvote_new_vote(){
|
||||
$result = '';
|
||||
$vote = array();
|
||||
$result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_uvote_vote_edit/vote.tpl'), $vote);
|
||||
$result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/vote.tpl'), $vote);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static function sai_mod_saimod_uvote_vote_edit(){
|
||||
public static function sai_mod__SAI_saimod_uvote_vote_edit(){
|
||||
/*$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=';
|
||||
return \SYSTEM\PAGE\replace::replaceFile(dirname(__FILE__).'/main.tpl', $vars);*/
|
||||
|
||||
$result = '';
|
||||
// $result.=self::sai_mod_saimod_uvote_new_vote();
|
||||
$votes = votes::getAllVotesOfGroup(1);
|
||||
$result.=self::sai_mod_saimod_uvote_new_vote();
|
||||
$votes = \votes::getAllVotesOfGroup(1);
|
||||
foreach($votes as $vote){
|
||||
$time_remain = strtotime($vote['time_end'])- microtime(true);
|
||||
$time_span = strtotime($vote['time_end']) - strtotime($vote['time_start']);
|
||||
$vote['vote_class'] = self::tablerow_class(votes::getUserPollData($vote['ID']));
|
||||
$vote['vote_class'] = self::tablerow_class(\votes::getUserPollData($vote['ID']));
|
||||
$vote['bt_vote_class'] = self::tablerow_class($vote['bt_choice']);
|
||||
$vote['time_left'] = round($time_remain/($time_span+1)*100,0);
|
||||
$vote['time_done'] = 100-$vote['time_left'];
|
||||
$vote['new_vote'] = self::sai_mod_saimod_uvote_new_vote();
|
||||
$result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_uvote_vote_edit/vote.tpl'), $vote);
|
||||
$result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/vote.tpl'), $vote);
|
||||
}
|
||||
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl'), array('list' => $result));
|
||||
|
||||
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl'), array('list' => $result));
|
||||
}
|
||||
|
||||
private static function tablerow_class($choice){
|
||||
@ -56,7 +58,7 @@ class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule {
|
||||
}
|
||||
}
|
||||
|
||||
public static function html_li_menu(){return '<li><a href="#" saimenu="saimod_uvote_vote_edit">Edit Votes</a></li><li class="divider"></li>';}
|
||||
public static function html_li_menu(){return '<li><a href="#!vote">Edit Votes</a></li>';}
|
||||
public static function right_public(){return false;}
|
||||
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
|
||||
public static function sai_mod_saimod_uvote_vote_edit_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user