From b13f35d57ee7ad874696413e4406eb27df1a039c Mon Sep 17 00:00:00 2001 From: Karen Date: Fri, 7 Sep 2012 16:21:46 +0530 Subject: [PATCH] resolved template conflicts, merged --- itf/static/css/modules/tabsinnerright.css | 12 +- itf/static/css/register.css | 8 +- itf/templates/modules/itfprofiles/person.html | 65 ++--- .../modules/itfprofiles/production.html | 261 +++++++++--------- .../modules/itfprofiles/theatregroup.html | 35 +-- 5 files changed, 202 insertions(+), 179 deletions(-) diff --git a/itf/static/css/modules/tabsinnerright.css b/itf/static/css/modules/tabsinnerright.css index f550e18..7b59ce9 100755 --- a/itf/static/css/modules/tabsinnerright.css +++ b/itf/static/css/modules/tabsinnerright.css @@ -110,4 +110,14 @@ margin-bottom:8px;} .tab_content h3 { font-size: 150%; padding-bottom: 10px; -} \ No newline at end of file +} + +#about ul, #people ul, #production ul { +margin-left: 10px; +} + +.itfFormDisplay +{padding-bottom: 8px;} + +.itfFormDisplay:first-of-type +{padding-top: 10px;} diff --git a/itf/static/css/register.css b/itf/static/css/register.css index 189c4cc..3a6f0eb 100755 --- a/itf/static/css/register.css +++ b/itf/static/css/register.css @@ -173,4 +173,10 @@ padding-left:20px;} .add-row {padding-left:16px; padding-top:16px; -display:inline-block;} \ No newline at end of file +display:inline-block;} + +.topFormErrors +{padding:10px 20px; +color:red; +font-weight:bold;} + diff --git a/itf/templates/modules/itfprofiles/person.html b/itf/templates/modules/itfprofiles/person.html index 1ede0d0..bcc158f 100644 --- a/itf/templates/modules/itfprofiles/person.html +++ b/itf/templates/modules/itfprofiles/person.html @@ -13,13 +13,13 @@ A brief bio and a history of work. should be able to add photos here {% if image %} - Photo : +

Photo :

{% endif %} {% if first_name %} - Name : {{ first_name }} +

Name :

{{ first_name }} {% endif %}
{% if last_name %} {{ last_name }} @@ -27,32 +27,35 @@
{% if about %} - About : {{ about }} - {% endif %}
+

About :

{{ about }} + {% endif %}
+ {% if user %} +

Username :

{{ user }} + {% endif %}
{% if tel_no %} - Tel_no : {{ tel_no }} +

Tel_no :

{{ tel_no }} {% endif %}
{% if dob %} - Date-of-birth : {{ dob }} +

Date-of-birth :

{{ dob }} {% endif %}
{% if is_practitioner %} Practitioner {{ is_practioner }} {% endif %}
{% if is_enthusiast %} - Enthusiast : {{ is_enthusiast }} +

Enthusiast :

{{ is_enthusiast }} {% endif %}
{% if is_freelancer %} - Freelancer : {{ is_freelancer }} +

Freelancer :

{{ is_freelancer }} {% endif %}
{% if gender %} - Gender : {{ gender }} +

Gender :

{{ gender }} {% endif %}
{% if occupations %} -
- Occupations: +
+

Occupations:

    {% for work in occupations %}
  • {{ work.name }} {% if work.is_main %} - Primary occupation {% endif %}
    • @@ -62,8 +65,8 @@ {% endif %} {% if locations %} -
    - Locations: +
    +

    Locations:

      {% for place in locations %}
    • @@ -76,8 +79,8 @@ {% if trainings %} -
      - Trainings: +
      +

      Trainings:

        {% for training in trainings %}
      • {{ training }} {{ training.title }} {{ training.desc }} {{ training.person }} {{ training.area }} {{ training.with_whom }} {{ training.where }} {{ training.from_when }} {{ training.until_when }} @@ -90,8 +93,8 @@ {% if languages %} -
        - Languages: +
        +

        Languages:

          {% for elem in languages %}
        • @@ -104,8 +107,8 @@ {% if awards %} -
          - Awards: +
          +

          Awards:

            {% for elem in awards %}
          • @@ -119,16 +122,16 @@ {% if buzzitems %} -
            - Buzz Items: +
            +

            Buzz Items:

              {% for elem in buzzitems %}
            • {% if elem.link %} - {{ elem.title }} - {% endif %} - + + {% endif %} + {{ elem.title }} {% if elem.link %} {% endif %} @@ -153,8 +156,8 @@ Active Members, Associates, (Fans? - maybe this is a link with a list popout, so they are not perceived as internal to the group). Photos of users on site should show up. We must SEE the community. Noel needs to send a design for tha tab, which will be used across all "People" tabs. {% if groups %} -
              - Theatre Groups: +
              +

              Theatre Groups:

                {% for elem in groups %}
              • @@ -168,8 +171,8 @@ {% if connections_from or connections_to %} -
                - Connections: +
                +

                Connections:

                {% if connections_from %}
                  {% for elem in connections_from %}
                • @@ -201,11 +204,11 @@ Title of each production links to "Productions" page. {% if productions %} -
                  - Productions: +
                  +

                  Productions:

                  diff --git a/itf/templates/modules/itfprofiles/production.html b/itf/templates/modules/itfprofiles/production.html index 6f5eee8..96322e9 100644 --- a/itf/templates/modules/itfprofiles/production.html +++ b/itf/templates/modules/itfprofiles/production.html @@ -1,130 +1,131 @@ -Production name: {{ name }} - -{% if anecdotes %} - -
                  Anecdotes
                  -

                  {{ anecdotes }}

                  -{% endif %} - -{% if group %} -Group: {{ group.name }}
                  -{% endif %} - -{% if director %} -Director: {{ director.get_title }}
                  -{% endif %} - -{% if playwright %} -Playwright: {{ playwright.get_title }} -{% endif %} - -{% if languages %} -
                  - Languages: -
                    - {% for elem in languages %} -
                  • - {{ elem.name }} -
                    • - {% endfor %} -
                  -
                  -{% endif %}
                  - - -{% if awards %} -
                  - Awards: - - -
                  -{% endif %} - - - -{% if buzzitems %} -
                  - Buzz Items: - - -
                  -{% endif %} -
                  - - -{% if sibling_productions %} -
                  - Productions based on the same script: - -
                  -{% endif %} -
                  - -{% if related_productions %} -
                  - Productions based on adaptations of the script: - -
                  -{% endif %} -
                  - - -Edit +

                  Production name:

                  {{ name }} + +{% if anecdotes %} + +
                  Anecdotes
                  +

                  {{ anecdotes }}

                  +{% endif %} + +{% if group %} + +

                  Group:

                  {{ group.name }}
                  {% endif %} + +{% if director %} +

                  Director:

                  {{ director.get_title }}
                  +{% endif %} + +{% if playwright %} +

                  Playwright:

                  {{ playwright.get_title }} +{% endif %} + +
                  + +{% if languages %} +
                  + Languages: +
                    + {% for elem in languages %} +
                  • + {{ elem.name }} +
                    • + {% endfor %} +
                  +
                  +{% endif %}
                  + + +{% if awards %} +
                  + Awards: + + +
                  +{% endif %} + + + +{% if buzzitems %} +
                  + Buzz Items: + + +
                  +{% endif %} +
                  + + +{% if sibling_productions %} +
                  + Productions based on the same script: + +
                  +{% endif %} +
                  + +{% if related_productions %} +
                  + Productions based on adaptations of the script: + +
                  +{% endif %} +
                  + +Edit diff --git a/itf/templates/modules/itfprofiles/theatregroup.html b/itf/templates/modules/itfprofiles/theatregroup.html index c5291ff..42e39a4 100644 --- a/itf/templates/modules/itfprofiles/theatregroup.html +++ b/itf/templates/modules/itfprofiles/theatregroup.html @@ -16,39 +16,39 @@ {% if email %} -
                  +
                  Email: {{ email }}
                  {% endif %} {% if tel %} -
                  +
                  Tel: {{ tel }}
                  {% endif %} {% if founded %} -
                  +
                  Year founded: {{ founded }}
                  {% endif %} {% if website %} -
                  +
                  Website: {{ website }}
                  {% endif %} {% if about %} -
                  +
                  About: {{ about }}
                  {% endif %} {% if nature_of_work %} -
                  +
                  Nature of Work:
                    {% for work in nature_of_work %} @@ -60,7 +60,7 @@ {% if trainings %} -
                    +
                    Trainings:
                      {% for training in trainings %} @@ -76,7 +76,7 @@ {% if venues %} -
                      +
                      Venues:
                        {% for elem in venues %} @@ -88,7 +88,7 @@ {% if buzzitems %} -
                        +
                        Buzz Items:
                          @@ -122,15 +122,18 @@ Active Members, Associates, (Fans? - maybe this is a link with a list popout, so they are not perceived as internal to the group). Photos of users on site should show up. We must SEE the community. Noel needs to send a design for tha tab, which will be used across all "People" tabs. {% if people %} -
                          +
                          People: