Merge pull request #2002 from emanuelschuetze/fixes2

Template improvements

openslides/agenda/static/js/agenda/base.js

@@ -80,7 +80,7 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
                     );
                 },
                 // override isProjected function of jsDataModel factory
-                isProjected: function () {
+                isProjected: function (list) {
                     // Returns true if there is a projector element with the same
                     // name and the same id.
                     var projector = Projector.get(1);
@@ -88,9 +88,19 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
                     if (typeof projector !== 'undefined') {
                         var self = this;
                         var predicate = function (element) {
-                            return element.name == self.content_object.collection &&
+                            var value;
-                                typeof element.id !== 'undefined' &&
+                            if (typeof list === 'undefined') {
-                                element.id == self.content_object.id;
+                                // Releated item detail slide
+                                value = element.name == self.content_object.collection &&
+                                    typeof element.id !== 'undefined' &&
+                                    element.id == self.content_object.id;
+                            } else {
+                                // Item list slide for sub tree
+                                value = element.name == 'agenda/item-list' &&
+                                    typeof element.id !== 'undefined' &&
+                                    element.id == self.id;
+                            }
+                            return value;
                         };
                         isProjected = typeof _.findKey(projector.elements, predicate) === 'string';
                     } else {
@@ -186,21 +196,21 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
                 return getChildren(parentItems);
             },
 
-            // Returns a list of all items as a flat tree the attribute parentCount
+            // Returns a list of all items as a flat tree
             getFlatTree: function(items) {
                 var tree = this.getTree(items);
                 var flatItems = [];
 
-                function generateFatTree(tree, parentCount) {
+                function generateFlatTree(tree, parentCount) {
                     _.each(tree, function (item) {
                         item.item.parentCount = parentCount;
                         flatItems.push(item.item);
-                        generateFatTree(item.children, parentCount + 1);
+                        generateFlatTree(item.children, parentCount + 1);
                     });
                 }
-                generateFatTree(tree, 0);
+                generateFlatTree(tree, 0);
                 return flatItems;
-            },
+            }
         };
     }
 ])

openslides/agenda/static/js/agenda/projector.js

@@ -34,9 +34,10 @@ angular.module('OpenSlidesApp.agenda.projector', ['OpenSlidesApp.agenda'])
 .controller('SlideItemListCtrl', [
     '$scope',
     '$http',
+    '$filter',
     'Agenda',
     'AgendaTree',
-    function($scope, $http, Agenda, AgendaTree) {
+    function($scope, $http, $filter, Agenda, AgendaTree) {
         // Attention! Each object that is used here has to be dealt on server side.
         // Add it to the coresponding get_requirements method of the ProjectorElement
         // class.
@@ -45,7 +46,30 @@ angular.module('OpenSlidesApp.agenda.projector', ['OpenSlidesApp.agenda'])
         $scope.$watch(function () {
             return Agenda.lastModified();
         }, function () {
-            $scope.items = AgendaTree.getFlatTree(Agenda.getAll());
+            if ($scope.element.id) {
+                $scope.rootItem = Agenda.get($scope.element.id);
+                var tree = AgendaTree.getFlatTree(Agenda.getAll());
+                var startIndex = tree.indexOf($scope.rootItem);
+                tree = tree.slice(startIndex);
+                // define delta to move the whole subtree to level 0
+                if (tree[0]) {
+                    var parentCountDelta = tree[0].parentCount;
+                }
+                $scope.items = [];
+                for (var i = 1; i < tree.length; i++) {
+                    if (tree[i].parentCount - parentCountDelta <= 0) {
+                        break;
+                    }
+                    var item = tree[i];
+                    // move rootItem (and all childs) to level 0
+                    item.parentCount = item.parentCount - parentCountDelta;
+                    $scope.items.push(item);
+                }
+            } else if ($scope.element.tree) {
+                $scope.items = AgendaTree.getFlatTree(Agenda.getAll());
+            } else {
+                $scope.items = $filter('filter')(Agenda.getAll(), {'parent_id': null});
+            }
         });
     }
 ]);

openslides/agenda/static/js/agenda/site.js

@@ -178,19 +178,31 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
         };
 
         // project agenda
-        $scope.projectAgenda = function () {
+        $scope.projectAgenda = function (tree, id) {
             $http.post('/rest/core/projector/1/prune_elements/',
-                    [{name: 'agenda/item-list'}]);
+                    [{name: 'agenda/item-list', tree: tree, id: id}]);
         };
         // check if agenda is projected
-        $scope.isAgendaProjected = function () {
+        $scope.isAgendaProjected = function (tree) {
             // Returns true if there is a projector element with the name
             // 'agenda/item-list'.
             var projector = Projector.get(1);
             if (typeof projector === 'undefined') return false;
             var self = this;
             var predicate = function (element) {
-                return element.name == 'agenda/item-list';
+                var value;
+                if (typeof tree === 'undefined') {
+                    // only main agenda items
+                    value = element.name == 'agenda/item-list' &&
+                        typeof element.id === 'undefined' &&
+                        !element.tree;
+                } else {
+                    // tree with all agenda items
+                    value = element.name == 'agenda/item-list' &&
+                        typeof element.id === 'undefined' &&
+                        element.tree;
+                }
+                return value;
             };
             return typeof _.findKey(projector.elements, predicate) === 'string';
         };

openslides/agenda/static/templates/agenda/item-list.html

@@ -38,14 +38,26 @@
             <translate>Select ...</translate>
           </button>
           <!-- project agenda button -->
-          <a os-perms="core.can_manage_projector"
+          <div class="btn-group" uib-dropdown>
-              class="btn btn-default"
+            <button os-perms="core.can_manage_projector"
-              title="{{ 'Project agenda' | translate }}"
+                type="button"
-              ng-click="projectAgenda()"
+                class="btn btn-default"
-              ng-class="{ 'btn-primary': isAgendaProjected() }">
+                title="{{ 'Project agenda' | translate }}"
-            <i class="fa fa-video-camera"></i>
+                ng-click="projectAgenda(tree=true)"
-            <translate>Agenda</translate>
+                ng-class="{ 'btn-primary': isAgendaProjected(tree=true) }">
-          </a>
+              <i class="fa fa-video-camera"></i>
+              <translate>Agenda</translate>
+            </button>
+            <button type="button" class="btn btn-default"
+                ng-class="{ 'btn-primary': isAgendaProjected() }"
+                uib-dropdown-toggle>
+              <span class="caret"></span>
+            </button>
+            <ul class="uib-dropdown-menu" role="menu" aria-labelledby="split-button">
+              <li role="menuitem"><a href="" ng-click="projectAgenda(tree=true)" translate>All agenda items (Default)</a>
+              <li role="menuitem"><a href="" ng-click="projectAgenda(tree=false)" translate>Only main agenda items</a>
+            </ul>
+          </div>
           <!-- auto numbering button -->
           <a os-perms="core.can_manage_projector"
               class="btn btn-default"
@@ -123,12 +135,25 @@
           ng-class="{ 'activeline': item.isProjected(), 'selected': item.selected, 'hiddenrow': item.is_hidden}">
         <!-- projector column -->
         <td ng-show="!isDeleteMode" os-perms="core.can_manage_projector">
-          <a class="btn btn-default btn-sm"
+          <div class="btn-group" style="width:54px;" uib-dropdown>
-              ng-class="{ 'btn-primary': item.isProjected() }"
+            <button os-perms="core.can_manage_projector"
-              ng-click="item.project()"
+                type="button"
-              title="{{ 'Project item' | translate }}">
+                class="btn btn-default btn-sm"
-            <i class="fa fa-video-camera"></i>
+                title="{{ 'Project item' | translate }}"
-          </a>
+                ng-click="item.project()"
+                ng-class="{ 'btn-primary': item.isProjected() }">
+              <i class="fa fa-video-camera"></i>
+            </button>
+            <button type="button" class="btn btn-default btn-sm slimDropDown"
+                ng-class="{ 'btn-primary': item.isProjected(list=true) }"
+                uib-dropdown-toggle>
+              <span class="caret"></span>
+            </button>
+            <ul class="uib-dropdown-menu" role="menu" aria-labelledby="split-button">
+              <li role="menuitem"><a href="" ng-click="item.project()" translate>Project item (Default)</a>
+              <li role="menuitem"><a href="" ng-click="projectAgenda(tree=true, id=item.id)" translate>Project all sub items</a>
+            </ul>
+          </div>
         <!-- delete selection column -->
         <td ng-show="isDeleteMode" os-perms="agenda.can_manage" class="deleteColumn">
           <input type="checkbox" ng-model="item.selected">

openslides/agenda/static/templates/agenda/slide-item-list.html

@@ -1,13 +1,13 @@
 <div ng-controller="SlideItemListCtrl" class="content scrollcontent">
-  <h1 translate>Agenda</h1>
+  <h1 ng-if="!element.id" translate>Agenda</h1>
+  <h1 ng-if="element.id">{{ rootItem.getTitle() }}</h1>
 
   <div class="agendalist">
     <!-- item type: AGENDA_ITEM = 1, HIDDEN_ITEM = 2 -->
     <p ng-repeat="item in items | filter: {type: 1}"
-        ng-class="item.parent_id ? 'subitem' : 'mainitem'">
+        ng-class="{mainitem: item.parentCount == 0, subitem: item.parentCount != 0, done: item.closed}">
       <span ng-repeat="n in [].constructor(item.parentCount) track by $index">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
       {{ item.getListViewTitle() }}
-      <i ng-if="item.closed" class="fa fa-check"></i>
     </p>
   </div>
 </div>

openslides/core/static/css/app.css

@@ -532,6 +532,11 @@ img {
     background-color: #317796;
 }
 
+.slimDropDown {
+    padding-left: 4px !important;
+    padding-right: 4px !important;
+}
+
 .spacer, .spacer-top {
     margin-top: 7px;
 }

openslides/core/static/css/projector.css

@@ -301,6 +301,9 @@ tr.elected td {
 .agendalist p {
     font-size: 140%;
 }
+.agendalist p.done {
+    color: #9a9898;
+}
 .agendalist .mainitem {
     margin-top: 25px;
 }

openslides/users/static/js/users/site.js

@@ -105,6 +105,9 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
             resolve: {
                 group: function(Group, $stateParams) {
                     return Group.find($stateParams.id);
+                },
+                permissions: function(Group) {
+                    return Group.getPermissions();
                 }
             }
         })
@@ -854,8 +857,19 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
     '$scope',
     'Group',
     'group',
-    function($scope, Group, group) {
+    'permissions',
+    function($scope, Group, group, permissions) {
         Group.bindOne(group.id, $scope, 'group');
+        $scope.groupPermissionNames = [];
+        // get display names of group permissions
+        // from an object array with all available permissions [{display_name, value}]
+        angular.forEach(group.permissions, function(permValue) {
+            angular.forEach(permissions, function(p) {
+                if (p.value == permValue) {
+                    $scope.groupPermissionNames.push(p.display_name);
+                }
+            });
+        });
     }
 ])
 

openslides/users/static/templates/users/group-detail.html

@@ -6,14 +6,14 @@
         <translate>Back to overview</translate>
       </a>
     </div>
-    <h1>{{ group.name }}</h1>
+    <h1>{{ group.name | translate }}</h1>
     <h2 translate>Group</h2>
   </div>
 </div>
 
 <div class="details">
   <p class="lead" translate>Permissions:</p>
-  <ul ng-repeat="perm in group.permissions">
+  <ul ng-repeat="permission in groupPermissionNames">
-    <li>{{ perm }}
+    <li>{{ permission | translate }}
   </ul>
 </div>