Modify some style

apps/assets/templates/assets/idc_list.html

@@ -28,7 +28,7 @@
              <td class="text-center">{{ idc.address }}</td>
              <td class="text-center">
                  <a href="{% url 'assets:idc-update' pk=idc.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a>
-                 <a onclick="obj_del(this,'{{ idc.name }}','{% url 'assets:idc-delete' idc.id %}')" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
+                 <a onclick="objectDelete(this, '{{ idc.name }}', '{% url 'assets:idc-delete' idc.id %}')" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
              </td>
          </tr>
      {% endfor %}

apps/assets/views.py

@@ -173,7 +173,7 @@ class IDCListView(AdminUserRequiredMixin, ListView):
 class IDCCreateView(AdminUserRequiredMixin, CreateView):
     model = IDC
     form_class = IDCForm
-    template_name = 'assets/idc_create.html'
+    template_name = 'assets/idc_create_update.html'
     success_url = reverse_lazy('assets:idc-list')
 
     def get_context_data(self, **kwargs):
@@ -188,24 +188,26 @@ class IDCCreateView(AdminUserRequiredMixin, CreateView):
 class IDCUpdateView(AdminUserRequiredMixin, UpdateView):
     model = IDC
     form_class = IDCForm
-    template_name = 'assets/idc_create.html'
+    template_name = 'assets/idc_create_update.html'
-    context_object_name = 'IDC'
+    context_object_name = 'idc'
     success_url = reverse_lazy('assets:idc-list')
+
     def form_valid(self, form):
-        IDC = form.save(commit=False)
+        idc = form.save(commit=False)
-        IDC.save()
+        idc.save()
         return super(IDCUpdateView, self).form_valid(form)
 
+
 class IDCDetailView(AdminUserRequiredMixin, DetailView):
     pass
 
 
-
 class IDCDeleteView(AdminUserRequiredMixin, DeleteView):
     model = IDC
     template_name = 'assets/delete_confirm.html'
     success_url = reverse_lazy('assets:idc-list')
 
+
 class AdminUserListView(AdminUserRequiredMixin, ListView):
     model = AdminUser
     paginate_by = settings.CONFIG.DISPLAY_PER_PAGE
@@ -241,7 +243,6 @@ class AdminUserCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateVie
     form_class = AdminUserForm
     template_name = 'assets/admin_user_create_update.html'
     success_url = reverse_lazy('assets:admin-user-list')
-    success_message = _('Create admin user <a href="%s">%s</a> successfully.')
 
     def get_context_data(self, **kwargs):
         context = {
@@ -252,17 +253,18 @@ class AdminUserCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateVie
         return super(AdminUserCreateView, self).get_context_data(**kwargs)
 
     def get_success_message(self, cleaned_data):
-        return self.success_message % (
+        success_message = _('Create admin user <a href="%s">%s</a> successfully.' %
+                            (
                                 reverse_lazy('assets:admin-user-detail', kwargs={'pk': self.object.pk}),
                                 self.object.name,
-        )
+                            ))
+        return success_message
 
 
 class AdminUserUpdateView(AdminUserRequiredMixin, UpdateView):
     model = AdminUser
     form_class = AdminUserForm
     template_name = 'assets/admin_user_create_update.html'
-    success_message = _('Update admin user <a href="%s">%s</a> successfully.')
 
     def get_context_data(self, **kwargs):
         context = {
@@ -340,7 +342,6 @@ class SystemUserCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateVi
     form_class = SystemUserForm
     template_name = 'assets/system_user_create_update.html'
     success_url = reverse_lazy('assets:system-user-list')
-    success_message = _('Create system user <a href="%s">%s</a> successfully.')
 
     def get_context_data(self, **kwargs):
         context = {
@@ -351,10 +352,13 @@ class SystemUserCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateVi
         return super(SystemUserCreateView, self).get_context_data(**kwargs)
 
     def get_success_message(self, cleaned_data):
-        return self.success_message % (
+        success_message = _('Create system user <a href="%s">%s</a> successfully.' %
+                            (
                                 reverse_lazy('assets:system-user-detail', kwargs={'pk': self.object.pk}),
                                 self.object.name,
-        )
+                            ))
+
+        return self.success_message
 
 
 class SystemUserUpdateView(AdminUserRequiredMixin, UpdateView):

apps/perms/views.py

@@ -60,7 +60,6 @@ class AssetPermissionCreateView(AdminUserRequiredMixin, SuccessMessageMixin, Cre
     form_class = AssetPermissionForm
     template_name = 'perms/asset_permission_create_update.html'
     success_url = reverse_lazy('perms:asset-permission-list')
-    success_message = _('Create asset permission <a href="%s"> %s </a> successfully.')
 
     def get_context_data(self, **kwargs):
         context = {
@@ -71,10 +70,12 @@ class AssetPermissionCreateView(AdminUserRequiredMixin, SuccessMessageMixin, Cre
         return super(AssetPermissionCreateView, self).get_context_data(**kwargs)
 
     def get_success_message(self, cleaned_data):
-        return self.success_message % (
+        success_message = _('Create asset permission <a href="%s"> %s </a> successfully.' %
+                            (
                                 reverse_lazy('perms:asset-permission-detail', kwargs={'pk': self.object.pk}),
                                 self.object.name,
-        )
+                            ))
+        return success_message
 
 
 class AssetPermissionUpdateView(AdminUserRequiredMixin, UpdateView):

apps/static/js/jumpserver.js

@@ -124,33 +124,66 @@ function move_left(from, to, from_o, to_o) {
 
 
 function selectAll(){
-    // 选择该页面所有option
+    // Select all check box
     $('option').each(function(){
         $(this).attr('selected', true);
     });
 }
 
 
-//
+// function getIDall() {
-//function move_all(from, to){
+//     var check_array = [];
-//    $("#"+from).children().each(function(){
+//     $(".gradeX input:checked").each(function () {
-//        $("#"+to).append(this);
+//         var id = $(this).attr("value");
+//         check_array.push(id);
 //     });
-//}
+//     return check_array.join(",");
+// }
 
-//function commit_select(form_array){
+function getCookie(name) {
-//    $('#{0} option'.format(form_array)).each(function(){
+    var cookieValue = null;
-//        $(this).prop('selected', true)
+    if (document.cookie && document.cookie !== '') {
-//        })
+        var cookies = document.cookie.split(';');
-//}
+        for (var i = 0; i < cookies.length; i++) {
+            var cookie = jQuery.trim(cookies[i]);
+            // Does this cookie string begin with the name we want?
+            if (cookie.substring(0, name.length + 1) === (name + '=')) {
+                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                break;
+            }
+        }
+    }
+    return cookieValue;
+}
 
-function getIDall() {
+function csrfSafeMethod(method) {
-    var check_array = [];
+    // these HTTP methods do not require CSRF protection
-    $(".gradeX input:checked").each(function () {
+    return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
-        var id = $(this).attr("value");
+}
-        check_array.push(id);
+
+function setAjaxCSRFToken() {
+    var csrftoken = getCookie('csrftoken');
+    var sessionid = getCookie('sessionid');
+
+    $.ajaxSetup({
+        beforeSend: function(xhr, settings) {
+            if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
+                xhr.setRequestHeader("X-CSRFToken", csrftoken);
+            }
+        }
     });
-    return check_array.join(",");
+}
+
+function activeNav() {
+    var url_array = document.location.pathname.split("/");
+    var app = url_array[1];
+    var resource = url_array[2];
+    if (app == ''){
+        $('#index').addClass('active')
+    } else {
+        $("#" + app).addClass('active');
+        $('#' + app + ' #' + resource).addClass('active');
+    }
 }
 
 function APIUpdateAttr(props) {
@@ -158,6 +191,7 @@ function APIUpdateAttr(props) {
   props = props || {};
   success_message = props.success_message || 'Update Successfully!';
   fail_message = props.fail_message || 'Error occurred while updating.';
+
   $.ajax({
     url: props.url,
     type: props.method || "PATCH",

apps/templates/_foot_js.html

@@ -6,62 +6,23 @@
 <!-- Custom and plugin javascript -->
 <script src="{% static "js/plugins/toastr/toastr.min.js" %}"></script>
 <script src="{% static "js/inspinia.js" %}"></script>
+<script src="{% static "js/jumpserver.js" %}"></script>
 <script>
-// active menu
+    activeNav();
-var url_array = document.location.pathname.split("/");
+    $(document).ready(function(){
-app = url_array[1];
+        setAjaxCSRFToken();
-resource = url_array[2];
-if (app == ''){
-    $('#index').addClass('active')
-} else {
-    $("#"+app).addClass('active');
-    $('#'+app+' #'+resource).addClass('active');
-}
 
-// ajax set cookie
+        // Set textarea rows five
-function getCookie(name) {
+        $('textarea').attr('rows', 5);
-    var cookieValue = null;
+    });
-    if (document.cookie && document.cookie !== '') {
-        var cookies = document.cookie.split(';');
-        for (var i = 0; i < cookies.length; i++) {
-            var cookie = jQuery.trim(cookies[i]);
-            // Does this cookie string begin with the name we want?
-            if (cookie.substring(0, name.length + 1) === (name + '=')) {
-                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                break;
-            }
-        }
-    }
-    return cookieValue;
-}
-
-var csrftoken = getCookie('csrftoken');
-var sessionid = getCookie('sessionid');
-
-function csrfSafeMethod(method) {
-    // these HTTP methods do not require CSRF protection
-    return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
-}
-
-$.ajaxSetup({
-    beforeSend: function(xhr, settings) {
-        if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
-            xhr.setRequestHeader("X-CSRFToken", csrftoken);
-        }
-    }
-});
-
-// textarea rows
-$('textarea').attr('rows', 5)
 
 
-
+// Sweet Alert for Delete
-//Sweet Alert for Delete
+// Todo: Change name to objectDelete(obj, name, url)
-function obj_del(obj,name,url){
+function objectDelete(obj, name, url){
     swal({
-        title: "{% trans 'Are you sure delete ??' %}",
+        title: "{% trans 'Are you sure delete ?' %}",
-        //text: "You will not be able to recover this imaginary file!",
+        text: "【" + name + "】",
-        text: "【"+name+"】",
         type: "warning",
         showCancelButton: true,
         cancelButtonText: "{% trans 'Cancel' %}",
@@ -73,16 +34,14 @@ function obj_del(obj,name,url){
             type : "post",
             url : url,
             data : {
-           // idc_id : idc_id
             },
+            dataType : "text",
             success : function(data) {
                 swal("{% trans 'Deleted!' %}", "【"+name+"】"+"{% trans 'has been deleted.' %}", "success");
                 $(obj).parent().parent().remove();
-            },
+            }
-            dataType : "text"
+        })
-            });
     });
 }
 
 </script>
-<script src="{% static "js/jumpserver.js" %}"></script>

apps/templates/base.html

@@ -12,7 +12,6 @@
     {% include '_head_css_js.html' %}
     {% block custom_head_css_js %} {% endblock %}
     <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
-    <script src="{% static "js/jumpserver.js" %}"></script>
 </head>
 
 <body>