From 85cff9bd9dfe9f755555ed1ce8b0ad0ad52cc6d9 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 6 Apr 2015 12:45:12 -0400 Subject: [PATCH] Slightly updated new repo view --- static/css/pages/new-repo.css | 92 ++++++++ static/css/quay.css | 83 ------- static/js/pages/new-repo.js | 10 +- static/partials/new-repo.html | 348 +++++++++++++++--------------- static/partials/old-new-repo.html | 237 ++++++++++++++++++++ 5 files changed, 517 insertions(+), 253 deletions(-) create mode 100644 static/css/pages/new-repo.css create mode 100644 static/partials/old-new-repo.html diff --git a/static/css/pages/new-repo.css b/static/css/pages/new-repo.css new file mode 100644 index 000000000..118454a9f --- /dev/null +++ b/static/css/pages/new-repo.css @@ -0,0 +1,92 @@ +.new-repo .co-main-content-panel { + padding: 30px; +} + +.new-repo .namespace-selector-header .slash { + color: #444; + padding-left: 6px; + padding-right: 6px; +} + +.new-repo .required-plan { + margin: 10px; + margin-top: 20px; + margin-left: 50px; +} + +.new-repo .required-plan .alert { + color: #444 !important; +} + +.new-repo .new-header .popover { + font-size: 14px; +} + +.new-repo .new-header .repo-circle { + margin-right: 14px; +} + +.new-repo .new-header .name-container { + display: inline-block; + width: 300px; + vertical-align: middle; +} + +.new-repo .description { + margin-left: 10px; + margin-top: 10px; +} + +.new-repo .section { + padding-bottom: 20px; + border-bottom: 1px solid #eee; + margin-bottom: 16px; +} + +.new-repo .section-title { + float: right; + color: #aaa; +} + +.new-repo .repo-option { + margin: 6px; + margin-top: 16px; +} + +.new-repo .repo-option label { + font-weight: normal; +} + +.new-repo .repo-option i { + font-size: 18px; + padding-left: 10px; + padding-right: 10px; + width: 42px; + display: inline-block; + text-align: center; +} + +.new-repo .option-description { + display: inline-block; + vertical-align: top; +} + +.new-repo .option-description label { + display: block; +} + +.new-repo .cbox { + margin: 10px; +} + +.new-repo .initialize-repo { + margin: 10px; + margin-top: 16px; + margin-left: 20px; + padding: 10px; + border: 1px dashed #ccc; +} + +.new-repo .initialize-repo .file-drop { + margin: 10px; +} diff --git a/static/css/quay.css b/static/css/quay.css index 3d674254e..31812341c 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -970,89 +970,6 @@ i.toggle-icon:hover { text-decoration: none !important; } -.new-repo .required-plan { - margin: 10px; - margin-top: 20px; - margin-left: 50px; -} - -.new-repo .required-plan .alert { - color: #444 !important; -} - -.new-repo .new-header .popover { - font-size: 14px; -} - -.new-repo .new-header .repo-circle { - margin-right: 14px; -} - -.new-repo .new-header .name-container { - display: inline-block; - width: 300px; - vertical-align: middle; -} - -.new-repo .description { - margin-left: 10px; - margin-top: 10px; -} - -.new-repo .section { - padding-bottom: 20px; - border-bottom: 1px solid #eee; - margin-bottom: 16px; -} - -.new-repo .section-title { - float: right; - color: #aaa; -} - -.new-repo .repo-option { - margin: 6px; - margin-top: 16px; -} - -.new-repo .repo-option label { - font-weight: normal; -} - -.new-repo .repo-option i { - font-size: 18px; - padding-left: 10px; - padding-right: 10px; - width: 42px; - display: inline-block; - text-align: center; -} - -.new-repo .option-description { - display: inline-block; - vertical-align: top; -} - -.new-repo .option-description label { - display: block; -} - -.new-repo .cbox { - margin: 10px; -} - -.new-repo .initialize-repo { - margin: 10px; - margin-top: 16px; - margin-left: 20px; - padding: 10px; - border: 1px dashed #ccc; -} - -.new-repo .initialize-repo .file-drop { - margin: 10px; -} - .user-guide h3 { margin-bottom: 20px; } diff --git a/static/js/pages/new-repo.js b/static/js/pages/new-repo.js index 79cac4762..36ff98016 100644 --- a/static/js/pages/new-repo.js +++ b/static/js/pages/new-repo.js @@ -3,10 +3,16 @@ * Page to create a new repository. */ angular.module('quayPages').config(['pages', function(pages) { - pages.create('new-repo', 'new-repo.html', NewRepoCtrl, { + pages.create('new-repo', 'new-repo.html', NewRepoCtrl, { + 'newLayout': true, 'title': 'New Repository', 'description': 'Create a new Docker repository' - }); + }, ['layout']) + + pages.create('new-repo', 'old-new-repo.html', NewRepoCtrl, { + 'title': 'New Repository', + 'description': 'Create a new Docker repository' + }, ['old-layout']); }]); function NewRepoCtrl($scope, $location, $http, $timeout, UserService, ApiService, PlanService, TriggerService, Features) { diff --git a/static/partials/new-repo.html b/static/partials/new-repo.html index 291e34752..7acfd196d 100644 --- a/static/partials/new-repo.html +++ b/static/partials/new-repo.html @@ -1,178 +1,190 @@ -
-
-
-
-
+
+
+
+ + + Repositories + + + + Create New Repository + +
-
- -
- -
- -
- -
-
- - -
- -
-
-
- - - / - - - - - Repository names must match [a-z0-9_-]+ - +
+
+
+
-
-
Repository Description
-
-
+
+
+ +
+ + + +
+ +
+
+
+ + + / + + + + + Repository names must match [a-z0-9_-]+ + +
+
+ +
+
Repository Description
+
+
+
+
+
+ + +
+ +
+
Repository Visibility
+
+
+ + + +
+ + Anyone can see and pull from this repository. You choose who can push. +
+
+
+ + + +
+ + You choose who can see, pull and push from/to this repository. +
+
+ + +
+
+ In order to make this repository private + under your personal namespace + under the organization {{ repo.namespace }}, you will need to upgrade your plan to + + {{ planRequired.title }} + . + This will cost ${{ planRequired.price / 100 }}/month. +
+ Upgrade now + or did you mean to create this repository + under {{ user.organizations[0].name }}? + +
+ + + +
+
+ This organization has reached its private repository limit. Please contact your administrator. +
+
+
+
+
+ +
+ +
+
+
Initialize repository
+ +
+ +
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+
+
+
+
+ +
+ +
+
+
Upload DockerfileArchive
+
+
+
+
+
+
+
+
+ +
+ +
+
+ You will be redirected to authorize via GitHub once the repository has been created +
+
+
+ +
+ +
+ +
+
+ +
- - -
- -
-
Repository Visibility
-
-
- - - -
- - Anyone can see and pull from this repository. You choose who can push. -
-
-
- - - -
- - You choose who can see, pull and push from/to this repository. -
-
- - -
-
- In order to make this repository private - under your personal namespace - under the organization {{ repo.namespace }}, you will need to upgrade your plan to - - {{ planRequired.title }} - . - This will cost ${{ planRequired.price / 100 }}/month. -
- Upgrade now - or did you mean to create this repository - under {{ user.organizations[0].name }}? - -
- - - -
-
- This organization has reached its private repository limit. Please contact your administrator. -
-
-
-
-
- -
- -
-
-
Initialize repository
- -
- -
- - - -
- - -
- - - -
- - -
- - - -
- - -
- - - -
-
-
-
-
- -
- -
-
-
Upload DockerfileArchive
-
-
-
-
-
-
-
-
- -
- -
-
- You will be redirected to authorize via GitHub once the repository has been created -
-
-
- -
- -
- -
-
- -
diff --git a/static/partials/old-new-repo.html b/static/partials/old-new-repo.html new file mode 100644 index 000000000..291e34752 --- /dev/null +++ b/static/partials/old-new-repo.html @@ -0,0 +1,237 @@ +
+
+
+
+
+ +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+
+
+ + + / + + + + + Repository names must match [a-z0-9_-]+ + +
+
+ +
+
Repository Description
+
+
+
+
+
+ + +
+ +
+
Repository Visibility
+
+
+ + + +
+ + Anyone can see and pull from this repository. You choose who can push. +
+
+
+ + + +
+ + You choose who can see, pull and push from/to this repository. +
+
+ + +
+
+ In order to make this repository private + under your personal namespace + under the organization {{ repo.namespace }}, you will need to upgrade your plan to + + {{ planRequired.title }} + . + This will cost ${{ planRequired.price / 100 }}/month. +
+ Upgrade now + or did you mean to create this repository + under {{ user.organizations[0].name }}? + +
+ + + +
+
+ This organization has reached its private repository limit. Please contact your administrator. +
+
+
+
+
+ +
+ +
+
+
Initialize repository
+ +
+ +
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+
+
+
+
+ +
+ +
+
+
Upload DockerfileArchive
+
+
+
+
+
+
+
+
+ +
+ +
+
+ You will be redirected to authorize via GitHub once the repository has been created +
+
+
+ +
+ +
+ +
+
+ +
+
+ + + + + + + + + +