From 6ca3c07e1f6c3128264c305b58d011ff326ca854 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@rats-os.de>
Date: Mon, 17 Oct 2016 10:10:13 +0200
Subject: [PATCH] Round corners for projectorbuttons (fixes #2494)

---
 openslides/agenda/static/templates/agenda/item-detail.html | 2 +-
 openslides/agenda/static/templates/agenda/item-list.html   | 7 ++++---
 openslides/core/static/templates/projector-button.html     | 2 +-
 .../static/templates/mediafiles/mediafile-list.html        | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/openslides/agenda/static/templates/agenda/item-detail.html b/openslides/agenda/static/templates/agenda/item-detail.html
index 2832be5eb..41103ff97 100644
--- a/openslides/agenda/static/templates/agenda/item-detail.html
+++ b/openslides/agenda/static/templates/agenda/item-detail.html
@@ -26,7 +26,7 @@
           uib-dropdown-toggle>
           <span class="caret"></span>
         </button>
-        <ul class="dropdown-menu">
+        <ul class="dropdown-menu" ng-if="projectors.length > 1">
           <li role="menuitem" ng-repeat="projector in projectors">
             <a href="" ng-click="item.projectListOfSpeakers(projector.id)"
               ng-class="{ 'projected': (item.isListOfSpeakersProjected() == projector.id) }">
diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index 65afc5dde..e3a6d9833 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -164,7 +164,7 @@
           ng-class="{ 'activeline': item.isProjected(), 'selected': item.selected, 'hiddenrow': item.is_hidden}">
         <!-- projector column -->
         <td ng-show="!isDeleteMode" os-perms="core.can_manage_projector">
-          <div class="btn-group" style="min-width:54px;" uib-dropdown
+          <div class="btn-group" style="min-width:{{ projectors.length > 1 ? '54' : '34' }}px;" uib-dropdown
             uib-tooltip="{{ 'Projector' | translate }} {{ item.isProjected(item.tree) }}"
             tooltip-enable="item.isProjected(item.tree) > 0">
             <button class="btn btn-default btn-sm"
@@ -175,11 +175,12 @@
             </button>
             <button type="button" class="btn btn-default btn-sm slimDropDown"
                 ng-class="{ 'btn-primary': item.isProjected(item.tree) > 0 && item.isProjected(item.tree) != getProjectionDefault(item)}"
-                ng-show="item.hasSubitems(items) || projectors.length > 1"
+                ng-if="item.hasSubitems(items) || projectors.length > 1"
                 uib-dropdown-toggle>
               <span class="caret"></span>
             </button>
-            <ul class="dropdown-menu" role="menu" aria-labelledby="split-button">
+            <ul class="dropdown-menu" role="menu" aria-labelledby="split-button"
+              ng-if="item.hasSubitems(items) || projectors.length > 1">
               <li role="menuitem" ng-show="item.hasSubitems(items)">
                 <a href="" ng-click="changeItemTree(item); $event.stopPropagation();">
                   <i class="fa" ng-class="item.tree ? 'fa-check-square-o' : 'fa-square-o'"></i>
diff --git a/openslides/core/static/templates/projector-button.html b/openslides/core/static/templates/projector-button.html
index 49415430e..02e3b5373 100644
--- a/openslides/core/static/templates/projector-button.html
+++ b/openslides/core/static/templates/projector-button.html
@@ -14,7 +14,7 @@
     uib-dropdown-toggle>
     <span class="caret"></span>
   </button>
-  <ul class="dropdown-menu">
+  <ul class="dropdown-menu" ng-if="projectors.length > 1">
     <li role="menuitem" ng-repeat="projector in projectors">
       <a href="" ng-click="model.project(projector.id, additionalId)"
         ng-class="{ 'projected': (model.isProjected(additionalId) == projector.id) }">
diff --git a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
index 4eefb7ef7..62a266db6 100644
--- a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
+++ b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
@@ -201,7 +201,7 @@
         <!-- projector column -->
         <td ng-show="!isDeleteMode"
             os-perms="core.can_manage_projector">
-          <div class="btn-group" style="min-width:54px;" uib-dropdown
+          <div class="btn-group" style="min-width:{{ projectors.length > 1 ? '54' : '34' }}px;" uib-dropdown
             ng-if="mediafile.is_presentable"
             uib-tooltip="{{ 'Projector' | translate }} {{ mediafile.isProjected() }}"
             tooltip-enable="mediafile.isProjected() > 0">
@@ -216,7 +216,7 @@
               uib-dropdown-toggle>
               <span class="caret"></span>
             </button>
-            <ul class="dropdown-menu">
+            <ul class="dropdown-menu" ng-if="projectors.length > 1">
               <li role="menuitem" ng-repeat="projector in projectors">
                 <a href="" ng-click="showMediafile(projector.id, mediafile)"
                   ng-class="{ 'projected': (mediafile.isProjected() == projector.id) }">