diff options
author | Belén Barros Peña <belen.barros.pena@intel.com> | 2014-10-02 17:41:28 +0100 |
---|---|---|
committer | Stephen Finucane <stephen.finucane@intel.com> | 2015-11-05 03:51:39 +0000 |
commit | 174e019fb4d04210768c82666dcb574d99d894b4 (patch) | |
tree | be88f238c950635a92cec96321ed5e0b00289af8 | |
parent | 73a4f9a414239bdee5a5d5b4bb490538bebd2c48 (diff) | |
download | patchwork-174e019fb4d04210768c82666dcb574d99d894b4.tar patchwork-174e019fb4d04210768c82666dcb574d99d894b4.tar.gz |
patch-list: Re-design the main list of patches with Bootsrap
A bit more spacing everywhere. Also opted for the highlight on hover
instead of the alternating row background color.
v2: Squash the patch fixing the unit tests (Jeremy Kerr)
Signed-off-by: Belén Barros Pena <belen.barros.pena@intel.com>
Acked-by: Stephen Finucane <stephen.finucane@intel.com>
-rw-r--r-- | htdocs/css/style.css | 43 | ||||
-rw-r--r-- | patchwork/templates/patchwork/patch-list.html | 4 | ||||
-rw-r--r-- | patchwork/tests/test_list.py | 2 |
3 files changed, 3 insertions, 46 deletions
diff --git a/htdocs/css/style.css b/htdocs/css/style.css index e09821e..1ec7400 100644 --- a/htdocs/css/style.css +++ b/htdocs/css/style.css @@ -106,34 +106,6 @@ dl dt { color: green; } -/* patch lists */ -table.patchlist { - width: 98%; - border: thin solid black; - padding: 0em 1em; -} - -table.patchlist th { - background: #eeeeee; - border-bottom: thin solid black; - text-align: left; - padding-left: 6px; -} - -table.patchlist th img { - vertical-align: bottom; -} - -table.patchlist td { - padding: 2px 6px 2px 6px; - margin: 0px; - margin-top: 10px; -} - -table.patchlist td img { - vertical-align: bottom; -} - .filters { border: 1px solid #cccccc; border-radius: 4px; @@ -149,21 +121,6 @@ a.filter-action:hover { } -table.patchlist td.patchlistreorder { - background: #c0c0ff; - border-top: thin solid gray; - border-bottom: thin solid black; - font-size: smaller; - text-align: right; -} -table.patchlist tr.odd { - background: #ffffff; -} - -table.patchlist tr.even { - background: #e8e8e8; -} - a.colinactive, a.colactive { color: black; text-decoration: none; diff --git a/patchwork/templates/patchwork/patch-list.html b/patchwork/templates/patchwork/patch-list.html index 6d57a66..628696e 100644 --- a/patchwork/templates/patchwork/patch-list.html +++ b/patchwork/templates/patchwork/patch-list.html @@ -39,7 +39,7 @@ {% csrf_token %} <input type="hidden" name="form" value="patchlistform"/> <input type="hidden" name="project" value="{{project.id}}"/> -<table class="patchlist" id="patchlist"> +<table class="table table-hover" id="patchlist"> <thead> <tr> {% if user.is_authenticated %} @@ -140,7 +140,7 @@ {% if page.paginator.count %} <tbody> {% for patch in page.object_list %} - <tr id="patch_row:{{patch.id}}" class="{% cycle 'odd' 'even' %}"> + <tr id="patch_row:{{patch.id}}"> {% if user.is_authenticated %} <td> <input type="checkbox" name="patch_id:{{patch.id}}"/> diff --git a/patchwork/tests/test_list.py b/patchwork/tests/test_list.py index c7fbbea..f440e3e 100644 --- a/patchwork/tests/test_list.py +++ b/patchwork/tests/test_list.py @@ -70,7 +70,7 @@ class PatchOrderTest(TestCase): patch.save() def _extract_patch_ids(self, response): - id_re = re.compile('<tr id="patch_row:(\d+)" ') + id_re = re.compile('<tr id="patch_row:(\d+)"') ids = [ int(m.group(1)) for m in id_re.finditer(response.content) ] return ids |