[copr] master: Fix builds tests (c009459)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit c009459143f234c87baf1ed8cef155a3154ceb28
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 10:56:23 2013 +0100
Fix builds tests
>---------------------------------------------------------------
.../tests/test_views/test_coprs_ns/test_builds.py | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_builds.py b/coprs_frontend/tests/test_views/test_coprs_ns/test_builds.py
index 375c998..71c869b 100644
--- a/coprs_frontend/tests/test_views/test_coprs_ns/test_builds.py
+++ b/coprs_frontend/tests/test_views/test_coprs_ns/test_builds.py
@@ -5,8 +5,7 @@ from tests.coprs_test_case import CoprsTestCase
class TestCoprShowBuilds(CoprsTestCase):
def test_copr_show_builds(self, f_users, f_coprs, f_builds):
r = self.tc.get('/coprs/detail/{0}/{1}/builds/'.format(self.u2.name, self.c2.name))
- print r.data
- assert r.data.count('<tr class=build-') == 2
+ assert r.data.count('<tr class="build-') == 2
class TestCoprAddBuild(CoprsTestCase):
def test_copr_owner_can_add_build(self, f_users, f_coprs):
@@ -15,7 +14,7 @@ class TestCoprAddBuild(CoprsTestCase):
s['openid'] = self.u1.openid_name
self.db.session.add_all([self.u1, self.c1])
- r = c.post('/coprs/detail/{0}/{1}/add_build/'.format(self.u1.name, self.c1.name),
+ r = c.post('/coprs/detail/{0}/{1}/new_build/'.format(self.u1.name, self.c1.name),
data = {'pkgs': 'http://testing'},
follow_redirects = True)
assert self.models.Build.query.first().pkgs == 'http://testing'
@@ -26,7 +25,7 @@ class TestCoprAddBuild(CoprsTestCase):
s['openid'] = self.u1.openid_name
self.db.session.add_all([self.u2, self.c2])
- r = c.post('/coprs/detail/{0}/{1}/add_build/'.format(self.u2.name, self.c2.name),
+ r = c.post('/coprs/detail/{0}/{1}/new_build/'.format(self.u2.name, self.c2.name),
data = {'pkgs': 'http://testing'},
follow_redirects = True)
assert self.models.Build.query.first().pkgs == 'http://testing'
@@ -37,7 +36,7 @@ class TestCoprAddBuild(CoprsTestCase):
s['openid'] = self.u1.openid_name
self.db.session.add_all([self.u2, self.c3])
- r = c.post('/coprs/detail/{0}/{1}/add_build/'.format(self.u2.name, self.c3.name),
+ r = c.post('/coprs/detail/{0}/{1}/new_build/'.format(self.u2.name, self.c3.name),
data = {'pkgs': 'http://testing'},
follow_redirects = True)
assert not self.models.Build.query.first()
@@ -48,7 +47,7 @@ class TestCoprAddBuild(CoprsTestCase):
s['openid'] = self.u3.openid_name
self.db.session.add_all([self.u1, self.c1])
- r = c.post('/coprs/detail/{0}/{1}/add_build/'.format(self.u1.name, self.c1.name),
+ r = c.post('/coprs/detail/{0}/{1}/new_build/'.format(self.u1.name, self.c1.name),
data = {'pkgs': 'http://testing'},
follow_redirects = True)
assert not self.models.Build.query.first()
11 years, 3 months
[copr] master: Don't fetch the builds list again for displaying builds table (22c0f32)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 22c0f32789bf51f1a59dca3a6c02855a29bad6dd
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 10:52:11 2013 +0100
Don't fetch the builds list again for displaying builds table
>---------------------------------------------------------------
.../coprs/templates/coprs/detail/builds.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/detail/builds.html b/coprs_frontend/coprs/templates/coprs/detail/builds.html
index 25544f0..8e193af 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/builds.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/builds.html
@@ -6,7 +6,7 @@
{% block detail_body %}
{% if copr.builds %}
- {{ builds_table(copr.builds) }}
+ {{ builds_table(builds) }}
<div class="pagination">
{{ render_pagination(request, paginator) }}
</div>
11 years, 3 months
[copr] master: Style the flash messages (1c63437)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 1c634379dbfc8dd29d7f65ea70ea3c39e7fd2dc8
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 10:49:27 2013 +0100
Style the flash messages
>---------------------------------------------------------------
coprs_frontend/coprs/static/style-new.css | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 8f4a254..5297d18 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -34,6 +34,17 @@ div.menu {
margin-bottom: 3em;
}
+div.flash {
+ background-color: #f9f9f9;
+ font-size: 1.2em;
+ text-align: center;
+ padding: 0.5em;
+
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
div.login, div.login a {
color: white;
font-weight: bold;
11 years, 3 months
[copr] master: Adding builds requires user to log in (35dad63)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 35dad63c53fb6d2ff6eadc43a989dccac2968d50
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 10:34:54 2013 +0100
Adding builds requires user to log in
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_builds.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
index 1fe0ff1..7756e6f 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
@@ -30,6 +30,7 @@ def copr_builds(username, coprname, page=1):
@coprs_ns.route('/detail/<username>/<coprname>/add_build/')
+@login_required
def copr_add_build(username, coprname, form=None):
copr = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname).first()
11 years, 3 months
[copr] master: Only show add copr button to logged in users (633bc19)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 633bc196dec0c144255ec863206a848e469ccbfb
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 10:33:16 2013 +0100
Only show add copr button to logged in users
>---------------------------------------------------------------
coprs_frontend/coprs/templates/coprs/show.html | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/show.html b/coprs_frontend/coprs/templates/coprs/show.html
index 4bbefa0..9a72d5d 100644
--- a/coprs_frontend/coprs/templates/coprs/show.html
+++ b/coprs_frontend/coprs/templates/coprs/show.html
@@ -12,7 +12,9 @@
</div>
{% endif %}
<div class="coprs-list-{% if g.user %}thin{% else %}thick{% endif %}">
- <div class="add-copr">+ <a href={{ url_for('coprs_ns.copr_add') }}>add a new Copr</a></div>
+ {% if g.user %}
+ <div class="add-copr">+ <a href={{ url_for('coprs_ns.copr_add') }}>add a new Copr</a></div>
+ {% endif %}
{% for copr in coprs %}
<div class="copr">
<a href="{{ url_for('coprs_ns.copr_detail', username = copr.owner.name, coprname = copr.name) }}">{{ copr.owner.name }}/{{ copr.name }}</a>
11 years, 3 months
[copr] master: Display logout link (cee4a20)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit cee4a20df40411cf417902190aae68584b0809ec
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 10:30:34 2013 +0100
Display logout link
>---------------------------------------------------------------
coprs_frontend/coprs/static/style-new.css | 1 -
coprs_frontend/coprs/templates/layout.html | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index f2713c6..8f4a254 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -37,7 +37,6 @@ div.menu {
div.login, div.login a {
color: white;
font-weight: bold;
- text-align: right;
text-decoration: none;
line-height: 250%;
diff --git a/coprs_frontend/coprs/templates/layout.html b/coprs_frontend/coprs/templates/layout.html
index 87ebfff..ac3e8ef 100644
--- a/coprs_frontend/coprs/templates/layout.html
+++ b/coprs_frontend/coprs/templates/layout.html
@@ -10,7 +10,7 @@
<a href="/"><img id="logo" src="{{ url_for('static', filename='copr_logo.png') }}" alt="Copr Build System"></a>
<div class="login">
{% if g.user %}
- <div><span class="text">logged in as </span>{{ g.user.name }}</div>
+ <div><span class="text">logged in as </span>{{ g.user.name }} | <a href="{{ url_for('misc.logout') }}">log out</a></div>
{% else %}
<div><a href="{{ url_for('misc.login') }}">log in</a></div>
{% endif %}
11 years, 3 months
[copr] master: When there are no permissions for a copr, tell it to user (d4d322d)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit d4d322d645fd66109628cb84ce85c2fae30ac384
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 10:20:58 2013 +0100
When there are no permissions for a copr, tell it to user
>---------------------------------------------------------------
.../coprs/templates/coprs/detail/permissions.html | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/detail/permissions.html b/coprs_frontend/coprs/templates/coprs/detail/permissions.html
index 12e9d2c..3d9cb75 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/permissions.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/permissions.html
@@ -7,5 +7,7 @@
{% if (g.user and g.user != copr.owner) or permissions %}
{# the table is displayed only if there are some permissions or a non-owner is viewing the page (then display at least his applier form #}
{{ permissions_table(permissions, current_user_permissions, copr, permissions_applier_form, permissions_form) }}
+ {% else %}
+ <h2>No permissions yet</h2>
{% endif %}
{% endblock %}
11 years, 3 months
[copr] master: Make the arrow in copr detail views display under the right menu item Also fix some titles while at it (8f509fe)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 8f509fe6cf94789f7e6267f3357121a642504d30
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 10:18:43 2013 +0100
Make the arrow in copr detail views display under the right menu item
Also fix some titles while at it
>---------------------------------------------------------------
coprs_frontend/coprs/static/style-new.css | 3 +++
coprs_frontend/coprs/templates/coprs/detail.html | 12 +++++-------
.../coprs/templates/coprs/detail/builds.html | 2 ++
.../coprs/templates/coprs/detail/edit.html | 4 ++--
.../coprs/templates/coprs/detail/overview.html | 2 ++
.../coprs/templates/coprs/detail/permissions.html | 2 ++
6 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 46c44c9..f2713c6 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -166,6 +166,9 @@ div.horizontal-menu div.selected a {
color: #db3279;
margin-left: auto;
margin-right: auto;
+ padding-bottom: 11px;
+ background: url("pink_arrow.png") no-repeat;
+ background-position: center bottom;
}
div.horizontal-menu div.selected, div.horizontal-menu div.unselected {
diff --git a/coprs_frontend/coprs/templates/coprs/detail.html b/coprs_frontend/coprs/templates/coprs/detail.html
index b851500..acf45aa 100644
--- a/coprs_frontend/coprs/templates/coprs/detail.html
+++ b/coprs_frontend/coprs/templates/coprs/detail.html
@@ -1,29 +1,27 @@
{% extends "layout.html" %}
{% block title %}{{ copr.owner.name }}/{{ copr.name }} Copr{% endblock %}
-{% block header %}Information for Copr {{ copr.owner.name }}/{{ copr.name }}{% endblock %}
{% from "coprs/detail/_build_forms.html" import copr_build_form,
copr_build_cancel_form with context %}
{% block body %}
<h1>{{ copr.owner.name }} / <strong>{{ copr.name }}</strong></h1>
<div class="horizontal-menu">
- <div class="selected">
+ <div class="{% block overview_selected %}unselected{% endblock %}">
<a href="{{ url_for('coprs_ns.copr_detail', username = copr.owner.name, coprname = copr.name) }}">Overview</a>
- <img src="{{ url_for('static', filename='pink_arrow.png') }}">
</div>
- <div class="unselected">
+ <div class="{% block permissions_selected %}unselected{% endblock %}">
<a href="{{ url_for('coprs_ns.copr_permissions', username = copr.owner.name, coprname = copr.name) }}">Permissions</a>
</div>
- <div class="unselected">
+ <div class="{% block builds_selected %}unselected{% endblock %}">
<a href="{{ url_for('coprs_ns.copr_builds', username = copr.owner.name, coprname = copr.name) }}">Builds</a>
</div>
{% if g.user and g.user.can_build_in(copr) %}
- <div class="unselected">
+ <div class="{% block new_build_selected %}unselected{% endblock %}">
<a href="{{ url_for('coprs_ns.copr_add_build', username = copr.owner.name, coprname = copr.name) }}">New Build</a>
</div>
{% endif %}
{% if g.user and g.user.can_edit(copr) %}
- <div class="unselected">
+ <div class="{% block edit_selected %}unselected{% endblock %}">
<a href="{{ url_for('coprs_ns.copr_edit', username = copr.owner.name, coprname = copr.name) }}">Edit</a>
</div>
{% endif %}
diff --git a/coprs_frontend/coprs/templates/coprs/detail/builds.html b/coprs_frontend/coprs/templates/coprs/detail/builds.html
index 7ce3ec7..25544f0 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/builds.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/builds.html
@@ -1,4 +1,6 @@
{% extends "coprs/detail.html" %}
+{% block title %}Builds for {{ copr.owner.name }}/{{ copr.name }}{% endblock %}
+{% block builds_selected %}selected{% endblock %}
{% from "_helpers.html" import render_pagination %}
{% from "coprs/detail/_builds_table.html" import builds_table with context %}
diff --git a/coprs_frontend/coprs/templates/coprs/detail/edit.html b/coprs_frontend/coprs/templates/coprs/detail/edit.html
index 8068435..9b82fe6 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/edit.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/edit.html
@@ -1,6 +1,6 @@
{% extends "coprs/detail.html" %}
-{% block title %}Editing {{ copr.name }}{% endblock %}
-{% block header %}Editing {{ copr.name }} Copr{% endblock %}
+{% block title %}Editing {{ copr.owner.name }}/{{ copr.name }}{% endblock %}
+{% block edit_selected %}selected{% endblock %}
{% from "coprs/_coprs_forms.html" import copr_form, copr_permissions_form with context %}
{% block detail_body %}
diff --git a/coprs_frontend/coprs/templates/coprs/detail/overview.html b/coprs_frontend/coprs/templates/coprs/detail/overview.html
index 455d314..a07d1ff 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/overview.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/overview.html
@@ -1,4 +1,6 @@
{% extends "coprs/detail.html" %}
+{% block overview_selected %}selected{% endblock %}
+
{% block detail_body %}
<h2>Description</h2>
<div class="shift-right">This is a description...</div>
diff --git a/coprs_frontend/coprs/templates/coprs/detail/permissions.html b/coprs_frontend/coprs/templates/coprs/detail/permissions.html
index 2b2ad6d..12e9d2c 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/permissions.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/permissions.html
@@ -1,4 +1,6 @@
{% extends "coprs/detail.html" %}
+{% block title %}Permissions for {{ copr.owner.name }}/{{ copr.name }}{% endblock %}
+{% block permissions_selected %}selected{% endblock %}
{% from "coprs/detail/_permissions_table.html" import permissions_table with context%}
{% block detail_body %}
11 years, 3 months
[copr] master: Move displaying builds to single view (34a3138)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 34a3138845d27bce3fe114401689a719d5576ec7
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 09:51:07 2013 +0100
Move displaying builds to single view
>---------------------------------------------------------------
.../coprs/templates/coprs/detail/builds.html | 12 +++++++-----
.../coprs/templates/coprs/show_builds.html | 13 -------------
.../coprs/views/coprs_ns/coprs_builds.py | 8 ++++----
.../coprs/views/coprs_ns/coprs_general.py | 11 -----------
4 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/detail/builds.html b/coprs_frontend/coprs/templates/coprs/detail/builds.html
index 117a82d..7ce3ec7 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/builds.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/builds.html
@@ -1,12 +1,14 @@
{% extends "coprs/detail.html" %}
+{% from "_helpers.html" import render_pagination %}
{% from "coprs/detail/_builds_table.html" import builds_table with context %}
{% block detail_body %}
{% if copr.builds %}
- <h3>Latest 10 in this repo</h3>
- {{ builds_table(copr.builds) }}
- <a href="{{ url_for('coprs_ns.copr_show_builds', username = copr.owner.name, coprname = copr.name) }}">Show all builds</a>
- {% else %}
- <h3>No builds so far</h3>
+ {{ builds_table(copr.builds) }}
+ <div class="pagination">
+ {{ render_pagination(request, paginator) }}
+ </div>
+ {% else %}
+ <h2>No builds so far.</h2>
{% endif %}
{% endblock %}
diff --git a/coprs_frontend/coprs/templates/coprs/show_builds.html b/coprs_frontend/coprs/templates/coprs/show_builds.html
deleted file mode 100644
index cf19cb8..0000000
--- a/coprs_frontend/coprs/templates/coprs/show_builds.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}Builds in {{ request.view_args['name'] }}{% endblock %}
-{% block header %}Builds in {{ request.view_args['name'] }} Copr{% endblock %}
-{% from "_helpers.html" import render_pagination %}
-{% from "coprs/_builds_table.html" import builds_table with context %}
-{% from "coprs/_coprs_forms.html" import copr_build_cancel_form %}
-{% block body %}
- {{ builds_table(builds) }}
- <div class=pagination>
- {{ render_pagination(request, paginator) }}
- </div>
- <a href="{{ url_for('coprs_ns.copr_detail', username = request.view_args['username'], coprname = request.view_args['coprname']) }}">Back to Copr</a>
-{% endblock %}
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
index 646da72..1fe0ff1 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
@@ -15,18 +15,18 @@ from coprs.views.misc import login_required
from coprs.views.coprs_ns import coprs_ns
from coprs.views.coprs_ns import coprs_general
-(a)coprs_ns.route('/detail/<username>/<coprname>/builds/', defaults = {'page': 1})
+(a)coprs_ns.route('/detail/<username>/<coprname>/builds/', defaults={'page': 1})
@coprs_ns.route('/detail/<username>/<coprname>/builds/<int:page>/')
-def copr_show_builds(username, coprname, page = 1):
+def copr_builds(username, coprname, page=1):
copr = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname).first()
if not copr: # hey, this Copr doesn't exist
return page_not_found('Copr with name {0} does not exist.'.format(coprname))
- builds_query = builds_logic.BuildsLogic.get_multiple(flask.g.user, copr = copr)
+ builds_query = builds_logic.BuildsLogic.get_multiple(flask.g.user, copr=copr)
paginator = helpers.Paginator(builds_query, copr.build_count, page, per_page_override = 20)
- return flask.render_template('coprs/show_builds.html', builds = paginator.sliced_query, paginator = paginator)
+ return flask.render_template('coprs/detail/builds.html', copr=copr, builds=paginator.sliced_query, paginator=paginator)
@coprs_ns.route('/detail/<username>/<coprname>/add_build/')
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 2b1eff6..b878db0 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -127,17 +127,6 @@ def copr_permissions(username, coprname):
permissions = permissions,
current_user_permissions = user_perm)
-(a)coprs_ns.route('/detail/<username>/<coprname>/builds/')
-def copr_builds(username, coprname):
- try: # query[0:10][0] will raise an index error, if Copr doesn't exist
- query = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname, with_builds = True)
- copr = query[0:10][0]# we retrieved all builds, but we got one copr in a list...
- except IndexError:
- return page_not_found('Copr with name {0} does not exist.'.format(coprname))
-
- return flask.render_template('coprs/detail/builds.html',
- copr = copr)
-
@coprs_ns.route('/detail/<username>/<coprname>/edit/')
@login_required
def copr_edit(username, coprname, form=None):
11 years, 3 months
[copr] master: Style the builds table a bit (a714cfd)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit a714cfd8782bc147af600afe24061f39cebdb7cf
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 09:29:40 2013 +0100
Style the builds table a bit
>---------------------------------------------------------------
coprs_frontend/coprs/static/style-new.css | 33 ++++++++++++++++++++
.../templates/coprs/detail/_builds_table.html | 17 +++------
2 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 527b1f5..46c44c9 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -174,6 +174,15 @@ div.horizontal-menu div.selected, div.horizontal-menu div.unselected {
float: left;
}
+div.pkg-url-list {
+ white-space: pre;
+ background-color: #f9f9f9;
+ font-family: monospace;
+ padding: 1em;
+ line-height: 120%;
+ font-size: 1.1em;
+}
+
div.shift-right {
margin-left: 1em;
}
@@ -198,6 +207,30 @@ table.releases {
border-collapse:collapse;
}
+table.builds-table {
+ width: 100%;
+}
+
+tr.build-pending {
+ color: #3B6EB4;
+}
+
+tr.build-running {
+ color: #FF6600;
+}
+
+tr.build-succeeded {
+ color: #22DD22;
+}
+
+tr.build-failed {
+ color: #DD2222;
+}
+
+tr.build-canceled {
+ color: #CDC90C;
+}
+
table.releases th {
background-color: #f2f2f2;
}
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html b/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
index ac44dc4..b2fa2b9 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
@@ -2,7 +2,7 @@
{% macro builds_table(builds) %}
{% if builds %}
- <table class=builds-table>
+ <table class="builds-table">
<tr>
<th>Id</th>
<th>Submitted on</th>
@@ -14,14 +14,14 @@
<th>Action</th>
</tr>
{% for build in builds %}
- <tr class=build-{{ build.state }}>
+ <tr class="build-{{ build.state }}">
<td>{{ build.id }}</td>
<td>{{ build.submitted_on|date_from_secs }}</td>
<td>{{ build.user.name }}</td>
<td>{{ build.started_on|date_from_secs or 'Not yet' }}</td>
<td>{{ build.ended_on|date_from_secs or 'Not yet' }}</td>
<td>{{ build.state }}</td>
- <td>{% if build.results %}<a href={{ build.results }}>{% endif %}{{ build.results }}{% if build.results %}</a>{% endif %}</td>
+ <td>{% if build.results %}<a href="{{ build.results }}">{% endif %}{{ build.results }}{% if build.results %}</a>{% endif %}</td>
<td>
{% if g.user and g.user == build.user %}
{{ copr_build_cancel_form(build) }}
@@ -32,14 +32,9 @@
</tr>
<tr>
<td colspan=8>
- <h4>Package URLs:</h4>
- <ul class=packages-list>
- {% if build.pkgs is not none %}
- {% for pkg in build.pkgs.split() %}
- <li><a href={{ pkg }}>{{ pkg }}</a></li>
- {% endfor %}
- {% endif %}
- </ul>
+ <h2>Package URLs:</h2>
+ <div class="pkg-url-list">{% if build.pkgs is not none %}{% for pkg in build.pkgs.split() %}<a href="{{ pkg }}">{{ pkg }}</a>
+{% endfor %}{% endif %}</div>
</td>
</tr>
{% endfor %}
11 years, 3 months