diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index d625c0641..278ce8b60 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -264,11 +264,28 @@ img { float: right; } -.col1 .meta { +.col1 .meta .title { + width: 100%; + cursor: pointer; + height: 30px; + color: #fff; + background: #317796; + padding: 5px 20px 0 20px; +} +.col1 .meta .title .name { + float: left; + font-size: 14px; +} +.col1 .meta .title .icon { + float: right; +} + +.col1 .meta .detail { padding: 0 20px 10px 20px; - width: auto; + width: 100%; min-height: 30px; - background: #bed4de; + background: #d3d3d3; + color: #444; } .col1 .meta h3 { @@ -304,17 +321,15 @@ img { width: 70px; } -#content .col2 h4 { +#content .col2 h4, .col1 .meta h3 { font-size: 22px; line-height: 24px; font-family: 'Roboto Condensed Light'; font-weight: 300; -} - -#content .col2 a h4 { color: #444; } + #content .col2 a:hover h4 { text-decoration: none; } @@ -380,7 +395,6 @@ img { text-align: center; padding-top: 7px; font-size: 24px; - opacity: 0.5; } .col2 .projector_full .title a, .col2 .projector_full .title a:hover { @@ -388,6 +402,9 @@ img { text-decoration: none; display: block; } +.meta .title:hover, .col2 .projector_full .title:hover { + color: #d3d3d3; +} .col2 .projector_full .details { clear: both; @@ -659,8 +676,19 @@ img { .result_label { margin-top: 5px; } -tr.total td { - font-weight: bold; +.pollresults table { + margin-bottom: 0; +} +.pollresults table td{ + border: none !important; + padding: 5px 2px !important; + vertical-align: middle !important; +} +.pollresults table .icon { + color: #636363; +} +.pollresults table tr.total td { + border-top: 1px solid #444 !important; } /* Chatbox */ diff --git a/openslides/core/static/templates/index.html b/openslides/core/static/templates/index.html index d7b478265..436524e2f 100644 --- a/openslides/core/static/templates/index.html +++ b/openslides/core/static/templates/index.html @@ -157,11 +157,11 @@
- + Projector
- +
diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 1511720c1..5e9a3b06b 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -42,6 +42,9 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions']) }, users: function(User) { return User.findAll(); + }, + workflows: function(Workflow) { + return Workflow.findAll(); } } }) diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html index 8f822d226..461d895be 100644 --- a/openslides/motions/static/templates/motions/motion-detail.html +++ b/openslides/motions/static/templates/motions/motion-detail.html @@ -41,9 +41,17 @@
- -
+
+
+ + Meta information +
+
+ +
+
+
+

Submitters

@@ -163,60 +171,59 @@
- -
- - Yes: -
-
- -
-
{{ poll.yes }} {{ poll.getYesPercent() }}
- -
- - No: -
-
- -
-
{{ poll.no }} {{ poll.getNoPercent() }}
- -
- - Abstain: -
-
- -
-
{{ poll.abstain }} {{ poll.getAbstainPercent() }}
-
- -
-
- - Valid votes: -
-
{{ poll.votesvalid }} {{ poll.getVotesValidPercent() }}
-
- -
-
- - Invalid votes: -
-
{{ poll.votesinvalid }} {{ poll.getVotesInvalidPercent() }}
-
-
- -
-
- - Votes cast: -
-
{{ poll.votescast }} {{ poll.getVotesCastPercent() }}
-
-
+ + + + + + + + +
+ + + Yes: + {{ poll.yes }} {{ poll.getYesPercent() }} +
+ +
+ +
+ + + No: + {{ poll.no }} {{ poll.getNoPercent() }} +
+ +
+ +
+ + + Abstain: + {{ poll.abstain }} {{ poll.getAbstainPercent() }} +
+ +
+ +
+ + + Valid votes: + {{ poll.votesvalid }} {{ poll.getVotesValidPercent() }} + +
+ + + Invalid votes: + {{ poll.votesinvalid }} {{ poll.getVotesInvalidPercent() }} + +
+ + + Votes cast: + {{ poll.votescast }} {{ poll.getVotesCastPercent() }} +
+