annotate sat_templates/templates/default/merge-request/item.html @ 170:6c251da9a4f3

style improvment
author Goffi <goffi@goffi.org>
date Sat, 19 Jan 2019 11:49:18 +0100
parents 178f55b825b7
children 4a03d0a6839b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
69
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
1 {# display a single ticket
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
2
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
3 @variable item(xmlui_item): ticket to display
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
4 @variable comments(data_object.BlogItems): comments of the ticket
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
5 @variable comments_service(unicode): service for adding comments
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
6 @variable comments_node(unicode): node for adding comments
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
7 #}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
8
138
85877c76d47d merge-request: discovery page
Goffi <goffi@goffi.org>
parents: 116
diff changeset
9 {% set category_menu = [('merge-requests', url_tickets_list),
69
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
10 ('merge-request_new', url_tickets_new)] %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
11 {% if not embedded %}{% extends 'base/base.html' %}{% endif %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
12 {% import 'input/xmlui.html' as xmlui with context %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
13 {% import 'blog/macros.html' as blog with context %}
116
da8f1ba9034d input/comment: renamed "comment" library to "textbox", and made it more generic
Goffi <goffi@goffi.org>
parents: 69
diff changeset
14 {% import 'input/textbox.html' as textbox with context %}
69
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
15
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
16 {% block title %}{{item|adv_format('[{value.widget_value.id}] {value.widget_value.title}') }}{% endblock %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
17
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
18 {% block confirm_message %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
19 {% trans %}Your comment has been sent{% endtrans %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
20 {% endblock confirm_message %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
21
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
22 {% block body %}
140
b1e22caab8bc ticket (item), merge-request (item): added "edit" button when url_ticket_edit is defined
Goffi <goffi@goffi.org>
parents: 138
diff changeset
23 {{ icon_defs('pencil') }}
166
178f55b825b7 small refactoring/redesign, better BEM integration:
Goffi <goffi@goffi.org>
parents: 164
diff changeset
24 <div class="tab__container">
178f55b825b7 small refactoring/redesign, better BEM integration:
Goffi <goffi@goffi.org>
parents: 164
diff changeset
25 <div class="tab__header">
69
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
26 <ul>
166
178f55b825b7 small refactoring/redesign, better BEM integration:
Goffi <goffi@goffi.org>
parents: 164
diff changeset
27 <li class="tab__btn state_clicked" onclick='tab_select(this, "tab_description")'>{% trans %}Description{% endtrans %}</li>
178f55b825b7 small refactoring/redesign, better BEM integration:
Goffi <goffi@goffi.org>
parents: 164
diff changeset
28 <li class="tab__btn" onclick='tab_select(this, "tab_patches")'>{% trans %}Patches{% endtrans %}</li>
69
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
29 </ul>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
30 </div>
166
178f55b825b7 small refactoring/redesign, better BEM integration:
Goffi <goffi@goffi.org>
parents: 164
diff changeset
31 <div class="tab__page state_clicked" id="tab_description">
69
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
32 <div id="{{ item.widget_value['id'] }}" class="view single ticket box">
140
b1e22caab8bc ticket (item), merge-request (item): added "edit" button when url_ticket_edit is defined
Goffi <goffi@goffi.org>
parents: 138
diff changeset
33 {% if url_ticket_edit is defined %}
b1e22caab8bc ticket (item), merge-request (item): added "edit" button when url_ticket_edit is defined
Goffi <goffi@goffi.org>
parents: 138
diff changeset
34 <p class="box__tools">
b1e22caab8bc ticket (item), merge-request (item): added "edit" button when url_ticket_edit is defined
Goffi <goffi@goffi.org>
parents: 138
diff changeset
35 <a href="{{url_ticket_edit}}">
b1e22caab8bc ticket (item), merge-request (item): added "edit" button when url_ticket_edit is defined
Goffi <goffi@goffi.org>
parents: 138
diff changeset
36 {{ icon('pencil', cls='icon--small') }}
b1e22caab8bc ticket (item), merge-request (item): added "edit" button when url_ticket_edit is defined
Goffi <goffi@goffi.org>
parents: 138
diff changeset
37 edit
b1e22caab8bc ticket (item), merge-request (item): added "edit" button when url_ticket_edit is defined
Goffi <goffi@goffi.org>
parents: 138
diff changeset
38 </a>
b1e22caab8bc ticket (item), merge-request (item): added "edit" button when url_ticket_edit is defined
Goffi <goffi@goffi.org>
parents: 138
diff changeset
39 </p>
b1e22caab8bc ticket (item), merge-request (item): added "edit" button when url_ticket_edit is defined
Goffi <goffi@goffi.org>
parents: 138
diff changeset
40 {% endif %}
69
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
41 {{ xmlui.generate(item,
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
42 form=false,
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
43 filters={'created': {'filters': ['date_fmt'], 'filters_args':[{'fmt': 'short'}]},
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
44 'updated': {'filters': ['date_fmt'], 'filters_args':[{'fmt': 'short'}]},
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
45 'body': {'filters': ['urlize'], 'filters_args':[{'nofollow': True, 'rel': 'noopener noreferrer'}]}},
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
46 )}}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
47 </div>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
48 {% if comments is defined %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
49 <div id="blog_items">
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
50 {{ blog.show_items(comments|reverse, expanded=true) }}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
51 </div>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
52 {% endif %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
53 {% if comments_node is defined %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
54 <div class="comment_post">
116
da8f1ba9034d input/comment: renamed "comment" library to "textbox", and made it more generic
Goffi <goffi@goffi.org>
parents: 69
diff changeset
55 {{- textbox.comment_or_login(service=comments_service, node=comments_node) -}}
69
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
56 </div>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
57 {% endif %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
58 </div>
166
178f55b825b7 small refactoring/redesign, better BEM integration:
Goffi <goffi@goffi.org>
parents: 164
diff changeset
59 <div class="tab__page" id="tab_patches">
69
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
60 {% for patch in patches %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
61 <div class="patch">
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
62 <header class="box">
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
63 <div class="author"><label>{% trans %}author:{% endtrans %} </label>{{patch.author}}</div>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
64 <p class="commit_msg">{{patch.commit_msg}}</p>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
65 </header>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
66 <div class="diff">
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
67 {{- patch.diff|highlight('diff') -}}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
68 </div>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
69 </div>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
70 {% endfor %}
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
71 </div>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
72 </div>
339f4011ed9b merge-request: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
73 {% endblock body %}