From 954d14cd66c102db31df1ed802d1c31a8a6bce98 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 10 Sep 2015 14:32:56 +0200
Subject: [PATCH] Warn the user when he performs an upgrade instead of update

Fixes #481
---
 webadmin/src/index.html | 47 +++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/webadmin/src/index.html b/webadmin/src/index.html
index 0d1d6cf5a..dac213c57 100644
--- a/webadmin/src/index.html
+++ b/webadmin/src/index.html
@@ -73,27 +73,34 @@
                         <br/>
                         <br/>
                     </div>
-                    <p>This update will install version <b>{{config.update.box.version}}</b> on your Cloudron.</p>
-                    <p>Recent Changes:</p>
-                    <ul>
-                        <li ng-repeat="change in config.update.box.changelog">{{change}}</li>
-                    </ul>
-                    <br/>
-                    <fieldset ng-show="installedApps | readyToUpdate">
-                        <form name="update_form" role="form" ng-submit="doUpdate()" autocomplete="off">
-                            <div class="form-group" ng-class="{ 'has-error': update_form.password.$dirty && update_form.password.$invalid }">
-                                <label class="control-label" for="inputUpdatePassword">Give your password to verify that you are performing that action</label>
-                                <div class="control-label" ng-show="(!update_form.password.$dirty && update.error.password) || (update_form.password.$dirty && update_form.password.$invalid)">
-                                    <small ng-show="update_form.password.$error.required && !update.error.password">A password is required</small>
-                                    <small ng-show="update_form.password.$error.minlength">The password is too short</small>
-                                    <small ng-show="update_form.password.$error.maxlength">The password is too long</small>
-                                    <small ng-show="update.error.password">Incorrect password</small>
+                    <div ng-show="installedApps | readyToUpdate">
+                        <b ng-show="config.update.box.upgrade" class="text-danger">
+                            The update is a base system upgrade.<br/>
+                            This will cause some application downtime!<br/>
+                            <br/>
+                        </b>
+                        <p>New version: <b>{{config.update.box.version}}</b></p>
+                        <p>Recent Changes:</p>
+                        <ul>
+                            <li ng-repeat="change in config.update.box.changelog">{{change}}</li>
+                        </ul>
+                        <br/>
+                        <fieldset>
+                            <form name="update_form" role="form" ng-submit="doUpdate()" autocomplete="off">
+                                <div class="form-group" ng-class="{ 'has-error': update_form.password.$dirty && update_form.password.$invalid }">
+                                    <label class="control-label" for="inputUpdatePassword">Give your password to verify that you are performing that action</label>
+                                    <div class="control-label" ng-show="(!update_form.password.$dirty && update.error.password) || (update_form.password.$dirty && update_form.password.$invalid)">
+                                        <small ng-show="update_form.password.$error.required && !update.error.password">A password is required</small>
+                                        <small ng-show="update_form.password.$error.minlength">The password is too short</small>
+                                        <small ng-show="update_form.password.$error.maxlength">The password is too long</small>
+                                        <small ng-show="update.error.password">Incorrect password</small>
+                                    </div>
+                                    <input type="password" class="form-control" ng-model="update.password" id="inputUpdatePassword" name="password" placeholder="Password" ng-maxlength="512" ng-minlength="5" required autofocus>
                                 </div>
-                                <input type="password" class="form-control" ng-model="update.password" id="inputUpdatePassword" name="password" placeholder="Password" ng-maxlength="512" ng-minlength="5" required autofocus>
-                            </div>
-                            <input class="ng-hide" type="submit" ng-disabled="update_form.$invalid || update.busy"/>
-                        </form>
-                    </fieldset>
+                                <input class="ng-hide" type="submit" ng-disabled="update_form.$invalid || update.busy"/>
+                            </form>
+                        </fieldset>
+                    </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>