Poprawienie stylów wyświetlania pull-requestów.

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index b17b8c8..2c9b17d 100644 (file)
--- 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):    
 # = 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)
 
 
     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} )
     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 5e1c541..d1e2fc2 100644 (file)
--- a/platforma/static/css/managment.css
+++ b/platforma/static/css/managment.css
@@ -46,18 +46,25 @@ table.request-report
     margin-right: 10px;
 }
 
     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;
 }
 
     background-color: red;
 }
 

-.request-report .status-A {
-    background-color: gray;
+.pull-request.status-A {
+    background-color: #DDD;

 }
 
 .pull-request .diff {
     white-space: pre;
 }
 
 .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 020fcda..a44b1ed 100644 (file)
--- a/platforma/templates/manager/pull_request.html
+++ b/platforma/templates/manager/pull_request.html
@@ -85,11 +85,13 @@
             <li>data: {{ pullreq.timestamp }}</li>
         </ul>
         <p class="comment">{{ pullreq.comment }}</p>
             <li>data: {{ pullreq.timestamp }}</li>
         </ul>
         <p class="comment">{{ pullreq.comment }}</p>

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

         <p class="buttons">
             <button type="button" class="awesome button green accept-button" title="{{pullreq.id}}">Akceptuj</button>
             <button type="button" class="awesome button show-diff" title="{{pullreq.id}}">Zmiany</button>
             <a class="awesome button" href="{% url editor_view pullreq.document %}?user=$prq-{{pullreq.id}}">Zobacz</a>
         </p>
         <p class="buttons">
             <button type="button" class="awesome button green accept-button" title="{{pullreq.id}}">Akceptuj</button>
             <button type="button" class="awesome button show-diff" title="{{pullreq.id}}">Zmiany</button>
             <a class="awesome button" href="{% url editor_view pullreq.document %}?user=$prq-{{pullreq.id}}">Zobacz</a>
         </p>

+        {% endifnotequal %}

     </div>
     {% endfor %}
 {% else %}
     </div>
     {% endfor %}
 {% else %}