add some infoblurbs to the updater plugin, remove experimental notices

diff --git a/plugins/updater/init.php b/plugins/updater/init.php
index adab6bc80de0bd97d27f4b9309ccd15979be5f71..6bfaa82c44bab66eef403c1ad047b6639f8fbbc9 100644 (file)
--- a/plugins/updater/init.php
+++ b/plugins/updater/init.php
@@ -298,8 +298,10 @@ class Updater extends Plugin {
        }
 
        function update_self($args) {
-               _debug("Warning: self-updating is experimental. Use at your own risk.");
-               _debug("Please backup your tt-rss directory before continuing. Your database will not be modified.");
+               _debug("READ THE FOLLOWING BEFORE CONTINUING!");
+               _debug("* It is suggested to backup your tt-rss directory first.");
+               _debug("* Your database will not be modified.");
+               _debug("* Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes.");
                _debug("Type 'yes' to continue.");
 
                $input = read_stdin();
@@ -346,11 +348,18 @@ class Updater extends Plugin {
        }
 
        function updateSelf() {
+               print_warning(__("Do not close this dialog until updating is finished."));
+
                print "<form style='display : block' name='self_update_form' id='self_update_form'>";
 
-               print "<div class='error'>".__("Do not close this dialog until updating is finished. Backup your tt-rss directory before continuing.")."</div>";
+               print "<style type='text/css'>
+                       li.notice { font-style : italic; color : red; }
+               </style>";
 
                print "<ul class='selfUpdateList' id='self_update_log'>";
+               print "<li class='notice'>" .__("It is suggested to backup your tt-rss directory first.") . "</li>";
+               print "<li class='notice'>" . __("Your database will not be modified.") . "</li>";
+               print "<li class='notice'>" . __("Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes.") . "</li>";
                print "<li>" . __("Ready to update.") . "</li>";
                print "</ul>";
 

diff --git a/plugins/updater/updater.js b/plugins/updater/updater.js
index 40fcc871b15df7df5a176b822b6ea4d4a4a61c6f..4a18473725e250c84441239160daaab3dec38203 100644 (file)
--- a/plugins/updater/updater.js
+++ b/plugins/updater/updater.js
@@ -55,7 +55,7 @@ function updateSelf() {
                                }
                        },
                        start: function() {
-                               if (prompt(__("Live updating is considered experimental. Backup your tt-rss directory before continuing. Please type 'yes' to continue.")) == 'yes') {
+                               if (prompt(__("Backup your tt-rss directory before continuing. Please type 'yes' to continue.")) == 'yes') {
                                        dialog.performUpdate(0);
                                }
                        },