From 9650e3cf9c3a73d633f8b5e86b1da32513e1564c Mon Sep 17 00:00:00 2001 From: Alice Poggioli Date: Thu, 9 Jul 2020 13:26:31 +0000 Subject: [PATCH 1/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85a9757..790fd7d 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ On `config.json`: Where: -* `xmpp` is your Prosody with [appropriate modules](https://git.startinblox.com/infra/prosody-modules/) configured on. +* `xmpp` is your [Prosody](https://prosody.im/) with [appropriate modules](https://git.startinblox.com/infra/prosody-modules/) configured on. * `authority` is the OpenID Provider. Usually, if you use `djangoldp-account` it's the same as your djangoldp server. * `endpoints.users` is the API endpoints for Users on your djangoldp server. From 9997379323b5bfd821a797012e78a458ad73ece3 Mon Sep 17 00:00:00 2001 From: Benoit Alessandroni Date: Thu, 9 Jul 2020 17:03:27 +0200 Subject: [PATCH 2/2] update: adding proper menu access from circles to events and resources --- src/page-circle.pug | 11 +++++++++++ src/views/circle/page-circle-events.pug | 6 ++++++ src/views/circle/page-circle-resources.pug | 6 ++++++ 3 files changed, 23 insertions(+) create mode 100644 src/views/circle/page-circle-events.pug create mode 100644 src/views/circle/page-circle-resources.pug diff --git a/src/page-circle.pug b/src/page-circle.pug index 6439aac..ce4a12a 100644 --- a/src/page-circle.pug +++ b/src/page-circle.pug @@ -16,6 +16,10 @@ include views/circle/page-circle-chat.pug #circle-information.content-box__height(hidden) include views/circle/page-circle-profile.pug + #circle-events(hidden) + include views/circle/page-circle-events.pug + #circle-resources(hidden) + include views/circle/page-circle-resources.pug nav.jsRightMenu(role='navigation') sib-router(default-route='circle-chat') @@ -28,3 +32,10 @@ nav.jsRightMenu(role='navigation') sib-route(name='circle-information') li a Information + sib-route(name='circle-events' use-id) + li + a Events + sib-route(name='circle-resources' use-id) + li + a Resources + diff --git a/src/views/circle/page-circle-events.pug b/src/views/circle/page-circle-events.pug new file mode 100644 index 0000000..9acc4f8 --- /dev/null +++ b/src/views/circle/page-circle-events.pug @@ -0,0 +1,6 @@ +sib-display( + class='w700' + bind-resources + nested-field="events" + fields='name, shortDescription, startDate' +) \ No newline at end of file diff --git a/src/views/circle/page-circle-resources.pug b/src/views/circle/page-circle-resources.pug new file mode 100644 index 0000000..1fb4cdd --- /dev/null +++ b/src/views/circle/page-circle-resources.pug @@ -0,0 +1,6 @@ +sib-display( + class='w700' + bind-resources + nested-field="resources" + fields='name, shortdesc, keywords' +) \ No newline at end of file