From 88537cf67e0cb54be54e059feb44f0ea03c5a533 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@rats-os.de>
Date: Mon, 21 Nov 2016 15:01:54 +0100
Subject: [PATCH 1/2] Some improvements for Multiprojector

---
 .../static/templates/core/manage-projectors.html     |  6 ++++--
 .../static/templates/motions/motion-list.html        |  2 +-
 openslides/users/static/js/users/site.js             | 12 +++++++++++-
 .../users/static/templates/users/user-detail.html    |  8 ++------
 .../users/static/templates/users/user-list.html      |  2 +-
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/openslides/core/static/templates/core/manage-projectors.html b/openslides/core/static/templates/core/manage-projectors.html
index a5e6c0b59..0a48d375b 100644
--- a/openslides/core/static/templates/core/manage-projectors.html
+++ b/openslides/core/static/templates/core/manage-projectors.html
@@ -26,7 +26,8 @@
         </ul>
       </div>
       <!-- Identity -->
-      <button class="btn" ng-click="identifyProjectors()" ng-class="identifyPromise ? 'btn-primary' : 'btn-default'">
+      <button class="btn" ng-click="identifyProjectors()" ng-class="identifyPromise ? 'btn-primary' : 'btn-default'"
+        uib-tooltip="{{ 'Display an identifier message on all projectors with the id and name.' | translate }}">
         <i class="fa fa-binoculars"></i>
         <translate>Identify</translate>
       </button>
@@ -184,7 +185,8 @@
         <div class="btn-group">
           <button class="btn btn-sm" ng-class="broadcast == projector.id ? 'btn-primary' : 'btn-default'"
             ng-click="projector.toggleBroadcast(projector)"
-            ng-disabled="broadcast > 0 && broadcast != projector.id">
+            ng-disabled="broadcast > 0 && broadcast != projector.id"
+            uib-tooltip="{{ 'Broadcast the content from this projector on all other projectors.' | translate }}">
             <i class="fa" ng-class="broadcast == projector.id ? 'fa-star' : 'fa-star-o'"></i>
             <translate>Broadcast</translate>
           </button>
diff --git a/openslides/motions/static/templates/motions/motion-list.html b/openslides/motions/static/templates/motions/motion-list.html
index dc94212b0..eed6d5892 100644
--- a/openslides/motions/static/templates/motions/motion-list.html
+++ b/openslides/motions/static/templates/motions/motion-list.html
@@ -288,7 +288,7 @@
       </div>
       <!-- projector column -->
       <div class="col-xs-1 centered projector" os-perms="core.can_manage_projector">
-        <projector-button model="motion", default-projector-id="defaultProjectorId">
+        <projector-button model="motion" default-projector-id="defaultProjectorId">
         </projector-button>
       </div>
       <!-- main content column -->
diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js
index c7284915d..2b867cf5f 100644
--- a/openslides/users/static/js/users/site.js
+++ b/openslides/users/static/js/users/site.js
@@ -685,9 +685,19 @@ angular.module('OpenSlidesApp.users.site', [
     'User',
     'user',
     'Group',
-    function($scope, ngDialog, UserForm, User, user, Group) {
+    'Projector',
+    'ProjectionDefault',
+    function($scope, ngDialog, UserForm, User, user, Group, Projector, ProjectionDefault) {
         User.bindOne(user.id, $scope, 'user');
         Group.bindAll({where: {id: {'>': 1}}}, $scope, 'groups');
+        $scope.$watch(function () {
+            return Projector.lastModified();
+        }, function () {
+            var projectiondefault = ProjectionDefault.filter({name: 'users'})[0];
+            if (projectiondefault) {
+                $scope.defaultProjectorId = projectiondefault.projector_id;
+            }
+        });
 
         // open edit dialog
         $scope.openDialog = function (user) {
diff --git a/openslides/users/static/templates/users/user-detail.html b/openslides/users/static/templates/users/user-detail.html
index 11518eb64..94e48fd13 100644
--- a/openslides/users/static/templates/users/user-detail.html
+++ b/openslides/users/static/templates/users/user-detail.html
@@ -6,12 +6,8 @@
         <translate>Back to overview</translate>
       </a>
       <!-- project -->
-      <a os-perms="core.can_manage_projector" class="btn btn-default btn-sm"
-          ng-class="{ 'btn-primary': user.isProjected() }"
-          ng-click="user.project()"
-          title="{{ 'Project user' | translate }}">
-        <i class="fa fa-video-camera"></i>
-      </a>
+      <projector-button model="user" default-projector-id="defaultProjectorId">
+      </projector-button>
       <!-- edit -->
       <a os-perms="users.can_manage" ng-click="openDialog(user)"
           class="btn btn-default btn-sm"
diff --git a/openslides/users/static/templates/users/user-list.html b/openslides/users/static/templates/users/user-list.html
index e2fe495cd..d6ab2e5c4 100644
--- a/openslides/users/static/templates/users/user-list.html
+++ b/openslides/users/static/templates/users/user-list.html
@@ -318,7 +318,7 @@
       </div>
       <!-- projector column -->
       <div class="col-xs-1 centered projector" os-perms="core.can_manage_projector">
-        <projector-button model="user", default-projector-id="defaultProjectorId">
+        <projector-button model="user" default-projector-id="defaultProjectorId">
         </projector-button>
       </div>
       <!-- main content column -->

From 36dc957f196c736efcf5a79b728751aa8f5ab8b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <contact@normanjaeckel.de>
Date: Thu, 24 Nov 2016 00:07:50 +0100
Subject: [PATCH 2/2] Changed tooltips.

---
 openslides/core/static/templates/core/manage-projectors.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openslides/core/static/templates/core/manage-projectors.html b/openslides/core/static/templates/core/manage-projectors.html
index 0a48d375b..8e1aa4574 100644
--- a/openslides/core/static/templates/core/manage-projectors.html
+++ b/openslides/core/static/templates/core/manage-projectors.html
@@ -27,7 +27,7 @@
       </div>
       <!-- Identity -->
       <button class="btn" ng-click="identifyProjectors()" ng-class="identifyPromise ? 'btn-primary' : 'btn-default'"
-        uib-tooltip="{{ 'Display an identifier message on all projectors with the id and name.' | translate }}">
+        uib-tooltip="{{ 'Display an identifier message on all projectors with the id and the name.' | translate }}">
         <i class="fa fa-binoculars"></i>
         <translate>Identify</translate>
       </button>
@@ -186,7 +186,7 @@
           <button class="btn btn-sm" ng-class="broadcast == projector.id ? 'btn-primary' : 'btn-default'"
             ng-click="projector.toggleBroadcast(projector)"
             ng-disabled="broadcast > 0 && broadcast != projector.id"
-            uib-tooltip="{{ 'Broadcast the content from this projector on all other projectors.' | translate }}">
+            uib-tooltip="{{ 'Broadcast the content of this projector to all other projectors.' | translate }}">
             <i class="fa" ng-class="broadcast == projector.id ? 'fa-star' : 'fa-star-o'"></i>
             <translate>Broadcast</translate>
           </button>