Skip to content

Commit ae139e5

Browse files
Use create project popup rather than the create-project page
Fixes #2029
1 parent db9abb5 commit ae139e5

File tree

6 files changed

+36
-13
lines changed

6 files changed

+36
-13
lines changed

app/scripts/controllers/projects.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,12 @@ angular.module('openshiftConsole')
133133

134134
$scope.newProjectPanelShown = false;
135135

136-
$scope.createProject = function() {
136+
$scope.createProject = function(event) {
137+
var button =_.get(event, 'target');
138+
while (button && !angular.element(button).hasClass('btn')) {
139+
button = button.parentElement;
140+
}
141+
$scope.popupElement = button;
137142
$scope.newProjectPanelShown = true;
138143
};
139144

app/styles/_projects.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,3 +202,9 @@
202202
}
203203
}
204204
}
205+
206+
.projects-list-create-popup {
207+
form {
208+
width: 400px;
209+
}
210+
}

app/views/projects.html

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<div class="middle surface-shaded">
2+
<origin-modal-popup class="projects-list-create-popup" shown="newProjectPanelShown" modal-title="Create Project" on-close="closeNewProjectPanel" reference-element="popupElement">
3+
<create-project is-dialog="true" redirect-action="onNewProject" on-cancel="closeNewProjectPanel"></create-project>
4+
</origin-modal-popup>
25
<div class="middle-content">
36
<div class="container-fluid">
47
<div class="row">
@@ -17,13 +20,10 @@ <h2 class="text-center">Loading...</h2>
1720
<h1>My Projects</h1>
1821
<div class="projects-options">
1922
<div class="projects-add" ng-if="canCreate">
20-
<button ng-click="createProject()" class="btn btn-md btn-primary">
23+
<button ng-click="createProject($event)" class="btn btn-primary">
2124
<span class="fa fa-plus" aria-hidden="true"></span>
2225
<span class="icon-button-text">Create Project</span>
2326
</button>
24-
<origin-modal-popup shown="newProjectPanelShown" modal-title="Create Project" on-close="closeNewProjectPanel">
25-
<create-project is-dialog="true" redirect-action="onNewProject" on-cancel="closeNewProjectPanel"></create-project>
26-
</origin-modal-popup>
2727
</div>
2828
<div class="projects-search">
2929
<form role="form" class="search-pf has-button">
@@ -170,7 +170,12 @@ <h1>Welcome to OpenShift.</h1>
170170
OpenShift helps you quickly develop, host, and scale applications.<br>
171171
<span ng-if="canCreate">Create a project for your application.</span>
172172
</p>
173-
<a ng-if="canCreate" href="create-project" class="btn btn-lg btn-primary">Create Project</a>
173+
<div>
174+
<button ng-click="createProject($event)" class="btn btn-lg btn-primary">
175+
<span class="fa fa-plus" aria-hidden="true"></span>
176+
<span class="icon-button-text">Create Project</span>
177+
</button>
178+
</div>
174179
<p>To learn more, visit the OpenShift <a target="_blank" ng-href="{{'' | helpLink}}">documentation</a>.</p>
175180
<p class="projects-instructions" ng-if="canCreate === false" ng-include="'views/_cannot-create-project.html'"></p>
176181
</div>

dist/scripts/scripts.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4357,8 +4357,9 @@ d = _.toArray(t.by("metadata.name")), e.loading = !1, e.showGetStarted = _.isEmp
43574357
}, k = function() {
43584358
g || u.list().then(w);
43594359
};
4360-
e.newProjectPanelShown = !1, e.createProject = function() {
4361-
e.newProjectPanelShown = !0;
4360+
e.newProjectPanelShown = !1, e.createProject = function(t) {
4361+
for (var n = _.get(t, "target"); n && !angular.element(n).hasClass("btn"); ) n = n.parentElement;
4362+
e.popupElement = n, e.newProjectPanelShown = !0;
43624363
}, e.closeNewProjectPanel = function() {
43634364
e.newProjectPanelShown = !1;
43644365
}, e.onNewProject = function() {

dist/scripts/templates.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12538,6 +12538,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1253812538

1253912539
$templateCache.put('views/projects.html',
1254012540
"<div class=\"middle surface-shaded\">\n" +
12541+
"<origin-modal-popup class=\"projects-list-create-popup\" shown=\"newProjectPanelShown\" modal-title=\"Create Project\" on-close=\"closeNewProjectPanel\" reference-element=\"popupElement\">\n" +
12542+
"<create-project is-dialog=\"true\" redirect-action=\"onNewProject\" on-cancel=\"closeNewProjectPanel\"></create-project>\n" +
12543+
"</origin-modal-popup>\n" +
1254112544
"<div class=\"middle-content\">\n" +
1254212545
"<div class=\"container-fluid\">\n" +
1254312546
"<div class=\"row\">\n" +
@@ -12555,13 +12558,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1255512558
"<h1>My Projects</h1>\n" +
1255612559
"<div class=\"projects-options\">\n" +
1255712560
"<div class=\"projects-add\" ng-if=\"canCreate\">\n" +
12558-
"<button ng-click=\"createProject()\" class=\"btn btn-md btn-primary\">\n" +
12561+
"<button ng-click=\"createProject($event)\" class=\"btn btn-primary\">\n" +
1255912562
"<span class=\"fa fa-plus\" aria-hidden=\"true\"></span>\n" +
1256012563
"<span class=\"icon-button-text\">Create Project</span>\n" +
1256112564
"</button>\n" +
12562-
"<origin-modal-popup shown=\"newProjectPanelShown\" modal-title=\"Create Project\" on-close=\"closeNewProjectPanel\">\n" +
12563-
"<create-project is-dialog=\"true\" redirect-action=\"onNewProject\" on-cancel=\"closeNewProjectPanel\"></create-project>\n" +
12564-
"</origin-modal-popup>\n" +
1256512565
"</div>\n" +
1256612566
"<div class=\"projects-search\">\n" +
1256712567
"<form role=\"form\" class=\"search-pf has-button\">\n" +
@@ -12672,7 +12672,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1267212672
"OpenShift helps you quickly develop, host, and scale applications.<br>\n" +
1267312673
"<span ng-if=\"canCreate\">Create a project for your application.</span>\n" +
1267412674
"</p>\n" +
12675-
"<a ng-if=\"canCreate\" href=\"create-project\" class=\"btn btn-lg btn-primary\">Create Project</a>\n" +
12675+
"<div>\n" +
12676+
"<button ng-click=\"createProject($event)\" class=\"btn btn-lg btn-primary\">\n" +
12677+
"<span class=\"fa fa-plus\" aria-hidden=\"true\"></span>\n" +
12678+
"<span class=\"icon-button-text\">Create Project</span>\n" +
12679+
"</button>\n" +
12680+
"</div>\n" +
1267612681
"<p>To learn more, visit the OpenShift <a target=\"_blank\" ng-href=\"{{'' | helpLink}}\">documentation</a>.</p>\n" +
1267712682
"<p class=\"projects-instructions\" ng-if=\"canCreate === false\" ng-include=\"'views/_cannot-create-project.html'\"></p>\n" +
1267812683
"</div>\n" +

dist/styles/main.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)