From: zuber Date: Mon, 26 Oct 2009 15:17:33 +0000 (+0100) Subject: Poprawienie stylów wyświetlania pull-requestów. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/30ac8daa26e44d77b606eda4338c392f76245879 Poprawienie stylów wyświetlania pull-requestów. --- diff --git a/apps/explorer/views.py b/apps/explorer/views.py index b17b8c8e..2c9b17da 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -109,11 +109,10 @@ def _get_issues_for_file(fileid): # = Pull requests = # ================= def pull_requests(request): - objects = PullRequest.objects.order_by('status') + objects = PullRequest.objects.order_by('-status', 'timestamp') if not request.user.has_perm('explorer.book.can_share'): objects = objects.filter(comitter=request.user) - return direct_to_template(request, 'manager/pull_request.html', extra_context = {'objects': objects} ) diff --git a/platforma/static/css/managment.css b/platforma/static/css/managment.css index 5e1c5411..d1e2fc20 100644 --- a/platforma/static/css/managment.css +++ b/platforma/static/css/managment.css @@ -46,18 +46,25 @@ table.request-report margin-right: 10px; } -.request-report .status-N { - background-color: teal; +.pull-request.status-N { + background-color: #FFF; } -.request-report .status-R { +.pull-request.status-R { background-color: red; } -.request-report .status-A { - background-color: gray; +.pull-request.status-A { + background-color: #DDD; } .pull-request .diff { white-space: pre; + height: 360px; + width: 960px; + overflow: auto; + border: 1px solid #CCC; + margin-top: 10px; + background-color: #F9F9F9; + padding: 2px; } diff --git a/platforma/templates/manager/pull_request.html b/platforma/templates/manager/pull_request.html index 020fcdad..a44b1ede 100644 --- a/platforma/templates/manager/pull_request.html +++ b/platforma/templates/manager/pull_request.html @@ -85,11 +85,13 @@
  • data: {{ pullreq.timestamp }}
  • {{ pullreq.comment }}

    + {% ifnotequal pullreq.status 'A' %}

    Zobacz

    + {% endifnotequal %} {% endfor %} {% else %}