From 936c6d6170376624b4a2cdde2df6dc71fa1f3a9d Mon Sep 17 00:00:00 2001 From: OldHawk Date: Fri, 7 Jul 2017 16:08:45 +0800 Subject: [PATCH] feat(forums): init post new topic view --- modules/core/client/app/trans-string-en.js | 4 ++ modules/core/client/app/trans-string-zh.js | 4 ++ .../forums-post.client.controller.js | 8 ++-- modules/forums/client/less/forum.less | 1 + .../client/views/index.client.view.html | 4 +- .../forums/client/views/post.client.view.html | 38 +++++++++++++------ .../forums/client/views/view.client.view.html | 19 ++++++---- 7 files changed, 54 insertions(+), 24 deletions(-) diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 65241d87..204d1ed8 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -619,6 +619,8 @@ //forum FORUMS: { + FORUM_TITLE: 'meanTorrent Forums', + FORUM_SUB_TITLE: 'Welcome to meanTorrent forums!', HOME_INDEX: 'Forums Home', BTN_ADD_FORUM: 'Add New Forum', BTN_EDIT_FORUM: 'Edit Forum', @@ -626,6 +628,8 @@ BTN_EDIT: '　　Edit　　 ', LINK_EDIT: 'Edit', BTN_DELETE: '　Delete　 ', + BTN_SUBMIT: 'Submit New Topic', + BTN_POST_NEW: 'Post New Topic', ADD_SUCCESSFULLY: 'Forum added successfully', ADD_FAILED: 'Forum added failed', EDIT_SUCCESSFULLY: 'Forum edited successfully', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 44e44cdf..ecd07327 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -619,6 +619,8 @@ //forum FORUMS: { + FORUM_TITLE: 'meanTorrent 官方论坛', + FORUM_SUB_TITLE: '欢迎您进入 meanTorrent 官方论坛，请文明发言，谢谢!', HOME_INDEX: '论坛首页', BTN_ADD_FORUM: '添加版块', BTN_EDIT_FORUM: '编辑版块', @@ -626,6 +628,8 @@ BTN_EDIT: '　　编辑　　', LINK_EDIT: '编辑', BTN_DELETE: '　删除　　', + BTN_SUBMIT: ' 提交新话题 ', + BTN_POST_NEW: ' 发起新话题 ', ADD_SUCCESSFULLY: '版块添加成功', ADD_FAILED: '版块添加失败', EDIT_SUCCESSFULLY: '版块编辑成功', diff --git a/modules/forums/client/controllers/forums-post.client.controller.js b/modules/forums/client/controllers/forums-post.client.controller.js index 09c178c5..25c9ceca 100644 --- a/modules/forums/client/controllers/forums-post.client.controller.js +++ b/modules/forums/client/controllers/forums-post.client.controller.js @@ -6,10 +6,10 @@ .controller('ForumsPostController', ForumsPostController); ForumsPostController.$inject = ['$scope', '$state', '$translate', 'Authentication', 'MeanTorrentConfig', 'ForumsService', 'SideOverlay', '$filter', 'NotifycationService', - 'marked', 'ModalConfirmService', '$stateParams', 'TopicsService']; + 'marked', 'ModalConfirmService', '$stateParams', 'TopicsService', 'localStorageService']; function ForumsPostController($scope, $state, $translate, Authentication, MeanTorrentConfig, ForumsService, SideOverlay, $filter, NotifycationService, - marked, ModalConfirmService, $stateParams, TopicsService) { + marked, ModalConfirmService, $stateParams, TopicsService, localStorageService) { var vm = this; vm.forumsConfig = MeanTorrentConfig.meanTorrentConfig.forumsConfig; vm.user = Authentication.user; @@ -22,7 +22,9 @@ autofocus:false, savable:false, iconlibrary: 'fa', - resize: 'vertical' + resize: 'vertical', + language: localStorageService.get('storage_user_lang'), + fullscreen: { enable: false} }); // get forum info by state params diff --git a/modules/forums/client/less/forum.less b/modules/forums/client/less/forum.less index e0c1b2ce..527eb42c 100644 --- a/modules/forums/client/less/forum.less +++ b/modules/forums/client/less/forum.less @@ -140,4 +140,5 @@ } .post-view { + margin-bottom: 100px; } \ No newline at end of file diff --git a/modules/forums/client/views/index.client.view.html b/modules/forums/client/views/index.client.view.html index e4212268..6d13bbcc 100644 --- a/modules/forums/client/views/index.client.view.html +++ b/modules/forums/client/views/index.client.view.html @@ -3,9 +3,9 @@
-

meanTorrent Forums

+

-

Welcome to meanTorrent forums!

+

diff --git a/modules/forums/client/views/post.client.view.html b/modules/forums/client/views/post.client.view.html index 3ae75070..527080c4 100644 --- a/modules/forums/client/views/post.client.view.html +++ b/modules/forums/client/views/post.client.view.html @@ -3,9 +3,9 @@
-

meanTorrent Forums

+

-

Welcome to meanTorrent forums!

+

@@ -28,18 +28,34 @@
  1. {{'FORUMS.HOME_INDEX' | translate}}
    2. -
  2. {{p.name}}{{p.name}}
    3. +
  3. + {{p.name}} + + {{p.name}} +
-
-
-
-
- - +
+
+
+ + + +
+ + + {{ 'MARKDOWN_LINK' | translate }} + +
+ +
diff --git a/modules/forums/client/views/view.client.view.html b/modules/forums/client/views/view.client.view.html index 55a043ea..42e0aca5 100644 --- a/modules/forums/client/views/view.client.view.html +++ b/modules/forums/client/views/view.client.view.html @@ -3,9 +3,9 @@
-

meanTorrent Forums

+

-

Welcome to meanTorrent forums!

+

@@ -28,7 +28,9 @@
  1. {{'FORUMS.HOME_INDEX' | translate}}
    2. -
  2. {{p.name}}{{p.name}}
    3. +
  3. {{p.name}}{{p.name}}
@@ -43,7 +45,8 @@
- Post New Topic + {{'FORUMS.BTN_POST_NEW' | translate}}
@@ -59,10 +62,10 @@ - - - - + + + +