Merge pull request #1775 from emanuelschuetze/templateStuff

Fixed some template bugs (#1727)

openslides/assignments/static/js/assignments/site.js

@@ -358,6 +358,9 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments'])
     'Assignment',
     'AssignmentFormFieldFactory',
     function($scope, $state, Assignment, AssignmentFormFieldFactory) {
+        $scope.model = {};
+        // set default value for open posts form field
+        $scope.model.open_posts = 1;
         // get all form fields
         $scope.formFields = AssignmentFormFieldFactory.getFormFields();
 

openslides/core/static/css/app.css

@@ -396,10 +396,13 @@ img {
 }
 
 .col2 .projector_full .details .section {
-    padding: 10px 20px;
+    padding: 1px 20px;
     width: auto;
     border-bottom: 1px solid #c2c2c2;
 }
+.col2 .projector_full .details .section div.in.collapse {
+    padding-bottom: 15px;
+}
 
 #content .col2 .section a:hover {
     text-decoration: none;
@@ -409,6 +412,7 @@ img {
 #content .toggle-icon {
     font-size: 20px;
     float: right;
+    margin-top: 10px;
 }
 
 /* countdown and message controls */

openslides/core/static/css/projector.css

@@ -159,7 +159,7 @@ hr {
     left: 0;
     width: 100%;
     height: 100%;
-    z-index: 200;
+    z-index: 300;
 }
 .message {
     position: fixed;
@@ -172,7 +172,7 @@ hr {
     font-size: 2.75em;
     padding: 0.2em 0;
     line-height: normal !important;
-    z-index: 201;
+    z-index: 301;
 }
 
 

openslides/core/static/templates/core/projector-controls.html

@@ -4,11 +4,11 @@
   <div ng-controller="ProjectorControlCtrl">
     <!-- live view -->
     <div class="section" os-perms-lite="core.can_see_projector">
-      <a href="#" ng-click="isLiveView = !isLiveView">
-        <i class="fa toggle-icon" ng-class="isLiveView ? 'fa-angle-up' : 'fa-angle-down'"></i>
+      <a href="#" ng-click="isLiveViewClosed = !isLiveViewClosed">
+        <i class="fa toggle-icon" ng-class="isLiveViewClosed ? 'fa-angle-up' : 'fa-angle-down'"></i>
         <h4 translate>Live view</h4>
       </a>
-      <div uib-collapse="!isLiveView">
+      <div uib-collapse="isLiveViewClosed">
         <a ui-sref="projector" target="_blank">
           <div id="iframewrapper">
             <iframe id="iframe" src="/projector" frameborder="0"></iframe>
@@ -16,7 +16,7 @@
           </div>
         </a>
         <!-- projector control buttons -->
-        <p os-perms="core.can_manage_projector">
+        <div os-perms="core.can_manage_projector">
           <a ng-click="editCurrentSlide()"
               class="btn btn-default btn-sm"
               title="{{ 'Edit current slide' | translate}}">
@@ -51,7 +51,7 @@
             <i class="fa fa-undo"></i>
           </a>
           <span ng-class="{ 'notNull': scrollLevel != 0 }">{{ scrollLevel }}</span>
-        </p>
+        </div>
       </div>
     </div>
 

openslides/motions/static/js/motions/site.js

@@ -485,21 +485,18 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
         User.bindAll({}, $scope, 'users');
         Workflow.bindAll({}, $scope, 'workflows');
 
+        $scope.model = {};
+        // set default values for create form
+        // ... set preamble config value as text
+        $scope.model.text = Config.get('motions_preamble').value;
+        // ... preselect default workflow
+        $scope.model.workflow_id = Config.get('motions_workflow').value;
         // get all form fields
         $scope.formFields = MotionFormFieldFactory.getFormFields();
-        // override default values for create form
         for (var i = 0; i < $scope.formFields.length; i++) {
             if ($scope.formFields[i].key == "identifier") {
                $scope.formFields[i].hide = true;
             }
-            if ($scope.formFields[i].key == "text") {
-               // set  preamble config value as default text
-               $scope.formFields[i].defaultValue = Config.get('motions_preamble').value;
-            }
-            if ($scope.formFields[i].key == "workflow_id") {
-               // preselect default workflow
-               $scope.formFields[i].defaultValue = Config.get('motions_workflow').value;
-            }
         }
         // save motion
         $scope.save = function (motion) {