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

Merge pull request #2491 from emanuelschuetze/template-fixes

Browse Source 
Template fixes
This commit is contained in:
Norman Jäckel 2016-10-07 20:07:11 +02:00 committed by GitHub
commit 1b218843ef
3 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openslides/core/static/css/app.css
View File

@ -270,15 +270,6 @@ img {
float: right;
}
.col1 .header .submenu > div {
display: inline-block;
float: left;
margin-left: 5px;
}
.col1 .header .submenu > div.button {
float: none;
margin-left: 0;
}
.col1 .meta .title {
width: 100%;
cursor: pointer;

41
openslides/core/static/templates/core/manage-projectors.html
View File

@ -1,34 +1,35 @@
<div class="header">
<div class="title">
<div class="submenu">
<div>
<button class="btn btn-primary" ng-bootbox-prompt="{{ 'Please enter a name for the new projector' | translate }}"
ng-bootbox-prompt-action="createProjector(result)">
<i class="fa fa-plus"></i>
<translate>New</translate>
</button>
</div>
<div class="dropdown">
<button class="btn btn-default dropdown-toggle" id="menuListofSpeakers" data-toggle="dropdown"
<!-- New -->
<button class="btn btn-primary" ng-bootbox-prompt="{{ 'Please enter a name for the new projector' | translate }}"
ng-bootbox-prompt-action="createProjector(result)">
<i class="fa fa-plus"></i>
<translate>New</translate>
</button>
<!-- Reference for current list of speakers -->
<div class="btn-group" uib-dropdown>
<button class="btn btn-default" id="menuListofSpeakers" uib-dropdown-toggle
uib-tooltip="{{ 'Select the projector to which the current list of speakers refers to.' | translate }}"
aria-haspopup="true" aria-expanded="true">
<i class="fa fa-microphone"></i>
<translate>Reference for current list of speakers</translate>
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-entries" aria-labelledby="menuListOfSpeakers">
<li ng-repeat="projector in projectors"
ng-click="setListOfSpeakers(projector)">
<i class="fa fa-check" ng-if="projector.id == currentListOfSpeakers"></i>
{{ projector.name }}
<ul class="dropdown-menu" uib-dropdown-menu aria-labelledby="menuListOfSpeakers">
<li ng-repeat="projector in projectors">
<a href ng-click="setListOfSpeakers(projector)">
<i class="fa fa-check" ng-if="projector.id == currentListOfSpeakers"></i>
{{ projector.name }}
</a>
</li>
</ul>
</div>
<div>
<button class="btn" ng-click="identifyProjectors()" ng-class="identifyPromise ? 'btn-primary' : 'btn-default'">
<i class="fa fa-binoculars"></i>
<translate>Identify</translate>
</button>
</div>
<!-- Identity -->
<button class="btn" ng-click="identifyProjectors()" ng-class="identifyPromise ? 'btn-primary' : 'btn-default'">
<i class="fa fa-binoculars"></i>
<translate>Identify</translate>
</button>
</div>
<h1 translate>Manage projectors</h1>
</div>

34
openslides/motions/static/templates/motions/motion-list.html
View File

@ -324,7 +324,7 @@
<span class="label" ng-class="'label-'+motion.state.css_class">
{{ motion.state.name | translate }}
</span>
<span ng-class="{'hiddenDiv': !motion.stateHover}" uib-dropdown>
<span os-perms="motions.can_manage" ng-class="{'hiddenDiv': !motion.stateHover}" uib-dropdown>
<i class="fa fa-cog pointer" uib-dropdown-toggle id="state-dropdown{{ motion.id }}"></i>
<ul uib-dropdown-menu aria-labelledby="state-dropdown{{ motion.id }}">
<li ng-repeat="state in motion.state.getNextStates()">
@ -376,11 +376,11 @@
<div class="col-xs-4 content">
<div style="width: 60%;" class="optional">
<small>
<div ng-mouseover="motion.categoryHover=true"
ng-mouseleave="motion.categoryHover=false"
ng-show="categories.length > 0">
<!-- Category dropdown -->
<span uib-dropdown>
<!-- Category dropdown for manage user -->
<div os-perms="motions.can_manage" ng-show="categories.length > 0"
ng-mouseover="motion.categoryHover=true"
ng-mouseleave="motion.categoryHover=false">
<span uib-dropdown >
<span id="dropdown-category{{ motion.id }}" class="pointer"
uib-dropdown-toggle uib-tooltip="{{ 'Set a category' | translate }}"
tooltip-class="nobr">
@ -405,9 +405,16 @@
</ul>
</span>
</div>
<div ng-mouseover="motion.tagHover=true"
ng-mouseleave="motion.tagHover=false"
ng-show="tags.length > 0">
<!-- Category string for normal user -->
<div os-perms="!motions.can_manage" ng-show="motion.category != null">
<i class="fa fa-sitemap spacer-right"></i>
{{ motion.category.name }}
</div>
<!-- Tag dropdown for manage user -->
<div os-perms="motions.can_manage" ng-show="tags.length > 0"
ng-mouseover="motion.tagHover=true"
ng-mouseleave="motion.tagHover=false">
<span uib-dropdown>
<span id="dropdown-tags{{ motion.id }}" class="pointer"
uib-dropdown-toggle uib-tooltip="{{ 'Add a tag' | translate }}"
@ -434,6 +441,15 @@
</ul>
</span>
</div>
<!-- Tag string for normal user -->
<div os-perms="!motions.can_manage" ng-show="motion.tags.length > 0">
<i class="fa fa-tags spacer-right"></i>
<span ng-repeat="tag in motion.tags">
{{ tag.name }}<span ng-if="!$last">,</span>
</span>
</div>
<!-- Origin -->
<div ng-if="motion.origin">
<i class="fa fa-share spacer-right" uib-tooltip="{{ 'Origin' | translate }}"></i>
{{ motion.origin | limitTo:25 }}{{ motion.origin.length > 25 ? '...' : '' }}