diff --git a/myapp/ns_tag/routes.py b/myapp/ns_tag/routes.py index 8b11694..b3d9ea4 100644 --- a/myapp/ns_tag/routes.py +++ b/myapp/ns_tag/routes.py @@ -26,3 +26,13 @@ def tag_id(id): return views_user.tag_id(id) else: return views_guest.tag_id(id) + + +@app.route('/tag//notes') +def tag_notes(id): + """Заметки с меткой + """ + if lib.get_user(): + return views_user.tag_notes(id) + else: + abort(404) diff --git a/myapp/ns_tag/templates/user/tag.html b/myapp/ns_tag/templates/user/tag.html index 59e3e0e..54bf915 100644 --- a/myapp/ns_tag/templates/user/tag.html +++ b/myapp/ns_tag/templates/user/tag.html @@ -7,6 +7,7 @@ Тег {{ tag.name }}
{% endraw %} +{% include 'user/tag_menu.html' %} @@ -35,6 +36,7 @@ var app = new Vue({ el: '#app', data: { + menuitem: null, tag: {{ pagedata['tag']|tojson|safe }}, pages: [], pagination: {{ pagedata['pagination']|tojson|safe }}, @@ -80,7 +82,9 @@ var app = new Vue({ { "jsonrpc": "2.0", "method": "tag.pages.count", - "params": {}, + "params": { + "id": vm.tag.id + }, "id": 1 } ] @@ -95,6 +99,12 @@ var app = new Vue({ } ); }, + computed: { + filteredPages: function() { + let vm = this; + return vm.pages; + } + } }) {% endblock %} diff --git a/myapp/ns_tag/templates/user/tag_menu.html b/myapp/ns_tag/templates/user/tag_menu.html new file mode 100644 index 0000000..fe1cade --- /dev/null +++ b/myapp/ns_tag/templates/user/tag_menu.html @@ -0,0 +1,14 @@ +
+
+ +
+
+ +
+ +
Заметки
+Заметки + +
+
+
diff --git a/myapp/ns_tag/templates/user/tag_notes.html b/myapp/ns_tag/templates/user/tag_notes.html new file mode 100644 index 0000000..74ce2d9 --- /dev/null +++ b/myapp/ns_tag/templates/user/tag_notes.html @@ -0,0 +1,133 @@ +{% extends "user/skeleton.html" %} +{% block content %} + +{% raw %} +

+ +Тег {{ tag.name }}

+
+{% endraw %} + +{% include 'user/tag_menu.html' %} + +{% raw %} + + +
+
+ + + +
+
+ + {{ tag.name }}  + +
+
+ +
+
+Создано: {{ note.created }}  +Обновлено: {{ note.updated }} +
+
+ +
+
+ + + +{% endraw %} +{% endblock %} + +{% block breadcrumb %} +{% raw %} + +{% endraw %} +{% endblock %} + +{% block script %} + + + + + +{% endblock %} diff --git a/myapp/ns_tag/views_user.py b/myapp/ns_tag/views_user.py index 9a6b0c6..0ea0e91 100644 --- a/myapp/ns_tag/views_user.py +++ b/myapp/ns_tag/views_user.py @@ -44,3 +44,31 @@ def tag_id(id): body = render_template('user/tag.html', pagedata=pagedata) return body + + +def tag_notes(id): + """Метка + """ + pagedata = {} + tag = models.db_session.query( + models.Tag + ).filter( + models.Tag.id == id + ).first() + if tag is None: + abort(404) + + pagedata['title'] = 'Метка {} - {}'.format( + tag.name, + app.config['TITLE'] + ) + pagedata['tag'] = tag.as_dict() + + pagedata['pagination'] = { + "page": 1, + "per_page": app.config['ITEMS_ON_PAGE'], + "size": 0 + } + + body = render_template('user/tag_notes.html', pagedata=pagedata) + return body