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

Merge pull request #1969 from emanuelschuetze/templateFixes

Browse Source 
Template fixes
This commit is contained in:
Norman Jäckel 2016-02-14 23:01:04 +01:00
commit 8436963dce
5 changed files with 8 additions and 6 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

@ -107,7 +107,7 @@
<!-- Next speakers --> <!-- Next speakers -->
<h3 translate>Next speakers</h3> <h3 translate>Next speakers</h3>
<div ng-show="speakers.length > 0"> <div ng-show="speakers.length > 0">
<div ui-tree="treeOptions" class="halfWidth"> <div ui-tree="treeOptions">
<ol ui-tree-nodes="" ng-model="speakers"> <ol ui-tree-nodes="" ng-model="speakers">
<li ng-repeat="speaker in speakers | filter: {begin_time: null}" ui-tree-node> <li ng-repeat="speaker in speakers | filter: {begin_time: null}" ui-tree-node>
<i os-perms="agenda.can_manage" ui-tree-handle="" class="fa fa-arrows-v"></i> <i os-perms="agenda.can_manage" ui-tree-handle="" class="fa fa-arrows-v"></i>

4
openslides/agenda/static/templates/agenda/slide-list-of-speakers.html
View File

@ -12,8 +12,8 @@
</div> </div>
<!-- Last speakers --> <!-- Last speakers -->
<p ng-repeat="speaker in item.speakers | filter: {end_time: '!!', begin_time: '!!'} | <p ng-repeat="speaker in lastSpeakers = (item.speakers | filter: {end_time: '!!', begin_time: '!!'}) |
limitTo: config('agenda_show_last_speakers')" class="lastSpeakers"> limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))" class="lastSpeakers">
{{ speaker.user.get_full_name() }} {{ speaker.user.get_full_name() }}
<!-- Current speaker --> <!-- Current speaker -->

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

@ -82,7 +82,7 @@ body{
top: 150px; top: 150px;
right: 50px; right: 50px;
z-index: -1; z-index: -1;
line-height: 28px; line-height: 1.3em;
} }
.scrollcontent { .scrollcontent {
transition-property: margin, font-size; transition-property: margin, font-size;

3
openslides/core/static/templates/config-form-field.html
View File

@ -5,8 +5,9 @@
<input ng-if="type != 'choice' && type != 'textarea'" <input ng-if="type != 'choice' && type != 'textarea'"
ng-model="$parent.value" ng-model="$parent.value"
ng-change="save(configOption.key, $parent.value)" ng-change="save(configOption.key, $parent.value)"
ng-class="{ 'form-control': type != 'checkbox' }"
id="{{ key }}" id="{{ key }}"
type="{{ type }}" class="form-control"> type="{{ type }}">
<textarea ng-if="type == 'textarea'" <textarea ng-if="type == 'textarea'"
ng-model="$parent.value" ng-model="$parent.value"

3
openslides/motions/signals.py
View File

@ -68,7 +68,7 @@ def setup_motion_config(sender, **kwargs):
subgroup=ugettext_lazy('General')) subgroup=ugettext_lazy('General'))
# Amendments # Amendments
# Amendments currently not implemented. (TODO: Implement it like in OpenSlides 1.7.)
yield ConfigVariable( yield ConfigVariable(
name='motions_amendments_enabled', name='motions_amendments_enabled',
default_value=False, default_value=False,
@ -167,6 +167,7 @@ def setup_motion_config(sender, **kwargs):
yield ConfigVariable( yield ConfigVariable(
name='motions_pdf_paragraph_numbering', name='motions_pdf_paragraph_numbering',
default_value=False, default_value=False,
input_type='boolean',
label=ugettext_lazy('Show paragraph numbering (only in PDF)'), label=ugettext_lazy('Show paragraph numbering (only in PDF)'),
weight=380, weight=380,
group=ugettext_lazy('Motion'), group=ugettext_lazy('Motion'),