resolved template conflicts, merged
This commit is contained in:
Karen
parent
a880b14173
commit
b13f35d57e
|
|
@ -110,4 +110,14 @@ margin-bottom:8px;}
|
|||
.tab_content h3 {
|
||||
font-size: 150%;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
#about ul, #people ul, #production ul {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.itfFormDisplay
|
||||
{padding-bottom: 8px;}
|
||||
|
||||
.itfFormDisplay:first-of-type
|
||||
{padding-top: 10px;}
|
||||
|
|
|
|||
|
|
@ -173,4 +173,10 @@ padding-left:20px;}
|
|||
.add-row
|
||||
{padding-left:16px;
|
||||
padding-top:16px;
|
||||
display:inline-block;}
|
||||
display:inline-block;}
|
||||
|
||||
.topFormErrors
|
||||
{padding:10px 20px;
|
||||
color:red;
|
||||
font-weight:bold;}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
A brief bio and a history of work. should be able to add photos here
|
||||
|
||||
{% if image %}
|
||||
<span class="orange"> Photo : </span>
|
||||
<p class="orange"> Photo : </p>
|
||||
<img href={{ image.get_absolute_url }} </img>
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if first_name %}
|
||||
<span class="orange"> Name : </span> {{ first_name }}
|
||||
<p class="orange"> Name : </p> {{ first_name }}
|
||||
{% endif %} <br/>
|
||||
{% if last_name %}
|
||||
{{ last_name }}
|
||||
|
|
@ -27,32 +27,35 @@
|
|||
<br/>
|
||||
|
||||
{% if about %}
|
||||
<span class="orange"> About : </span> {{ about }}
|
||||
{% endif %} <br/>
|
||||
<p class="orange"> About : </p> {{ about }}
|
||||
{% endif %} <br/>
|
||||
{% if user %}
|
||||
<p class="orange"> Username : </p> {{ user }}
|
||||
{% endif %} <br/>
|
||||
{% if tel_no %}
|
||||
<span class="orange"> Tel_no : </span> {{ tel_no }}
|
||||
<p class="orange"> Tel_no : </p> {{ tel_no }}
|
||||
{% endif %} <br/>
|
||||
|
||||
{% if dob %}
|
||||
<span class="orange"> Date-of-birth : </span> {{ dob }}
|
||||
<p class="orange"> Date-of-birth : </p> {{ dob }}
|
||||
{% endif %} <br/>
|
||||
|
||||
{% if is_practitioner %}
|
||||
<span class="orange"> Practitioner </span> {{ is_practioner }}
|
||||
{% endif %} <br/>
|
||||
{% if is_enthusiast %}
|
||||
<span class="orange"> Enthusiast : </span> {{ is_enthusiast }}
|
||||
<p class="orange"> Enthusiast : </p> {{ is_enthusiast }}
|
||||
{% endif %} <br/>
|
||||
{% if is_freelancer %}
|
||||
<span class="orange"> Freelancer : </span> {{ is_freelancer }}
|
||||
<p class="orange"> Freelancer : </p> {{ is_freelancer }}
|
||||
{% endif %} <br/>
|
||||
{% if gender %}
|
||||
<span class="orange"> Gender : </span> {{ gender }}
|
||||
<p class="orange"> Gender : </p> {{ gender }}
|
||||
{% endif %} <br/>
|
||||
|
||||
{% if occupations %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Occupations: </span>
|
||||
<div id="" class="itfFormDisplay">
|
||||
<p class="orange">Occupations: </p>
|
||||
<ul>
|
||||
{% for work in occupations %}
|
||||
<li>{{ work.name }} {% if work.is_main %} - Primary occupation {% endif %} </li>
|
||||
|
|
@ -62,8 +65,8 @@
|
|||
{% endif %}
|
||||
|
||||
{% if locations %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Locations: </span>
|
||||
<div id="" class="itfFormDisplay">
|
||||
<p class="orange">Locations: </p>
|
||||
<ul>
|
||||
{% for place in locations %}
|
||||
<li>
|
||||
|
|
@ -76,8 +79,8 @@
|
|||
|
||||
|
||||
{% if trainings %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Trainings: </span>
|
||||
<div id="" class="itfFormDisplay">
|
||||
<p class="orange">Trainings: </p>
|
||||
<ul>
|
||||
{% 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 }}
|
||||
|
|
@ -90,8 +93,8 @@
|
|||
|
||||
|
||||
{% if languages %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Languages: </span>
|
||||
<div id="" class="itfFormDisplay">
|
||||
<p class="orange">Languages: </p>
|
||||
<ul>
|
||||
{% for elem in languages %}
|
||||
<li>
|
||||
|
|
@ -104,8 +107,8 @@
|
|||
|
||||
|
||||
{% if awards %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Awards: </span>
|
||||
<div id="" class="itfFormDisplay">
|
||||
<p class="orange">Awards: </p>
|
||||
<ul>
|
||||
{% for elem in awards %}
|
||||
<li>
|
||||
|
|
@ -119,16 +122,16 @@
|
|||
|
||||
|
||||
{% if buzzitems %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Buzz Items: </span>
|
||||
<div id="" class="itfFormDisplay">
|
||||
<p class="orange">Buzz Items: </p>
|
||||
|
||||
<ul>
|
||||
{% for elem in buzzitems %}
|
||||
<li>
|
||||
{% if elem.link %}
|
||||
<a href={{ elem.link }}> {{ elem.title }}
|
||||
{% endif %}
|
||||
|
||||
<a href="{{ elem.link }}">
|
||||
{% endif %}
|
||||
{{ elem.title }}
|
||||
{% if elem.link %}
|
||||
</a>
|
||||
{% 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 %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Theatre Groups: </span>
|
||||
<div id="" class="itfFormDisplay">
|
||||
<p class="orange">Theatre Groups: </p>
|
||||
<ul>
|
||||
{% for elem in groups %}
|
||||
<li>
|
||||
|
|
@ -168,8 +171,8 @@
|
|||
|
||||
|
||||
{% if connections_from or connections_to %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Connections: </span>
|
||||
<div id="" class="itfFormDisplay">
|
||||
<p class="orange">Connections: </p>
|
||||
{% if connections_from %} <ul>
|
||||
{% for elem in connections_from %}
|
||||
<li>
|
||||
|
|
@ -201,11 +204,11 @@
|
|||
Title of each production links to "Productions" page.
|
||||
|
||||
{% if productions %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Productions: </span>
|
||||
<div id="" class="itfFormDisplay">
|
||||
<p class="orange">Productions: </p>
|
||||
<ul>
|
||||
{% 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>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -1,130 +1,131 @@
|
|||
<span class="orange">Production name: </span> {{ name }}
|
||||
|
||||
{% if anecdotes %}
|
||||
|
||||
<div class="orange">Anecdotes</div>
|
||||
<p>{{ anecdotes }}</p>
|
||||
{% endif %}
|
||||
|
||||
{% if group %}
|
||||
<span class="orange">Group: </span> <a href="{{ group.get_absolute_url }}">{{ group.name }}</a> <br />
|
||||
{% endif %}
|
||||
|
||||
{% if director %}
|
||||
<span class="orange">Director: </span><a href="{{ director.get_absolute_url }}">{{ director.get_title }}</a><br />
|
||||
{% endif %}
|
||||
|
||||
{% if playwright %}
|
||||
<span class="orange">Playwright: </span><a href="{{ playwright.get_absolute_url }}">{{ playwright.get_title }}</a>
|
||||
{% endif %}
|
||||
|
||||
{% if languages %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Languages: </span>
|
||||
<ul>
|
||||
{% for elem in languages %}
|
||||
<li>
|
||||
{{ elem.name }}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %} <br/>
|
||||
|
||||
|
||||
{% if awards %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Awards: </span>
|
||||
|
||||
<ul>
|
||||
{% for elem in awards %}
|
||||
<li>
|
||||
{% if elem.link %}
|
||||
<a href="{{ elem.link }}">
|
||||
{% endif %}
|
||||
{{ elem.title }}
|
||||
{% if elem.link %}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
{% if elem.year %}
|
||||
{{ elem.year }}
|
||||
{% endif %}
|
||||
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
||||
{% if buzzitems %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Buzz Items: </span>
|
||||
|
||||
<ul>
|
||||
{% for elem in buzzitems %}
|
||||
<li>
|
||||
{% if elem.link %}
|
||||
<a href={{ elem.link }}> {{ elem.title }}
|
||||
{% endif %}
|
||||
|
||||
{% if elem.link %}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
<br/>
|
||||
Desc: {{ elem.blurb }}
|
||||
<br/>
|
||||
Type:{{ elem.typ }}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
<br />
|
||||
|
||||
|
||||
{% if sibling_productions %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Productions based on the same script: </span>
|
||||
<ul>
|
||||
{% for elem in sibling_productions %}
|
||||
<li>
|
||||
{% if elem.get_absolute_url %}
|
||||
<a href={{ elem.get_absolute_url }}> {{ elem.name }}
|
||||
{% endif %}
|
||||
{% if elem.get_absolute_url %}
|
||||
</a>
|
||||
{% endif %}
|
||||
<br/>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
<br />
|
||||
|
||||
{% if related_productions %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Productions based on adaptations of the script: </span>
|
||||
<ul>
|
||||
{% for elem in related_productions %}
|
||||
<li>
|
||||
{% if elem.get_absolute_url %}
|
||||
<a href={{ elem.get_absolute_url }}> {{ elem.name }}
|
||||
{% endif %}
|
||||
{% if elem.get_absolute_url %}
|
||||
</a>
|
||||
{% endif %}
|
||||
<br/>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
<br />
|
||||
|
||||
|
||||
<a href="{{ edit_url }}">Edit</a>
|
||||
<p class="orange">Production name: </p> {{ name }}
|
||||
|
||||
{% if anecdotes %}
|
||||
|
||||
<div class="orange">Anecdotes</div>
|
||||
<p>{{ anecdotes }}</p>
|
||||
{% endif %}
|
||||
|
||||
{% if group %}
|
||||
|
||||
<p class="orange">Group: </p> <a href="{{ group.get_absolute_url }}">{{ group.name }}</a> <br /> {% endif %}
|
||||
|
||||
{% if director %}
|
||||
<p class="orange">Director: </p><a href="{{ director.get_absolute_url }}">{{ director.get_title }}</a><br />
|
||||
{% endif %}
|
||||
|
||||
{% if playwright %}
|
||||
<p class="orange">Playwright: </p><a href="{{ playwright.get_absolute_url }}">{{ playwright.get_title }}</a>
|
||||
{% endif %}
|
||||
|
||||
<br />
|
||||
|
||||
{% if languages %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Languages: </span>
|
||||
<ul>
|
||||
{% for elem in languages %}
|
||||
<li>
|
||||
{{ elem.name }}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %} <br/>
|
||||
|
||||
|
||||
{% if awards %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Awards: </span>
|
||||
|
||||
<ul>
|
||||
{% for elem in awards %}
|
||||
<li>
|
||||
{% if elem.link %}
|
||||
<a href="{{ elem.link }}">
|
||||
{% endif %}
|
||||
{{ elem.title }}
|
||||
{% if elem.link %}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
{% if elem.year %}
|
||||
{{ elem.year }}
|
||||
{% endif %}
|
||||
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
||||
{% if buzzitems %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Buzz Items: </span>
|
||||
|
||||
<ul>
|
||||
{% for elem in buzzitems %}
|
||||
<li>
|
||||
{% if elem.link %}
|
||||
<a href={{ elem.link }}> {{ elem.title }}
|
||||
{% endif %}
|
||||
|
||||
{% if elem.link %}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
<br/>
|
||||
Desc: {{ elem.blurb }}
|
||||
<br/>
|
||||
Type:{{ elem.typ }}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
<br />
|
||||
|
||||
|
||||
{% if sibling_productions %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Productions based on the same script: </span>
|
||||
<ul>
|
||||
{% for elem in sibling_productions %}
|
||||
<li>
|
||||
{% if elem.get_absolute_url %}
|
||||
<a href={{ elem.get_absolute_url }}> {{ elem.name }}
|
||||
{% endif %}
|
||||
{% if elem.get_absolute_url %}
|
||||
</a>
|
||||
{% endif %}
|
||||
<br/>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
<br />
|
||||
|
||||
{% if related_productions %}
|
||||
<div id="" class="">
|
||||
<span class="orange">Productions based on adaptations of the script: </span>
|
||||
<ul>
|
||||
{% for elem in related_productions %}
|
||||
<li>
|
||||
{% if elem.get_absolute_url %}
|
||||
<a href={{ elem.get_absolute_url }}> {{ elem.name }}
|
||||
{% endif %}
|
||||
{% if elem.get_absolute_url %}
|
||||
</a>
|
||||
{% endif %}
|
||||
<br/>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
<br />
|
||||
|
||||
<a href="{{ edit_url }}">Edit</a>
|
||||
|
|
|
|||
|
|
@ -16,39 +16,39 @@
|
|||
|
||||
|
||||
{% if email %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Email: </span> {{ email }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if tel %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Tel: </span> {{ tel }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if founded %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Year founded: </span> {{ founded }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if website %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Website: </span> {{ website }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if about %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">About: </span> {{ about }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if nature_of_work %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Nature of Work: </span>
|
||||
<ul>
|
||||
{% for work in nature_of_work %}
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
|
||||
|
||||
{% if trainings %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Trainings: </span>
|
||||
<ul>
|
||||
{% for training in trainings %}
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
|
||||
|
||||
{% if venues %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Venues: </span>
|
||||
<ul>
|
||||
{% for elem in venues %}
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
|
||||
|
||||
{% if buzzitems %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Buzz Items: </span>
|
||||
|
||||
<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.
|
||||
|
||||
{% if people %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">People: </span>
|
||||
|
||||
<ul>
|
||||
{% for elem in people %}
|
||||
<li>
|
||||
{% 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 %}
|
||||
</a>
|
||||
|
|
@ -148,7 +151,7 @@
|
|||
Title of each production links to "Productions" page.
|
||||
|
||||
{% if productions %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Productions: </span>
|
||||
<ul>
|
||||
{% for elem in productions %}
|
||||
|
|
@ -166,7 +169,7 @@
|
|||
Photos & Videos. There should be a clear demarcation between Photos and Videos
|
||||
|
||||
{% if awards %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Awards: </span>
|
||||
|
||||
<ul>
|
||||
|
|
@ -197,7 +200,7 @@
|
|||
|
||||
|
||||
{% if resources %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Resources: </span>
|
||||
<ul>
|
||||
{% 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.
|
||||
|
||||
{% if scripts %}
|
||||
<div id="" class="">
|
||||
<div id="" class="itfFormDisplay">
|
||||
<span class="orange">Scripts: </span>
|
||||
|
||||
<ul>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user