# HG changeset patch
# User Bob Mourlam <bob.mourlam@gmail.com>
# Date 1320632905 21600
# Node ID b9d6f6d930a9ed9d31a31ffd1f3dcfa4329cb1cb
# Parent  6b4e02b8be6bf834ad3db21a4cefc70db86627f7# Parent  1eb4b4072888d92958438d6b37bbba2aa6fd6e42
Merged Chris and Brian's changes with mine.

diff -r 1eb4b4072888 -r b9d6f6d930a9 bns_website/news/models.py
--- a/bns_website/news/models.py	Sun Nov 06 14:19:12 2011 -0600
+++ b/bns_website/news/models.py	Sun Nov 06 20:28:25 2011 -0600
@@ -15,7 +15,7 @@
 
 
     def is_new(self):
-        if datetime.now() - self.date <= timedelta(days=3):
+        if datetime.now() - self.date <= timedelta(days=30):
             return True
 
         return False
diff -r 1eb4b4072888 -r b9d6f6d930a9 bns_website/static/css/base.css
--- a/bns_website/static/css/base.css	Sun Nov 06 14:19:12 2011 -0600
+++ b/bns_website/static/css/base.css	Sun Nov 06 20:28:25 2011 -0600
@@ -1,4 +1,4 @@
-body { 
+body {
    padding-top: 60px
 }
 .social-sharing {
@@ -24,3 +24,6 @@
 li.review-list-item {
    margin-bottom: 30px;
 }
+#article {
+    margin-bottom: 1.5em;
+}
\ No newline at end of file
diff -r 1eb4b4072888 -r b9d6f6d930a9 bns_website/templates/news/news_list.html
--- a/bns_website/templates/news/news_list.html	Sun Nov 06 14:19:12 2011 -0600
+++ b/bns_website/templates/news/news_list.html	Sun Nov 06 20:28:25 2011 -0600
@@ -2,31 +2,16 @@
 {% load core_tags %}
 {% block title %}News{% endblock %}
 
-{% block custom_css %}
-<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/redmond/jquery-ui.css">
-{% endblock %}
-{% block custom_js %}
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
-<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
-<script type="text/javascript">
-    $(function() {
-      $("#accordion").accordion({active: false});
-    });
-</script>
-{% endblock %}
-
 {% block content %}
 {% navbar 'news' %}
 <h1>News</h1>
 <dl>
 {% for news in object_list %}
-<div class="alert-message block-message info">
-<dt><h2>{{ news.title }} {% if news.is_new %}<span class="label success">New</span>{% endif %}</h2>
-</dt>
-<dd>{{ news.content|safe }}</dd>
-<p align="right">   <span class="label">{{news.date}}</span></p>
-</div>
-<p/>
+<article id="article"><h2>{{ news.title }} {% if news.is_new %}<span class="label success">New</span>{% endif %}</h2>
+    <div>{{ news.content|safe }}</div>
+    <small><b>{{ news.date }}</b></small>
+</article>
+
 {% endfor %}
 </dl>