From 4e1f9c97a5d1f503e558ddedda4f9ff09b2dc719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=9F=E4=B8=96=E5=B3=B0?= <93648765@qq.com>
Date: Sun, 16 Oct 2016 22:35:25 +0800
Subject: [PATCH] asset:update assets_list by tag

---
 apps/assets/templates/assets/asset_list.html | 41 +++++++++++++-------
 apps/static/css/jumpserver.css               |  4 +-
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index 071f35667..c9d7f298f 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -7,6 +7,9 @@ div.dataTables_wrapper div.dataTables_filter,
 .dataTables_length {
     float: right !important;
 }
+div.dataTables_wrapper div.dataTables_filter {
+  margin-left: 15px;
+}
 .custom{
     float:left;
     margin-right:5px;
@@ -21,21 +24,33 @@ div.dataTables_wrapper div.dataTables_filter,
                         {% endblock %}
 {% block tags_list %}
 
-                      <div class="ydxbd" id="ydxbd" style="display: block;">
+                      <div class="ydxbd" id="ydxbd" style="display: none;">
                            <div>
                                <p id="tags_p">
                                    {% for tag in tag_list %}
-                                    <a href="{% url 'assets:asset-tags' tag_id=tag.0 %}"
-                                        {% if tag.0|IntToStr == tag_id %}
-                                            class="fa fa-tag btn btn-sm  btn-primary mar-j" name="tag_on">
-                                        {% else %}
-                                            class="fa fa-tag btn btn-sm btn-outline btn-primary mar-j">
-                                        {% endif %}
-                                        <span class="mar">
-                                            <strong>{{ tag.1}}</strong>({{ tag.2 }})
-                                        </span></a>
+
+                                   <a href="{% url 'assets:asset-tags' tag_id=tag.0 %}">
+                                       <span
+                                           {% if tag.0|IntToStr == tag_id %}
+                                               class="label label-warning" name="tag_on"
+                                           {% else %}
+                                               class="label label-default"
+                                           {% endif %}
+                                       >{{ tag.1}}({{ tag.2 }})</span>
+                                       </a>
+{#                                    <a href="{% url 'assets:asset-tags' tag_id=tag.0 %}"#}
+{#                                        {% if tag.0|IntToStr == tag_id %}#}
+{#                                            class="fa fa-tag btn btn-sm btn-warning btn-rounded mar-j" name="tag_on">#}
+{#                                        {% else %}#}
+{#                                            class="fa fa-tag btn btn-sm btn-default btn-rounded mar-j">#}
+{#                                        {% endif %}#}
+{#                                        <span class="mar">#}
+{#                                            <strong>{{ tag.1}}</strong>({{ tag.2 }})#}
+{#                                        </span></a>#}
+
                                    {% endfor %}
-                                    <a href="{% url 'assets:asset-list' %}" class="btn btn-sm btn-outline btn-default ">移除选择</a>
+{#                                    <a href="{% url 'assets:asset-list' %}" class="btn btn-sm btn-rounded btn-default ">移除选择</a>#}
+                                   <a href="{% url 'assets:asset-list' %}" ><span class="label label-default">移除选择</span></a>
                                </p>
                            </div>
                        </div>
@@ -121,8 +136,8 @@ div.dataTables_wrapper div.dataTables_filter,
                 oDiv.style.display = "none";
             }
     };
-
     $(document).ready(function(){
+        var oTags = document.getElementById("ydxbd");
         var table = $('#editable').DataTable({
             "aLengthMenu": [[10, 25, 50, -1], ["10", "25", "50", "all"]],
             "iDisplayLength":25,
@@ -130,11 +145,11 @@ div.dataTables_wrapper div.dataTables_filter,
             "aoColumnDefs": [ { "bSortable": false, "aTargets": [ 0 ] }],
             "bAutoWidth": false,
             "language": {"url": "/static/js/plugins/dataTables/i18n/zh-hans.json"},
-            //"dom": '<lf<t>ip>',
             "dom": '<"custom">lftip',
             "initComplete": function() {
                 //alert( 'DataTables has finished its initialisation.' );
                 $('#editable_length').before("<a href=\"{% url 'assets:asset-create' %}\" class=\"btn btn-sm btn-primary custom \"> {% trans 'Create asset' %} </a>&nbsp; <button class='btn btn-sm btn-primary custom' id='zksx' onclick='tagShow()'>标签</button>");
+                $('#editable').before(oTags);
             },
         columns: [
             {data: "checkbox"},
diff --git a/apps/static/css/jumpserver.css b/apps/static/css/jumpserver.css
index 02baf9f62..f61cdca4f 100644
--- a/apps/static/css/jumpserver.css
+++ b/apps/static/css/jumpserver.css
@@ -204,12 +204,12 @@ table.dataTable tbody td.selected td i.text-navy
 	padding-top: 15px;
 	margin-bottom: 15px;
 	display: block;
-	background: #f4f4f4;
+	/*background: #ccc;*/
 	padding-left: 10px;
 }
 .mar {
     margin-left: 2px;
-    line-height: 15px;
+    line-height: 0px;
 }
 .mar-j {
     margin-left: 3px;