From 42ea3b835ca9a5883dd44cfd8d326cb525e04575 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 12 Jan 2015 11:42:09 -0500 Subject: [PATCH 1/5] Fix NPE --- auth/permissions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/auth/permissions.py b/auth/permissions.py index ae398092d..f970450af 100644 --- a/auth/permissions.py +++ b/auth/permissions.py @@ -89,6 +89,8 @@ class QuayDeferredPermissionUser(Identity): if not self._permissions_loaded: logger.debug('Loading user permissions after deferring.') user_object = model.get_user_by_uuid(self.id) + if user_object is None: + return super(QuayDeferredPermissionUser, self).can(permission) # Add the superuser need, if applicable. if (user_object.username is not None and From 5a0277b4654b64f178e76b11aa01ee1cfd7028de Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 12 Jan 2015 12:17:00 -0500 Subject: [PATCH 2/5] Fix plans table on mobile --- static/css/quay.css | 16 ++++++++++ static/directives/plans-table.html | 50 ++++++++++++++++++++---------- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/static/css/quay.css b/static/css/quay.css index 4df625503..bc23177df 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -3547,6 +3547,22 @@ p.editable:hover i { font-size: 16px; } +.plans-table ul { + margin-top: 10px; + padding: 0px; +} + + +.plans-table ul li { + padding: 4px; + margin: 0px; +} + +.plans-table ul li .plan-info { + padding: 4px; +} + + .repo-breadcrumb-element .crumb { cursor: pointer; } diff --git a/static/directives/plans-table.html b/static/directives/plans-table.html index 2870a06de..d4badb3c6 100644 --- a/static/directives/plans-table.html +++ b/static/directives/plans-table.html @@ -1,23 +1,41 @@
- - - - - - - +
    +
  • -
- - - - - -
PlanPrivate RepositoriesPrice
{{ plan.title }}{{ plan.privateRepos }}
${{ plan.price / 100 }}
- {{ currentPlan == plan ? 'Selected' : 'Choose' }} + {{ plan.title }} -
+ +
+ ${{ plan.price / 100 }} / month - + {{ plan.privateRepos }} repositories +
+ + + +
From 2878fd28c69bd58936aa3205617849981b1a8de4 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 12 Jan 2015 12:26:57 -0500 Subject: [PATCH 3/5] Fix header and some other minor fixes on mobile --- static/css/quay.css | 1 - static/directives/header-bar.html | 15 ++++++++++++++- static/partials/new-organization.html | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/static/css/quay.css b/static/css/quay.css index bc23177df..e0aafa8e8 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -1528,7 +1528,6 @@ i.toggle-icon:hover { } .landing .call-to-action { - height: 40px; font-size: 18px; padding-left: 14px; padding-right: 14px; diff --git a/static/directives/header-bar.html b/static/directives/header-bar.html index 903de59bd..dc82a425a 100644 --- a/static/directives/header-bar.html +++ b/static/directives/header-bar.html @@ -19,8 +19,21 @@
  • Organizations
  • + + -