diff --git a/uvote/autoload.inc b/uvote/autoload.inc index e979a70..4ed9409 100644 --- a/uvote/autoload.inc +++ b/uvote/autoload.inc @@ -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'; \ No newline at end of file +require_once dirname(__FILE__).'/api/autoload.inc'; +require_once dirname(__FILE__).'/sai/autoload.inc'; \ No newline at end of file diff --git a/uvote/page/autoload.inc b/uvote/page/autoload.inc index f7129ac..330800b 100644 --- a/uvote/page/autoload.inc +++ b/uvote/page/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',''); \ No newline at end of file +SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_poll',''); \ No newline at end of file diff --git a/uvote/page/default_page/css/loginform.css b/uvote/page/default_page/css/loginform.css index 63ce3ac..d3c74a5 100644 --- a/uvote/page/default_page/css/loginform.css +++ b/uvote/page/default_page/css/loginform.css @@ -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; diff --git a/uvote/page/default_page/css/page.css b/uvote/page/default_page/css/page.css index 198bc6d..0a201ee 100644 --- a/uvote/page/default_page/css/page.css +++ b/uvote/page/default_page/css/page.css @@ -2,6 +2,10 @@ body { padding-top: 60px; } +.panel-heading :hover{ + cursor: pointer; +} + .main_container { } diff --git a/uvote/page/default_page/tpl/loginform.tpl b/uvote/page/default_page/tpl/loginform.tpl index 5bed726..4ad6ea1 100644 --- a/uvote/page/default_page/tpl/loginform.tpl +++ b/uvote/page/default_page/tpl/loginform.tpl @@ -1,7 +1,13 @@ - diff --git a/uvote/page/default_page/tpl/menu.tpl b/uvote/page/default_page/tpl/menu.tpl index 95c8b0a..ef30036 100644 --- a/uvote/page/default_page/tpl/menu.tpl +++ b/uvote/page/default_page/tpl/menu.tpl @@ -1,8 +1,12 @@
- +
+ + diff --git a/uvote/page/default_page/tpl/menu_loggedout.tpl b/uvote/page/default_page/tpl/menu_loggedout.tpl index 559f363..2a48a6a 100644 --- a/uvote/page/default_page/tpl/menu_loggedout.tpl +++ b/uvote/page/default_page/tpl/menu_loggedout.tpl @@ -1,3 +1,5 @@
- +
diff --git a/uvote/page/default_page/tpl/page.tpl b/uvote/page/default_page/tpl/page.tpl index 48445ef..f411101 100644 --- a/uvote/page/default_page/tpl/page.tpl +++ b/uvote/page/default_page/tpl/page.tpl @@ -45,12 +45,7 @@
-
${menu} -
-
- ${loginform} -
diff --git a/uvote/page/default_register/js/default_register.js b/uvote/page/default_register/js/default_register.js new file mode 100644 index 0000000..3bae51d --- /dev/null +++ b/uvote/page/default_register/js/default_register.js @@ -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. + */ + + diff --git a/uvote/page/page_uvote.php b/uvote/page/page_uvote.php index ca4bfdf..6f87e38 100644 --- a/uvote/page/page_uvote.php +++ b/uvote/page/page_uvote.php @@ -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()){ diff --git a/uvote/page/user_main_start/js/user_main_start.js b/uvote/page/user_main_start/js/user_main_start.js new file mode 100644 index 0000000..aa641d5 --- /dev/null +++ b/uvote/page/user_main_start/js/user_main_start.js @@ -0,0 +1,3 @@ +function init_user_main_start(){ + +} diff --git a/uvote/page/user_main_start/tpl/user_main_start.tpl b/uvote/page/user_main_start/tpl/user_main_start.tpl new file mode 100644 index 0000000..a1ca7ee --- /dev/null +++ b/uvote/page/user_main_start/tpl/user_main_start.tpl @@ -0,0 +1,31 @@ +
+
+
+
+

+ Willkommen auf uvote.eu! +

+
+
+
+ ${welcome_text} +
+
+
+ ${user_temp_votes} +
+
+
+
+ ${user_count} +
+
+
+ Nutzer auf uVote +
+
+
+
+
+
+
\ No newline at end of file diff --git a/uvote/page/user_main_start/user_main_start.php b/uvote/page/user_main_start/user_main_start.php new file mode 100644 index 0000000..ee058e4 --- /dev/null +++ b/uvote/page/user_main_start/user_main_start.php @@ -0,0 +1,19 @@ +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); + } + +} \ No newline at end of file diff --git a/uvote/page/user_main_votelist/tpl/user_main_votelist.tpl b/uvote/page/user_main_votelist/tpl/user_main_votelist.tpl index a801b02..3c61712 100644 --- a/uvote/page/user_main_votelist/tpl/user_main_votelist.tpl +++ b/uvote/page/user_main_votelist/tpl/user_main_votelist.tpl @@ -1,34 +1,3 @@ -
-
-
-
-

- Willkommen auf uvote.eu! -

-
-
-
- ${welcome_text} -
-
-
- ${user_temp_votes} -
-
-
-
- ${user_count} -
-
-
- Nutzer auf uVote -
-
-
-
-
-
-
diff --git a/uvote/sai/autoload.inc b/uvote/sai/autoload.inc new file mode 100644 index 0000000..e928ede --- /dev/null +++ b/uvote/sai/autoload.inc @@ -0,0 +1,4 @@ + $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 '
  • Edit Votes
  • ';} + public static function html_li_menu(){return '
  • Edit Votes
    • ';} 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(