Remove cloudron name from the setup wizard

webadmin/src/js/client.js

@@ -368,12 +368,11 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
         }).error(defaultErrorHandler(callback));
     };
 
-    Client.prototype.createAdmin = function (username, password, email, name, setupToken, callback) {
+    Client.prototype.createAdmin = function (username, password, email, setupToken, callback) {
         var payload = {
             username: username,
             password: password,
-            email: email,
-            name: name
+            email: email
         };
 
         var that = this;

webadmin/src/js/setup.js

@@ -40,7 +40,6 @@ app.service('Wizard', [ function () {
         this.username = '';
         this.email = '';
         this.password = '';
-        this.name = '';
         this.availableAvatars = [{
             file: null,
             data: null,
@@ -198,7 +197,7 @@ app.controller('StepController', ['$scope', '$route', '$location', 'Wizard', fun
 app.controller('FinishController', ['$scope', '$location', '$timeout', 'Wizard', 'Client', function ($scope, $location, $timeout, Wizard, Client) {
     $scope.wizard = Wizard;
 
-    Client.createAdmin($scope.wizard.username, $scope.wizard.password, $scope.wizard.email, $scope.wizard.name, $scope.setupToken, function (error) {
+    Client.createAdmin($scope.wizard.username, $scope.wizard.password, $scope.wizard.email, $scope.setupToken, function (error) {
         if (error) {
             console.error('Internal error', error);
             window.location.href = '/error.html';

webadmin/src/views/setup/step1.html

@@ -3,7 +3,7 @@
         <h1>Welcome to your Cloudron!</h1>
         <hr/>
         <h3 class="">
-                Choose a name and avatar for your Cloudron
+                Choose an avatar
         </h3>
     </div>
 </div>
@@ -19,16 +19,6 @@
 <br/>
 <br/>
 
-<div class="row">
-    <div class="col-md-4 col-md-offset-4 text-center">
-        <div class="form-group" ng-class="{ 'has-error': setup_form.name.$dirty && setup_form.name.$invalid }">
-            <!-- <label class="control-label" for="inputName">Name</label> -->
-            <input type="text" class="form-control" ng-model="wizard.name" id="inputName" name="name" placeholder="Name" ng-enter="next('/step2', setup_form.name.$invalid)" ng-maxlength="512" ng-minlength="1" autofocus required autocomplete="off">
-        </div>
-    </div>
-</div>
-
-
 <div class="row">
     <div class="col-md-12 settings-avatar-selector">
         <input type="file" id="avatarFileInput" style="display: none" accept="image/png"/>
@@ -48,6 +38,6 @@
 
 <div class="row">
     <div class="col-md-12 text-center">
-        <a class="btn btn-primary" href="#/step2" ng-disabled="setup_form.name.$invalid">Next</a>
+        <a class="btn btn-primary" href="#/step2">Next</a>
     </div>
 </div>

webadmin/src/views/setup/step2.html

@@ -1,6 +1,6 @@
 <div class="row">
     <div class="col-md-12 text-center">
-        <h1>Create an Administrator for <b>{{ wizard.name }}</b></h1>
+        <h1>Create an Administrator for your Cloudron</h1>
         <h4 class="">
             This admin account is separate from your <a href="https://cloudron.io">cloudron.io</a> account.
         </h4>