From 2b18892796f832edb0c7e52e8317d3d75f2864ed Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Thu, 14 May 2020 16:05:33 +0200 Subject: [PATCH] start new media picker --- .../forms/{media.vue => media-old.vue} | 2 +- .../pickers/mediaPicker/mediapicker.vue | 106 ++++++++++ .../pickers/mediaPicker/overlay.vue | 183 ++++++++++++++++++ zero.Web.UI/App/pages/settings/user.vue | 2 +- .../Resources/Localization/zero.en-us.json | 4 +- zero.Web/ZeroMiddleware.cs | 2 +- 6 files changed, 294 insertions(+), 5 deletions(-) rename zero.Web.UI/App/components/forms/{media.vue => media-old.vue} (99%) create mode 100644 zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue create mode 100644 zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue diff --git a/zero.Web.UI/App/components/forms/media.vue b/zero.Web.UI/App/components/forms/media-old.vue similarity index 99% rename from zero.Web.UI/App/components/forms/media.vue rename to zero.Web.UI/App/components/forms/media-old.vue index 7f64ed4a..c72c94d8 100644 --- a/zero.Web.UI/App/components/forms/media.vue +++ b/zero.Web.UI/App/components/forms/media-old.vue @@ -64,7 +64,7 @@ }; export default { - name: 'uiMedia', + name: 'uiMediaOld', props: { disabled: { diff --git a/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue b/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue new file mode 100644 index 00000000..fb78d5a8 --- /dev/null +++ b/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue @@ -0,0 +1,106 @@ + + + + \ No newline at end of file diff --git a/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue b/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue new file mode 100644 index 00000000..1069a1a4 --- /dev/null +++ b/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue @@ -0,0 +1,183 @@ + + + + + + \ No newline at end of file diff --git a/zero.Web.UI/App/pages/settings/user.vue b/zero.Web.UI/App/pages/settings/user.vue index bf38a835..9a688d63 100644 --- a/zero.Web.UI/App/pages/settings/user.vue +++ b/zero.Web.UI/App/pages/settings/user.vue @@ -30,7 +30,7 @@ - + diff --git a/zero.Web/Resources/Localization/zero.en-us.json b/zero.Web/Resources/Localization/zero.en-us.json index 0ab2d1ff..8b113e1c 100644 --- a/zero.Web/Resources/Localization/zero.en-us.json +++ b/zero.Web/Resources/Localization/zero.en-us.json @@ -297,8 +297,8 @@ }, "mediapicker": { - "select_text": "Select", - "select_description": "from library", + "select_text": "Add media", + "select_description": "Upload or select", "upload_text": "Upload", "upload_description": "Upload a new file" }, diff --git a/zero.Web/ZeroMiddleware.cs b/zero.Web/ZeroMiddleware.cs index 919ec84c..849f42ff 100644 --- a/zero.Web/ZeroMiddleware.cs +++ b/zero.Web/ZeroMiddleware.cs @@ -13,7 +13,7 @@ namespace zero.Web public ZeroMiddleware(RequestDelegate next, IZeroOptions options) { Next = next; - Options = options; + Options = options; }