From 2afce31e9583b638cd651e9ed499f9f7b294b28a Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 26 Nov 2015 20:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E6=8E=89=E6=B7=BB=E5=8A=A0=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/jasset/asset_list.html | 58 ++++++++++++++++++++++++++------
 templates/jasset/group_list.html | 24 ++++++-------
 templates/nav.html               |  5 ---
 3 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/templates/jasset/asset_list.html b/templates/jasset/asset_list.html
index 92de964e0..b6574ddc0 100644
--- a/templates/jasset/asset_list.html
+++ b/templates/jasset/asset_list.html
@@ -5,7 +5,7 @@
 
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
-        <div class="col-lg-12">
+        <div class="col-sm-12">
             <div class="ibox float-e-margins" id="all">
                 <div class="ibox-title">
                     <h5> 主机详细信息列表</h5>
@@ -24,7 +24,11 @@
 
                 <div class="ibox-content">
                     <form id="asset_form">
-                        <div class="col-sm-2" style="padding-left: 0px">
+{#                        <div class="col-sm-1">#}
+{#                            <a target="_blank" href="/jasset/group_add/" class="btn btn-sm btn-primary "> 添加资产 </a>#}
+{#                        </div>#}
+                        <div class="col-sm-8" style="padding-left: 0px">
+                            <a target="_blank" href="/jasset/group_add/" class="btn btn-sm btn-primary" > 添加资产 </a>
                             <label>
                                 <select name="idc" class="form-control m-b" onchange="change_info()">
                                     <option value="">IDC机房</option>
@@ -37,8 +41,20 @@
                                     {% endfor %}
                                 </select>
                             </label>
-                        </div>
-                        <div class="col-sm-2">
+
+                            <label>
+                                <select name="group" class="form-control m-b" onchange="change_info()">
+                                    <option value="">主机组</option>
+                                    {% for asset_group in asset_group_all %}
+                                        {% ifequal asset_group.name group_name %}
+                                            <option value="{{ asset_group.name }}" selected> {{ asset_group.name }} </option>
+                                        {% else %}
+                                            <option value="{{ asset_group.name }}"> {{ asset_group.name }} </option>
+                                        {% endifequal %}
+                                    {% endfor %}
+                                </select>
+                            </label>
+
                             <label>
                                 <select name="group" class="form-control m-b" onchange="change_info()">
                                     <option value="">主机组</option>
@@ -51,9 +67,7 @@
                                     {% endfor %}
                                 </select>
                             </label>
-                        </div>
 
-                        <div class="col-sm-2">
                             <label>
                                 <select name="asset_type" class="form-control m-b" onchange="change_info()">
                                     <option value="">所有类型</option>
@@ -66,8 +80,7 @@
                                     {% endfor %}
                                 </select>
                             </label>
-                        </div>
-                        <div class="col-sm-2">
+
                             <label>
                                 <select name="status" class="form-control m-b" onchange="change_info()">
                                     <option value="">所有状态</option>
@@ -81,8 +94,9 @@
                                 </select>
                             </label>
                         </div>
-                         <div class="col-sm-4">
-                            <div class="input-group">
+
+                        <div class="col-sm-4">
+                             <div class="input-group inline-group">
                                 <input type="text" class="form-control m-b" id="search_input" name="keyword" value="{{ keyword }}" placeholder="Search">
                                 <input type="text" style="display: none">
                                 <div class="input-group-btn">
@@ -95,6 +109,30 @@
                                 </div>
                             </div>
                         </div>
+{#                        <div class="col-sm-2">#}
+
+{#                        </div>#}
+{##}
+{#                        <div class="col-sm-2">#}
+
+{#                        </div>#}
+{#                        <div class="col-sm-2">#}
+
+{#                        </div>#}
+{#                         <div class="col-sm-4">#}
+{#                            <div class="input-group">#}
+{#                                <input type="text" class="form-control m-b" id="search_input" name="keyword" value="{{ keyword }}" placeholder="Search">#}
+{#                                <input type="text" style="display: none">#}
+{#                                <div class="input-group-btn">#}
+{#                                    <button id='search_btn' href="/jasset/asset_list/?search=true" type="button" class="btn btn-xm btn-primary search-btn"  onclick="change_info()">#}
+{#                                        - 搜索 -#}
+{#                                    </button>#}
+{#                                    <button type="button" href="/jasset/asset_list/?export=true" name="export" class="btn btn-xm btn-success search-btn-excel" onclick="return false">#}
+{#                                        - 导出 -#}
+{#                                    </button>#}
+{#                                </div>#}
+{#                            </div>#}
+{#                        </div>#}
 
                         <div id="export"></div>
                         <table class="table table-striped table-bordered table-hover " id="editable" name="editable">
diff --git a/templates/jasset/group_list.html b/templates/jasset/group_list.html
index 5141127af..c5bd6aea4 100644
--- a/templates/jasset/group_list.html
+++ b/templates/jasset/group_list.html
@@ -23,19 +23,19 @@
                 </div>
                 <div class="ibox-content">
                     <div class="">
-                    <a target="_blank" href="/jasset/group_add/" class="btn btn-sm btn-primary "> 添加主机组 </a>
-                    <a target="_blank" class="btn btn-sm btn-danger" id="del_check"> 删除所选 </a>
-                    <form id="search_form" method="get" action="" class="pull-right mail-search">
-                        <div class="input-group">
-                            <input type="text" class="form-control input-sm" id="search_input" name="keyword" placeholder="Search">
-                            <input type="text" style="display: none">
-                            <div class="input-group-btn">
-                                <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
-                                    - 搜索 -
-                                </button>
+                        <a target="_blank" href="/jasset/group_add/" class="btn btn-sm btn-primary "> 添加主机组 </a>
+                        <a target="_blank" class="btn btn-sm btn-danger" id="del_check"> 删除所选 </a>
+                        <form id="search_form" method="get" action="" class="pull-right mail-search">
+                            <div class="input-group">
+                                <input type="text" class="form-control input-sm" id="search_input" name="keyword" placeholder="Search">
+                                <input type="text" style="display: none">
+                                <div class="input-group-btn">
+                                    <button id='search_btn' type="submit" class="btn btn-sm btn-primary">
+                                        - 搜索 -
+                                    </button>
+                                </div>
                             </div>
-                        </div>
-                    </form>
+                        </form>
                     </div>
 
                     <form id="contents_form" name="contents_form">
diff --git a/templates/nav.html b/templates/nav.html
index e1f05862e..db523b40c 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -10,19 +10,14 @@
                 <a href="#"><i class="fa fa-group"></i> <span class="nav-label">用户管理</span><span class="fa arrow"></span></a>
                 <ul class="nav nav-second-level">
                     <li class="group_list group_edit"><a href="/juser/group_list/">查看用户组</a></li>
-                    <li class="group_add"><a href="/juser/group_add/">添加用户组</a></li>
                     <li class="user_list user_edit user_detail"><a href="/juser/user_list/">查看用户<span class="label {% ifequal user_active_num user_total_num %}label-primary {% else %}label-warning {% endifequal %}pull-right">{{ user_active_num }}/{{ user_total_num }}</span></a></li>
-                    <li class="user_add"><a href="/juser/user_add/">添加用户</a></li>
                 </ul>
             </li>
             <li id="jasset">
                 <a><i class="fa fa-inbox"></i> <span class="nav-label">资产管理</span><span class="fa arrow"></span></a>
                 <ul class="nav nav-second-level">
-                    <li class="group_add"><a href="/jasset/group_add/">添加资产组</a></li>
                     <li class="group_list group_detail group_edit"><a href="/jasset/group_list/">查看资产组</a></li>
-                    <li class="asset_add asset_add_batch"><a href="/jasset/asset_add/">添加资产</a></li>
                     <li class="asset_list asset_detail asset_edit"><a href="/jasset/asset_list/">查看资产<span class="label label-info pull-right">{{ host_active_num }}/{{ host_total_num}}</span></a></li>
-                    <li class="idc_add"><a href="/jasset/idc_add/">添加机房</a></li>
                     <li class="idc_list idc_detail idc_edit"><a href="/jasset/idc_list/">查看机房</a></li>
                 </ul>
             </li>