CAMP/itf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved template conflicts, merged

Browse Source
This commit is contained in:
Karen 2012-09-07 16:21:46 +05:30
parent a880b14173
commit b13f35d57e
5 changed files with 202 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
itf/static/css/modules/tabsinnerright.css
View File

@ -110,4 +110,14 @@ margin-bottom:8px;}
.tab_content h3 { .tab_content h3 {
font-size: 150%; font-size: 150%;
padding-bottom: 10px; padding-bottom: 10px;
} }
#about ul, #people ul, #production ul {
margin-left: 10px;
}
.itfFormDisplay
{padding-bottom: 8px;}
.itfFormDisplay:first-of-type
{padding-top: 10px;}

8
itf/static/css/register.css
View File

@ -173,4 +173,10 @@ padding-left:20px;}
.add-row .add-row
{padding-left:16px; {padding-left:16px;
padding-top:16px; padding-top:16px;
display:inline-block;} display:inline-block;}
.topFormErrors
{padding:10px 20px;
color:red;
font-weight:bold;}

65
itf/templates/modules/itfprofiles/person.html
View File

@ -13,13 +13,13 @@
A brief bio and a history of work. should be able to add photos here A brief bio and a history of work. should be able to add photos here
{% if image %} {% if image %}
<span class="orange"> Photo : </span> <p class="orange"> Photo : </p>
<img href={{ image.get_absolute_url }} </img> <img href={{ image.get_absolute_url }} </img>
{% endif %} {% endif %}
{% if first_name %} {% if first_name %}
<span class="orange"> Name : </span> {{ first_name }} <p class="orange"> Name : </p> {{ first_name }}
{% endif %} <br/> {% endif %} <br/>
{% if last_name %} {% if last_name %}
{{ last_name }} {{ last_name }}
@ -27,32 +27,35 @@
<br/> <br/>
{% if about %} {% if about %}
<span class="orange"> About : </span> {{ about }} <p class="orange"> About : </p> {{ about }}
{% endif %} <br/> {% endif %} <br/>
{% if user %}
<p class="orange"> Username : </p> {{ user }}
{% endif %} <br/>
{% if tel_no %} {% if tel_no %}
<span class="orange"> Tel_no : </span> {{ tel_no }} <p class="orange"> Tel_no : </p> {{ tel_no }}
{% endif %} <br/> {% endif %} <br/>
{% if dob %} {% if dob %}
<span class="orange"> Date-of-birth : </span> {{ dob }} <p class="orange"> Date-of-birth : </p> {{ dob }}
{% endif %} <br/> {% endif %} <br/>
{% if is_practitioner %} {% if is_practitioner %}
<span class="orange"> Practitioner </span> {{ is_practioner }} <span class="orange"> Practitioner </span> {{ is_practioner }}
{% endif %} <br/> {% endif %} <br/>
{% if is_enthusiast %} {% if is_enthusiast %}
<span class="orange"> Enthusiast : </span> {{ is_enthusiast }} <p class="orange"> Enthusiast : </p> {{ is_enthusiast }}
{% endif %} <br/> {% endif %} <br/>
{% if is_freelancer %} {% if is_freelancer %}
<span class="orange"> Freelancer : </span> {{ is_freelancer }} <p class="orange"> Freelancer : </p> {{ is_freelancer }}
{% endif %} <br/> {% endif %} <br/>
{% if gender %} {% if gender %}
<span class="orange"> Gender : </span> {{ gender }} <p class="orange"> Gender : </p> {{ gender }}
{% endif %} <br/> {% endif %} <br/>
{% if occupations %} {% if occupations %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Occupations: </span> <p class="orange">Occupations: </p>
<ul> <ul>
{% for work in occupations %} {% for work in occupations %}
<li>{{ work.name }} {% if work.is_main %} - Primary occupation {% endif %} </li> <li>{{ work.name }} {% if work.is_main %} - Primary occupation {% endif %} </li>
@ -62,8 +65,8 @@
{% endif %} {% endif %}
{% if locations %} {% if locations %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Locations: </span> <p class="orange">Locations: </p>
<ul> <ul>
{% for place in locations %} {% for place in locations %}
<li> <li>
@ -76,8 +79,8 @@
{% if trainings %} {% if trainings %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Trainings: </span> <p class="orange">Trainings: </p>
<ul> <ul>
{% for training in trainings %} {% for training in trainings %}
<li>{{ training }} {{ training.title }} {{ training.desc }} {{ training.person }} {{ training.area }} {{ training.with_whom }} {{ training.where }} {{ training.from_when }} {{ training.until_when }} <li>{{ 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 %} {% if languages %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Languages: </span> <p class="orange">Languages: </p>
<ul> <ul>
{% for elem in languages %} {% for elem in languages %}
<li> <li>
@ -104,8 +107,8 @@
{% if awards %} {% if awards %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Awards: </span> <p class="orange">Awards: </p>
<ul> <ul>
{% for elem in awards %} {% for elem in awards %}
<li> <li>
@ -119,16 +122,16 @@
{% if buzzitems %} {% if buzzitems %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Buzz Items: </span> <p class="orange">Buzz Items: </p>
<ul> <ul>
{% for elem in buzzitems %} {% for elem in buzzitems %}
<li> <li>
{% if elem.link %} {% if elem.link %}
<a href={{ elem.link }}> {{ elem.title }} <a href="{{ elem.link }}">
{% endif %} {% endif %}
{{ elem.title }}
{% if elem.link %} {% if elem.link %}
</a> </a>
{% endif %} {% 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. 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 %} {% if groups %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Theatre Groups: </span> <p class="orange">Theatre Groups: </p>
<ul> <ul>
{% for elem in groups %} {% for elem in groups %}
<li> <li>
@ -168,8 +171,8 @@
{% if connections_from or connections_to %} {% if connections_from or connections_to %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Connections: </span> <p class="orange">Connections: </p>
{% if connections_from %} <ul> {% if connections_from %} <ul>
{% for elem in connections_from %} {% for elem in connections_from %}
<li> <li>
@ -201,11 +204,11 @@
Title of each production links to "Productions" page. Title of each production links to "Productions" page.
{% if productions %} {% if productions %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Productions: </span> <p class="orange">Productions: </p>
<ul> <ul>
{% for elem in productions %} {% for elem in productions %}
<li> <a href={{ elem.get_absolute_url }}> {{ elem.name }} </a> <li> <a href={{ elem.get_absolute_url }}> {{ elem.name }} </a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>

261
itf/templates/modules/itfprofiles/production.html
View File

@ -1,130 +1,131 @@
<span class="orange">Production name: </span> {{ name }} <p class="orange">Production name: </p> {{ name }}
{% if anecdotes %} {% if anecdotes %}
<div class="orange">Anecdotes</div> <div class="orange">Anecdotes</div>
<p>{{ anecdotes }}</p> <p>{{ anecdotes }}</p>
{% endif %} {% endif %}
{% if group %} {% if group %}
<span class="orange">Group: </span> <a href="{{ group.get_absolute_url }}">{{ group.name }}</a> <br />
{% endif %} <p class="orange">Group: </p> <a href="{{ group.get_absolute_url }}">{{ group.name }}</a> <br /> {% endif %}
{% if director %} {% if director %}
<span class="orange">Director: </span><a href="{{ director.get_absolute_url }}">{{ director.get_title }}</a><br /> <p class="orange">Director: </p><a href="{{ director.get_absolute_url }}">{{ director.get_title }}</a><br />
{% endif %} {% endif %}
{% if playwright %} {% if playwright %}
<span class="orange">Playwright: </span><a href="{{ playwright.get_absolute_url }}">{{ playwright.get_title }}</a> <p class="orange">Playwright: </p><a href="{{ playwright.get_absolute_url }}">{{ playwright.get_title }}</a>
{% endif %} {% endif %}
{% if languages %} <br />
<div id="" class="">
<span class="orange">Languages: </span> {% if languages %}
<ul> <div id="" class="">
{% for elem in languages %} <span class="orange">Languages: </span>
<li> <ul>
{{ elem.name }} {% for elem in languages %}
</li> <li>
{% endfor %} {{ elem.name }}
</ul> </li>
</div> {% endfor %}
{% endif %} <br/> </ul>
</div>
{% endif %} <br/>
{% if awards %}
<div id="" class="">
<span class="orange">Awards: </span> {% if awards %}
<div id="" class="">
<ul> <span class="orange">Awards: </span>
{% for elem in awards %}
<li> <ul>
{% if elem.link %} {% for elem in awards %}
<a href="{{ elem.link }}"> <li>
{% endif %} {% if elem.link %}
{{ elem.title }} <a href="{{ elem.link }}">
{% if elem.link %} {% endif %}
</a> {{ elem.title }}
{% endif %} {% if elem.link %}
</a>
{% if elem.year %} {% endif %}
{{ elem.year }}
{% endif %} {% if elem.year %}
{{ elem.year }}
</li> {% endif %}
{% endfor %}
</ul> </li>
</div> {% endfor %}
{% endif %} </ul>
</div>
{% endif %}
{% if buzzitems %}
<div id="" class="">
<span class="orange">Buzz Items: </span> {% if buzzitems %}
<div id="" class="">
<ul> <span class="orange">Buzz Items: </span>
{% for elem in buzzitems %}
<li> <ul>
{% if elem.link %} {% for elem in buzzitems %}
<a href={{ elem.link }}> {{ elem.title }} <li>
{% endif %} {% if elem.link %}
<a href={{ elem.link }}> {{ elem.title }}
{% if elem.link %} {% endif %}
</a>
{% endif %} {% if elem.link %}
</a>
<br/> {% endif %}
Desc: {{ elem.blurb }}
<br/> <br/>
Type:{{ elem.typ }} Desc: {{ elem.blurb }}
</li> <br/>
{% endfor %} Type:{{ elem.typ }}
</ul> </li>
</div> {% endfor %}
{% endif %} </ul>
<br /> </div>
{% endif %}
<br />
{% if sibling_productions %}
<div id="" class="">
<span class="orange">Productions based on the same script: </span> {% if sibling_productions %}
<ul> <div id="" class="">
{% for elem in sibling_productions %} <span class="orange">Productions based on the same script: </span>
<li> <ul>
{% if elem.get_absolute_url %} {% for elem in sibling_productions %}
<a href={{ elem.get_absolute_url }}> {{ elem.name }} <li>
{% endif %} {% if elem.get_absolute_url %}
{% if elem.get_absolute_url %} <a href={{ elem.get_absolute_url }}> {{ elem.name }}
</a> {% endif %}
{% endif %} {% if elem.get_absolute_url %}
<br/> </a>
</li> {% endif %}
{% endfor %} <br/>
</ul> </li>
</div> {% endfor %}
{% endif %} </ul>
<br /> </div>
{% endif %}
{% if related_productions %} <br />
<div id="" class="">
<span class="orange">Productions based on adaptations of the script: </span> {% if related_productions %}
<ul> <div id="" class="">
{% for elem in related_productions %} <span class="orange">Productions based on adaptations of the script: </span>
<li> <ul>
{% if elem.get_absolute_url %} {% for elem in related_productions %}
<a href={{ elem.get_absolute_url }}> {{ elem.name }} <li>
{% endif %} {% if elem.get_absolute_url %}
{% if elem.get_absolute_url %} <a href={{ elem.get_absolute_url }}> {{ elem.name }}
</a> {% endif %}
{% endif %} {% if elem.get_absolute_url %}
<br/> </a>
</li> {% endif %}
{% endfor %} <br/>
</ul> </li>
</div> {% endfor %}
{% endif %} </ul>
<br /> </div>
{% endif %}
<br />
<a href="{{ edit_url }}">Edit</a>
<a href="{{ edit_url }}">Edit</a>

35
itf/templates/modules/itfprofiles/theatregroup.html
View File

@ -16,39 +16,39 @@
{% if email %} {% if email %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Email: </span> {{ email }} <span class="orange">Email: </span> {{ email }}
</div> </div>
{% endif %} {% endif %}
{% if tel %} {% if tel %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Tel: </span> {{ tel }} <span class="orange">Tel: </span> {{ tel }}
</div> </div>
{% endif %} {% endif %}
{% if founded %} {% if founded %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Year founded: </span> {{ founded }} <span class="orange">Year founded: </span> {{ founded }}
</div> </div>
{% endif %} {% endif %}
{% if website %} {% if website %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Website: </span> {{ website }} <span class="orange">Website: </span> {{ website }}
</div> </div>
{% endif %} {% endif %}
{% if about %} {% if about %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">About: </span> {{ about }} <span class="orange">About: </span> {{ about }}
</div> </div>
{% endif %} {% endif %}
{% if nature_of_work %} {% if nature_of_work %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Nature of Work: </span> <span class="orange">Nature of Work: </span>
<ul> <ul>
{% for work in nature_of_work %} {% for work in nature_of_work %}
@ -60,7 +60,7 @@
{% if trainings %} {% if trainings %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Trainings: </span> <span class="orange">Trainings: </span>
<ul> <ul>
{% for training in trainings %} {% for training in trainings %}
@ -76,7 +76,7 @@
{% if venues %} {% if venues %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Venues: </span> <span class="orange">Venues: </span>
<ul> <ul>
{% for elem in venues %} {% for elem in venues %}
@ -88,7 +88,7 @@
{% if buzzitems %} {% if buzzitems %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Buzz Items: </span> <span class="orange">Buzz Items: </span>
<ul> <ul>
@ -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. 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 %} {% if people %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">People: </span> <span class="orange">People: </span>
<ul> <ul>
{% for elem in people %} {% for elem in people %}
<li> <li>
{% if elem.get_absolute_url %} {% if elem.get_absolute_url %}
<a href={{ elem.get_absolute_url }}> {{ elem.first_name }} {{ elem.last_name }}
{% endif %} <a href={{ elem.get_absolute_url }}>
{% endif %}
{{ elem.first_name }} {{ elem.last_name }}
{% if elem.get_absolute_url %} {% if elem.get_absolute_url %}
</a> </a>
@ -148,7 +151,7 @@
Title of each production links to "Productions" page. Title of each production links to "Productions" page.
{% if productions %} {% if productions %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Productions: </span> <span class="orange">Productions: </span>
<ul> <ul>
{% for elem in productions %} {% for elem in productions %}
@ -166,7 +169,7 @@
Photos & Videos. There should be a clear demarcation between Photos and Videos Photos & Videos. There should be a clear demarcation between Photos and Videos
{% if awards %} {% if awards %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Awards: </span> <span class="orange">Awards: </span>
<ul> <ul>
@ -197,7 +200,7 @@
{% if resources %} {% if resources %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Resources: </span> <span class="orange">Resources: </span>
<ul> <ul>
{% for elem in resources %} {% for elem in resources %}
@ -241,7 +244,7 @@
Anything about the group (annotations & anecdotes in a sense). Anybody can add. These are scripts owned by the group. i.e the group is the author. Anything about the group (annotations & anecdotes in a sense). Anybody can add. These are scripts owned by the group. i.e the group is the author.
{% if scripts %} {% if scripts %}
<div id="" class=""> <div id="" class="itfFormDisplay">
<span class="orange">Scripts: </span> <span class="orange">Scripts: </span>
<ul> <ul>