diff --git a/screenshots/screenshots.js b/screenshots/screenshots.js index 914192216..623cbe0fe 100644 --- a/screenshots/screenshots.js +++ b/screenshots/screenshots.js @@ -94,14 +94,14 @@ casper.then(function() { this.capture(outputDir + 'repo-admin.png'); }); -casper.thenOpen(rootUrl + 'organizations/new/', function() { - this.waitForText('Create'); +casper.thenOpen(rootUrl + 'repository/?namespace=' + org, function() { + this.waitForText('Repositories'); }); disableOlark(); casper.then(function() { - this.capture(outputDir + 'org-create.png'); + this.capture(outputDir + 'org-repo-list.png'); }); casper.thenOpen(rootUrl + 'organization/' + org, function() { diff --git a/static/css/quay.css b/static/css/quay.css index b0c2d1983..59c1638d8 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -954,6 +954,11 @@ p.editable:hover i { float: right; } +.button-bar-bottom { + margin-bottom: 60px; +} + + .repo-list .section-header { padding: 10px; border-bottom: 1px solid #eee; @@ -1949,4 +1954,8 @@ p.editable:hover i { top: -9px; font-weight: bold; font-size: .4em; +} + +.page-description { + margin-bottom: 40px; } \ No newline at end of file diff --git a/static/img/org-admin.png b/static/img/org-admin.png new file mode 100644 index 000000000..a67852e99 Binary files /dev/null and b/static/img/org-admin.png differ diff --git a/static/img/org-repo-admin.png b/static/img/org-repo-admin.png new file mode 100644 index 000000000..cf9377477 Binary files /dev/null and b/static/img/org-repo-admin.png differ diff --git a/static/img/org-repo-list.png b/static/img/org-repo-list.png new file mode 100644 index 000000000..bcbc081b3 Binary files /dev/null and b/static/img/org-repo-list.png differ diff --git a/static/img/org-teams.png b/static/img/org-teams.png new file mode 100644 index 000000000..e084abeca Binary files /dev/null and b/static/img/org-teams.png differ diff --git a/static/img/repo-admin.png b/static/img/repo-admin.png index e3b08e1c2..f0511cf7c 100644 Binary files a/static/img/repo-admin.png and b/static/img/repo-admin.png differ diff --git a/static/img/repo-changes.png b/static/img/repo-changes.png index ccf58197d..40a0ce8c2 100644 Binary files a/static/img/repo-changes.png and b/static/img/repo-changes.png differ diff --git a/static/img/repo-view.png b/static/img/repo-view.png index 6a100acef..ea26cd4b5 100644 Binary files a/static/img/repo-view.png and b/static/img/repo-view.png differ diff --git a/static/img/user-home.png b/static/img/user-home.png index 11f95fc78..32aa92d1f 100644 Binary files a/static/img/user-home.png and b/static/img/user-home.png differ diff --git a/static/partials/new-organization.html b/static/partials/new-organization.html index 5de5dbbc6..955c0d2d0 100644 --- a/static/partials/new-organization.html +++ b/static/partials/new-organization.html @@ -5,8 +5,7 @@
-
-
+

Create Organization

@@ -31,9 +30,18 @@
+
+ In order to create a new organization, you must first be signed in as the + user that will become an admin for the organization. Please sign-in if + you already have an account, or sign up on the landing + page to create a new account. +
+
+

Sign In

+
diff --git a/static/partials/organizations.html b/static/partials/organizations.html index ec7e66928..b6ff064cc 100644 --- a/static/partials/organizations.html +++ b/static/partials/organizations.html @@ -35,37 +35,95 @@
Organizations
- Organizations in Quay provide unique features for businesses and other groups, such as team-based sharing and fine-grain permission controls. + Organizations in Quay provide unique features for businesses and other + groups, including team-based sharing and fine-grained permission controls.
-
- -
+
-
Working in teams
+
A central collection of repositories
- Organizations are designed for business blah blah blah + Your organization is the focal point for all activity that occurs within + your public or private repositories. Your repositories are centrally visible + and managed within the namespace of your organization. You may share + your repositories with as many users and teams as you like, without + any additional cost.
-
- -
-
-
Global and Local Permissions
+
+
+
Organization settings at a glance
- Organizations are designed for business blah blah blah + Your organization allows you to view your private repository count + and manage billing settings in a centralized place. +
+
+ You can also see all of the users who have access to your organization + and the teams of which they are members. This allows you to audit the + access that has been granted in your organization.
+
+
+
+
Teams simplify access controls
+
+ Teams allow your organization to delegate access to your namespace and + repositories in a controlled fashion. Each team has permissions that + apply across the entire org, and can also be given specific levels of + access to specific repositories. A user is switching roles? No problem, + change their team membership and their access will be adjusted accordingly. +
+
+ Owners of your organization, and members of other teams with + administrator privileges, have full permissions to all repositories + in the organization, as well as permissions to view and adjust the + account settings for the organization. Add users to these teams with + caution. +
+
+
+ +
+
+
+
Fine-grained control of sharing
+
+ Repositories that you create within your organization can be assigned + fine-grained permissions just like any other repository. You can also + add teams that exist in your organization, or individual users from + inside our outside your organization. +
+
+ In order to protect your intellectual property, we warn you before + you share your repositories with anyone who is not currently a member + of a team in your organization. +
+
+
+ +
+ + + + + + +
diff --git a/static/partials/repo-list.html b/static/partials/repo-list.html index 3bb5bfb0c..536701d94 100644 --- a/static/partials/repo-list.html +++ b/static/partials/repo-list.html @@ -38,7 +38,7 @@

You don't have any repositories yet!

-

This organization does not have any repositories yet!

+

This organization doesn't have any repositories, or you have not been provided access.

Click here to learn how to create a repository