diff --git a/modules/forums/client/config/forums.client.menus.js b/modules/forums/client/config/forums.client.menus.js
index 39ec68d5..18f52036 100644
--- a/modules/forums/client/config/forums.client.menus.js
+++ b/modules/forums/client/config/forums.client.menus.js
@@ -11,7 +11,7 @@
// Set top bar menu items
menuService.addMenuItem('topbar', {
title: 'MENU_FORUMS',
- state: 'forums',
+ state: 'forums.list',
roles: ['*'],
position: 1
});
diff --git a/modules/forums/client/config/forums.client.routes.js b/modules/forums/client/config/forums.client.routes.js
index f7d97c6e..bcb226ff 100644
--- a/modules/forums/client/config/forums.client.routes.js
+++ b/modules/forums/client/config/forums.client.routes.js
@@ -10,12 +10,25 @@
function routeConfig($stateProvider) {
$stateProvider
.state('forums', {
+ abstract: true,
url: '/forums',
+ template: ''
+ })
+ .state('forums.list', {
+ url: '',
templateUrl: '/modules/forums/client/views/index.client.view.html',
data: {
roles: ['user', 'oper', 'admin'],
pageTitle: 'PAGETITLE.FORUM'
}
+ })
+ .state('forums.view', {
+ url: '/:forumId',
+ templateUrl: '/modules/forums/client/views/view.client.view.html',
+ data: {
+ roles: ['user', 'oper', 'admin'],
+ pageTitle: 'PAGETITLE.FORUM'
+ }
});
}
}());
diff --git a/modules/forums/client/controllers/forums-view.client.controller.js b/modules/forums/client/controllers/forums-view.client.controller.js
new file mode 100644
index 00000000..f06e2032
--- /dev/null
+++ b/modules/forums/client/controllers/forums-view.client.controller.js
@@ -0,0 +1,27 @@
+(function () {
+ 'use strict';
+
+ angular
+ .module('forums')
+ .controller('ForumsViewController', ForumsViewController);
+
+ ForumsViewController.$inject = ['$scope', '$state', '$translate', 'Authentication', 'MeanTorrentConfig', 'ForumsService', 'SideOverlay', '$filter', 'NotifycationService',
+ 'marked', 'ModalConfirmService'];
+
+ function ForumsViewController($scope, $state, $translate, Authentication, MeanTorrentConfig, ForumsService, SideOverlay, $filter, NotifycationService,
+ marked, ModalConfirmService) {
+ var vm = this;
+ vm.forumsConfig = MeanTorrentConfig.meanTorrentConfig.forumsConfig;
+ vm.user = Authentication.user;
+
+ /**
+ * init
+ */
+ vm.init = function () {
+ ForumsService.query({}, function (items) {
+ vm.forums = items;
+ });
+ };
+
+ }
+}());
diff --git a/modules/forums/client/less/forum.less b/modules/forums/client/less/forum.less
index 64f01582..afe929f6 100644
--- a/modules/forums/client/less/forum.less
+++ b/modules/forums/client/less/forum.less
@@ -75,7 +75,7 @@
margin-left: 60px;
}
.moderators-title {
- color: @brand-primary;
+ color: #666;
}
.moderators-list {
.moderators-item {
diff --git a/modules/forums/client/views/index.client.view.html b/modules/forums/client/views/index.client.view.html
index 2351498a..7434c1a7 100644
--- a/modules/forums/client/views/index.client.view.html
+++ b/modules/forums/client/views/index.client.view.html
@@ -46,10 +46,10 @@
-
+
- {{f.name}}
+
diff --git a/modules/forums/client/views/view.client.view.html b/modules/forums/client/views/view.client.view.html
new file mode 100644
index 00000000..3ec2c604
--- /dev/null
+++ b/modules/forums/client/views/view.client.view.html
@@ -0,0 +1,27 @@
+
\ No newline at end of file
|