Merge pull request #2560 from jumpserver/dev

[Update] 修复小问题 (#2557)

apps/assets/templates/assets/asset_detail.html

@@ -20,7 +20,7 @@
                                 <a href="{% url 'assets:asset-detail' pk=asset.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Asset detail' %} </a>
                             </li>
                             <li>
-                                <a href="{% url 'assets:asset-user-list' pk=asset.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Asset user list' %} </a>
+                                <a href="{% url 'assets:asset-user-list' pk=asset.id %}" class="text-center"><i class="fa fa-bar-chart-o"></i> {% trans 'Asset user list' %} </a>
                             </li>
                             {% if user.is_superuser %}
                             <li class="pull-right">

apps/audits/templates/audits/operate_log_list.html

@@ -37,7 +37,7 @@
             </select>
         </div>
         <div class="input-group">
-            <select class="select2 form-control" name="asset">
+            <select class="select2 form-control" name="action">
                 <option value="">{% trans 'Action' %}</option>
                 {% for k, v in actions.items %}
                     <option value="{{ k }}" {% if k == action %} selected {% endif %}>{{ v }}</option>
@@ -45,7 +45,7 @@
             </select>
         </div>
         <div class="input-group">
-            <select class="select2 form-control" name="system_user">
+            <select class="select2 form-control" name="resource_type">
                 <option value="">{% trans 'Resource Type' %}</option>
                 {% for r in resource_type_list %}
                     <option value="{{ r }}" {% if r == resource_type %} selected {% endif %}>{{ r }}</option>

apps/authentication/templates/authentication/login_otp.html

@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>  {{ JMS_TITLE }} </title>
-    <link rel="shortcut icon" href="{{ FAVICON_URL }}"" type="image/x-icon">
+    <link rel="shortcut icon" href="{{ FAVICON_URL }}" type="image/x-icon">
     {% include '_head_css_js.html' %}
     <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
     <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>

apps/users/templates/users/reset_password.html

@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title> {{ JMS_TITLE }} </title>
-    <link rel="shortcut icon" href="{{ FAVICON_URL }}" %}" type="image/x-icon">
+    <link rel="shortcut icon" href="{{ FAVICON_URL }}" type="image/x-icon">
     {% include '_head_css_js.html' %}
     <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
     <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>