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

Merge pull request #3747 from emanuelschuetze/misc-improvements 

Minor template improvements and fixes
This commit is contained in:
Emanuel Schütze 2018-05-17 09:09:07 +02:00 committed by GitHub
parent 8d7bcedd32 682a5eea5a
commit 7ab5611a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/static/templates/agenda/item-detail.html
View File

@ -5,7 +5,7 @@
<i class="fa fa-angle-double-left fa-lg"></i>
<translate>Agenda</translate>
</a>
<a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail({id: item.content_object.id})" class="btn btn-sm btn-default">
<a ui-sref="{{ item.getContentObjectDetailState() }}" class="btn btn-sm btn-default">
<i class="fa fa-angle-double-left fa-lg"></i>
{{ item.getContentResource().verboseName | translate }}
</a>

2
openslides/core/static/css/_helper.scss
View File

@ -224,7 +224,7 @@ tr.selected td {
}
.grey {
color: #9a9898;
color: gray;
}
.info {

11
openslides/core/static/js/core/projector.js
View File

@ -82,11 +82,20 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
'$scope',
'Languages',
'Config',
'Projector',
'ProjectorID',
'Fonts',
function ($scope, Languages, Config, ProjectorID, Fonts) {
function ($scope, Languages, Config, Projector, ProjectorID, Fonts) {
// for the dynamic title
$scope.projectorId = ProjectorID();
$scope.$watch(function () {
return Projector.lastModified($scope.projectorId);
}, function () {
var projector = Projector.get($scope.projectorId);
if (projector) {
$scope.projectorName = projector.name;
}
});
$scope.$watch(function () {
return Config.lastModified('projector_language');

4
openslides/core/static/templates/projector-container.html
View File

@ -3,8 +3,8 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<base href="/">
<title ng-if="projectorId===undefined">OpenSlides &ndash; Projector</title> <!-- avoid {{ ... }} in title while angular is not loaded -->
<title ng-if="projectorId!==undefined">OpenSlides &ndash; {{ 'Projector' | translate }} {{ projectorId }}</title>
<title ng-if="projectorId===undefined">Projector &ndash; OpenSlides</title> <!-- avoid {{ ... }} in title while angular is not loaded -->
<title ng-if="projectorId!==undefined">{{ 'Projector' | translate }} {{ projectorName }} &ndash; OpenSlides</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="static/css/openslides-libs.css">
<link rel="stylesheet" href="static/css/openslides-projector.css">

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

@ -1237,7 +1237,7 @@ angular.module('OpenSlidesApp.motions.site', [
display_name: gettext('Title')},
{name: 'submitters[0].get_short_name()',
display_name: gettext('Submitters')},
{name: 'category.name',
{name: 'category.' + Config.get('motions_export_category_sorting').value,
display_name: gettext('Category')},
{name: 'motionBlock.title',
display_name: gettext('Motion block')},

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

@ -15,6 +15,7 @@
</projector-button>
<!-- edit -->
<a ng-click="openDialog(motionBlock)"
os-perms="motions.can_manage"
class="btn btn-default btn-sm"
title="{{ 'Edit' | translate}}">
<i class="fa fa-pencil"></i>

4
openslides/motions/static/templates/motions/motion-detail/view-diff.html
View File

@ -35,7 +35,7 @@
</button>
</div>
<div class="status-row" ng-if="!motion.isAllowed('can_manage') && title_change_recommendation.rejected">
<translate>Rejected</translate>
<i class="grey"><translate>Rejected</translate>:</i>
</div>
<div class="motion-text motion-text-diff line-numbers-{{ lineNumberMode }}">
@ -81,7 +81,7 @@
</button>
</div>
<div class="status-row" ng-if="!motion.isAllowed('can_manage') && change.rejected">
<translate>Rejected</translate>
<i class="grey"><translate>Rejected</translate>:</i>
</div>
<div class="motion-text motion-text-diff line-numbers-{{ lineNumberMode }}"

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

@ -100,7 +100,7 @@
<!-- motionBlock select -->
<select ng-show="selectedAction == 'setMotionBlock'" ng-model="selectedMotionBlock" class="form-control input-sm">
<option value="" translate>--- Select motion block ---</option>
<option ng-repeat="motionBlock in motionBlocks" value="{{ motionBlock.id }}">
<option ng-repeat="motionBlock in motionBlocks | orderBy: 'title'" value="{{ motionBlock.id }}">
{{ motionBlock.title }}
</option>
<option value="no_motionBlock_selected" translate>No motion block</option>
@ -246,7 +246,7 @@
<span class="caret"></span>
</span>
<ul class="dropdown-menu dropdown-menu-left" aria-labelledby="dropdownBlock">
<li ng-repeat="block in motionBlocks">
<li ng-repeat="block in motionBlocks | orderBy: 'title'">
<a href ng-click="filter.operateMultiselectFilter('motionBlock', block.id, isSelectMode)">
<i class="fa fa-check" ng-if="filter.multiselectFilters.motionBlock.indexOf(block.id) > -1"></i>
{{ block.title }}
@ -454,7 +454,7 @@
<translate>No category set</translate>
</span>
<!-- motion block -->
<span ng-repeat="motionBlock in motionBlocks" class="pointer spacer-left-lg"
<span ng-repeat="motionBlock in motionBlocks | orderBy: 'title'" class="pointer spacer-left-lg"
ng-if="filter.multiselectFilters.motionBlock.indexOf(motionBlock.id) > -1"
ng-click="filter.operateMultiselectFilter('motionBlock', motionBlock.id, isSelectMode)"
ng-class="{'disabled': isSelectMode}">
@ -707,7 +707,7 @@
</span>
</span>
<ul class="dropdown-menu" aria-labelledby="dropdownMotionBlock{{ motion.id }}">
<li ng-repeat="motionBlock in motionBlocks">
<li ng-repeat="motionBlock in motionBlocks | orderBy: 'title'">
<a href ng-click="toggleMotionBlock(motion, motionBlock)">
<i class="fa fa-check" ng-if="motionBlock.id == motion.motionBlock.id"></i>
{{ motionBlock.title }}