# HG changeset patch # User Goffi # Date 1611855779 -3600 # Node ID 1c330913ff1359b930c0082c4493648d434f99e6 # Parent 0657982e81affc6b06c8f2e8d4b19fb5861755c1 bulma (tickets): renamed "tickets" to "lists" diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/components/menu_labels.html --- a/sat_templates/templates/bulma/components/menu_labels.html Fri Dec 11 17:30:47 2020 +0100 +++ b/sat_templates/templates/bulma/components/menu_labels.html Thu Jan 28 18:42:59 2021 +0100 @@ -5,9 +5,9 @@ 'forums': _('Forums'), 'merge-requests': _('Merge requests'), 'merge-request_new': _('Create new merge request'), - 'tickets': _('Tickets'), - 'tickets_list': _('List tickets'), - 'ticket_new': _('Create new ticket'), + 'lists': _('Lists'), + 'list_items': _('List items'), + 'list_item_new': _('Create new list item'), 'chat': _('Chat'), 'files': _('Files sharing'), 'events': _('Events'), diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/event/overview.html --- a/sat_templates/templates/bulma/event/overview.html Fri Dec 11 17:30:47 2020 +0100 +++ b/sat_templates/templates/bulma/event/overview.html Thu Jan 28 18:42:59 2021 +0100 @@ -1,7 +1,7 @@ {# overview of current events - @variable item(xmlui_item): ticket to display - @variable comments(data_object.BlogItems): comments of the ticket + @variable item(xmlui_item): item to display + @variable comments(data_object.BlogItems): comments of the item @variable comments_service(unicode): service for adding comments @variable comments_node(unicode): node for adding comments #} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/list/create.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/bulma/list/create.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,37 @@ +{% extends 'base/base.html' %} +{% import 'components/block.html' as block with context %} +{% import 'components/images.html' as images with context %} +{% import 'components/avatar.html' as avatar with context %} +{% import 'input/form.html' as form with context %} +{% import 'input/field.html' as field with context %} + +{% block body %} +{{ icon_defs('clipboard') }} +
+ +
+
+ {% trans %} + Please select the list to use. + {% endtrans %} +
+
+ {% if lists_directory is defined %} +
+ {{block.disco_icon_grid(lists_directory, 'clipboard')}} +
+ {% endif %} +
+
+ {% call form.form(class="form--single") %} + {{ field.text("jid", _("list jid"), required=true)}} + {{ field.submit(_("Access")) }} + {% endcall %} +
+{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/list/create_item.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/bulma/list/create_item.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,30 @@ +{# create a new list item #} + +{% set category_menu = [('list_items', url_list_items)] %} +{% extends 'base/base.html' %} +{% import 'input/form.html' as form with context %} +{% import 'input/field.html' as field with context %} +{% import 'input/xmlui.html' as xmlui with context %} + +{% block body %} +
+
+
+ {% trans app_name=C.APP_NAME%}This page allows you to report an issue or ask/suggest a new feature for {{app_name}}{% endtrans %} +
+
+ +
+ {% call form.form() %} + {{ xmlui.generate(new_list_item_xmlui, + attributes = {'title': {'required': 'required', + 'placeholder': _("Short description of your issue/request")}, + 'body': {'required': 'required', + 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, + 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, + })}} + {{ field.submit(_("Create list item"), class="mt-4") }} + {% endcall %} +
+
+{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/list/discover.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/bulma/list/discover.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,30 @@ +{% extends 'base/base.html' %} +{% import 'components/block.html' as block with context %} +{% import 'components/images.html' as images with context %} +{% import 'components/avatar.html' as avatar with context %} +{% import 'input/form.html' as form with context %} +{% import 'input/field.html' as field with context %} + +{% block body %} +{{ icon_defs('clipboard') }} +
+
+
+ {% trans %} + Please select the list to use. + {% endtrans %} +
+
+ {% if lists_directory is defined %} +
+ {{block.disco_icon_grid(lists_directory, 'clipboard')}} +
+ {% endif %} +
+
+ {% call form.form(class="form--single") %} + {{ field.text("jid", _("list jid"), required=true)}} + {{ field.submit(_("Access")) }} + {% endcall %} +
+{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/list/edit.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/bulma/list/edit.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,22 @@ +{# edit an existing list item #} + +{% set category_menu = [('list_items', url_list_items)] %} +{% extends 'base/base.html' %} +{% import 'input/form.html' as form with context %} +{% import 'input/field.html' as field with context %} +{% import 'input/xmlui.html' as xmlui with context %} + +{% block body %} +
+{% call form.form() %} + {{ xmlui.generate(new_list_item_xmlui, + attributes = {'title': {'required': 'required', + 'placeholder': _("Short description of your issue/request")}, + 'body': {'required': 'required', + 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, + 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, + })}} + {{ field.submit(_("Modify list item"), class="mt-4") }} +{% endcall %} +
+{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/list/item.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/bulma/list/item.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,80 @@ +{# display a single list item + + @variable item(xmlui_item): list item to display + @variable comments(data_object.BlogItems): comments of the list item + @variable comments_service(unicode): service for adding comments + @variable comments_node(unicode): node for adding comments +#} + +{% set category_menu = [('list', url_list_items), + ('list_item_new', url_list_new), + ] %} +{% if not embedded %}{% extends 'base/base.html' %}{% endif %} +{% import 'input/xmlui.html' as xmlui with context %} +{% import 'components/avatar.html' as avatar with context %} +{% import 'blog/macros.html' as blog with context %} +{% import 'input/textbox.html' as textbox 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 %} +{{ icon_defs('pencil') }} +
+
+
+ {% if identities is defined %} + {% if avatar is defined %} +
+ {{ avatar.avatar(item.widget_value['publisher'].bare) }} +
+ {% endif %} + {% endif %} +
+
+

{{item.widget_value['title']}}

+ {{ item.widget_value['body'] }} + +
+ {% if comments is defined %} + {{ blog.show_items(comments['items']|reverse, expanded=true) }} + {% endif %} + {% if comments_node is defined %} +
+ {{- textbox.comment_or_login(service=comments_service, node=comments_node) -}} +
+ {% endif %} +
+ {% if url_list_item_edit is defined %} +
+ + {{ icon('pencil', cls='icon is-64x64') }} + +
+ {% endif %} +
+
+
+ {{ + xmlui.generate( + item, + form=false, + filters={ + 'created': { + 'filters': ['date_fmt'], + 'filters_args':[{'fmt': 'short'}] + }, + 'updated': { + 'filters': ['date_fmt'], + 'filters_args':[{'fmt': 'short'}] + }, + }, + ignore=['publisher', 'title', 'body', 'comments_uri'], + ) + }} +
+
+{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/list/overview.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/bulma/list/overview.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,48 @@ +{# display the list of list #} + +{% set category_menu = [('list_item_new', url_list_new)] %} +{% extends 'base/base.html' %} +{% import 'input/xmlui.html' as xmlui with context %} +{% import 'input/navigation.html' as navigation with context %} +{% import 'input/textbox.html' as textbox with context %} + +{% block body %} +
+ +
+ {{ xmlui.generate_list( + list_items, + ( + ('title', _('Title')), + ('labels', _('Labels')), + ('id', _('Id')), + ('author', _('Author')), + ), + { + 'id': '\n#{value}', + 'author': _('by {value}'), + }, + item_class_fields=['status', 'priority', 'severity'], + field_class_map={ + 'title': 'has-text-weight-bold', + 'labels': 'tag is-rounded x-is-hoverable', + 'id': 'has-text-grey-light is-size-7 has-whitespace-pre-wrap', + 'author': 'is-size-7' + }, + on_click=on_list_item_click) + }} +
+
+{{ navigation.prev_next(_("previous page"), _("next page")) }} +{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/merge-request/create.html --- a/sat_templates/templates/bulma/merge-request/create.html Fri Dec 11 17:30:47 2020 +0100 +++ b/sat_templates/templates/bulma/merge-request/create.html Thu Jan 28 18:42:59 2021 +0100 @@ -1,6 +1,6 @@ -{# creata a new ticket #} +{# creata a new list item #} -{% set category_menu = [('merge-requests', url_tickets_list)] %} +{% set category_menu = [('merge-requests', url_list_items)] %} {% extends 'base/base.html' %} {% block body %}
diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/merge-request/discover.html --- a/sat_templates/templates/bulma/merge-request/discover.html Fri Dec 11 17:30:47 2020 +0100 +++ b/sat_templates/templates/bulma/merge-request/discover.html Thu Jan 28 18:42:59 2021 +0100 @@ -16,7 +16,7 @@ {% if mr_handlers is defined %} -
+
{{block.disco_icon_grid(mr_handlers, 'merge')}}
{% endif %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/merge-request/edit.html --- a/sat_templates/templates/bulma/merge-request/edit.html Fri Dec 11 17:30:47 2020 +0100 +++ b/sat_templates/templates/bulma/merge-request/edit.html Thu Jan 28 18:42:59 2021 +0100 @@ -1,7 +1,7 @@ -{# edit an existing ticket #} +{# edit an existing merge request #} -{% set category_menu = [('merge-requests', url_tickets_list), - ('merge-request_new', url_tickets_new)] %} +{% set category_menu = [('merge-requests', url_list_items), + ('merge-request_new', url_list_new)] %} {% extends 'base/base.html' %} {% import 'input/form.html' as form with context %} {% import 'input/field.html' as field with context %} @@ -14,16 +14,16 @@ {% trans app_name=C.APP_NAME%}to modify content of the merge request, you'll have to use command line (with jp){% endtrans %}

-
+
{% call form.form() %} - {{ xmlui.generate(new_ticket_xmlui, + {{ xmlui.generate(new_list_item_xmlui, attributes = {'title': {'required': 'required', 'placeholder': _("Short description of your issue/request")}, 'body': {'required': 'required', 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, })}} - {{ field.submit(_("Modify ticket")) }} + {{ field.submit(_("Modify merge request")) }} {% endcall %}
{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/merge-request/item.html --- a/sat_templates/templates/bulma/merge-request/item.html Fri Dec 11 17:30:47 2020 +0100 +++ b/sat_templates/templates/bulma/merge-request/item.html Thu Jan 28 18:42:59 2021 +0100 @@ -1,13 +1,13 @@ -{# display a single ticket +{# display a single list item - @variable item(xmlui_item): ticket to display - @variable comments(data_object.BlogItems): comments of the ticket + @variable item(xmlui_item): item to display + @variable comments(data_object.BlogItems): comments of the item @variable comments_service(unicode): service for adding comments @variable comments_node(unicode): node for adding comments #} -{% set category_menu = [('merge-requests', url_tickets_list), - ('merge-request_new', url_tickets_new)] %} +{% set category_menu = [('merge-requests', url_list_items), + ('merge-request_new', url_list_new)] %} {% if not embedded %}{% extends 'base/base.html' %}{% endif %} {% import 'input/xmlui.html' as xmlui with context %} {% import 'components/avatar.html' as avatar with context %} @@ -65,9 +65,9 @@
{% endif %} - {% if url_ticket_edit is defined %} + {% if url_list_item_edit is defined %}
- + {{ icon('pencil', cls='icon is-64x64') }}
diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/ticket/create.html --- a/sat_templates/templates/bulma/ticket/create.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -{# create a new ticket #} - -{% set category_menu = [('tickets_list', url_tickets_list)] %} -{% extends 'base/base.html' %} -{% import 'input/form.html' as form with context %} -{% import 'input/field.html' as field with context %} -{% import 'input/xmlui.html' as xmlui with context %} - -{% block body %} -
-
-
- {% trans app_name=C.APP_NAME%}This page allows you to report an issue or ask/suggest a new feature for {{app_name}}{% endtrans %} -
-
- -
- {% call form.form() %} - {{ xmlui.generate(new_ticket_xmlui, - attributes = {'title': {'required': 'required', - 'placeholder': _("Short description of your issue/request")}, - 'body': {'required': 'required', - 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, - 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, - })}} - {{ field.submit(_("Create ticket"), class="mt-4") }} - {% endcall %} -
-
-{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/ticket/discover.html --- a/sat_templates/templates/bulma/ticket/discover.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -{% extends 'base/base.html' %} -{% import 'components/block.html' as block with context %} -{% import 'components/images.html' as images with context %} -{% import 'components/avatar.html' as avatar with context %} -{% import 'input/form.html' as form with context %} -{% import 'input/field.html' as field with context %} - -{% block body %} -{{ icon_defs('clipboard') }} -
-
-
- {% trans %} - Please select a tickets tracker - {% endtrans %} -
-
- {% if tickets_trackers is defined %} -
- {{block.disco_icon_grid(tickets_trackers, 'clipboard')}} -
- {% endif %} -
-
- {% call form.form(class="form--single") %} - {{ field.text("jid", _("tickets tracker jid"), required=true)}} - {{ field.submit(_("Access")) }} - {% endcall %} -
-{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/ticket/edit.html --- a/sat_templates/templates/bulma/ticket/edit.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -{# edit an existing ticket #} - -{% set category_menu = [('tickets_list', url_tickets_list)] %} -{% extends 'base/base.html' %} -{% import 'input/form.html' as form with context %} -{% import 'input/field.html' as field with context %} -{% import 'input/xmlui.html' as xmlui with context %} - -{% block body %} -
-{% call form.form() %} - {{ xmlui.generate(new_ticket_xmlui, - attributes = {'title': {'required': 'required', - 'placeholder': _("Short description of your issue/request")}, - 'body': {'required': 'required', - 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, - 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, - })}} - {{ field.submit(_("Modify ticket"), class="mt-4") }} -{% endcall %} -
-{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/ticket/item.html --- a/sat_templates/templates/bulma/ticket/item.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -{# 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 = [('tickets', url_tickets_list), - ('ticket_new', url_tickets_new), - ] %} -{% if not embedded %}{% extends 'base/base.html' %}{% endif %} -{% import 'input/xmlui.html' as xmlui with context %} -{% import 'components/avatar.html' as avatar with context %} -{% import 'blog/macros.html' as blog with context %} -{% import 'input/textbox.html' as textbox 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 %} -{{ icon_defs('pencil') }} -
-
-
- {% if identities is defined %} - {% if avatar is defined %} -
- {{ avatar.avatar(item.widget_value['publisher'].bare) }} -
- {% endif %} - {% endif %} -
-
-

{{item.widget_value['title']}}

- {{ item.widget_value['body'] }} - -
- {% if comments is defined %} - {{ blog.show_items(comments['items']|reverse, expanded=true) }} - {% endif %} - {% if comments_node is defined %} -
- {{- textbox.comment_or_login(service=comments_service, node=comments_node) -}} -
- {% endif %} -
- {% if url_ticket_edit is defined %} -
- - {{ icon('pencil', cls='icon is-64x64') }} - -
- {% endif %} -
-
-
- {{ - xmlui.generate( - item, - form=false, - filters={ - 'created': { - 'filters': ['date_fmt'], - 'filters_args':[{'fmt': 'short'}] - }, - 'updated': { - 'filters': ['date_fmt'], - 'filters_args':[{'fmt': 'short'}] - }, - }, - ignore=['publisher', 'title', 'body', 'comments_uri'], - ) - }} -
-
-{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/ticket/overview.html --- a/sat_templates/templates/bulma/ticket/overview.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -{# display the list of tickets #} - -{% set category_menu = [('ticket_new', url_tickets_new)] %} -{% extends 'base/base.html' %} -{% import 'input/xmlui.html' as xmlui with context %} -{% import 'input/navigation.html' as navigation with context %} -{% import 'input/textbox.html' as textbox with context %} - -{% block body %} -
- -
- {{ xmlui.generate_list( - tickets, - ( - ('title', _('Title')), - ('labels', _('Labels')), - ('id', _('Id')), - ('author', _('Author')), - ), - { - 'id': '\n#{value}', - 'author': _('by {value}'), - }, - item_class_fields=['status', 'priority', 'severity'], - field_class_map={ - 'title': 'has-text-weight-bold', - 'labels': 'tag is-rounded x-is-hoverable', - 'id': 'has-text-grey-light is-size-7 has-whitespace-pre-wrap', - 'author': 'is-size-7' - }, - on_click=on_ticket_click) - }} -
-
-{{ navigation.prev_next(_("previous page"), _("next page")) }} -{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/bulma/ticket/tickets.html --- a/sat_templates/templates/bulma/ticket/tickets.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -{% extends 'base/base.html' %} -{% import 'input/xmlui.html' as xmlui with context %} - -{% block body %} -
- {% for ticket in tickets %} -
- {{ xmlui.generate(ticket) }} -
- {% endfor %} -
-{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/list/create_item.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/default/list/create_item.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,25 @@ +{# create a new ticket #} + +{% set category_menu = [('tickets_list', url_tickets_list)] %} +{% extends 'base/base.html' %} +{% import 'input/form.html' as form with context %} +{% import 'input/field.html' as field with context %} +{% import 'input/xmlui.html' as xmlui with context %} + +{% block body %} +
+

{% trans app_name=C.APP_NAME%}This page allows you to report an issue or ask/suggest a new feature for {{app_name}}{% endtrans %}

+
+
+{% call form.form() %} + {{ xmlui.generate(new_ticket_xmlui, + attributes = {'title': {'required': 'required', + 'placeholder': _("Short description of your issue/request")}, + 'body': {'required': 'required', + 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, + 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, + })}} + {{ field.submit(_("Create ticket")) }} +{% endcall %} +
+{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/list/discover.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/default/list/discover.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,25 @@ +{% extends 'base/base.html' %} +{% import 'components/block.html' as block with context %} +{% import 'components/images.html' as images with context %} +{% import 'components/avatar.html' as avatar with context %} +{% import 'input/form.html' as form with context %} +{% import 'input/field.html' as field with context %} + +{% block body %} +{{ icon_defs('clipboard') }} +

+ {% trans %} + Please select a tickets tracker + {% endtrans %} +

+{% if tickets_trackers is defined %} +
+ {{block.disco_icon_grid(tickets_trackers, 'clipboard')}} +
+{% endif %} + +{% call form.form(class="form--single") %} + {{ field.text("jid", _("tickets tracker jid"), required=true)}} + {{ field.submit(_("Access")) }} +{% endcall %} +{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/list/edit.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/default/list/edit.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,22 @@ +{# edit an existing ticket #} + +{% set category_menu = [('tickets_list', url_tickets_list)] %} +{% extends 'base/base.html' %} +{% import 'input/form.html' as form with context %} +{% import 'input/field.html' as field with context %} +{% import 'input/xmlui.html' as xmlui with context %} + +{% block body %} +
+{% call form.form() %} + {{ xmlui.generate(new_ticket_xmlui, + attributes = {'title': {'required': 'required', + 'placeholder': _("Short description of your issue/request")}, + 'body': {'required': 'required', + 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, + 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, + })}} + {{ field.submit(_("Modify ticket")) }} +{% endcall %} +
+{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/list/item.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/default/list/item.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,51 @@ +{# 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 = [('tickets', url_tickets_list), + ('ticket_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/textbox.html' as textbox 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 %} +{{ icon_defs('pencil') }} +
+ {% if url_ticket_edit is defined %} +

+ + {{ icon('pencil', cls='icon--text') }} + edit + +

+ {% endif %} + {{ xmlui.generate(item, + form=false, + filters={'created': {'filters': ['date_fmt'], 'filters_args':[{'fmt': 'short'}]}, + 'updated': {'filters': ['date_fmt'], 'filters_args':[{'fmt': 'short'}]}, + 'body': {'filters_args':[{'nofollow': True, 'rel': 'noopener noreferrer'}]}}, + )}} +
+{% if comments is defined %} +
+ {{ blog.show_items(comments|reverse, expanded=true) }} +
+{% endif %} +{% if comments_node is defined %} +
+ {{- textbox.comment_or_login(service=comments_service, node=comments_node) -}} +
+{% endif %} +{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/list/overview.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/default/list/overview.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,19 @@ +{# display the list of tickets #} + +{% set category_menu = [('ticket_new', url_tickets_new)] %} +{% extends 'base/base.html' %} +{% import 'input/xmlui.html' as xmlui with context %} +{% import 'input/navigation.html' as navigation with context %} + +{% block body %} +{{ icon_defs('angle-double-left', 'angle-double-right') }} +
+ {{ xmlui.generate_list(tickets, (('id', _('Id')), + ('title', _('Title')), + ('labels', _('Labels'))), + {'id': '[{value}]'}, + item_class_fields=['status', 'priority', 'severity'], + on_click=on_ticket_click) }} +
+{{ navigation.prev_next(_("previous page"), _("next page")) }} +{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/list/tickets.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sat_templates/templates/default/list/tickets.html Thu Jan 28 18:42:59 2021 +0100 @@ -0,0 +1,12 @@ +{% extends 'base/base.html' %} +{% import 'input/xmlui.html' as xmlui with context %} + +{% block body %} +
+ {% for ticket in tickets %} +
+ {{ xmlui.generate(ticket) }} +
+ {% endfor %} +
+{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/ticket/create.html --- a/sat_templates/templates/default/ticket/create.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -{# create a new ticket #} - -{% set category_menu = [('tickets_list', url_tickets_list)] %} -{% extends 'base/base.html' %} -{% import 'input/form.html' as form with context %} -{% import 'input/field.html' as field with context %} -{% import 'input/xmlui.html' as xmlui with context %} - -{% block body %} -
-

{% trans app_name=C.APP_NAME%}This page allows you to report an issue or ask/suggest a new feature for {{app_name}}{% endtrans %}

-
-
-{% call form.form() %} - {{ xmlui.generate(new_ticket_xmlui, - attributes = {'title': {'required': 'required', - 'placeholder': _("Short description of your issue/request")}, - 'body': {'required': 'required', - 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, - 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, - })}} - {{ field.submit(_("Create ticket")) }} -{% endcall %} -
-{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/ticket/discover.html --- a/sat_templates/templates/default/ticket/discover.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -{% extends 'base/base.html' %} -{% import 'components/block.html' as block with context %} -{% import 'components/images.html' as images with context %} -{% import 'components/avatar.html' as avatar with context %} -{% import 'input/form.html' as form with context %} -{% import 'input/field.html' as field with context %} - -{% block body %} -{{ icon_defs('clipboard') }} -

- {% trans %} - Please select a tickets tracker - {% endtrans %} -

-{% if tickets_trackers is defined %} -
- {{block.disco_icon_grid(tickets_trackers, 'clipboard')}} -
-{% endif %} - -{% call form.form(class="form--single") %} - {{ field.text("jid", _("tickets tracker jid"), required=true)}} - {{ field.submit(_("Access")) }} -{% endcall %} -{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/ticket/edit.html --- a/sat_templates/templates/default/ticket/edit.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -{# edit an existing ticket #} - -{% set category_menu = [('tickets_list', url_tickets_list)] %} -{% extends 'base/base.html' %} -{% import 'input/form.html' as form with context %} -{% import 'input/field.html' as field with context %} -{% import 'input/xmlui.html' as xmlui with context %} - -{% block body %} -
-{% call form.form() %} - {{ xmlui.generate(new_ticket_xmlui, - attributes = {'title': {'required': 'required', - 'placeholder': _("Short description of your issue/request")}, - 'body': {'required': 'required', - 'placeholder': _("Please describe your issue/request with as much details as possible. You can use Markdown syntax.")}, - 'labels': {'placeholder': _("You can enter one or several labels separated by commas")}, - })}} - {{ field.submit(_("Modify ticket")) }} -{% endcall %} -
-{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/ticket/item.html --- a/sat_templates/templates/default/ticket/item.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -{# 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 = [('tickets', url_tickets_list), - ('ticket_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/textbox.html' as textbox 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 %} -{{ icon_defs('pencil') }} -
- {% if url_ticket_edit is defined %} -

- - {{ icon('pencil', cls='icon--text') }} - edit - -

- {% endif %} - {{ xmlui.generate(item, - form=false, - filters={'created': {'filters': ['date_fmt'], 'filters_args':[{'fmt': 'short'}]}, - 'updated': {'filters': ['date_fmt'], 'filters_args':[{'fmt': 'short'}]}, - 'body': {'filters_args':[{'nofollow': True, 'rel': 'noopener noreferrer'}]}}, - )}} -
-{% if comments is defined %} -
- {{ blog.show_items(comments|reverse, expanded=true) }} -
-{% endif %} -{% if comments_node is defined %} -
- {{- textbox.comment_or_login(service=comments_service, node=comments_node) -}} -
-{% endif %} -{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/ticket/overview.html --- a/sat_templates/templates/default/ticket/overview.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -{# display the list of tickets #} - -{% set category_menu = [('ticket_new', url_tickets_new)] %} -{% extends 'base/base.html' %} -{% import 'input/xmlui.html' as xmlui with context %} -{% import 'input/navigation.html' as navigation with context %} - -{% block body %} -{{ icon_defs('angle-double-left', 'angle-double-right') }} -
- {{ xmlui.generate_list(tickets, (('id', _('Id')), - ('title', _('Title')), - ('labels', _('Labels'))), - {'id': '[{value}]'}, - item_class_fields=['status', 'priority', 'severity'], - on_click=on_ticket_click) }} -
-{{ navigation.prev_next(_("previous page"), _("next page")) }} -{% endblock body %} diff -r 0657982e81af -r 1c330913ff13 sat_templates/templates/default/ticket/tickets.html --- a/sat_templates/templates/default/ticket/tickets.html Fri Dec 11 17:30:47 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -{% extends 'base/base.html' %} -{% import 'input/xmlui.html' as xmlui with context %} - -{% block body %} -
- {% for ticket in tickets %} -
- {{ xmlui.generate(ticket) }} -
- {% endfor %} -
-{% endblock body %}