Merge remote-tracking branch 'upstream/develop' into item-delete

[friendica.git] / view / theme / frio / templates / theme_settings.tpl

diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl
index 83b466b73b292d38bb71df70f49033c60879f5fb..37b29d9a103716868e407e525dd2bccbd3fa8f55 100644 (file)
--- a/view/theme/frio/templates/theme_settings.tpl
+++ b/view/theme/frio/templates/theme_settings.tpl
@@ -30,9 +30,12 @@
 {{/foreach}}
 </div>
 
-<script>
-       $(function(){
-               $("#frio_nav_bg, #frio_nav_icon_color, #frio_background_color, #frio_link_color").colorpicker({format: 'hex', align: 'left'});
+{{if $login_bg_image}}{{include file="field_fileinput.tpl" field=$login_bg_image}}{{/if}}
+{{if $login_bg_color}}{{include file="field_colorinput.tpl" field=$login_bg_color}}{{/if}}
+
+<script type="text/javascript">
+       $(document).ready(function() {
+               $("#frio_nav_bg, #frio_nav_icon_color, #frio_background_color, #frio_link_color, #frio_login_bg_color").colorpicker({format: 'hex', align: 'left'});
 
                // show image options when user user starts to type the address of the image
                $("#id_frio_background_image").keyup(function(){
@@ -60,6 +63,13 @@
                        theme: 'theme-frio',
                });
 
+               // The position of the slider is wrong calculated on hidden elements.
+               // So set an event listener toggle and update the jRange value.
+               $(document).on('click', '#custom-settings-title a', function() {
+                       var bgTransp = $('#frio_contentbg_transp').val();
+                       $('.slider-input').jRange('setValue', bgTransp);
+               });
+
        });
 </script>
 
@@ -68,6 +78,6 @@
 </div>
 <div class="clearfix"></div>
 
-<script>
+<script type="text/javascript">
     $(".inputRange").rangeinput();
 </script>