Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

[redakcja.git] / platforma / templates / manager / pull_request.html

diff --git a/platforma/templates/manager/pull_request.html b/platforma/templates/manager/pull_request.html
index c2964c2..9b23551 100644 (file)
--- a/platforma/templates/manager/pull_request.html
+++ b/platforma/templates/manager/pull_request.html
@@ -1,7 +1,10 @@
 {% extends 'base.html' %}
 
 {% extends 'base.html' %}
 

+{% block bodyid %}management{% endblock %}
+

 {% block extrahead %}
 <link rel="stylesheet" href="{{ STATIC_URL }}css/managment.css" type="text/css" />
 {% block extrahead %}
 <link rel="stylesheet" href="{{ STATIC_URL }}css/managment.css" type="text/css" />

+<link rel="stylesheet" href="{{ STATIC_URL }}css/pygments.css" type="text/css" />

 <script type="text/javascript">
 
     
 <script type="text/javascript">
 
     


@@ -32,7 +35,6 @@
         $('.accept-button').click(function()
         {
             var id = parseInt($(this).attr('title'));
         $('.accept-button').click(function()
         {
             var id = parseInt($(this).attr('title'));

-            

 
             $.ajax({
                 url: '{% url pullrequest_list %}/'+id,
 
             $.ajax({
                 url: '{% url pullrequest_list %}/'+id,


@@ -46,30 +48,52 @@
             
         });
         
             
         });
         

+        $('.show-diff').click(function() {
+            var button = $(this);
+            
+            if (button.attr('disabled') != 'disabled') {
+                button.attr('disabled', 'disabled');
+                var id = parseInt(button.attr('title'));
+                var docid = $('h2', button.parents('.pull-request')).html();
+                var revision = $('.pull-request-revision', button.parents('.pull-request')).html();
+                
+                $('.diff').slideUp(function() { $(this).remove() });
+                $('<div class="diff"></div>')
+                    .hide()
+                    .appendTo($(this).parents('.pull-request'))
+                    .slideDown('slow')
+                    .load('/api/documents/' + docid + '/diff?revision=' + revision, null, function() {
+                        button.attr('disabled', null);
+                    });
+            }
+        });
+        

     });
 </script>
 {% endblock %}
 
 {% block maincontent %}
     });
 </script>
 {% endblock %}
 
 {% block maincontent %}

-<table class="request-report" cellspacing="0">
-    <tr>
-        <th>Utwór</th><th>Użytkownik</th><th>Komentarz</th><th>Stan</th>
-        <th>Akcje</th>
-    </tr>

 {% if objects %}
     {% for pullreq in objects %}
 {% if objects %}
     {% for pullreq in objects %}

-    <tr class="status-{{pullreq.status}}" id="request-{{pullreq.id}}">
-        <td class="column-doc">{{ pullreq.document }}</td>
-        <td class="column-user">{{ pullreq.comitter }}</td>
-        <td class="column-comment">{{ pullreq.comment }}</td>
-        <td class="column-status"> {{ pullreq.status }}</td>
-        <td><button type="button" class="accept-button" title="{{pullreq.id}}">Akceptuj</button></td>
-    </tr>
-    
+    <div class="status-{{ pullreq.status }} pull-request" id="request-{{ pullreq.id }}">
+        <h2>{{ pullreq.document }}</h2>
+        <ul class="request-info">
+            <li>commiter: {{ pullreq.comitter }}</li>
+            <li>revision: <span class="pull-request-revision">{{ pullreq.source_revision }}</span></li>
+            <li>status: {{ pullreq.status }}</li>
+            <li>data: {{ pullreq.timestamp }}</li>
+        </ul>
+        <p class="comment">{{ pullreq.comment }}</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>
+    </div>

     {% endfor %}
 {% else %}
     {% endfor %}
 {% else %}

-    <tr><td colspan="*">Brak żądań</td></tr>
+    {# <tr><td colspan="6">Brak żądań</td></tr> #}

 {% endif %}
 {% endif %}

-</table>
+{# </table> #}

 
 {% endblock %}
 
 {% endblock %}