diff --git a/powerdnsadmin/templates/admin_setting_authentication.html b/powerdnsadmin/templates/admin_setting_authentication.html index e0e3a3f..4b8a446 100644 --- a/powerdnsadmin/templates/admin_setting_authentication.html +++ b/powerdnsadmin/templates/admin_setting_authentication.html @@ -35,7 +35,7 @@
-
+

Authentication Settings

@@ -46,20 +46,36 @@ {{ result['msg'] }}
{% endif %} - - -
- - {% endblock %} diff --git a/powerdnsadmin/templates/admin_setting_basic.html b/powerdnsadmin/templates/admin_setting_basic.html index dcfb298..f62d43a 100644 --- a/powerdnsadmin/templates/admin_setting_basic.html +++ b/powerdnsadmin/templates/admin_setting_basic.html @@ -52,15 +52,15 @@ {{ setting }} {% if SETTING.get(setting) in [False] %} - {{ SETTING.get(setting)|display_setting_state }} - +  Off + {% elif SETTING.get(setting) in [True] %} - {{ SETTING.get(setting)|display_setting_state }} - +  On + @@ -69,7 +69,7 @@ - + @@ -87,7 +87,7 @@ {% block extrascripts %} diff --git a/powerdnsadmin/templates/domain_setting.html b/powerdnsadmin/templates/domain_setting.html index 364b938..cc677d4 100644 --- a/powerdnsadmin/templates/domain_setting.html +++ b/powerdnsadmin/templates/domain_setting.html @@ -170,12 +170,12 @@ PowerDNS server or you handle replication via your backend.
  • - Master - This PowerDNS server will serve as the master and will send zone transfers - (AXFRs) to other servers configured as slaves. + Primary - This PowerDNS server will serve as the primary and will send zone transfers + (AXFRs) to other servers configured as secondaries.
  • - Slave - This PowerDNS server will serve as the slave and will request and receive - zone transfers (AXFRs) from other servers configured as masters. + Secondary - This PowerDNS server will serve as the secondaries and will request and receive + zone transfers (AXFRs) from other servers configured as primaries.
    • New Domain Type Setting: @@ -184,13 +184,13 @@
    - - {% if 'email' in error_messages %} + {% if 'username' in error_messages %}
    + {{ error_messages['username'] }}
    {% endif %} @@ -112,8 +115,9 @@
    - {% if 'email' in error_messages %} + {% if 'password' in error_messages %}
    + {{ error_messages['password'] }}
    {% endif %} @@ -130,6 +134,7 @@ {% if 'rpassword' in error_messages %}
    + {{ error_messages['rpassword'] }}
    {% endif %} @@ -138,20 +143,28 @@ {% if captcha_enable %} -
    +
    {{ captcha() }} - - +
    +
    + + + +
    + + {% if 'captcha_result' in error_messages %} +
    + + {{ error_messages['captcha_result'] }} +
    + {% endif %}
    {% endif %}
    -
    - -
    -
    - +
    + +
    diff --git a/powerdnsadmin/templates/template_add.html b/powerdnsadmin/templates/template_add.html index 0120ebc..8bbedc3 100644 --- a/powerdnsadmin/templates/template_add.html +++ b/powerdnsadmin/templates/template_add.html @@ -61,7 +61,7 @@
    -
    +
    @@ -105,10 +105,10 @@ diff --git a/powerdnsadmin/templates/user_profile.html b/powerdnsadmin/templates/user_profile.html index 2b1b476..286760e 100644 --- a/powerdnsadmin/templates/user_profile.html +++ b/powerdnsadmin/templates/user_profile.html @@ -29,118 +29,127 @@ {% block content %}
    -
    +
    -
    -
    -
    -

    Edit my profile{% if session['authentication_type'] != 'LOCAL' %} [Disabled - - Authenticated externally]{% endif %}

    -
    -
    - - -
    +
    {% endblock %} {% block extrascripts %}