From a7eb5eef3fef1fe82008c7196468ad0a6b9cd463 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Mon, 3 Jul 2017 18:27:07 +0800 Subject: [PATCH] feat(forums): add forums admin list view side-overlay --- .../controllers/forums.client.controller.js | 15 +++++++++++++-- modules/forums/client/less/forum.less | 19 +++++++++++++++++++ .../views/admin/configure.client.view.html | 8 +++++++- modules/messages/client/less/message.less | 2 +- 4 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 modules/forums/client/less/forum.less diff --git a/modules/forums/client/controllers/forums.client.controller.js b/modules/forums/client/controllers/forums.client.controller.js index f1c07187..99c94a55 100644 --- a/modules/forums/client/controllers/forums.client.controller.js +++ b/modules/forums/client/controllers/forums.client.controller.js @@ -5,18 +5,29 @@ .module('forums') .controller('ForumsController', ForumsController); - ForumsController.$inject = ['$scope', '$translate', 'Authentication', 'MeanTorrentConfig', 'ForumsAdminService']; + ForumsController.$inject = ['$scope', '$translate', 'Authentication', 'MeanTorrentConfig', 'ForumsAdminService', 'SideOverlay']; - function ForumsController($scope, $translate, Authentication, MeanTorrentConfig, ForumsAdminService) { + function ForumsController($scope, $translate, Authentication, MeanTorrentConfig, ForumsAdminService, SideOverlay) { var vm = this; vm.forumsConfig = MeanTorrentConfig.meanTorrentConfig.forumsConfig; vm.user = Authentication.user; + /** + * init + */ vm.init = function () { ForumsAdminService.query({}, function (items) { vm.forums = items; console.log(items); }); }; + + /** + * openSideOverlay + * @param evt + */ + vm.openSideOverlay = function (evt) { + SideOverlay.open(evt, 'popupSlide'); + }; } }()); diff --git a/modules/forums/client/less/forum.less b/modules/forums/client/less/forum.less new file mode 100644 index 00000000..cf342950 --- /dev/null +++ b/modules/forums/client/less/forum.less @@ -0,0 +1,19 @@ +@import (reference) "../../../core/client/less/mt-var.less"; + +.forum-side-overlay { + top: 50px !important; + @media (min-width: @screen-sm-min) { + width: 450px; + } + @media (max-width: @screen-xs-max) { + min-width: ~"calc(100% - 50px)"; + } +} + +.forum-popup { + background-color: #fdfdfd; + width: 100%; + height: ~"calc(100% - 150px)"; + overflow: auto; + padding: 15px; +} diff --git a/modules/forums/client/views/admin/configure.client.view.html b/modules/forums/client/views/admin/configure.client.view.html index a49529de..c3a31899 100644 --- a/modules/forums/client/views/admin/configure.client.view.html +++ b/modules/forums/client/views/admin/configure.client.view.html @@ -1,7 +1,7 @@
- +
@@ -23,6 +23,7 @@

{{f.name}}

+

{{f.desc}}

{{f.order}} @@ -34,5 +35,10 @@
+ +
+
+
+
diff --git a/modules/messages/client/less/message.less b/modules/messages/client/less/message.less index 05b1ffc2..ac93b2aa 100644 --- a/modules/messages/client/less/message.less +++ b/modules/messages/client/less/message.less @@ -90,7 +90,7 @@ width: 450px; } @media (max-width: @screen-xs-max) { - min-width: ~"calc(100% - 150px)"; + min-width: ~"calc(100% - 50px)"; } }