From 4cf09d54409372f048351a76e175e8ac85833df5 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Fri, 18 Jul 2014 19:32:20 +0200 Subject: [PATCH] - Add titles to pages - Add favicon + fix UL (thanks brita_!) --- blender-bfct/application/static/assets_shared | 2 +- blender-bfct/application/templates/applications/index.html | 1 + blender-bfct/application/templates/applications/view.html | 2 +- blender-bfct/application/templates/apply.html | 1 + blender-bfct/application/templates/become_a_trainer.html | 7 ++++--- .../application/templates/email/new_submission.html | 2 +- .../application/templates/email/new_submission.txt | 2 +- blender-bfct/application/templates/index.html | 5 +++-- blender-bfct/application/templates/layout.html | 2 +- blender-bfct/application/templates/my_application.html | 1 + 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/blender-bfct/application/static/assets_shared b/blender-bfct/application/static/assets_shared index 56f71f6..e5e703c 160000 --- a/blender-bfct/application/static/assets_shared +++ b/blender-bfct/application/static/assets_shared @@ -1 +1 @@ -Subproject commit 56f71f65c98d4ca56d1228c897698fffb306467d +Subproject commit e5e703c7ea84bede3cba2c284000c4e28ba45809 diff --git a/blender-bfct/application/templates/applications/index.html b/blender-bfct/application/templates/applications/index.html index 116cc1e..e17f5ab 100755 --- a/blender-bfct/application/templates/applications/index.html +++ b/blender-bfct/application/templates/applications/index.html @@ -1,5 +1,6 @@ {% extends 'layout.html' %} {% block body %} +{% block page_title %}BFCT Applications{% endblock %}

BFCT Applications

diff --git a/blender-bfct/application/templates/applications/view.html b/blender-bfct/application/templates/applications/view.html index e7f7363..7470b41 100755 --- a/blender-bfct/application/templates/applications/view.html +++ b/blender-bfct/application/templates/applications/view.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} {% block body %} - +{% block page_title %}{{application.user.first_name}}'s BFCT Application{% endblock %}

{{application.user.first_name}} {{application.user.last_name}}

diff --git a/blender-bfct/application/templates/apply.html b/blender-bfct/application/templates/apply.html index b56e68b..dcb4cda 100755 --- a/blender-bfct/application/templates/apply.html +++ b/blender-bfct/application/templates/apply.html @@ -1,5 +1,6 @@ {% extends 'layout.html' %} {% block body %} +{% block page_title %}Submit Application{% endblock %}
diff --git a/blender-bfct/application/templates/become_a_trainer.html b/blender-bfct/application/templates/become_a_trainer.html index 6932f9b..80c56b5 100644 --- a/blender-bfct/application/templates/become_a_trainer.html +++ b/blender-bfct/application/templates/become_a_trainer.html @@ -1,5 +1,6 @@ {% extends 'layout.html' %} {% block body %} +{% block page_title %}Become a Trainer{% endblock %}

How to become a BFCT?

@@ -31,7 +32,7 @@

Candidates should know the purpose and function of the Blender Foundation and the Blender Insitute.

Candidates should know Blender's history, how it became open source, and what being open source means to Blender's development and documentation. With a portfolio/reel submission consisting of stills, animations, and/or .blend files, candidates should exhibit proficiency in 7 of these core areas:

-
    +
    • Modeling
    • Materials/Texturing
    • Rigging
      • @@ -52,13 +53,13 @@

      III. Teaching Experience

      Candidates should be at least 16 years old. With the submission of a resume or CV, a candidate should exhibit experience as an educator or trainer in at least one of the three following ways:

      -
        +
        • Academic instructor
        • Commercial trainer
        • Community experience (includes forum assistance on blender forums, IRC support, community workshops, or updates to the Blender documentation wiki)

        A certified trainer should target at least one of the following audiences:

        -
          +
          • Corporations who want employees trained in Blender
          • School/College/University teachers who want to integrate Blender in classes
          • Individual 3D artists who want to become trained in Blender
            • diff --git a/blender-bfct/application/templates/email/new_submission.html b/blender-bfct/application/templates/email/new_submission.html index 3e25f1e..99d292b 100644 --- a/blender-bfct/application/templates/email/new_submission.html +++ b/blender-bfct/application/templates/email/new_submission.html @@ -1,4 +1,4 @@ -

            Hello!

            +

            Hello there fellow BFCT member!

            A new BFCT application awaits your review! Check it out at the BFCT portal.

            The BFCT robot

            diff --git a/blender-bfct/application/templates/email/new_submission.txt b/blender-bfct/application/templates/email/new_submission.txt index 759e8fb..60e744a 100644 --- a/blender-bfct/application/templates/email/new_submission.txt +++ b/blender-bfct/application/templates/email/new_submission.txt @@ -1,4 +1,4 @@ -Hello! +Hello there fellow board member! A new BFCT application awaits your review! Check it out at http://www.blender.org/certification{{url_for('applications.view', id=application.id)}}. The BFCT robot diff --git a/blender-bfct/application/templates/index.html b/blender-bfct/application/templates/index.html index b1c6f27..30afde6 100755 --- a/blender-bfct/application/templates/index.html +++ b/blender-bfct/application/templates/index.html @@ -1,5 +1,6 @@ {% extends 'layout.html' %} {% block body %} +{% block page_title %}About{% endblock %}

            What is the BFCT?

            @@ -7,7 +8,7 @@

            The goals of the BFCT program are:

            -
              +
              • Provide a standard for Certification for everyone who is interested in teaching Blender professionally
              • Help experienced Blender artists and developers to get into training business
              • Increase the quality and quantity of Blender training worldwide
                • @@ -16,7 +17,7 @@

                Training areas

                A certified trainer should target at least one of the following audiences:

                -
                  +
                  • Corporations who want employees trained in Blender
                  • School/College/University teachers who want to integrate Blender in classes
                  • Individual 3D artists who want to become trained in Blender
                    • diff --git a/blender-bfct/application/templates/layout.html b/blender-bfct/application/templates/layout.html index 607e2e2..8b4f2c0 100644 --- a/blender-bfct/application/templates/layout.html +++ b/blender-bfct/application/templates/layout.html @@ -21,7 +21,7 @@ - + diff --git a/blender-bfct/application/templates/my_application.html b/blender-bfct/application/templates/my_application.html index 5d0d003..a4386c3 100755 --- a/blender-bfct/application/templates/my_application.html +++ b/blender-bfct/application/templates/my_application.html @@ -1,5 +1,6 @@ {% extends 'layout.html' %} {% block body %} +{% block page_title %}My Application{% endblock %}