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

added search for left column, changed template a bit, etc. etc.

Browse Source
This commit is contained in:
Karen 2011-08-25 17:18:49 +05:30
parent ca49d4c4eb
commit 05febe1222
6 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
itf/itfcore/models.py
View File

@ -2,7 +2,7 @@ from django.db import models
from django.contrib.auth.models import User
import datetime
from django.contrib.localflavor.in_.forms import INZipCodeField
from oxdjango.fields import DictField
from ox.django.fields import DictField
GENDER_CHOICES = (
('M', 'Male'),

33
itf/static/css/noel/inner.css
View File

@ -51,6 +51,32 @@ right:16px;
top:11px;
cursor:pointer;}
.searchInnerField
{width:114px;
/*position:absolute;
right:4px;
top:11px;*/
margin-left: 174px;
margin-top:4px;
border:1px solid #f0f0f0;
background:url(img/search-icon.png) no-repeat right;
padding:2px 2px 2px 4px;
font-family:Arial, Helvetica, 'DejaVu Sans', sans-serif;
font-size:12px;
color:#7d7d7d;
-moz-border-radius:8px;
-webkit-border-radius:8px;
border-radius:8px;
-moz-box-shadow:inset 2px 2px 6px #d7d7d7;
-webkit-box-shadow:inset 2px 2px 6px #d7d7d7;
box-shadow:inset 2px 2px 6px #d7d7d7;
outline:none;
} /*placeholder input text supported by html5 for FF3.7 and webkit*/
.searchInnerField:focus
{border:1px solid #999; }
#tabsInner /*tabs not touching because i would prefer not to give fixed width, shadow, etc.*/
{font-size:14px;
color:#ff8400;
@ -150,7 +176,7 @@ text-decoration:none;}
{text-decoration:underline;
color:#898989;}
#listLeftSelected
.listLeftSelected
{border-bottom:1px solid #eece98;
border-top:1px solid #eece98;
-moz-box-shadow:inset -6px 0px 18px #eece98;
@ -257,9 +283,12 @@ border-radius:8px;
-webkit-box-shadow:2px 3px 20px #252425;
box-shadow:2px 3px 20px #252425;}
#sectionTitle
.itfInfoSub
{color:#f7bd00;
font-weight:bold;}
.itfInfo p
{padding-bottom:8px;}
#clearBoth
{clear:both;}

2
itf/static/js/jquery.js vendored
View File

@ -1 +1 @@
jquery-1.4.4.js
jquery-1.6.2.min.js

2
itf/templates/modules/bestpractices/bestpractice.html
View File

@ -9,7 +9,7 @@
<img class="itfInfoImg" src="{{ law_image }}" />
{% endif %}
<br /><br />
<span class="itfInfoSub">Relevance to Theatre: </span><span class="itfInfoInfo">{{ theatre }}</span><br /><br />
<span class="itfInfoSub">Relevance to Theatre: </span><span class="itfInfoInfo">{{ theatre|linebreaks }}</span>
<span class="itfInfoSub">Quick Howto: </span><span class="itfInfoInfo">{{ quick_howto }}</span><br /><br />
</div>

25
itf/templates/noel/insidepage.html
View File

@ -22,6 +22,9 @@
<h3 id="topText">{{ title }}</h3>
<img src="/static/images/noel/search-inner.png" width="22" height="18" alt="search" id="searchInner">
<form action="" method="get">
<input type="text" placeholder="search" name="field" class="searchInnerField"/>
</form>
<div id="tabsInner">
<ul id="selection">
@ -58,8 +61,8 @@
<!-- <li><a href=""><span>The Mystery of vanishing rights<span></a></li> -->
</ul>
<div id="triangleUp">&#x25B2</div>
<div id="triangleDown">&#x25BC</div>
<div id="triangleUp">&#x25B2;</div>
<div id="triangleDown">&#x25BC;</div>
</div>
@ -88,23 +91,23 @@
<div id="bottomRight">
<!--
<p><span id="sectionTitle">Story 1:</span> A well known theatre group had auditions for casting lead characters in their play for which over 150 actors auditioned. A television film director happened to see the recording of the auditions and obtained a copy. Two months later, a few actors who had auditioned were horrified to see themselves in a television comedy show. Snippets of the recording had obviously been used!</p><br/>
<p><span class="sectionTitle">Story 1:</span> A well known theatre group had auditions for casting lead characters in their play for which over 150 actors auditioned. A television film director happened to see the recording of the auditions and obtained a copy. Two months later, a few actors who had auditioned were horrified to see themselves in a television comedy show. Snippets of the recording had obviously been used!</p><br/>
<p><span id="sectionTitle">Actors:</span> Not on! If you like our acting, you hire us! Not use our improvisations for another purpose and that too by someone else! We'll sue the television show producer and the theatre group.</p><br/>
<p><span class="sectionTitle">Actors:</span> Not on! If you like our acting, you hire us! Not use our improvisations for another purpose and that too by someone else! We'll sue the television show producer and the theatre group.</p><br/>
<p><span id="sectionTitle">Story 2:</span> Neha Bhasin, a play back singer went for an audition. Months later, she heard the piece on a radio channel and realized that it had been used without her permission. She also found that her name was mentioned as the background vocalist and the producer of the movie was credited as the lead vocalist.</p><br/>
<p><span class="sectionTitle">Story 2:</span> Neha Bhasin, a play back singer went for an audition. Months later, she heard the piece on a radio channel and realized that it had been used without her permission. She also found that her name was mentioned as the background vocalist and the producer of the movie was credited as the lead vocalist.</p><br/>
<p><span id="sectionTitle">Neha Bhasin:</span> That's my voice…that's my name on the CD but I'm not the background vocalist!!! I'll sue the film producer! The music director: Hmmm not so! We didn't even want to use your voice. It was a recording mistake! The Court: A costly mistake. You've used her voice, now pay up royalty! And recall all the CDs with her voice.</p><br/>
<p><span class="sectionTitle">Neha Bhasin:</span> That's my voice…that's my name on the CD but I'm not the background vocalist!!! I'll sue the film producer! The music director: Hmmm not so! We didn't even want to use your voice. It was a recording mistake! The Court: A costly mistake. You've used her voice, now pay up royalty! And recall all the CDs with her voice.</p><br/>
<p><span id="sectionTitle">Law:</span> Do actors have special rights? Under the Indian Copyright law, actors, singers, musicians, dancers, et al are called performers</p><br/>
<p><span class="sectionTitle">Law:</span> Do actors have special rights? Under the Indian Copyright law, actors, singers, musicians, dancers, et al are called performers</p><br/>
<p><span id="sectionTitle">Actors:</span> Not on! If you like our acting, you hire us! Not use our improvisations for another purpose and that too by someone else! We'll sue the television show producer and the theatre group.</p><br/>
<p><span class="sectionTitle">Actors:</span> Not on! If you like our acting, you hire us! Not use our improvisations for another purpose and that too by someone else! We'll sue the television show producer and the theatre group.</p><br/>
<p><span id="sectionTitle">Story 2:</span> Neha Bhasin, a play back singer went for an audition. Months later, she heard the piece on a radio channel and realized that it had been used without her permission. She also found that her name was mentioned as the background vocalist and the producer of the movie was credited as the lead vocalist.</p><br/>
<p><span class="sectionTitle">Story 2:</span> Neha Bhasin, a play back singer went for an audition. Months later, she heard the piece on a radio channel and realized that it had been used without her permission. She also found that her name was mentioned as the background vocalist and the producer of the movie was credited as the lead vocalist.</p><br/>
<p><span id="sectionTitle">Neha Bhasin:</span> That's my voice…that's my name on the CD but I'm not the background vocalist!!! I'll sue the film producer! The music director: Hmmm not so! We didn't even want to use your voice. It was a recording mistake! The Court: A costly mistake. You've used her voice, now pay up royalty! And recall all the CDs with her voice.</p><br/>
<p><span class="sectionTitle">Neha Bhasin:</span> That's my voice…that's my name on the CD but I'm not the background vocalist!!! I'll sue the film producer! The music director: Hmmm not so! We didn't even want to use your voice. It was a recording mistake! The Court: A costly mistake. You've used her voice, now pay up royalty! And recall all the CDs with her voice.</p><br/>
<p><span id="sectionTitle">Law:</span> Do actors have special rights? Under the Indian Copyright law, actors, singers, musicians, dancers, et al are called performers</p><br/>
<p><span class="sectionTitle">Law:</span> Do actors have special rights? Under the Indian Copyright law, actors, singers, musicians, dancers, et al are called performers</p><br/>
-->
</div>
</div>

2
itf/urls.py
View File

@ -61,7 +61,7 @@ if settings.LOCAL_DEVELOPMENT:
#
urlpatterns += patterns('',
#
(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': join(settings.PROJECT_PATH, "static")}),
(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': join(settings.PROJECT_ROOT, "static")}),
#
)
#