Skip to content
Browse files

Merged server hotfixes back in.

  • Loading branch information...
2 parents 4389bbf + 1556f61 commit 1d52966c6a8a62a2a5d7e2c99d8421d747b70da0 @philipbjorge philipbjorge committed
View
2 django/pnwmoths/settings_global.py
@@ -186,7 +186,7 @@
# define the lookup channels in use on the site
AJAX_LOOKUP_CHANNELS = {
# pass a dict with the model and the field to search against
- 'SpeciesRecord' : ('species.ajaxselect_lookups', 'SpeciesRecordLookup')
+ 'SpeciesRecord' : ('pnwmoths.species.ajaxselect_lookups', 'SpeciesRecordLookup')
}
# magically include jqueryUI/js/css
AJAX_SELECT_BOOTSTRAP = True
View
10 django/pnwmoths/species/models.py
@@ -311,12 +311,10 @@ def details_tostr(self):
@property
def date(self):
- date = None
try:
- date = datetime.date(self.year, self.month, self.day)
+ return datetime.date(self.year, self.month, self.day)
except Exception:
- pass
- return date
+ return None
def save(self, *args, **kwargs):
if not self.date_added:
@@ -420,9 +418,9 @@ def license_details(self):
if notes:
s += "<br />" + str(notes)
- if r.collection.url:
+ if r.collection and r.collection.url:
s += '<br />Specimen courtesy of <a href="%s" target="_blank">%s</a>' % (r.collection.url, r.collection)
- else:
+ elif r.collection:
s += "<br />Specimen courtesy of %s" % r.collection
s += "<br />Photograph copyright: %s" % self.photographer
View
27 django/pnwmoths/templates/cms/base.html
@@ -175,33 +175,6 @@ <h1 id="header-text">Pacific Northwest <span id="header-green">Moths</span></h1>
</div>
</div>
-<!--
-
- <div class="threecol"><h5>About Moths</h5>
- <ul>
- {% show_menu_below_id "about-moths" 0 100 100 100 %}
- </ul>
- </div>
- <div class="threecol"><h5>About Us</h5>
- <ul>
- {% show_menu_below_id "about-us" 0 100 100 100 %}
- </ul>
- </div>
- <div class="threecol last"><h5>Related Sites</h5>
- {% block related_sites_footer %}
- {% show_placeholder "related_sites" "index" %}
- {% endblock %}
- </div>
- </div>
- <div class="row">
- <div id="credits" class="twelvecol last">
- <ul>
- <li><a href="http://github.com/huddlej/pnwmoths/issues">Issues</a></li>
- <li><a href="/admin/">Site Admin</a></li>
- <li><a href="/accounts/logout/">Logout</a></li>
- </ul>
--->
-
{% block scripts %}
<script language="javascript" type="text/javascript" src="{{ MEDIA_URL }}js/responsive.navigation.js"></script>
<script language="javascript" type="text/javascript" src="{{ MEDIA_URL }}js_ext/jquery.fittext.js">
View
8 django/pnwmoths/templates/cms/stub.html
@@ -1,8 +1,8 @@
{% extends "cms/base.html" %}
+{% block stylesheets %}
+ {{ block.super }}
+ <link rel="stylesheet" href="{{ MEDIA_URL }}css_pages/stub.css" type="text/css" media="screen" />
+{% endblock %}
{% block content %}
-<div class="row">
- <div class="twelvecol last">
{{ block.super }}
- </div>
-</div>
{% endblock %}
View
25 www/media/css_pages/stub.css
@@ -0,0 +1,25 @@
+#content {
+ padding-left: 40px;
+ max-width: 50em;
+ color: black;
+}
+#content ol { list-style: decimal; }
+
+
+#site_credits h1 {
+ color: #A4AB78;
+ font-weight: bold;
+}
+#site_credits ul {
+ list-style: disc inside;
+}
+
+
+#faqLinks { list-style: none; }
+#site_faqs h4 {
+ color: #D15E25;
+}
+#site_faqs h4 a {
+ font-size: 0.8em;
+ font-weight: normal;
+}

0 comments on commit 1d52966

Please sign in to comment.
Something went wrong with that request. Please try again.