From de8182312123f7c8316170b54ff70c9af7f426c1 Mon Sep 17 00:00:00 2001 From: llj Date: Tue, 26 Jul 2016 15:03:15 +0800 Subject: [PATCH] [Terms] fix & improvement --- media/css/seahub.css | 8 ++ seahub/templates/base_wide_page.html | 6 +- .../templates/sysadmin/sys_terms_admin.html | 103 +++++++++--------- .../termsandconditions/tc_accept_terms.html | 39 +++---- seahub/views/sysadmin.py | 2 +- 5 files changed, 80 insertions(+), 78 deletions(-) diff --git a/media/css/seahub.css b/media/css/seahub.css index a5e78750b4..813b79c298 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -23,6 +23,7 @@ * (...) * discussions/comments * custom select2 + * sf-panel * * Container * Container ......... common container styles @@ -141,6 +142,7 @@ .sf2-icon-trash:before { content:"\e016"; } .sf2-icon-security:before { content:"\e017"; } .sf2-icon-edit:before { content:"\e018"; } +.sf2-icon-edit2:before { content:"\e018"; } /* for some reason */ .sf2-icon-eye:before { content:"\e019"; } .sf2-icon-caret-down:before { content:"\e01a"; } .sf2-icon-cog2:before { content:"\e01b"; } @@ -1506,6 +1508,12 @@ button.sf-dropdown-toggle:focus { .select2-result-label .text { vertical-align:middle; } +/**** sf-panel ****/ +.sf-panel { + padding:10px; + border: 1px solid #e8e8e8; + border-radius:3px; +} /********** Container ***********/ #wrapper { diff --git a/seahub/templates/base_wide_page.html b/seahub/templates/base_wide_page.html index 855fc5521e..66fe5b0496 100644 --- a/seahub/templates/base_wide_page.html +++ b/seahub/templates/base_wide_page.html @@ -3,8 +3,8 @@ {% block main_content %}
-
- {% block wide_page_content %}{% endblock %} -
+
+ {% block wide_page_content %}{% endblock %} +
{% endblock %} diff --git a/seahub/templates/sysadmin/sys_terms_admin.html b/seahub/templates/sysadmin/sys_terms_admin.html index fd827f5152..4852a66856 100644 --- a/seahub/templates/sysadmin/sys_terms_admin.html +++ b/seahub/templates/sysadmin/sys_terms_admin.html @@ -1,33 +1,33 @@ {% extends "sysadmin/base.html" %} {% load i18n seahub_tags %} -{% block cur_links %}tab-tc{% endblock %} +{% block cur_tc %}tab-cur{% endblock %} {% block right_panel %} -
- - +
+

{% trans "Terms and Conditions" %}

+
{% if object_list %} + - + - - - + + + + + {% for tc in object_list %} + - - {% endfor %} +
{% trans "Name" %}{% trans "Version number" %}{% trans "Version" %} {% trans "Text" %}{% trans "Active date" %}{% trans "Created date" %}{% trans "Operations" %}{% trans "Created" %}{% trans "Activated" %}
{{ tc.name }} {{ tc.version_number }} {{ tc.text|truncatechars:50 }}{{ tc.date_created|translate_seahub_time }} {% if tc.date_active %} {{ tc.date_active|translate_seahub_time }} @@ -35,12 +35,13 @@ -- {% endif %} {{ tc.date_created|translate_seahub_time }}{% trans "Update" %} - {% trans "Delete" %} + + +
{% else %} @@ -48,9 +49,9 @@ {% endif %}
{% csrf_token %} +

{% trans "Add Terms and Conditions" %}

-

{% trans "Add Terms and Condistions" %}



@@ -58,11 +59,13 @@

-
+
-
- {% trans "Enabled" %} - {% trans "Disabled" %}
+
+ + {% trans "On" %}
+ + {% trans "Off" %}

@@ -79,28 +82,17 @@ $('#add-btn').click(function() { $('#simplemodal-container').css({'width':'auto', 'height':'auto'}); }); -$('.js-update').click(function() { - var form = $('#tc-form'); - form.children('[name="pk"]').val($(this).data('pk')); - form.children('[name="name"]').val($(this).data('name')); - form.children('[name="version_number"]').val($(this).data('version_number')); - form.children('[name="text"]').val($(this).data('text')); - - $('#tc-form').modal(); - $('#simplemodal-container').css({'width':'auto', 'height':'auto'}); -}); - $('#tc-form').submit(function(){ - var form = $(this), - form_id = form.attr('id'), - submit_btn = form.find('[type="submit"]'), - pk = form.children('[name="pk"]').val(); - name = $.trim(form.children('[name="name"]').val()), - version_num = $.trim(form.children('[name="version_number"]').val()), - text = $.trim(form.children('[name="text"]').val()), - status = form.children('[name="status"]:checked').val(); + var $form = $(this), + form_id = $form.attr('id'), + $submit_btn = $form.find('[type="submit"]'), + pk = $('[name="pk"]', $form).val(), + name = $.trim($('[name="name"]', $form).val()), + version = $.trim($('[name="version_number"]', $form).val()), + text = $.trim($('[name="text"]', $form).val()), + activated = $('[name="status"]:checked', $form).val(); - disable(submit_btn); + disable($submit_btn); $.ajax({ url: '{% url 'sys_terms_admin' %}', type: 'POST', @@ -109,15 +101,13 @@ $('#tc-form').submit(function(){ beforeSend: prepareCSRFToken, data: { 'name': name, - 'version_number': version_num, + 'version_number': version, 'text': text, - 'status': status, + 'status': activated, 'pk': pk }, success: function(data) { - if (data['success']) { - location.reload(true); - } + location.reload(true); }, error: function(jqXHR, textStatus, errorThrown) { if (jqXHR.responseText) { @@ -125,14 +115,28 @@ $('#tc-form').submit(function(){ } else { apply_form_error(form_id, "{% trans "Failed. Please check the network." %}"); } + enable($submit_btn); } - }).complete(function() { - enable(submit_btn); }); return false; }); +$('.js-update').click(function() { + var $form = $('#tc-form'); + $form.modal({focus: false}); + $('#simplemodal-container').css({'width':'auto', 'height':'auto'}); + + $('h3', $form).html("{% trans "Update Terms and Conditions" %}"); + $('[name="pk"]', $form).val($(this).attr('data-pk')); + $('[name="name"]', $form).val($(this).attr('data-name')); + $('[name="version_number"]', $form).val($(this).attr('data-version')); + $('[name="text"]', $form).val($(this).attr('data-text')); + $('[name="status"][value="' + $(this).attr('data-activated') + '"]', $form).prop('checked', true); + + return false; +}); + addConfirmTo($('.remove-btn'), { 'title': "Delete T&C", 'con':"{% trans "Are you sure you want to delete %s ?" %}", @@ -140,8 +144,9 @@ addConfirmTo($('.remove-btn'), { }); $('.js-text').click(function() { - $('#popup-msg').html($(this).data('msg')); - $('#popup-msg').modal(); + $('#popup-msg').html($(this).attr('data-msg')).modal({ + minWidth: 150 + }); $('#simplemodal-container').css({'height':'auto'}); return false; diff --git a/seahub/templates/termsandconditions/tc_accept_terms.html b/seahub/templates/termsandconditions/tc_accept_terms.html index 96c111703c..d7d98bc672 100644 --- a/seahub/templates/termsandconditions/tc_accept_terms.html +++ b/seahub/templates/termsandconditions/tc_accept_terms.html @@ -1,29 +1,18 @@ -{% extends "base.html" %} +{% extends "base_wide_page.html" %} {% load i18n %} -{% block main_panel %} -
-
-

{{ form.initial.terms.name|safe }}

- {{ form.errors }} -
- {{ form.initial.terms.text|safe|linebreaksbr }} -
- {% csrf_token %} - {{ form.terms }} - {{ form.returnTo }} - - - -
+{% block wide_page_content %} +
+

{{ form.initial.terms.name|safe }}

+ {{ form.errors }} +
+ {{ form.initial.terms.text|safe|linebreaksbr }} +
+
{% csrf_token %} + {{ form.terms }} + {{ form.returnTo }} + + {% trans "Cancel" %} +
{% endblock %} - -{% block extra_script %} - -{% endblock %} diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index 76935d0808..46dba5b50b 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -2264,7 +2264,7 @@ def sys_terms_admin(request): @require_POST def sys_delete_terms(request, pk): TermsAndConditions.objects.filter(pk=pk).delete() - messages.success(request, _('Success')) + messages.success(request, _('Successfully deleted 1 item')) return HttpResponseRedirect(reverse('sys_terms_admin'))