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

Improved motion state dropdown element.

Browse Source
This commit is contained in:
Emanuel Schuetze 2016-02-08 20:34:12 +01:00
parent 4bbb153c42
commit f89f3a9933
3 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,13 @@ h4 {
font-size: 18px; font-size: 18px;
color: #222; color: #222;
} }
.heading a {
color: #444;
}
.heading a:hover {
color: #2b6883;
text-decoration: none;
}
p { p {
padding-bottom: 14px; padding-bottom: 14px;
@ -284,11 +290,6 @@ img {
color: #444; color: #444;
} }
.col1 .meta h3 {
padding-bottom: 0;
margin-bottom: 5px;
}
.col1 .details { .col1 .details {
padding: 20px; padding: 20px;
width: auto; width: auto;
@ -317,14 +318,25 @@ img {
width: 70px; width: 70px;
} }
#content .col2 h4, .col1 .meta h3 { #content .col2 h4 {
font-size: 22px; font-size: 22px;
line-height: 24px; line-height: 24px;
font-family: 'Roboto Condensed Light'; font-family: 'Roboto Condensed Light';
font-weight: 300; font-weight: 300;
color: #444; color: #444;
} }
#content .col1 .meta .heading, #content .col1 .meta h3 {
font-size: 22px;
line-height: 24px;
font-weight: 300;
color: #444;
padding-bottom: 0;
margin-top: 20px;
margin-bottom: 5px;
}
#content .col1 .meta .heading .drop-down-name, #content .col1 .meta h3 {
font-family: 'Roboto Condensed Light';
}
#content .col2 a:hover h4 { #content .col2 a:hover h4 {
text-decoration: none; text-decoration: none;

2
openslides/motions/static/js/motions/base.js
View File

@ -248,6 +248,8 @@ angular.module('OpenSlidesApp.motions', ['OpenSlidesApp.users'])
return operator.hasPerms('motions.can_manage'); return operator.hasPerms('motions.can_manage');
case 'reset_state': case 'reset_state':
return operator.hasPerms('motions.can_manage'); return operator.hasPerms('motions.can_manage');
case 'can_manage':
return operator.hasPerms('motions.can_manage');
default: default:
return false; return false;
} }

33
openslides/motions/static/templates/motions/motion-detail.html
View File

@ -90,22 +90,27 @@
</span> </span>
<!-- State --> <!-- State -->
<h3 translate>State</h3> <h3 ng-if="!motion.isAllowed('change_state')" class="heading" translate>State</h3>
<span class="label" ng-class="'label-'+motion.state.css_class"> <div ng-if="motion.isAllowed('change_state')" class="heading">
{{ motion.state.name | translate }} <span uib-dropdown>
</span> <a href id="state-dropdown" class="drop-down-name" uib-dropdown-toggle>
<div ng-if="motion.isAllowed('change_state')" class="spacer"> <translate>State</translate>
<select ng-if="motion.state.getNextStates().length > 0" ng-model="stateSelect" class="form-control" ng-change="updateState(stateSelect)"> <i class="fa fa-cog"></i>
<option value="" translate>--- Set next state ---</option> </a>
<option ng-repeat="state in motion.state.getNextStates()" value="{{ state.id }}"> <ul uib-dropdown-menu aria-labelledby="state-dropdown">
{{ state.action_word | translate }} <li ng-repeat="state in motion.state.getNextStates()">
</option> <a href ng-click="updateState(state.id)">{{ state.action_word | translate }}</a>
</select> <li class="divider" ng-if="motion.state.getNextStates().length">
<button ng-if="motion.isAllowed('reset_state')" ng-click="reset_state()" <li>
class="btn btn-danger btn-xs spacer"> <a href ng-if="motion.isAllowed('reset_state')" ng-click="reset_state()">
<i class="fa fa-exclamation-triangle"></i> <i class="fa fa-exclamation-triangle"></i>
<translate>Reset state</translate> <translate>Reset state</translate>
</button> </a>
</ul>
</span>
</div>
<div class="label" ng-class="'label-'+motion.state.css_class">
{{ motion.state.name | translate }}
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">