ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2514 from FinnStutzenstein/Issue2494

Browse Source 
Round corners for projectorbuttons (fixes #2494)
This commit is contained in:
Emanuel Schütze 2016-10-18 13:01:49 +02:00 committed by GitHub
commit dc1c958e0f
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/static/templates/agenda/item-detail.html
View File

@ -26,7 +26,7 @@
uib-dropdown-toggle> uib-dropdown-toggle>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu" ng-if="projectors.length > 1">
<li role="menuitem" ng-repeat="projector in projectors"> <li role="menuitem" ng-repeat="projector in projectors">
<a href="" ng-click="item.projectListOfSpeakers(projector.id)" <a href="" ng-click="item.projectListOfSpeakers(projector.id)"
ng-class="{ 'projected': (item.isListOfSpeakersProjected() == projector.id) }"> ng-class="{ 'projected': (item.isListOfSpeakersProjected() == projector.id) }">

7
openslides/agenda/static/templates/agenda/item-list.html
View File

@ -164,7 +164,7 @@
ng-class="{ 'activeline': item.isProjected(), 'selected': item.selected, 'hiddenrow': item.is_hidden}"> ng-class="{ 'activeline': item.isProjected(), 'selected': item.selected, 'hiddenrow': item.is_hidden}">
<!-- projector column --> <!-- projector column -->
<td ng-show="!isDeleteMode" os-perms="core.can_manage_projector"> <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) }}" uib-tooltip="{{ 'Projector' | translate }} {{ item.isProjected(item.tree) }}"
tooltip-enable="item.isProjected(item.tree) > 0"> tooltip-enable="item.isProjected(item.tree) > 0">
<button class="btn btn-default btn-sm" <button class="btn btn-default btn-sm"
@ -175,11 +175,12 @@
</button> </button>
<button type="button" class="btn btn-default btn-sm slimDropDown" <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-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> uib-dropdown-toggle>
<span class="caret"></span> <span class="caret"></span>
</button> </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)"> <li role="menuitem" ng-show="item.hasSubitems(items)">
<a href="" ng-click="changeItemTree(item); $event.stopPropagation();"> <a href="" ng-click="changeItemTree(item); $event.stopPropagation();">
<i class="fa" ng-class="item.tree ? 'fa-check-square-o' : 'fa-square-o'"></i> <i class="fa" ng-class="item.tree ? 'fa-check-square-o' : 'fa-square-o'"></i>

2
openslides/core/static/templates/projector-button.html
View File

@ -14,7 +14,7 @@
uib-dropdown-toggle> uib-dropdown-toggle>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu" ng-if="projectors.length > 1">
<li role="menuitem" ng-repeat="projector in projectors"> <li role="menuitem" ng-repeat="projector in projectors">
<a href="" ng-click="model.project(projector.id, arg)" <a href="" ng-click="model.project(projector.id, arg)"
ng-class="{ 'projected': (model.isProjected(arg) == projector.id) }"> ng-class="{ 'projected': (model.isProjected(arg) == projector.id) }">

4
openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
View File

@ -201,7 +201,7 @@
<!-- projector column --> <!-- projector column -->
<td ng-show="!isDeleteMode" <td ng-show="!isDeleteMode"
os-perms="core.can_manage_projector"> 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" ng-if="mediafile.is_presentable"
uib-tooltip="{{ 'Projector' | translate }} {{ mediafile.isProjected() }}" uib-tooltip="{{ 'Projector' | translate }} {{ mediafile.isProjected() }}"
tooltip-enable="mediafile.isProjected() > 0"> tooltip-enable="mediafile.isProjected() > 0">
@ -216,7 +216,7 @@
uib-dropdown-toggle> uib-dropdown-toggle>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu" ng-if="projectors.length > 1">
<li role="menuitem" ng-repeat="projector in projectors"> <li role="menuitem" ng-repeat="projector in projectors">
<a href="" ng-click="showMediafile(projector.id, mediafile)" <a href="" ng-click="showMediafile(projector.id, mediafile)"
ng-class="{ 'projected': (mediafile.isProjected() == projector.id) }"> ng-class="{ 'projected': (mediafile.isProjected() == projector.id) }">