diff --git a/uVote/page/default_bulletin/bars_user.tpl b/uVote/page/default_bulletin/bars_user.tpl index 77d82cd..a502a85 100644 --- a/uVote/page/default_bulletin/bars_user.tpl +++ b/uVote/page/default_bulletin/bars_user.tpl @@ -1,6 +1,6 @@
${bulletin_bars_title}
${urvote_bars_user} -
+
${vote_yes_perc}%
${vote_no_perc}%
${vote_ent_perc}%
diff --git a/uVote/page/default_bulletin/bulletin.tpl b/uVote/page/default_bulletin/bulletin.tpl index 8b30687..1c6a945 100644 --- a/uVote/page/default_bulletin/bulletin.tpl +++ b/uVote/page/default_bulletin/bulletin.tpl @@ -1,10 +1,10 @@ -
+

${title}

${vote_buttons} -
+
-
+
${openvote_help_text} ${title} ${openvote_help_text1} @@ -12,29 +12,29 @@
${voice_weight}
-
+
${bars_user}
${bars_bt}
-
+
${icons_party} ${choice_party}
-
+

-
+

Kommentare

-
-
+
+
Pro
${comments_pro}
-
+
Contra
${comments_con}
-
+
Kommentar

diff --git a/uVote/page/default_bulletin/comment.tpl b/uVote/page/default_bulletin/comment.tpl index 687a1ce..e0450f9 100644 --- a/uVote/page/default_bulletin/comment.tpl +++ b/uVote/page/default_bulletin/comment.tpl @@ -1,15 +1,15 @@ -
-
${timestamp}
+
+
${timestamp}
-
+
${c_txt}

-
- ${count_up} +
+ ${count_up} - ${count_down} + ${count_down} -
Quelle:${c_src}
+
Quelle:${c_src}
diff --git a/uVote/page/default_bulletin/css/bars_user.css b/uVote/page/default_bulletin/css/bars_user.css new file mode 100644 index 0000000..513c5aa --- /dev/null +++ b/uVote/page/default_bulletin/css/bars_user.css @@ -0,0 +1,4 @@ +.progress#progress_bars_user { + height: 20px; + width: 350px; +} \ No newline at end of file diff --git a/uVote/page/default_bulletin/css/bulletin.css b/uVote/page/default_bulletin/css/bulletin.css new file mode 100644 index 0000000..1cb78e3 --- /dev/null +++ b/uVote/page/default_bulletin/css/bulletin.css @@ -0,0 +1,48 @@ +#bulletin_main { + float: left; + width: 100%; +} + +#bulletin_left { + float: left; +} + +#bulletin_sub1 { + margin-top: 30px; +} + +#bulletin_sub2 { + float: left; + width: 50%; + padding-top: 30px; +} + +#bulletin_sub3 { + float: right; + width: 50%; + padding-top: 30px; +} +#divider { + clear: both; +} + +#bulletin_sub4 { + padding-top: 30px; +} +#bulletin_sub5 { + padding-top: 20px; +} + +#bulletin_sub5_sub { + float: left; + width: 40%; +} + + #bulletin_sub6 { + float: right; + width: 40%; + } + + #bulletin_sub7 { + clear: both; + } \ No newline at end of file diff --git a/uVote/page/default_bulletin/css/comment.css b/uVote/page/default_bulletin/css/comment.css new file mode 100644 index 0000000..125793f --- /dev/null +++ b/uVote/page/default_bulletin/css/comment.css @@ -0,0 +1,22 @@ +#comment_main { + float: left; + width: 90%; +} + +#comment_sub1 { + float: left; + font-size: 1; +} + +#comment_sub2 { + clear: both; +} + +#comment_sub3 { + font-size: 2; +} + +#comment_sub4 { + float: right; + font-size: 1; +} \ No newline at end of file diff --git a/uVote/page/default_bulletin/default_bulletin.php b/uVote/page/default_bulletin/default_bulletin.php index ff6b783..5d6361b 100644 --- a/uVote/page/default_bulletin/default_bulletin.php +++ b/uVote/page/default_bulletin/default_bulletin.php @@ -195,7 +195,9 @@ class default_bulletin extends SYSTEM\PAGE\Page { private function js(){ return '';} private function css(){ - return '';} + return ''. + ''. + '';} diff --git a/uVote/page/default_page/cover.tpl b/uVote/page/default_page/cover.tpl index 4be7ec8..1ff8efd 100644 --- a/uVote/page/default_page/cover.tpl +++ b/uVote/page/default_page/cover.tpl @@ -1,6 +1,6 @@ -
+
-
+
diff --git a/uVote/page/default_page/css/cover.css b/uVote/page/default_page/css/cover.css new file mode 100644 index 0000000..df0a719 --- /dev/null +++ b/uVote/page/default_page/css/cover.css @@ -0,0 +1,6 @@ +.row { + margin-right: 30px; +} +#cover_style { + margin-right: 25px; +} \ No newline at end of file diff --git a/uVote/page/default_page/css/full_vote.css b/uVote/page/default_page/css/full_vote.css new file mode 100644 index 0000000..40a001f --- /dev/null +++ b/uVote/page/default_page/css/full_vote.css @@ -0,0 +1,11 @@ +.row { + margin: 0; +} + +.span6 { + float: right +} + +.span6#iframe_ { + width: 50%; +} \ No newline at end of file diff --git a/uVote/page/default_page/css/loggedinform.css b/uVote/page/default_page/css/loggedinform.css new file mode 100644 index 0000000..5da54ab --- /dev/null +++ b/uVote/page/default_page/css/loggedinform.css @@ -0,0 +1,9 @@ +.row#row_loggedinform { + padding-bottom: 20px; +} + +.btn#btn_loggedinform { + margin-left: 150px; + height: 100px; + width: 100px; +} \ No newline at end of file diff --git a/uVote/page/default_page/css/loggedinformtop.css b/uVote/page/default_page/css/loggedinformtop.css new file mode 100644 index 0000000..e69de29 diff --git a/uVote/page/default_page/css/page.css b/uVote/page/default_page/css/page.css new file mode 100644 index 0000000..6967da3 --- /dev/null +++ b/uVote/page/default_page/css/page.css @@ -0,0 +1,35 @@ +body { + padding-top: 60px; +} + +.main_container { +} + +.modal { + float: left; + display:none; +} + +.navbar-inner { + padding-left: 50px; + padding-right: 50px; +} + +#site-content { + padding: 0; + margin: 0; + margin-left: 35px; +} + +#user_main { + padding: 0; + padding-top: 0px; + width: 50%; + float: left; +} + +#user_list { + padding: 0px; + width: 50%; + float: right; +} \ No newline at end of file diff --git a/uVote/page/default_page/css/parties_on_vote.css b/uVote/page/default_page/css/parties_on_vote.css new file mode 100644 index 0000000..e69de29 diff --git a/uVote/page/default_page/css/register_form.css b/uVote/page/default_page/css/register_form.css new file mode 100644 index 0000000..5984d36 --- /dev/null +++ b/uVote/page/default_page/css/register_form.css @@ -0,0 +1,23 @@ +.btn#btn_register_form { + margin-top: 0; +} + +.control-group{ + margin: 0px; + padding: 0px; +} + +#remember_me { + margin-top: -1px; +} + +#help-block-user-password-combi-wrong { + display: none; + color: red; +} + +.btn btn-primary#btn-primary_register_form { + clear: left; + height: 32px; + font-size: 13px; +} \ No newline at end of file diff --git a/uVote/page/default_page/css/vote.css b/uVote/page/default_page/css/vote.css new file mode 100644 index 0000000..a73fddb --- /dev/null +++ b/uVote/page/default_page/css/vote.css @@ -0,0 +1,69 @@ +#vote_main { + margin-bottom: 5px; + width: 100%; + min-height: 125px; + border: solid lightgray 1px; + background: beige; +} + +#vote_sub1 { + float: left; + width: 75%; + padding: 5px; + padding-top: 0; +} + +#vote_sub2 { + margin: 0; + padding: 0; + float: right; +} + +#vote_sub3 { + width: 100%; + height: 125px; + margin: 0; + padding: 0; +} + +#bt_vote_class_ { + float: left; + width: 80px; + border-left: 1px solid lightgray; + padding-right: 2px; + padding-left: 2px; +} + + #uv_vote_class_ { + float: left; + height: 125px; + width: 60px; + border-left: 1px solid lightgray; + padding-right: 2px; + padding-left: 2px; + } + +#time_done { + background: white; + margin: 0; + padding: 0; +} + +#vote_sub_3_1 { + width: 5px; + margin: 0; + padding: 0; +} + +#vote_sub_3_2 { + width: 5px; + margin: 0; + padding: 0; +} + +#time_left { + background: blue; + margin: 0; + padding: 0; +} + \ No newline at end of file diff --git a/uVote/page/default_page/css/vote_bt.css b/uVote/page/default_page/css/vote_bt.css new file mode 100644 index 0000000..7ef6333 --- /dev/null +++ b/uVote/page/default_page/css/vote_bt.css @@ -0,0 +1,3 @@ +#vote_bt_span { + float:right; +} \ No newline at end of file diff --git a/uVote/page/default_page/default_page.php b/uVote/page/default_page/default_page.php index 00192a4..815afca 100644 --- a/uVote/page/default_page/default_page.php +++ b/uVote/page/default_page/default_page.php @@ -16,6 +16,15 @@ class default_page extends SYSTEM\PAGE\Page { private function css(){ return ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. ''. ''. '';} diff --git a/uVote/page/default_page/full_vote.tpl b/uVote/page/default_page/full_vote.tpl index 6d87166..47f533b 100644 --- a/uVote/page/default_page/full_vote.tpl +++ b/uVote/page/default_page/full_vote.tpl @@ -1,8 +1,8 @@ -
-
+
+ -
+
diff --git a/uVote/page/default_page/loggedinform.tpl b/uVote/page/default_page/loggedinform.tpl index 54a31c3..7b259ae 100644 --- a/uVote/page/default_page/loggedinform.tpl +++ b/uVote/page/default_page/loggedinform.tpl @@ -12,7 +12,7 @@ Zum Umgang mit diesen Daten lesen sie bitte
unsere AGBs.
-
+
- +
diff --git a/uVote/page/default_page/loginform.css b/uVote/page/default_page/loginform.css new file mode 100644 index 0000000..62d3bf7 --- /dev/null +++ b/uVote/page/default_page/loginform.css @@ -0,0 +1,20 @@ +#help-block { + float: left; + padding: 0; +} + +#controls { + float: left; + margin-right: 10px; +} + + #controls2 { + float: left; + margin-right: 20px; + } + +.btn btn-primary#login_submit { + float: left; + height: 32px; + font-size: 13px; +} \ No newline at end of file diff --git a/uVote/page/default_page/loginform.tpl b/uVote/page/default_page/loginform.tpl index 750d197..4f98cb2 100644 --- a/uVote/page/default_page/loginform.tpl +++ b/uVote/page/default_page/loginform.tpl @@ -3,11 +3,11 @@ --> -