todos 1-6

This commit is contained in:
Sanj 2011-10-07 02:55:56 +05:30
parent 3755a6379d
commit 2d7f9e855a
5 changed files with 51 additions and 34 deletions

View File

@ -1,5 +1,27 @@
$(document).ready(function() { $(document).ready(function() {
$('#logo').fadeIn(4000); $('#logo').fadeIn(4000);
$(window).resize(function() {
var width = $(this).width();
var $names = $('#names');
if (width < 1024) {
if ($names.is(":visible")) {
$('#names').hide();
}
} else {
if (!$names.is(":visible")) {
$('#names').show();
}
}
});
highlightMenuSelected();
}); });
function highlightMenuSelected() {
var thisPage = window.location.pathname.substring(1);
$('#menu a[href=' + thisPage + ']').addClass("menuSelected");
}

View File

@ -9,18 +9,13 @@
{% endblock %} {% endblock %}
{% block inner_content %} {% block inner_content %}
<p class="orange"><strong>Title</strong></p> {% for l in links %}
<p class="orange"><strong>{{ l.title }}</strong></p>
<br> <br>
<p>This is dummy text about a beautiful architectural website.</p> <p>{{ l.description }}</p>
<br> <br>
<a href="">www.link.com</a> <a href="{{ l.url }}">{{ l.url }}</a>
<br><br><br>
<p class="orange"><strong>Title</strong></p>
<br>
<p>This is dummy text about a beautiful architectural website.</p>
<br>
<a href="">www.link.com</a>
<br><br><br> <br><br><br>
{% endfor %}
{% endblock %} {% endblock %}

View File

@ -43,27 +43,18 @@ height:150px;
<a href="">Read more</a> <a href="">Read more</a>
<br><br><br> <br><br><br>
</div><!--NOTEWORTHY CLOSING --> </div><!--NOTEWORTHY CLOSING -->
<div class="noteworthy">
<img src="img/linksDummy.jpg" width="200" height="150" alt="links-dummy" class="imgLinks">
<p class="orange"><strong>Title</strong></p>
<br>
<p>This is dummy text about a beautiful architectural website.</p>
<br>
<a href="">Read more</a>
<br><br><br>
</div><!--NOTEWORTHY CLOSING -->
<div class="noteworthy">
<img src="img/linksDummy.jpg" width="200" height="150" alt="links-dummy" class="imgLinks">
<p class="orange"><strong>Title</strong></p>
<br>
<p>This is dummy text about a beautiful architectural website.</p>
<br>
<a href="">Read more</a>
<br><br><br>
</div><!--NOTEWORTHY CLOSING -->
{% for n in noteworthy %}
<div class="noteworthy">
<img src="{{ n.image.url }}" width="200" height="150" alt="{{ n.title }}" class="imgLinks">
<p class="orange"><strong>{{ n.title }}</strong></p>
<br>
<p>{{ n.description }}</p>
<br>
<a href="{{ n.url }}">{{ n.url }}</a>
<br><br><br>
</div><!--NOTEWORTHY CLOSING -->
{% endfor %}
{% endblock %} {% endblock %}

View File

@ -39,7 +39,12 @@
$('#projectTitle').next().text(data.title); $('#projectTitle').next().text(data.title);
$('#projectSizeProgram').next().html(nl2br(data.size_program)); $('#projectSizeProgram').next().html(nl2br(data.size_program));
$('#projectDesignStatement').next().html(nl2br(data.design_statement)); $('#projectDesignStatement').next().html(nl2br(data.design_statement));
$('#projectExtraText').next().html(nl2br(data.extra_text)); if (data.extra_text == '') {
$('#projectExtraText').hide();
$('#projectExtraText').next().hide();
} else {
$('#projectExtraText').show().next().html(nl2br(data.extra_text)).show();
}
}); });
}); });
@ -116,4 +121,4 @@
{% endthumbnail %} {% endthumbnail %}
{% endfor %} {% endfor %}
</ul> </ul>
{% endblock %} {% endblock %}

View File

@ -29,7 +29,11 @@ def contact(request):
return render_to_response("contact.html", {}) return render_to_response("contact.html", {})
def links(request): def links(request):
return render_to_response("links.html", {}) return render_to_response("links.html", {
'links': Link.objects.all()
})
def noteworthy(request): def noteworthy(request):
return render_to_response("noteworthy.html", {}) return render_to_response("noteworthy.html", {
'noteworthy': Noteworthy.objects.all()
})