# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1512085605 -3600
# Node ID 339f4011ed9b15fee03863dea7dc3f4f6092101f
# Parent  46109efcf671e87fed585c2b16e7da1f72bc7e63
merge-request: first draft:

template for viewing a merge request (comments + patches) + a text explaining how to use jp to create a new one (new merge requests from inside Libervia is not handled yet).

diff -r 46109efcf671 -r 339f4011ed9b default/merge-request/create.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/default/merge-request/create.html	Fri Dec 01 00:46:45 2017 +0100
@@ -0,0 +1,9 @@
+{# creata a new ticket #}
+
+{% set category_menu = [('merge-requests_list', url_tickets_list)] %}
+{% extends 'base/base.html' %}
+{% block body %}
+<div class="box message_info">
+    <p>{% trans %}It is not yet possible to create a merge request from inside Libervia, please use <pre>jp merge-request set</pre> for now. Merge requests welcome ;){% endtrans %}</p>
+</div>
+{% endblock body %}
diff -r 46109efcf671 -r 339f4011ed9b default/merge-request/item.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/default/merge-request/item.html	Fri Dec 01 00:46:45 2017 +0100
@@ -0,0 +1,64 @@
+{# display a single ticket
+
+    @variable item(xmlui_item): ticket to display
+    @variable comments(data_object.BlogItems): comments of the ticket
+    @variable comments_service(unicode): service for adding comments
+    @variable comments_node(unicode): node for adding comments
+#}
+
+{% set category_menu = [('merge-requests_list', url_tickets_list),
+                        ('merge-request_new', url_tickets_new)] %}
+{% if not embedded %}{% extends 'base/base.html' %}{% endif %}
+{% import 'input/xmlui.html' as xmlui with context %}
+{% import 'blog/macros.html' as blog with context %}
+{% import 'input/comment.html' as comment with context %}
+
+{% block title %}{{item|adv_format('[{value.widget_value.id}] {value.widget_value.title}') }}{% endblock %}
+
+{% block confirm_message %}
+    {% trans %}Your comment has been sent{% endtrans %}
+{% endblock confirm_message %}
+
+{% block body %}
+<div class="tab_container">
+    <div class="tab_header">
+        <ul>
+            <li class="tab_button clicked" onclick='toggle_clicked_class_sel(".tab_button,.tab_page")'>{% trans %}Description{% endtrans %}</li>
+            <li class="tab_button" onclick='toggle_clicked_class_sel(".tab_button,.tab_page")'>{% trans %}Patches{% endtrans %}</li>
+        </ul>
+    </div>
+    <div class="tab_page clicked" id="tab_description">
+        <div id="{{ item.widget_value['id'] }}" class="view single ticket box">
+            {{ xmlui.generate(item,
+                form=false,
+                filters={'created': {'filters': ['date_fmt'], 'filters_args':[{'fmt': 'short'}]},
+                         'updated': {'filters': ['date_fmt'], 'filters_args':[{'fmt': 'short'}]},
+                         'body': {'filters': ['urlize'], 'filters_args':[{'nofollow': True, 'rel': 'noopener noreferrer'}]}},
+                )}}
+        </div>
+        {% if comments is defined %}
+        <div id="blog_items">
+            {{ blog.show_items(comments|reverse, expanded=true) }}
+        </div>
+        {% endif %}
+        {% if comments_node is defined %}
+            <div class="comment_post">
+                {{- comment.comment_or_login(service=comments_service, node=comments_node) -}}
+            </div>
+        {% endif %}
+    </div>
+    <div class="tab_page" id="tab_patches">
+        {% for patch in patches %}
+            <div class="patch">
+                <header class="box">
+                    <div class="author"><label>{% trans %}author:{% endtrans %} </label>{{patch.author}}</div>
+                    <p class="commit_msg">{{patch.commit_msg}}</p>
+                </header>
+                <div class="diff">
+                    {{- patch.diff|highlight('diff') -}}
+                </div>
+            </div>
+        {% endfor %}
+    </div>
+</div>
+{% endblock body %}
diff -r 46109efcf671 -r 339f4011ed9b default/static/merge-request.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/default/static/merge-request.css	Fri Dec 01 00:46:45 2017 +0100
@@ -0,0 +1,1 @@
+ticket.css
\ No newline at end of file