From bafb6b3c29995cdac283ea68c419213766d6a1d6 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 30 May 2018 15:53:08 +0200 Subject: [PATCH 01/17] display whats new info in admin settings Signed-off-by: Arthur Schiwon --- apps/updatenotification/css/admin.css | 27 +++++++++++ .../js-src/components/popoverMenu.vue | 18 +++++++ .../components/popoverMenu/popoverItem.vue | 28 +++++++++++ .../js-src/components/root.vue | 47 ++++++++++++++++++- apps/updatenotification/js/merged.js | 6 +-- apps/updatenotification/js/merged.js.map | 2 +- .../updatenotification/lib/Settings/Admin.php | 2 + apps/updatenotification/lib/UpdateChecker.php | 6 +++ apps/updatenotification/package-lock.json | 18 +++++-- apps/updatenotification/package.json | 1 + lib/private/Updater/VersionCheck.php | 8 +++- 11 files changed, 151 insertions(+), 12 deletions(-) create mode 100644 apps/updatenotification/js-src/components/popoverMenu.vue create mode 100644 apps/updatenotification/js-src/components/popoverMenu/popoverItem.vue diff --git a/apps/updatenotification/css/admin.css b/apps/updatenotification/css/admin.css index 775e2134ba..85b919cb06 100644 --- a/apps/updatenotification/css/admin.css +++ b/apps/updatenotification/css/admin.css @@ -44,3 +44,30 @@ #updatenotification .warning { color: #ce3702; } + +#updatenotification .whatsNew { + display: inline-block; +} + +#updatenotification .toggleWhatsNews { + position: relative; +} + +#updatenotification .item-wrapper { + display: flex; + align-items: flex-start; +} + +#updatenotification .item-wrapper { + display: flex; + align-items: flex-start; +} + +#updatenotification .item-wrapper p { + margin-bottom: 10px; + margin-left: 0.5em; +} + +#updatenotification .item-wrapper span[class^="icon-"] { + padding: 0 19px 0 0; +} diff --git a/apps/updatenotification/js-src/components/popoverMenu.vue b/apps/updatenotification/js-src/components/popoverMenu.vue new file mode 100644 index 0000000000..92f62c5090 --- /dev/null +++ b/apps/updatenotification/js-src/components/popoverMenu.vue @@ -0,0 +1,18 @@ + + + + diff --git a/apps/updatenotification/js-src/components/popoverMenu/popoverItem.vue b/apps/updatenotification/js-src/components/popoverMenu/popoverItem.vue new file mode 100644 index 0000000000..6d743a8d3a --- /dev/null +++ b/apps/updatenotification/js-src/components/popoverMenu/popoverItem.vue @@ -0,0 +1,28 @@ + + + diff --git a/apps/updatenotification/js-src/components/root.vue b/apps/updatenotification/js-src/components/root.vue index 2c3d82dc4d..79a6b827e8 100644 --- a/apps/updatenotification/js-src/components/root.vue +++ b/apps/updatenotification/js-src/components/root.vue @@ -39,6 +39,14 @@ {{ t('updatenotification', 'Open updater') }} {{ t('updatenotification', 'Download now') }} +
+
+ {{ t('updatenotification', 'What\'s new?') }} +
+ +
+
+