Config for projector header and footer
This commit is contained in:
parent
14e38861c7
commit
c72399ff9b
@ -68,6 +68,7 @@ Core:
|
|||||||
- Added config value for standard font size in PDF [#3332].
|
- Added config value for standard font size in PDF [#3332].
|
||||||
- Added default sorting for agenda, motions, elections, mediafiles and
|
- Added default sorting for agenda, motions, elections, mediafiles and
|
||||||
users [#3334, 3348].
|
users [#3334, 3348].
|
||||||
|
- Added config for disabling header and footer in the projector [#3357].
|
||||||
|
|
||||||
Mediafiles:
|
Mediafiles:
|
||||||
- Fixed reloading of PDF on page change [#3274].
|
- Fixed reloading of PDF on page change [#3274].
|
||||||
|
@ -170,6 +170,14 @@ def get_config_variables():
|
|||||||
weight=152,
|
weight=152,
|
||||||
group='Projector')
|
group='Projector')
|
||||||
|
|
||||||
|
yield ConfigVariable(
|
||||||
|
name='projector_enable_clock',
|
||||||
|
default_value=True,
|
||||||
|
input_type='boolean',
|
||||||
|
label='Show the clock on projector',
|
||||||
|
weight=154,
|
||||||
|
group='Projector')
|
||||||
|
|
||||||
yield ConfigVariable(
|
yield ConfigVariable(
|
||||||
name='projector_enable_title',
|
name='projector_enable_title',
|
||||||
default_value=True,
|
default_value=True,
|
||||||
@ -179,11 +187,11 @@ def get_config_variables():
|
|||||||
group='Projector')
|
group='Projector')
|
||||||
|
|
||||||
yield ConfigVariable(
|
yield ConfigVariable(
|
||||||
name='projector_enable_clock',
|
name='projector_enable_header_footer',
|
||||||
default_value=True,
|
default_value=True,
|
||||||
input_type='boolean',
|
input_type='boolean',
|
||||||
label='Show the clock on projector',
|
label='Display header and footer',
|
||||||
weight=154,
|
weight=157,
|
||||||
group='Projector')
|
group='Projector')
|
||||||
|
|
||||||
yield ConfigVariable(
|
yield ConfigVariable(
|
||||||
|
@ -156,7 +156,6 @@ body {
|
|||||||
.content {
|
.content {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 50px;
|
left: 50px;
|
||||||
top: 100px;
|
|
||||||
right: 50px;
|
right: 50px;
|
||||||
z-index: -1;
|
z-index: -1;
|
||||||
line-height: 1.3em;
|
line-height: 1.3em;
|
||||||
|
@ -1898,6 +1898,7 @@ angular.module('OpenSlidesApp.core.site', [
|
|||||||
gettext('Projector language');
|
gettext('Projector language');
|
||||||
gettext('Current browser language');
|
gettext('Current browser language');
|
||||||
gettext('Show title and description of event on projector');
|
gettext('Show title and description of event on projector');
|
||||||
|
gettext('Display header and footer');
|
||||||
gettext('Show the clock on projector');
|
gettext('Show the clock on projector');
|
||||||
gettext('Background color of projector header and footer');
|
gettext('Background color of projector header and footer');
|
||||||
gettext('Font color of projector header and footer');
|
gettext('Font color of projector header and footer');
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<div id="header">
|
<div id="header" ng-if="config('projector_enable_header_footer')">
|
||||||
<img ng-if="config('projector_enable_logo')" id="logo" alt="OpenSlides"
|
<img ng-if="config('projector_enable_logo')" id="logo" alt="OpenSlides"
|
||||||
ng-src="{{ config('logo_projector_main').path || '/static/img/logo-projector.png' }}"/>
|
ng-src="{{ config('logo_projector_main').path || '/static/img/logo-projector.png' }}"/>
|
||||||
<div ng-if="config('projector_enable_title')" id="eventdata">
|
<div ng-if="config('projector_enable_title')" id="eventdata">
|
||||||
@ -60,11 +60,19 @@
|
|||||||
transform: scale({{scale/100}});
|
transform: scale({{scale/100}});
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
<style type="text/css" ng-if="config('projector_enable_header_footer')">
|
||||||
|
.content {
|
||||||
|
top: 100px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
<div class="contentContainer" ng-repeat="element in elements | orderBy:'index'">
|
<div class="contentContainer" ng-repeat="element in elements | orderBy:'index'">
|
||||||
<div ng-include="element.template"></div>
|
<div ng-include="element.template"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="footer">
|
<div id="footer" ng-if="config('projector_enable_header_footer')">
|
||||||
<span ng-if="config('general_event_date')">
|
<span ng-if="config('general_event_date')">
|
||||||
{{ config('general_event_date') }}
|
{{ config('general_event_date') }}
|
||||||
</span>
|
</span>
|
||||||
|
@ -152,7 +152,7 @@ angular.module('OpenSlidesApp.mediafiles.image-plugin', [
|
|||||||
return {
|
return {
|
||||||
title: gettextCatalog.getString('Image browser'),
|
title: gettextCatalog.getString('Image browser'),
|
||||||
minWidth: 1000,
|
minWidth: 1000,
|
||||||
minHeight: 400,
|
minHeight: 500,
|
||||||
contents: [
|
contents: [
|
||||||
{
|
{
|
||||||
id: 'imagebrowser-tab1',
|
id: 'imagebrowser-tab1',
|
||||||
|
Loading…
Reference in New Issue
Block a user