From eadca2f936839865b0e50ed7ffaf3586827da6d4 Mon Sep 17 00:00:00 2001 From: Naeltard Date: Thu, 1 Oct 2015 01:49:29 +0200 Subject: [PATCH] reworked menu system vote list on first tab no uvote, urvote anymore --- nbproject/project.properties | 2 +- uvote/page/default_page/tpl/page.tpl | 6 +- uvote/page/user_list_active/tpl/active.tpl | 2 +- uvote/page/user_main/main_menu.tpl | 6 +- uvote/page/user_main_uVote/tpl/uVote.tpl | 105 +++++------------- .../page/user_main_uVote/user_main_uVote.php | 8 +- uvote/page/user_main_urVote/tpl/all_polls.tpl | 2 +- .../tpl/overall_all_polls.tpl | 2 +- uvote/page/user_main_urVote/tpl/urVote.tpl | 44 ++------ 9 files changed, 56 insertions(+), 121 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 201ead6..dd71494 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -3,7 +3,7 @@ browser.reload.on.save=true file.reference.Webdesign-system=../system include.path=\ ${php.global.include.path} -php.version=PHP_56 +php.version=PHP_55 source.encoding=UTF-8 src.dir=. tags.asp=false diff --git a/uvote/page/default_page/tpl/page.tpl b/uvote/page/default_page/tpl/page.tpl index 11c268f..b419fbb 100644 --- a/uvote/page/default_page/tpl/page.tpl +++ b/uvote/page/default_page/tpl/page.tpl @@ -54,11 +54,9 @@ -
+
-
- -
+
diff --git a/uvote/page/user_list_active/tpl/active.tpl b/uvote/page/user_list_active/tpl/active.tpl index 0404b1b..4700613 100644 --- a/uvote/page/user_list_active/tpl/active.tpl +++ b/uvote/page/user_list_active/tpl/active.tpl @@ -1,2 +1,2 @@ -Active List: + ${votelist} \ No newline at end of file diff --git a/uvote/page/user_main/main_menu.tpl b/uvote/page/user_main/main_menu.tpl index f6686ff..cba1880 100644 --- a/uvote/page/user_main/main_menu.tpl +++ b/uvote/page/user_main/main_menu.tpl @@ -1,8 +1,8 @@
diff --git a/uvote/page/user_main_uVote/tpl/uVote.tpl b/uvote/page/user_main_uVote/tpl/uVote.tpl index fe3cad5..a12043d 100644 --- a/uvote/page/user_main_uVote/tpl/uVote.tpl +++ b/uvote/page/user_main_uVote/tpl/uVote.tpl @@ -1,76 +1,31 @@ -
-
-
-
-

- Welcome -

-
-
- ${welcome_text} -
-
-
-
-

- Übereinstimmung von uVote & Politik -

-
-
-
-
- - -
Übereinstimmung von uVote & Politik
- ${uvote_to_bt} - -
-
-
- -
-
-
-
-
-

- Entscheidungsverhalten der uVote Community / Bundestag -

-
-
-
-
-
Entscheidungsverhalten der uVote Community
- - ${votes_all} - - Wie oft die uVote Community -
insgesamt Dafür, Dagegen oder -
Enthaltung gestimmt hat. -
-
-
Entscheidungsverhalten des Bundestags
- - ${votes_all_bt} - - Wie oft der Bundestag -
Dafür, Dagegen oder -
Enthaltung gestimmt hat. -
-
-
-
-
-
-

- uVote Community -

-
-
-
- ${user_count} Nutzer auf uVote -
-
-
-
+
+
+ ${welcome_text} + + ${user_count} Nutzer auf uVote
+
+
Entscheidungsverhalten der uVote Community
+ + ${votes_all} + + Wie oft die uVote Community +
insgesamt Dafür, Dagegen oder +
Enthaltung gestimmt hat. + + +
Entscheidungsverhalten des Bundestags
+ + ${votes_all_bt} + + Wie oft der Bundestag +
Dafür, Dagegen oder +
Enthaltung gestimmt hat. + +
+ +
+
+ ${list_active} +
+ diff --git a/uvote/page/user_main_uVote/user_main_uVote.php b/uvote/page/user_main_uVote/user_main_uVote.php index 4d61608..6f80ec0 100644 --- a/uvote/page/user_main_uVote/user_main_uVote.php +++ b/uvote/page/user_main_uVote/user_main_uVote.php @@ -69,11 +69,17 @@ class user_main_uVote extends SYSTEM\PAGE\Page { $vars = votes::get_user_count(); return $vars['count']; } - + private function get_list_active(){ + $classObj = new user_list(); + $var = $classObj->html(); + return $var; + } public function html(){ $vars = array(); + $vars['list_active'] = $this->get_list_active(); + $vars['uvote_to_bt'] = $this->uvote_to_parties(); $vars['votes_all'] = $this->votes_all(); $vars['votes_all_bt'] = $this->votes_all_bt(); diff --git a/uvote/page/user_main_urVote/tpl/all_polls.tpl b/uvote/page/user_main_urVote/tpl/all_polls.tpl index b57717f..c433c31 100644 --- a/uvote/page/user_main_urVote/tpl/all_polls.tpl +++ b/uvote/page/user_main_urVote/tpl/all_polls.tpl @@ -4,7 +4,7 @@
Teilnahme an aktuellen Abstimmungen
-
${vote_perc}%
+
${vote_perc}%
diff --git a/uvote/page/user_main_urVote/tpl/overall_all_polls.tpl b/uvote/page/user_main_urVote/tpl/overall_all_polls.tpl index bcafd92..c31d252 100644 --- a/uvote/page/user_main_urVote/tpl/overall_all_polls.tpl +++ b/uvote/page/user_main_urVote/tpl/overall_all_polls.tpl @@ -1,7 +1,7 @@
Abstimmungsquote seit Accounterstellung
-
${vote_perc}%
+
${vote_perc}%
diff --git a/uvote/page/user_main_urVote/tpl/urVote.tpl b/uvote/page/user_main_urVote/tpl/urVote.tpl index 2ed1719..12aaff1 100644 --- a/uvote/page/user_main_urVote/tpl/urVote.tpl +++ b/uvote/page/user_main_urVote/tpl/urVote.tpl @@ -1,5 +1,4 @@ -
- +
@@ -11,15 +10,14 @@ ${urvote_body_text}
-
-
+
+

Übereinstimmung von Deiner uVote-Stimme & Politik

-
-
-
+
+
@@ -33,39 +31,17 @@
-
+
${user_temp_votes}

${user_overall_votes}
-
-
-
-
-
-
-

- Deine Übereinstimmung mit dem Bundestag -

-
-
-
-
- -
-
-
-
-
-

- Collapsible Group Item #3 -

-
-
-
- Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. +
+
+
+