diff --git a/hc/accounts/admin.py b/hc/accounts/admin.py index 3e5fe6e0..604ae999 100644 --- a/hc/accounts/admin.py +++ b/hc/accounts/admin.py @@ -100,10 +100,10 @@ class ProfileAdmin(admin.ModelAdmin): list_display = ( "id", "email", + "checks", "date_joined", "last_active_date", "projects", - "checks", "invited", "sms", "reports_allowed", @@ -130,10 +130,7 @@ class ProfileAdmin(admin.ModelAdmin): def email(self, obj): s = escape(obj.user.email) if obj.plan: - s = "%s" % (obj.plan, s) - - v = min(30, obj.num_checks) * 8 - s += """
""" % v + s = "%s %s" % (s, obj.plan) return s @@ -144,8 +141,12 @@ class ProfileAdmin(admin.ModelAdmin): def projects(self, obj): return render_to_string("admin/profile_list_projects.html", {"profile": obj}) + @mark_safe def checks(self, obj): - return "%d of %d" % (obj.num_checks, obj.check_limit) + s = "%d of %d" % (obj.num_checks, obj.check_limit) + if obj.num_checks > 10: + s = "%s" % s + return s def invited(self, obj): return "%d of %d" % (obj.num_members, obj.team_limit) diff --git a/static/css/admin/profiles.css b/static/css/admin/profiles.css index 072563f7..4a8cb9fc 100644 --- a/static/css/admin/profiles.css +++ b/static/css/admin/profiles.css @@ -9,17 +9,8 @@ } td.field-email span { - border-bottom: 2px solid #FFEB3B; + color: #555; + background: #EEE; + padding: 1px 4px; + border-radius: 2px; } - -.nchecks { - margin-top: 4px; - width: 240px; - height: 7px; - background-image: url(data:image/gif;base64,R0lGODlh8AABAKECAN3d3e7u7v///////yH5BAEKAAMALAAAAADwAAEAAAImhA+Cp5v+XFsTVQav0ZHmL4FeSFLBiQZCiq6s+sKvy9Kp3cb4KRQAOw==); -} - -.nchecks div { - background-image: url(data:image/gif;base64,R0lGODlhCAABAKEBAHmuyP///////////yH5BAEKAAIALAAAAAAIAAEAAAIDhA9RADs=); - height: 7px; -} \ No newline at end of file