@@ -39,9 +39,11 @@ </div> <div id="map_show" class="span-24 last"></div> + <div class="details span-24 last">{{ crime.details|markdown:"safe" }}</div> + <script type="text/javascript"><!-- google_ad_client = "pub-4395278747027765"; - /* malaysiacrime index */ + /* malaysiacrime banner */ google_ad_slot = "8210136586"; google_ad_width = 728; google_ad_height = 90; @@ -51,8 +53,6 @@ src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> </script> - <div class="details span-24 last">{{ crime.details|markdown:"safe" }}</div> - <div class="update span-24 last"> <a href="{% url crime-update crime.id %}">Update this Crime Report</a> </div> @@ -60,7 +60,7 @@ {% get_comment_list for crime as comments %} {% for comment in comments %} <hr /> - <div class="comment span-24 last"> + <div class="comment span-19"> <span>written about <strong>{{ comment.submit_date|timesince:now }}</strong> ago by <strong>{{ comment.name }}</strong>:</span><br /> {{ comment.comment|markdown:"safe" }} </div> templates/crime/show.html @@ -62,22 +62,16 @@ {% block tab0 %}<li><a class="active"><span>Home</span></a></li>{% endblock %} {% block content %} - <div class="title span-18"> + <div class="title span-14"> <h2>Recent Reported Malaysia Crimes</h2> </div> - <div class="stats span-6 last"> + <div class="stats span-10 last"> Showing <strong>{{ crimes.count }}</strong> of <strong>{{ crime_total }}</strong> Crime Reports </div> <div id="map_index" class="span-24 last"></div> - {# <div class="span-5 last"> #} - {# <a href="http://feeds.feedburner.com/malaysiacrime/latest"> #} - {# <img src="{{ MEDIA_URL }}images/rss.png" alt="Malaysia Crime Latest Reports RSS" title="Malaysia Crime Latest Reports RSS"/> #} - {# </a> #} - {# </div> #} - - <div class="span-17"> + <div class="span-19"> {% for crime in crimes %} {% get_comment_count for crime as comment_count %} <span class="linelist"> @@ -88,10 +82,14 @@ {% if comment_count %} // {{ comment_count }} comment{{ comment_count|pluralize }} {% endif %} - </span><br/><br/> + </span><br /><br /> {% endfor %} </div> - {# <div class="span-7 last"> #} - {# <img src="{{ MEDIA_URL }}images/amax.png"> #} - {# </div> #} + + <div class="span-5 last" style="text-align: center"> + <a href="http://www.apptivitylab.com/released-apps/malaysia-crime/"> + <img src="{{ MEDIA_URL }}images/iphone.jpg" alt="Malaysia Crime iPhone app" title="Download Malaysia Crime iPhone app"/> + </a> + </div> + {% endblock %} templates/main/index.html @@ -61,28 +61,16 @@ {% block title %}Recent Commented - Malaysia Crime{% endblock %} {% block content %} - <div class="title span-18"> + <div class="title span-14"> <h2>Recent Commented Malaysia Crimes</h2> </div> - <div class="stats span-6 last"> - Showing <strong>{{ crimes.count }}</strong> of <strong>{{ crime_total }}</strong> Crime Reports + <div class="stats span-10 last"> + Showing <strong>{{ crimes|length }}</strong> of <strong>{{ crime_total }}</strong> Crime Reports </div> <div id="map_index" class="span-24 last"></div> - <script type="text/javascript"><!-- - google_ad_client = "pub-4395278747027765"; - /* malaysiacrime index */ - google_ad_slot = "8210136586"; - google_ad_width = 728; - google_ad_height = 90; - //--> - </script> - <script type="text/javascript" - src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> - </script> - - <div class="span-24 last"> + <div class="span-19"> {% for crime in crimes %} {% get_comment_count for crime as comment_count %} <span class="linelist"> @@ -96,4 +84,10 @@ </span><br/><br/> {% endfor %} </div> + + <div class="span-5 last" style="text-align: center"> + <a href="http://www.apptivitylab.com/released-apps/malaysia-crime/"> + <img src="{{ MEDIA_URL }}images/iphone.jpg" alt="Malaysia Crime iPhone app" title="Download Malaysia Crime iPhone app"/> + </a> + </div> {% endblock %} templates/main/recent_commented.html @@ -69,18 +69,6 @@ </div> <div id="map_index" class="span-24 last"></div> - <script type="text/javascript"><!-- - google_ad_client = "pub-4395278747027765"; - /* malaysiacrime index */ - google_ad_slot = "8210136586"; - google_ad_width = 728; - google_ad_height = 90; - //--> - </script> - <script type="text/javascript" - src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> - </script> - <div class="span-24 last"> {% for crime in crimes %} {% get_comment_count for crime as comment_count %} templates/main/recent_updated.html 8d8590abec19c1713737a34b3dcb147c2d56259e Kegan Gan kegan@kebook.local http://github.com/kegan/malaysiacrime/commit/2b39ac0dff40debd5aa7fb9d5881303c203541c7 2b39ac0dff40debd5aa7fb9d5881303c203541c7 2009-11-07T06:25:43-08:00 2009-11-07T06:25:43-08:00 Updated templates with new AdSense. And iPhone app link. 9dbaec1982d9325fe6bc9166a71ec4277de50f49 Kegan Gan kegan@kebook.local