diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index ced67ce89..8655e0dc5 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -31,7 +31,8 @@
-
- @@ -95,6 +97,7 @@
+ {{ itemsFiltered.length }} / {{ items.length }} {{ "items" | translate }}, {{(items|filter:{selected:true}).length}} {{ "selected" | translate }}
@@ -115,8 +118,8 @@ Done - diff --git a/openslides/assignments/static/templates/assignments/assignment-list.html b/openslides/assignments/static/templates/assignments/assignment-list.html index 2247c4b03..bb5ad32e9 100644 --- a/openslides/assignments/static/templates/assignments/assignment-list.html +++ b/openslides/assignments/static/templates/assignments/assignment-list.html @@ -23,7 +23,8 @@
-
- @@ -69,6 +71,7 @@
+ {{ assignmentsFiltered.length }} / {{ assignments.length }} {{ "elections" | translate }}, {{(assignments|filter:{selected:true}).length}} {{ "selected" | translate }}
@@ -96,8 +99,8 @@ ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'"> - diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index 596b8e03c..e86fbf513 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -648,23 +648,21 @@ img { /* ngAnimate classes */ .animate-item.ng-enter { - -webkit-animation: fade-in 1s linear; - animation: fade-in 1.5s linear; + -webkit-animation: fade-in 0.5s linear; + animation: fade-in 0.5s linear; } .animate-item.ng-leave { - -webkit-animation: fade-out 1s linear; - animation: fade-out 1.5s linear; + -webkit-animation: fade-out 0.25s linear; + animation: fade-out 0.25s linear; } @keyframes fade-out { 0% { opacity: 1; background: none; } - 25% { opacity: 1; background: #f8efc0; } 100% { opacity: 0; background: none; } } @keyframes fade-in { 0% { opacity: 0; background: none; } - 25% { opacity: 1; background: #dff0d8; } 100% { opacity: 1; background: none; } } diff --git a/openslides/motions/static/templates/motions/motion-list.html b/openslides/motions/static/templates/motions/motion-list.html index 3e6a6fb27..3ee877c10 100644 --- a/openslides/motions/static/templates/motions/motion-list.html +++ b/openslides/motions/static/templates/motions/motion-list.html @@ -30,7 +30,8 @@
-
- @@ -75,6 +77,7 @@
+ {{ motionsFiltered.length }} / {{ motions.length }} {{ "motions" | translate }}, {{(motions|filter:{selected:true}).length}} {{ "selected" | translate }}
@@ -82,9 +85,9 @@ - + - + Identifier @@ -112,8 +115,8 @@ ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'"> - diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js index 1f23fd434..7ddccafef 100644 --- a/openslides/users/static/js/users/site.js +++ b/openslides/users/static/js/users/site.js @@ -35,6 +35,9 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users']) resolve: { users: function(User) { return User.findAll(); + }, + groups: function(Group) { + return Group.findAll(); } } }) diff --git a/openslides/users/static/templates/users/user-list.html b/openslides/users/static/templates/users/user-list.html index a64ea257b..4412bc03c 100644 --- a/openslides/users/static/templates/users/user-list.html +++ b/openslides/users/static/templates/users/user-list.html @@ -40,7 +40,8 @@
-
- @@ -64,7 +66,12 @@
-
+
+ + Is present @@ -83,6 +90,7 @@
+ {{ usersFiltered.length }} / {{ users.length }} {{ "participants" | translate }}, {{(users|filter:{selected:true}).length}} {{ "selected" | translate }}
@@ -90,9 +98,9 @@ - + - + Name @@ -116,8 +124,9 @@ ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'"> -