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

Merge pull request #2449 from emanuelschuetze/fixTranslations

Browse Source 
Minor fixes
This commit is contained in:
Norman Jäckel 2016-09-28 13:17:59 +02:00 committed by GitHub
commit f4c6c35584
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -760,7 +760,7 @@ img {
display: inline-block; display: inline-block;
} }
#motion-table .dropdown > span, #motion-table .sort-spacer { #motion-table .header-row .dropdown > span, #motion-table .sort-spacer {
padding: 5px 10px 5px 10px; padding: 5px 10px 5px 10px;
} }

4
openslides/users/static/templates/users/user-import.html
View File

@ -162,14 +162,14 @@
<div ng-if="user.duplicate" uib-tooltip="{{ user.duplicate_info }}" uib-dropdown> <div ng-if="user.duplicate" uib-tooltip="{{ user.duplicate_info }}" uib-dropdown>
<button type="button" class="btn btn-default btn-sm" <button type="button" class="btn btn-default btn-sm"
uib-dropdown-toggle ng-class="user.duplicateAction == duplicateActions[0] ? 'btn-warning' : (user.duplicateAction == duplicateActions[1] ? 'btn-danger' : 'btn-success')"> uib-dropdown-toggle ng-class="user.duplicateAction == duplicateActions[0] ? 'btn-warning' : (user.duplicateAction == duplicateActions[1] ? 'btn-danger' : 'btn-success')">
{{ user.duplicateAction }} {{ user.duplicateAction | translate }}
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu dropdown-entries"> <ul class="dropdown-menu dropdown-entries">
<li role="menuitem" ng-repeat="action in duplicateActions" class="pointer" <li role="menuitem" ng-repeat="action in duplicateActions" class="pointer"
ng-click="user.duplicateAction = action; calcStats()"> ng-click="user.duplicateAction = action; calcStats()">
<i class="fa fa-check" ng-if="user.duplicateAction == action"></i> <i class="fa fa-check" ng-if="user.duplicateAction == action"></i>
<translate>{{ action | translate }}</translate> {{ action | translate }}
</li> </li>
</ul> </ul>
</table> </table>