From 9ae959fe5c02635cb542f8d1dd915c8f02ef8da0 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Sun, 3 May 2015 18:30:28 +0300 Subject: mv templates -> template.d --- build.ant | 21 ++++-- res/template.d/base.html | 17 +++++ res/template.d/index.html | 150 ++++++++++++++++++++++++++++++++++++++++ res/template.d/login.html | 57 +++++++++++++++ res/template.d/pw_reset.html | 107 ++++++++++++++++++++++++++++ res/template.d/user_signup.html | 98 ++++++++++++++++++++++++++ res/templates/base.html | 17 ----- res/templates/index.html | 150 ---------------------------------------- res/templates/login.html | 57 --------------- res/templates/pw_reset.html | 107 ---------------------------- res/templates/user_signup.html | 98 -------------------------- 11 files changed, 443 insertions(+), 436 deletions(-) create mode 100644 res/template.d/base.html create mode 100644 res/template.d/index.html create mode 100644 res/template.d/login.html create mode 100644 res/template.d/pw_reset.html create mode 100644 res/template.d/user_signup.html delete mode 100644 res/templates/base.html delete mode 100644 res/templates/index.html delete mode 100644 res/templates/login.html delete mode 100644 res/templates/pw_reset.html delete mode 100644 res/templates/user_signup.html diff --git a/build.ant b/build.ant index b2b7aaaa..ef000457 100644 --- a/build.ant +++ b/build.ant @@ -105,10 +105,10 @@ - - + + - + @@ -131,7 +131,8 @@ - + - @@ -156,7 +157,7 @@ - @@ -222,6 +223,8 @@ + + @@ -230,12 +233,16 @@ - + + + diff --git a/res/template.d/base.html b/res/template.d/base.html new file mode 100644 index 00000000..7369984d --- /dev/null +++ b/res/template.d/base.html @@ -0,0 +1,17 @@ + + + + {% block head %} + + + {% block title %}{% endblock %} + + + + {% endblock %} + + +
{% block content %}{% endblock %}
+ + + diff --git a/res/template.d/index.html b/res/template.d/index.html new file mode 100644 index 00000000..3a1d921e --- /dev/null +++ b/res/template.d/index.html @@ -0,0 +1,150 @@ +{% extends "base.html" %} +{% block title %}{{ rz_config__rzdoc_cur__name|safe }} -- Rhizi Prototype{% endblock %} +{% block head %} +{{ super() }} + + + + +{% endblock %} +{% block content %} +
+ +
+ + + +
+ + + + + Hello {{ rz_username }}!Logout + + + +
+ +
+
+
+
Layout
+
Filter +
+ +
+
+ + + +
+
+
+
+
+
+
+
+
+ + +
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ Save history +
+
+ +
+
+
+
+
+ Save +
+
+
+
+
+
+ Load +
+
+
+
+ Copy to URL +
+
+
+
+ Import +
+
+ +
+ + + +
+
+ +{% endblock %} diff --git a/res/template.d/login.html b/res/template.d/login.html new file mode 100644 index 00000000..b3e4cfd0 --- /dev/null +++ b/res/template.d/login.html @@ -0,0 +1,57 @@ +{% extends "base.html" %} +{% block title %}Welcome to Rhizi{% endblock %} +{% block head %} +{{ super() }} + + + + +{% endblock %} +{% block content %} +
+ + + + + {% if signup_enabled %} + + {% endif %} + +
+{% endblock %} diff --git a/res/template.d/pw_reset.html b/res/template.d/pw_reset.html new file mode 100644 index 00000000..908f5597 --- /dev/null +++ b/res/template.d/pw_reset.html @@ -0,0 +1,107 @@ +{% extends "base.html" %} {% block title %}Rhizi - Password Reset{% endblock %} +{% block head %} {{ super() }} + + + + + +{% endblock %} {% block content %} +
+
+ +
Password Reset
+
+ {% if 'step_0__reset_request_submission' == pw_rst_step %} +
+
+

To have a password renewal link sent to you, please insert the email addressed associated with your Rhizi account.

+
+
+ +
+
+
+
+
+
Submit
+
+ {% elif 'step_1__collect_new_password' == pw_rst_step %} +
+
+

Please set a new account password:

+
+
+ +
+
+ +
+
+
+
+
Submit
+
+
+ {% elif 'general_error' == pw_rst_step %} +
+
+

An error has occurred, please try again later.

+
+
+ {% endif %} +
+
+
+
+
+
+{% endblock %} diff --git a/res/template.d/user_signup.html b/res/template.d/user_signup.html new file mode 100644 index 00000000..93589d86 --- /dev/null +++ b/res/template.d/user_signup.html @@ -0,0 +1,98 @@ +{% extends "base.html" %} {% block title %}Rhizi - Sign up{% endblock %} +{% block head %} {{ super() }} + + + + +{% endblock %} {% block content %} +
+ + + {% if 'activation_success' == state %} +
+

+ Congratulations! your account has been activated.
Please + head over to the login page to access + your account. +

+
+ {% elif 'activation_failure' == state %} +
+

Activation failure,
please try again later.

+
+ {% else %} + +
+{% endblock %} diff --git a/res/templates/base.html b/res/templates/base.html deleted file mode 100644 index 7369984d..00000000 --- a/res/templates/base.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - {% block head %} - - - {% block title %}{% endblock %} - - - - {% endblock %} - - -
{% block content %}{% endblock %}
- - - diff --git a/res/templates/index.html b/res/templates/index.html deleted file mode 100644 index 3a1d921e..00000000 --- a/res/templates/index.html +++ /dev/null @@ -1,150 +0,0 @@ -{% extends "base.html" %} -{% block title %}{{ rz_config__rzdoc_cur__name|safe }} -- Rhizi Prototype{% endblock %} -{% block head %} -{{ super() }} - - - - -{% endblock %} -{% block content %} -
- -
- - - -
- - - - - Hello {{ rz_username }}!Logout - - - -
- -
-
-
-
Layout
-
Filter -
- -
-
- - - -
-
-
-
-
-
-
-
-
- - -
- -
-
-
- - -
-
- -
- -
-
-
- Save history -
-
- -
-
-
-
-
- Save -
-
-
-
-
-
- Load -
-
-
-
- Copy to URL -
-
-
-
- Import -
-
- -
- - - -
-
- -{% endblock %} diff --git a/res/templates/login.html b/res/templates/login.html deleted file mode 100644 index b3e4cfd0..00000000 --- a/res/templates/login.html +++ /dev/null @@ -1,57 +0,0 @@ -{% extends "base.html" %} -{% block title %}Welcome to Rhizi{% endblock %} -{% block head %} -{{ super() }} - - - - -{% endblock %} -{% block content %} -
- - - - - {% if signup_enabled %} - - {% endif %} - -
-{% endblock %} diff --git a/res/templates/pw_reset.html b/res/templates/pw_reset.html deleted file mode 100644 index 908f5597..00000000 --- a/res/templates/pw_reset.html +++ /dev/null @@ -1,107 +0,0 @@ -{% extends "base.html" %} {% block title %}Rhizi - Password Reset{% endblock %} -{% block head %} {{ super() }} - - - - - -{% endblock %} {% block content %} -
-
- -
Password Reset
-
- {% if 'step_0__reset_request_submission' == pw_rst_step %} -
-
-

To have a password renewal link sent to you, please insert the email addressed associated with your Rhizi account.

-
-
- -
-
-
-
-
-
Submit
-
- {% elif 'step_1__collect_new_password' == pw_rst_step %} -
-
-

Please set a new account password:

-
-
- -
-
- -
-
-
-
-
Submit
-
-
- {% elif 'general_error' == pw_rst_step %} -
-
-

An error has occurred, please try again later.

-
-
- {% endif %} -
-
-
-
-
-
-{% endblock %} diff --git a/res/templates/user_signup.html b/res/templates/user_signup.html deleted file mode 100644 index 93589d86..00000000 --- a/res/templates/user_signup.html +++ /dev/null @@ -1,98 +0,0 @@ -{% extends "base.html" %} {% block title %}Rhizi - Sign up{% endblock %} -{% block head %} {{ super() }} - - - - -{% endblock %} {% block content %} -
- - - {% if 'activation_success' == state %} -
-

- Congratulations! your account has been activated.
Please - head over to the login page to access - your account. -

-
- {% elif 'activation_failure' == state %} -
-

Activation failure,
please try again later.

-
- {% else %} - -
-{% endblock %} -- cgit v1.3.1