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

Some template style and translation fixes.

Browse Source
This commit is contained in:
Emanuel Schütze 2016-12-12 20:30:50 +01:00
parent 99db9b71b7
commit a9cc8fcb37
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1018,6 +1018,10 @@ img {
background-color: transparent; background-color: transparent;
} }
.os-table .dropdown-hover-space {
padding: 5px 5px 5px 0;
}
/** Config **/ /** Config **/
.input-comments > div { .input-comments > div {
margin-bottom: 5px margin-bottom: 5px

14
openslides/mediafiles/static/js/mediafiles/site.js
View File

@ -133,15 +133,15 @@ angular.module('OpenSlidesApp.mediafiles.site', ['ngFileUpload', 'OpenSlidesApp.
$scope.sort.column = 'title_or_filename'; $scope.sort.column = 'title_or_filename';
$scope.sortOptions = [ $scope.sortOptions = [
{name: 'title_or_filename', {name: 'title_or_filename',
display_name: 'Title'}, display_name: gettext('Title')},
{name: 'timestamp',
display_name: 'UploadTime'},
{name: 'uploader.get_short_name()',
display_name: 'Uploader'},
{name: 'mediafile.type', {name: 'mediafile.type',
display_name: 'Type'}, display_name: gettext('Type')},
{name: 'filesize', {name: 'filesize',
display_name: 'Filesize'}, display_name: gettext('File size')},
{name: 'timestamp',
display_name: gettext('Upload time')},
{name: 'uploader.get_short_name()',
display_name: gettext('Uploaded by')},
]; ];
// open new/edit dialog // open new/edit dialog

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

@ -165,20 +165,20 @@
<span class="pointer" id="dropdown{{ name }}" uib-dropdown-toggle <span class="pointer" id="dropdown{{ name }}" uib-dropdown-toggle
ng-class="{'bold': booleanFilter.value !== undefined, 'disabled': isSelectMode}" ng-class="{'bold': booleanFilter.value !== undefined, 'disabled': isSelectMode}"
ng-disabled="isSelectMode"> ng-disabled="isSelectMode">
{{ booleanFilter.displayName }} {{ booleanFilter.displayName | translate }}
<span class="caret"></span> <span class="caret"></span>
</span> </span>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown{{ name }}"> <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown{{ name }}">
<li> <li>
<a href ng-click="booleanFilter.value = (booleanFilter.value ? undefined : true); filter.save();"> <a href ng-click="booleanFilter.value = (booleanFilter.value ? undefined : true); filter.save();">
<i class="fa" ng-class="{'fa-check': booleanFilter.value === true}"></i> <i class="fa" ng-class="{'fa-check': booleanFilter.value === true}"></i>
{{ booleanFilter.choiceYes }} {{ booleanFilter.choiceYes | translate }}
</a> </a>
</li> </li>
<li> <li>
<a href ng-click="booleanFilter.value = (booleanFilter.value === false) ? undefined : false; filter.save();"> <a href ng-click="booleanFilter.value = (booleanFilter.value === false) ? undefined : false; filter.save();">
<i class="fa" ng-class="{'fa-check': booleanFilter.value === false}"></i> <i class="fa" ng-class="{'fa-check': booleanFilter.value === false}"></i>
{{ booleanFilter.choiceNo }} {{ booleanFilter.choiceNo | translate }}
</a> </a>
</li> </li>
</ul> </ul>

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

@ -400,7 +400,8 @@
</div> </div>
<!-- state --> <!-- state -->
<div> <div>
<span ng-mouseover="motion.stateHover=true" ng-mouseleave="motion.stateHover=false"> <span ng-mouseover="motion.stateHover=true" ng-mouseleave="motion.stateHover=false"
class="dropdown-hover-space">
<span class="label" ng-class="'label-'+motion.state.css_class"> <span class="label" ng-class="'label-'+motion.state.css_class">
{{ motion.getStateName() }} {{ motion.getStateName() }}
</span> </span>
@ -423,7 +424,8 @@
</div> </div>
<!-- recommendation --> <!-- recommendation -->
<div ng-if="motion.recommendation"> <div ng-if="motion.recommendation">
<span ng-mouseover="motion.recommendationHover=true" ng-mouseleave="motion.recommendationHover=false"> <span ng-mouseover="motion.recommendationHover=true" ng-mouseleave="motion.recommendationHover=false"
class="dropdown-hover-space">
<span class="label" ng-class="'label-'+motion.recommendation.css_class" uib-tooltip="{{ config('motions_recommendations_by') }}"> <span class="label" ng-class="'label-'+motion.recommendation.css_class" uib-tooltip="{{ config('motions_recommendations_by') }}">
{{ motion.getRecommendationName() }} {{ motion.getRecommendationName() }}
</span> </span>