diff --git a/static/css/pages/new-organization.css b/static/css/pages/new-organization.css new file mode 100644 index 000000000..6e6a1ef7b --- /dev/null +++ b/static/css/pages/new-organization.css @@ -0,0 +1,4 @@ +.new-organization .co-main-content-panel { + padding: 30px; + position: relative; +} \ No newline at end of file diff --git a/static/css/pages/repo-list.css b/static/css/pages/repo-list.css index c92110fc1..ac0481c86 100644 --- a/static/css/pages/repo-list.css +++ b/static/css/pages/repo-list.css @@ -24,3 +24,15 @@ .repo-list .namespaces-list li .avatar { margin-right: 10px; } + +.repo-list .new-org { + margin-top: 20px !important; + padding-top: 14px; + border-top: 1px solid #eee; +} + +.repo-list .new-org i.fa { + width: 30px; + margin-right: 10px; + text-align: center; +} \ No newline at end of file diff --git a/static/js/pages/new-organization.js b/static/js/pages/new-organization.js index 5508da383..85c451115 100644 --- a/static/js/pages/new-organization.js +++ b/static/js/pages/new-organization.js @@ -4,9 +4,15 @@ */ angular.module('quayPages').config(['pages', function(pages) { pages.create('new-organization', 'new-organization.html', NewOrgCtrl, { + 'newLayout': true, 'title': 'New Organization', 'description': 'Create a new organization to manage teams and permissions' - }); + }, ['layout']); + + pages.create('new-organization', 'old-new-organization.html', NewOrgCtrl, { + 'title': 'New Organization', + 'description': 'Create a new organization to manage teams and permissions' + }, ['old-layout']); }]); function NewOrgCtrl($scope, $routeParams, $timeout, $location, UserService, PlanService, ApiService, CookieService, Features) { diff --git a/static/partials/new-organization.html b/static/partials/new-organization.html index 0e94be5ec..3d8143008 100644 --- a/static/partials/new-organization.html +++ b/static/partials/new-organization.html @@ -1,93 +1,80 @@ -
- -
- -
- -
-
-

Create Organization

- -
-
    -
  • - - Login with an account -
    • -
  • - - Setup your organization -
    • -
  • - - Create teams -
    • -
-
- +
+
+
+ + + Repositories + + + + Create New Organization +
-
- -
-
- In order to create a new organization, you must first be signed in as the - user that will become an admin for the organization. -
-
-
-
-
-
-
+
+
- -
-
-
-

Setup the new organization

- -
-
- - - This will also be the namespace for your repositories. Must be alphanumeric and all lowercase. +
+ +
+
+ In order to create a new organization, you must first be signed in as the + user that will become an admin for the organization.
- -
- - - This address must be different from your account's email. +
+
+
+
+
- -
- Choose your organization's plan -
+ +
+
+ +
+ + + This will also be the namespace for your repositories. Must be alphanumeric and all lowercase. +
+ +
+ + + This address must be different from your account's email. +
+ + +
+ Choose your organization's plan +
+
+ +
+ +
+
+
-
- + +
+
+

Organization Created

+

Manage Teams Now

- -
-
-
- - -
-
-
-

Organization Created

-

Manage Teams Now

+
diff --git a/static/partials/old-new-organization.html b/static/partials/old-new-organization.html new file mode 100644 index 000000000..0e94be5ec --- /dev/null +++ b/static/partials/old-new-organization.html @@ -0,0 +1,94 @@ +
+ +
+ +
+ +
+
+

Create Organization

+ +
+
    +
  • + + Login with an account +
    • +
  • + + Setup your organization +
    • +
  • + + Create teams +
    • +
+
+ +
+
+ + +
+
+ In order to create a new organization, you must first be signed in as the + user that will become an admin for the organization. +
+
+
+
+
+
+
+ + +
+
+
+

Setup the new organization

+ +
+
+ + + This will also be the namespace for your repositories. Must be alphanumeric and all lowercase. +
+ +
+ + + This address must be different from your account's email. +
+ + +
+ Choose your organization's plan +
+
+ +
+ +
+
+
+
+
+ + +
+
+
+

Organization Created

+

Manage Teams Now

+
+
+
+
diff --git a/static/partials/repo-list.html b/static/partials/repo-list.html index 23d1d1960..e1024dadb 100644 --- a/static/partials/repo-list.html +++ b/static/partials/repo-list.html @@ -42,6 +42,10 @@ {{ namespace.name }} +
  • + + Create New Organization +