Merge pull request #1843 from emanuelschuetze/motionsTemplate

Motion template fixes

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;
@@ -679,8 +696,19 @@ img {
 .result_label {
     margin-top: 5px;
 }
-tr.total td {
+.pollresults table {
-    font-weight: bold;
+    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 */

openslides/core/static/templates/index.html

@@ -157,11 +157,11 @@
       <div class="projector_full" ng-if="isProjectorSidebar">
         <div class="title" ng-click="showProjectorSidebar(false)">
           <div class="name">
-            <i class="fa fa-caret-square-o-right"></i>
+            <i class="fa fa-video-camera"></i>
             <translate>Projector</translate>
           </div>
           <div class="icon">
-            <i class="fa fa-video-camera"></i>
+            <i class="fa fa-angle-right"></i>
           </div>
         </div>
         <div ng-include src="'static/templates/core/projector-controls.html'"></div>

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();
                 }
             }
         })

openslides/motions/static/templates/motions/motion-detail.html

@@ -41,9 +41,17 @@
 </div>
 
 <div class="meta">
-  <i class="fa toggle-icon pointer" ng-click="isMeta = !isMeta"
+  <div class="title" ng-click="isMeta = !isMeta">
-    ng-class="isMeta ? 'fa-angle-down' : 'fa-angle-up'"></i>
+    <div class="name">
-  <div class="row" uib-collapse="isMeta">
+      <i class="fa fa-info-circle"></i>
+      <translate>Meta information</translate>
+    </div>
+    <div class="icon">
+      <i class="fa fa-lg" ng-class="isMeta ? 'fa-angle-down' : 'fa-angle-up'"></i>
+    </div>
+  </div>
+  <div class="detail" uib-collapse="isMeta">
+  <div class="row">
     <div class="col-sm-4">
         <!-- submitters -->
         <h3 translate>Submitters</h3>
@@ -163,60 +171,59 @@
               </form>
             </div>
             <div ng-show="!poll.isEditMode" class="pollresults">
-              <!-- yes -->
+              <table class="table">
-              <div class="result_label">
+                <!-- yes -->
-                <i class="fa fa-thumbs-up"></i>
+                <tr>
-                <translate>Yes</translate>:
+                  <td class="icon">
-              </div>
+                    <i class="fa fa-thumbs-up fa-2x"></i>
-              <div ng-if="poll.getYesPercent(true)">
+                  <td>
-                <uib-progressbar value="poll.getYesPercent(true)" type="success"></uib-progressbar>
+                    <span class="result_label"><translate>Yes</translate>:</span>
-              </div>
+                    <span class="result_value">{{ poll.yes }} {{ poll.getYesPercent() }}</span>
-              <div class="result_value">{{ poll.yes }} {{ poll.getYesPercent() }}</div>
+                    <div ng-if="poll.getYesPercent(true)">
-              <!-- no -->
+                      <uib-progressbar value="poll.getYesPercent(true)" type="success"></uib-progressbar>
-              <div class="result_label">
+                    </div>
-                <i class="fa fa-thumbs-down"></i>
+                <!-- no -->
-                <translate>No</translate>:
+                <tr>
-              </div>
+                  <td class="icon">
-              <div ng-if="poll.getNoPercent(true)">
+                    <i class="fa fa-thumbs-down fa-2x"></i>
-                <uib-progressbar value="poll.getNoPercent(true)" type="danger"></uib-progressbar>
+                  <td>
-              </div>
+                    <span class="result_label"><translate>No</translate>:</span>
-              <div class="result_value">{{ poll.no }} {{ poll.getNoPercent() }}</div>
+                    <span class="result_value">{{ poll.no }} {{ poll.getNoPercent() }}</span>
-              <!-- abstain -->
+                    <div ng-if="poll.getNoPercent(true)">
-              <div class="result_label">
+                      <uib-progressbar value="poll.getNoPercent(true)" type="danger"></uib-progressbar>
-                <b>&empty;</b>
+                    </div>
-                <translate>Abstain</translate>:
+                <!-- abstain -->
-              </div>
+                <tr>
-              <div ng-if="poll.getAbstainPercent(true)">
+                  <td class="icon">
-                <uib-progressbar value="poll.getAbstainPercent(true)" type="warning"></uib-progressbar>
+                    <strong style="font-size: 26px">&empty;</strong>
-              </div>
+                  <td>
-              <div class="result_value">{{ poll.abstain }} {{ poll.getAbstainPercent() }}</div>
+                    <span class="result_label"><translate>Abstain</translate>:</span>
-              <hr class="smallhr" ng-if="poll.votesvalid || poll.votesinvalid">
+                    <span class="result_value">{{ poll.abstain }} {{ poll.getAbstainPercent() }}</span>
-              <!-- valid votes -->
+                    <div ng-if="poll.getAbstainPercent(true)">
-              <div ng-if="poll.votesvalid">
+                      <uib-progressbar value="poll.getAbstainPercent(true)" type="warning"></uib-progressbar>
-                <div class="result_label">
+                    </div>
-                  <i class="fa fa-check"></i>
+                <!-- valid votes -->
-                  <translate>Valid votes</translate>:
+                <tr>
-                </div>
+                  <td class="icon">
-                <div class="result_value">{{ poll.votesvalid }} {{ poll.getVotesValidPercent() }}</div>
+                    <i class="fa fa-check fa-lg"></i>
-              </div>
+                  <td>
-              <!-- invalid votes -->
+                    <span class="result_label"><translate>Valid votes</translate>:</span>
-              <div ng-if="poll.votesinvalid">
+                    <span class="result_value">{{ poll.votesvalid }} {{ poll.getVotesValidPercent() }}</span>
-                <div class="result_label">
+                <!-- invalid votes -->
-                  <i class="fa fa-ban"></i>
+                <tr>
-                  <translate>Invalid votes</translate>:
+                  <td class="icon">
-                </div>
+                    <i class="fa fa-ban fa-lg"></i>
-                <div class="result_value">{{ poll.votesinvalid }} {{ poll.getVotesInvalidPercent() }}</div>
+                  <td>
-              </div>
+                    <span class="result_label"><translate>Invalid votes</translate>:</span>
-              <hr class="smallhr" ng-if="poll.votescast">
+                    <span class="result_value">{{ poll.votesinvalid }} {{ poll.getVotesInvalidPercent() }}</span>
-              <!-- votes cast -->
+                <!-- votes cast -->
-              <div ng-if="poll.votescast">
+                <tr class="total">
-                <div class="result_label">
+                  <td class="icon">
-                  <b>&sum;</b>
+                    <strong style="font-size: 16px">&sum;</strong>
-                  <translate>Votes cast</translate>:
+                  <td>
-                </div>
+                    <span class="result_label"><translate>Votes cast</translate>:</span>
-                <div class="result_value">{{ poll.votescast }} {{ poll.getVotesCastPercent() }}</div>
+                    <span class="result_value">{{ poll.votescast }} {{ poll.getVotesCastPercent() }}</span>
-              </div>
+              </table>
-            </div>
         </ol>
         <button ng-if="motion.isAllowed('create_poll')" ng-click="create_poll()" class="btn btn-default btn-sm">
           <i class="fa fa-bar-chart fa-lg"></i>
@@ -225,6 +232,7 @@
     </div>
     <div class="col-sm-1"></div>
   </div>
+  </div>
 </div>
 
 <div class="details">