diff --git a/dashboard/src/app/projects/create-project/create-project.controller.js b/dashboard/src/app/projects/create-project/create-project.controller.js index dea9f9799f..27d910fd4e 100755 --- a/dashboard/src/app/projects/create-project/create-project.controller.js +++ b/dashboard/src/app/projects/create-project/create-project.controller.js @@ -625,10 +625,10 @@ export class CreateProjectCtrl { this.$mdDialog.alert() .title('Workspace Connection Error') .content('It seems that your workspace is running, but we cannot connect your browser to it. This commonly happens when Che was' + - ' not configured properly. If your browser is connecting to workspaces running remotely, then you must start Che with the ' + - '--remote: flag where the is the IP address of the node that is running your Docker workspaces.' + - 'Please restart Che with this flag. You can read about what this flag does and why it is essential at: ' + - 'https://eclipse-che.readme.io/docs/configuration#envrionment-variables') + ' not configured properly. If your browser is connecting to workspaces running remotely, then you must start Che with the ' + + '--remote: flag where the is the IP address of the node that is running your Docker workspaces.' + + 'Please restart Che with this flag. You can read about what this flag does and why it is essential at: ' + + 'https://eclipse-che.readme.io/docs/configuration#envrionment-variables') .ariaLabel('Project creation') .ok('OK') ); diff --git a/dashboard/src/app/projects/create-project/create-project.html b/dashboard/src/app/projects/create-project/create-project.html index 5628486a78..546a1658a2 100644 --- a/dashboard/src/app/projects/create-project/create-project.html +++ b/dashboard/src/app/projects/create-project/create-project.html @@ -11,225 +11,249 @@ --> -
- -
+
+ +
-
-
-
-
-
{{step.name}}
-
-
+
+
+
+
+
{{step.name}}
+
+
-
-
-
-
-
+
+
+ +
+
- - -
- - -
-
-
- -
- -
-
{{createProjectCtrl.getCurrentProgressStep() + 1}} / {{createProjectCtrl.getCreationSteps().length - 1}}
-
{{createProjectCtrl.projectName}} : {{createProjectCtrl.getCreationSteps()[createProjectCtrl.getCurrentProgressStep()].text}}
-
-
-
-
-
-
-
{{$index + 1}}
-
{{createProjectCtrl.getStepText($index)}}
- -
-
-
-
 
- -
-
-
-
- -
-   -
- -
-
-
+ +
+
+
+
+
-
-
- - - - - - New from blank, template, or sample project - Import from existing location - - - -
- - - - - Git Repository - - - - - - - - - Github - - - - - - - - - Zip - - - - - - +
+
+ {{createProjectCtrl.getCurrentProgressStep() + 1}} / {{createProjectCtrl.getCreationSteps().length - 1}} +
+
{{createProjectCtrl.projectName}} : + {{createProjectCtrl.getCreationSteps()[createProjectCtrl.getCurrentProgressStep()].text}} +
+
+
+
+
+
+
+
+ {{$index + 1}} +
+
{{createProjectCtrl.getStepText($index)}}
+
+
+
+
 
+ +
+
+
+
+ +
+   +
+ +
+
+
- - - - - - - - - -
A name is required.
-
Workspace name may contain digits, latin letters, _ , . , - and should start only with digits, latin letters or underscores
-
The name has to be more then 3 characters long.
-
The name has to be less than 20 characters long.
- - - - - - - - - - Ready-to-run project samples - - Wizard-driven templates - - - - - - - -
A name is required.
-
This project name is already used.
-
The name should not contain special characters like space, dollar, etc.
-
The name has to be less than 128 characters long.
-
The name has to be less than 128 characters long.
- -
- -
The name has to be less than 256 characters long.
-
The name has to be less than 256 characters long.
- -
- - - - - - - - -
+
+ +
+ + + + + New from blank, template, or sample project + Import from existing location + + + +
+ + + + + Git Repository + + + + + + + + + Github + + + + + + + + + Zip + + + + + + +
+ + + + + + + + + + +
A name is required.
+
Workspace name may contain digits, latin letters, _ , . , - and should start only with digits, latin + letters or underscores +
+
The name has to be more then 3 characters long.
+
The name has to be less than 20 characters long.
+ + + + + + + + + + Ready-to-run project samples + + Wizard-driven templates + + + + + + + + +
A name is required.
+
This project name is already used.
+
The name should not contain special characters like space, dollar, etc.
+
The name has to be less than 128 characters long.
+
The name has to be less than 128 characters long.
+ +
+ +
The name has to be less than 256 characters long.
+
The name has to be less than 256 characters long.
+ +
+ + + + + + + +
+ +
diff --git a/dashboard/src/app/projects/create-project/samples/create-project-samples.controller.js b/dashboard/src/app/projects/create-project/samples/create-project-samples.controller.js index 63b8a9ce1b..383e9d2628 100644 --- a/dashboard/src/app/projects/create-project/samples/create-project-samples.controller.js +++ b/dashboard/src/app/projects/create-project/samples/create-project-samples.controller.js @@ -88,15 +88,14 @@ export class CreateProjectSamplesCtrl { * Select the first element in the list */ initItem($first, template, createProjectCtrl) { - if ($first && createProjectCtrl.selectSourceOption === 'select-source-new') { - this.$timeout(() => { - this.selectTemplate(template, createProjectCtrl); - }, 1000); - } + if ($first && createProjectCtrl.selectSourceOption === 'select-source-new') { + this.$timeout(() => { + this.selectTemplate(template, createProjectCtrl); + }, 1000); + } } - /** * Helper method used to get the length of keys of the given object * @param items @@ -105,6 +104,6 @@ export class CreateProjectSamplesCtrl { getItemsSize(items) { return Object.keys(items).length; -} + } } diff --git a/dashboard/src/app/workspaces/create-workspace/create-workspace.controller.js b/dashboard/src/app/workspaces/create-workspace/create-workspace.controller.js index acaa512a44..f7478f7358 100644 --- a/dashboard/src/app/workspaces/create-workspace/create-workspace.controller.js +++ b/dashboard/src/app/workspaces/create-workspace/create-workspace.controller.js @@ -45,8 +45,8 @@ export class CreateWorkspaceCtrl { }; // fetch default recipe if we haven't one - if (!cheAPI.getRecipeTemplate().getDefaultRecipe()) { - cheAPI.getRecipeTemplate().fetchDefaultRecipe(); + if (!cheAPI.getRecipeTemplate().getDefaultRecipe()) { + cheAPI.getRecipeTemplate().fetchDefaultRecipe(); } this.stack = null; @@ -216,7 +216,7 @@ export class CreateWorkspaceCtrl { /** * Handle the redirect for the given promise after workspace has been created * @param promise used to gather workspace data - */ + */ redirectAfterSubmitWorkspace(promise) { promise.then((workspaceData) => { let infoMessage = 'Workspace ' + workspaceData.name + ' successfully created.';