diff --git a/uVote/page/user_main/user_main.php b/uVote/page/user_main/user_main.php
index ecd2718..f85b31c 100644
--- a/uVote/page/user_main/user_main.php
+++ b/uVote/page/user_main/user_main.php
@@ -3,11 +3,12 @@
class user_main extends SYSTEM\PAGE\Page {
public function html(){
$vars = array();
-
+
$uv = new user_main_uVote();
+ $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
$vars['uVote'] = $uv->html();
- $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(SYSTEM\SERVERPATH(new PPAGE(),'user_main/main_menu.tpl'),$vars);
}
diff --git a/uVote/page/user_main_uVote/uVote.tpl b/uVote/page/user_main_uVote/uVote.tpl
index cafa9b9..ab0a69b 100644
--- a/uVote/page/user_main_uVote/uVote.tpl
+++ b/uVote/page/user_main_uVote/uVote.tpl
@@ -1,7 +1,6 @@
- | Choice |
- Vote Count |
+ ${uVote_overall_votes_title} |
${votes_all}
\ No newline at end of file
diff --git a/uVote/page/user_main_uVote/user_main_uVote.php b/uVote/page/user_main_uVote/user_main_uVote.php
index 3ec5a7a..467b3a4 100644
--- a/uVote/page/user_main_uVote/user_main_uVote.php
+++ b/uVote/page/user_main_uVote/user_main_uVote.php
@@ -24,7 +24,9 @@ class user_main_uVote extends SYSTEM\PAGE\Page {
public function html(){
$vars = array();
- $vars['votes_all'] = $this->votes_all();
+ $vars['votes_all'] = $this->votes_all();
+ $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(),'user_main_uVote/uVote.tpl'),$vars);
}
diff --git a/uVote/page/user_main_uVote/votecountchoice.tpl b/uVote/page/user_main_uVote/votecountchoice.tpl
index b882c15..0ffd93f 100644
--- a/uVote/page/user_main_uVote/votecountchoice.tpl
+++ b/uVote/page/user_main_uVote/votecountchoice.tpl
@@ -1,4 +1,4 @@
- | ${choice} |
- ${count} |
+ ${choice} |
+ ${count} |
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/urVote.tpl b/uVote/page/user_main_urVote/urVote.tpl
index 41666ac..0aacf33 100644
--- a/uVote/page/user_main_urVote/urVote.tpl
+++ b/uVote/page/user_main_urVote/urVote.tpl
@@ -1,10 +1,13 @@
-
+
+
- | Party |
- Match |
- Missmatch |
+ ${urVote_title}
+
+ ${urVote_user_party_compare}
${choices_user_ID}
+
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/urvoteparties.tpl b/uVote/page/user_main_urVote/urvoteparties.tpl
index 4e107fa..86df87a 100644
--- a/uVote/page/user_main_urVote/urvoteparties.tpl
+++ b/uVote/page/user_main_urVote/urvoteparties.tpl
@@ -1,5 +1,7 @@
- | ${party} |
- ${class_MATCH} |
- ${class_MISSMATCH} |
+
+
+ |
+ ${class_MATCH} |
+ ${class_MISSMATCH} |
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/user_main_urVote.php b/uVote/page/user_main_urVote/user_main_urVote.php
index ab81183..018abcc 100644
--- a/uVote/page/user_main_urVote/user_main_urVote.php
+++ b/uVote/page/user_main_urVote/user_main_urVote.php
@@ -12,15 +12,18 @@ class user_main_urVote extends SYSTEM\PAGE\Page {
ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID
WHERE user_ID = ? GROUP BY party;',
array(\SYSTEM\SECURITY\Security::getUser()->id));
- while($row = $res->next()){
+ while($row = $res->next()){
$result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/urvoteparties.tpl'), $row);;
}
return $result;
}
public function html(){
- $vars = array();
- $vars['choices_user_ID'] = $this->user_per_party_overall();
+ $vars = array();
+ $vars['choices_user_ID'] = $this->user_per_party_overall();
+ $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(),'user_main_urVote/urVote.tpl'),$vars);
}