Merge pull request #2766 from emanuelschuetze/template-fixes

Some template style and translation fixes.

openslides/core/static/css/app.css

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

openslides/mediafiles/static/js/mediafiles/site.js

@@ -133,15 +133,15 @@ angular.module('OpenSlidesApp.mediafiles.site', ['ngFileUpload', 'OpenSlidesApp.
         $scope.sort.column = 'title_or_filename';
         $scope.sortOptions = [
             {name: 'title_or_filename',
-             display_name: 'Title'},
-            {name: 'timestamp',
-             display_name: 'UploadTime'},
-            {name: 'uploader.get_short_name()',
-             display_name: 'Uploader'},
+             display_name: gettext('Title')},
             {name: 'mediafile.type',
-             display_name: 'Type'},
+             display_name: gettext('Type')},
             {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

openslides/mediafiles/static/templates/mediafiles/mediafile-list.html

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

openslides/motions/static/templates/motions/motion-list.html

@@ -400,7 +400,8 @@
           </div>
           <!-- state -->
           <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">
                 {{ motion.getStateName() }}
               </span>
@@ -423,7 +424,8 @@
           </div>
           <!-- 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') }}">
                 {{ motion.getRecommendationName() }}
               </span>