From 1082f7f4b694f55eeb7ca8b485dffb987d8ef4e3 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Wed, 19 Jul 2017 10:45:37 +0800
Subject: [PATCH] feat(forums): add forums item into search btn group

---
 modules/core/client/app/trans-string-en.js       |  1 +
 modules/core/client/app/trans-string-zh.js       |  1 +
 modules/forums/client/less/forum.less            | 13 +++++++++++++
 .../forums/client/views/search.client.view.html  | 16 ++++++++--------
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 1f4ed89f..46a4f929 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -701,6 +701,7 @@
       ATTACHE_DOWNLOAD_SUCCESSFULLY: 'Attach file download successfully',
       ATTACHE_DOWNLOAD_FAILED: 'Attach file download failed',
       FLOOR_POSTER: 'OWN',
+      ALL_FORUMS: 'All Forums',
 
       CATEGORY: {
         AFFAIRS: 'Affairs',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 58f109ee..86f3ce41 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -701,6 +701,7 @@
       ATTACHE_DOWNLOAD_SUCCESSFULLY: '附件文件下载成功',
       ATTACHE_DOWNLOAD_FAILED: '附件文件下载失败',
       FLOOR_POSTER: '楼主',
+      ALL_FORUMS: '所有论坛',
 
       CATEGORY: {
         AFFAIRS: '站务区',
diff --git a/modules/forums/client/less/forum.less b/modules/forums/client/less/forum.less
index 8c61a18f..7639ebc1 100644
--- a/modules/forums/client/less/forum.less
+++ b/modules/forums/client/less/forum.less
@@ -630,7 +630,20 @@ em {
         button {
             &:first-child {
                 border-radius: 0;
+                width: auto;
             }
         }
+        ul {
+            li {
+                &.item-divider {
+                    margin-top: 8px;
+                    padding-top: 8px;
+                    border-top: solid 1px #ccc;
+                }
+            }
+        }
+        .dropdown-menu-right {
+            right: 38px;
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/forums/client/views/search.client.view.html b/modules/forums/client/views/search.client.view.html
index 645e16ff..2318436b 100644
--- a/modules/forums/client/views/search.client.view.html
+++ b/modules/forums/client/views/search.client.view.html
@@ -1,4 +1,4 @@
-<div class="pagetop">
+<div class="pagetop" ng-controller="ForumsSearchController as vm" ng-init="vm.init();">
     <div class="container">
         <div class="col-sm-8">
             <div class="page-header">
@@ -14,15 +14,15 @@
 
                     <div class="input-group-btn">
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
-                                aria-expanded="false">Action <span class="caret"></span></button>
+                                aria-expanded="false">{{vm.selectedForum.name}} <span class="caret"></span></button>
                         <ul class="dropdown-menu dropdown-menu-right">
-                            <li><a href="#">Action</a></li>
-                            <li><a href="#">Another action</a></li>
-                            <li><a href="#">Something else here</a></li>
-                            <li role="separator" class="divider"></li>
-                            <li><a href="#">Separated link</a></li>
+                            <li ng-repeat="f in vm.forumList" ng-class="{'item-divider': f.divider}">
+                                <a href="#" ng-click="vm.selectedForum = f;">{{f.name}}</a>
+                            </li>
                         </ul>
-                        <button type="button" class="btn btn-default" aria-label="Search"><span class="glyphicon glyphicon-search"></span>
+                        <button type="button" class="btn btn-default" aria-label="Search"
+                                ng-click="vm.doSearch();">
+                            <span class="glyphicon glyphicon-search"></span>
                         </button>
                     </div>
                 </div>