Skip to content

Commit

Permalink
Dev: small corrections for theme options
Browse files Browse the repository at this point in the history
  • Loading branch information
@dominikvitt
dominikvitt committed Nov 8, 2018
1 parent 32024c2 commit 4fd7187
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions application/core/LsDefaultDataSets.php
View file
Expand Up @@ -168,7 +168,7 @@ public static function getTemplateConfigurationData()
'files_css' => '{"add":["css/ajaxify.css","css/theme.css","css/custom.css"]}',
'files_js' => '{"add":["scripts/theme.js","scripts/ajaxify.js","scripts/custom.js"]}',
'files_print_css' => '{"add":["css/print_theme.css"]}',
'options' => '{"ajaxmode":"on","brandlogo":"on","container":"on", "hideprivacyinfo": "off", "brandlogofile":"./files/logo.png","font":"noto", "showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
'options' => '{"ajaxmode":"on","brandlogo":"on","container":"on", "hideprivacyinfo": "off", "brandlogofile":"themes/survey/vanilla/files/logo.png","font":"noto", "showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
'cssframework_name' => 'bootstrap',
'cssframework_css' => '{}',
'cssframework_js' => '',
Expand All @@ -184,7 +184,7 @@ public static function getTemplateConfigurationData()
'files_css' => '{"add":["css/ajaxify.css","css/animate.css","css/variations/sea_green.css","css/theme.css","css/custom.css"]}',
'files_js' => '{"add":["scripts/theme.js","scripts/ajaxify.js","scripts/custom.js"]}',
'files_print_css' => '{"add":["css/print_theme.css"]}',
'options' => '{"ajaxmode":"on","brandlogo":"on","brandlogofile":"./files/logo.png","container":"on","backgroundimage":"off","backgroundimagefile":null,"animatebody":"off","bodyanimation":"fadeInRight","bodyanimationduration":"500","animatequestion":"off","questionanimation":"flipInX","questionanimationduration":"500","animatealert":"off","alertanimation":"shake","alertanimationduration":"500","font":"noto","bodybackgroundcolor":"#ffffff","fontcolor":"#444444","questionbackgroundcolor":"#ffffff","questionborder":"on","questioncontainershadow":"on","checkicon":"f00c","animatecheckbox":"on","checkboxanimation":"rubberBand","checkboxanimationduration":"500","animateradio":"on","radioanimation":"zoomIn","radioanimationduration":"500","zebrastriping":"off","stickymatrixheaders":"off","greyoutselected":"off","hideprivacyinfo":"off","crosshover":"off","showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
'options' => '{"ajaxmode":"on","brandlogo":"on","brandlogofile":"themes/survey/fruity/files/logo.png","container":"on","backgroundimage":"off","backgroundimagefile":null,"animatebody":"off","bodyanimation":"fadeInRight","bodyanimationduration":"500","animatequestion":"off","questionanimation":"flipInX","questionanimationduration":"500","animatealert":"off","alertanimation":"shake","alertanimationduration":"500","font":"noto","bodybackgroundcolor":"#ffffff","fontcolor":"#444444","questionbackgroundcolor":"#ffffff","questionborder":"on","questioncontainershadow":"on","checkicon":"f00c","animatecheckbox":"on","checkboxanimation":"rubberBand","checkboxanimationduration":"500","animateradio":"on","radioanimation":"zoomIn","radioanimationduration":"500","zebrastriping":"off","stickymatrixheaders":"off","greyoutselected":"off","hideprivacyinfo":"off","crosshover":"off","showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
'cssframework_name' => 'bootstrap',
'cssframework_css' => '{}',
'cssframework_js' => '',
Expand All @@ -200,7 +200,7 @@ public static function getTemplateConfigurationData()
'files_css' => '{"add":["css/ajaxify.css","css/theme.css","css/custom.css"]}',
'files_js' => '{"add":["scripts/theme.js","scripts/ajaxify.js","scripts/custom.js"]}',
'files_print_css' => '{"add":["css/print_theme.css"]}',
'options' => '{"ajaxmode":"on","brandlogo":"on","container":"on","brandlogofile":"./files/logo.png", "showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
'options' => '{"ajaxmode":"on","brandlogo":"on","container":"on","brandlogofile":"themes/survey/bootswatch/files/logo.png", "showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
'cssframework_name' => 'bootstrap',
'cssframework_css' => '{"replace":[["css/bootstrap.css","css/variations/flatly.min.css"]]}',
'cssframework_js' => '',
Expand Down
2 changes: 1 addition & 1 deletion themes/survey/bootswatch/config.xml
View file
Expand Up @@ -64,7 +64,7 @@
<options>
<ajaxmode>on</ajaxmode>
<brandlogo>on</brandlogo>
<brandlogofile>./files/logo.png</brandlogofile>
<brandlogofile>themes/survey/bootswatch/files/logo.png</brandlogofile>
<container>on</container>
<showpopups>1</showpopups>
<showclearall>off</showclearall>
Expand Down
2 changes: 1 addition & 1 deletion themes/survey/fruity/config.xml
View file
Expand Up @@ -69,7 +69,7 @@
<options>
<ajaxmode>off</ajaxmode>
<brandlogo>on</brandlogo>
<brandlogofile>./files/logo.png</brandlogofile>
<brandlogofile>themes/survey/fruity/files/logo.png</brandlogofile>
<container>on</container>
<backgroundimage>off</backgroundimage>
<backgroundimagefile>./files/pattern.png</backgroundimagefile>
Expand Down
4 changes: 2 additions & 2 deletions themes/survey/fruity/options/options.twig
View file
Expand Up @@ -775,7 +775,7 @@
{% endfor %}

{% if templateConfiguration.sid is not empty or templateConfiguration.gsid is not empty %}
{% set backgroundimagefileOptions = '<option data-lightbox-src="' ~ backgroundimagefileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ backgroundimagefileInheritFilename ~ ')</option>' ~ backgroundimagefileOptions %}
{% set backgroundimagefileOptions = '<option data-lightbox-src="' ~ backgroundimagefileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ backgroundimagefileInheritFilename ~ ']</option>' ~ backgroundimagefileOptions %}
{% endif %}

{{ backgroundimagefileOptions }}
Expand Down Expand Up @@ -830,7 +830,7 @@
{% endfor %}

{% if templateConfiguration.sid is not empty or templateConfiguration.gsid is not empty %}
{% set brandlogofileOptions = '<option data-lightbox-src="' ~ brandlogofileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ brandlogofileInheritFilename ~ ')</option>' ~ brandlogofileOptions %}
{% set brandlogofileOptions = '<option data-lightbox-src="' ~ brandlogofileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ brandlogofileInheritFilename ~ ']</option>' ~ brandlogofileOptions %}
{% endif %}

{{ brandlogofileOptions }}
Expand Down
2 changes: 1 addition & 1 deletion themes/survey/vanilla/config.xml
View file
Expand Up @@ -72,7 +72,7 @@
<container>on</container>
<bodyanimation>fadeInRight</bodyanimation>
<brandlogo>on</brandlogo>
<brandlogofile>./files/logo.png</brandlogofile>
<brandlogofile>themes/survey/vanilla/files/logo.png</brandlogofile>
<font>noto</font>
<showpopups>1</showpopups>
<showclearall>off</showclearall>
Expand Down
2 changes: 1 addition & 1 deletion themes/survey/vanilla/options/options.twig
View file
Expand Up @@ -308,7 +308,7 @@
{% endfor %}

{% if templateConfiguration.sid is not empty or templateConfiguration.gsid is not empty %}
{% set brandlogofileOptions = '<option data-lightbox-src="' ~ brandlogofileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ brandlogofileInheritFilename ~ ')</option>' ~ brandlogofileOptions %}
{% set brandlogofileOptions = '<option data-lightbox-src="' ~ brandlogofileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ brandlogofileInheritFilename ~ ']</option>' ~ brandlogofileOptions %}
{% endif %}

{{ brandlogofileOptions }}
Expand Down

1 comment on commit 4fd7187

@Shnoulle
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK for included survey, but how we can do this for user survey ?
Maybe need a thistemplate shortcut or something like this ?

Please sign in to comment.