Merge branch 'develop' into task/6778-add-storage-move-to-cron

[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 1e1485586c456c66bcb89a7b8d449bd6e7064d0c..1c870c92be94ea02a0e2c2d74b1d5a1b30dc1cdb 100644 (file)
--- a/view/theme/frio/templates/theme_settings.tpl
+++ b/view/theme/frio/templates/theme_settings.tpl
@@ -57,6 +57,25 @@
                                theme.background_color = $("#id_frio_background_color").val();
                        }
 
+                       if ($("#id_frio_background_image").length) {
+                               theme.background_image = $("#id_frio_background_image").val();
+
+                               if (theme.background_image.length > 0) {
+                                       if ($("#id_frio_bg_image_option_stretch").is(":checked") == true) {
+                                               theme.background_image_option = "stretch";
+                                       }
+                                       if ($("#id_frio_bg_image_option_cover").is(":checked") == true) {
+                                               theme.background_image_option = "cover";
+                                       }
+                                       if ($("#id_frio_bg_image_option_contain").is(":checked") == true) {
+                                               theme.background_image_option = "contain";
+                                       }
+                                       if ($("#id_frio_bg_image_option_repeat").is(":checked") == true) {
+                                               theme.background_image_option = "repeat";
+                                       }
+                                }
+                       }
+
                        if ($("#frio_contentbg_transp").length) {
                                theme.contentbg_transp = $("#frio_contentbg_transp").val();
                        }
@@ -68,15 +87,17 @@
                        if ($("#id_frio_login_bg_color").length) {
                                theme.login_bg_color = $("#id_frio_login_bg_color").val();
                        }
-
-                       var share_string = JSON.stringify(theme);
-                       $("#id_frio_share_string").val(share_string);
+                       if (!($("#id_frio_share_string").is(":focus"))){
+                               var share_string = JSON.stringify(theme);
+                               $("#id_frio_share_string").val(share_string);
+                       }
                }
 
                // interval because jquery.val does not trigger events
                window.setInterval(GenerateShareString, 500);
                GenerateShareString();
 
+               // Take advantage of the effects of previous comment
                $(document).on("keyup", "#id_frio_share_string", function() {
                        theme = JSON.parse($("#id_frio_share_string").val());
 
@@ -96,6 +117,31 @@
                                $("#id_frio_background_color").val(theme.background_color);
                        }
 
+                       if ($("#id_frio_background_image").length) {
+                               $("#id_frio_background_image").val(theme.background_image);
+                               var elText = theme.background_image;
+                               if(elText.length !== 0) {
+                                       $("#frio_bg_image_options").show();
+                               } else {
+                                       $("#frio_bg_image_options").hide();
+                               }
+
+                               switch (theme.background_image_option) {
+                                       case 'stretch':
+                                               $("#id_frio_bg_image_option_stretch").prop("checked", true);
+                                               break;
+                                       case 'cover':
+                                               $("#id_frio_bg_image_option_cover").prop("checked", true);
+                                               break;
+                                       case 'contain':
+                                               $("#id_frio_bg_image_option_contain").prop("checked", true);
+                                               break;
+                                       case 'repeat':
+                                               $("#id_frio_bg_image_option_repeat").prop("checked", true);
+                                               break;
+                               }
+                       }
+
                        if ($("#frio_contentbg_transp").length) {
                                $("#frio_contentbg_transp").val(theme.contentbg_transp);
                        }