Merge branch 'master' of https://bitbucket.org/dpaw/penguins

Conflicts:
	AUTHORS

AUTHORS

@@ -2,5 +2,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Nick Sandford
     * Drew Clarke
     * Shayne O'Neill
-
+    * Ashley Felton
+    * Jawaid Mushtaq
+
 Thank you to Scott Percival for designing the logo.

README.md

@@ -0,0 +1,2 @@
+Penguin Observations Application
+================================

example-supervisor.conf

@@ -0,0 +1,7 @@
+[program:penguins_8270]
+user=www-data
+directory=/var/www/penguins_8270
+environment=PATH="/var/www/penguins_8270/venv/bin"
+command=/var/www/penguins_8270/venv/bin/honcho start
+stopasgroup=true
+killasgroup=true

manage.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import os
 import sys
+import materialize
 
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "penguins.settings")

observations/models.py

@@ -29,7 +29,7 @@ class Site(geo_models.Model):
     location = geo_models.PointField()
 
     def __str__(self):
-        return self.name
+        return "{} ({})".format( self.name, ', '.join([c.name.encode("ascii") for c in self.camera_set.all()]) )
 
     class Meta:
         ordering = ['name']
@@ -114,11 +114,13 @@ def import_folder(cls, folder="beach_return_cams"):
             # create it
             print("importing {0}".format(video))
             datestr, camstr = nameparts
+            camstr = camstr.split(".")[0]
             video_datetime = datetime.datetime.strptime(datestr, "%d-%m-%Y_%H")
             date = video_datetime.date()
             start_time = video_datetime.time()
             # assume each video is 60 mins long (video times are inaccurate/halved?)
             end_time = (video_datetime + datetime.timedelta(minutes=60)).time()
+            print("Finding camera name closest to {}".format(camstr))
             camera = Camera.objects.get(name__istartswith=camstr.split("_")[0])
             cls.objects.create(date=date, start_time=start_time, end_time=end_time,
                                camera=camera, file=os.path.join(folder, video))

observations/sites.py

@@ -80,3 +80,4 @@ def index(self, request, extra_context=None):
 site.register(PenguinCount, PenguinCountAdmin)
 site.register(PenguinObservation, PenguinObservationAdmin)
 site.register(Video, VideoAdmin)
+site.register(Camera, CameraAdmin)

observations/templates/admin/base.html

@@ -9,6 +9,7 @@
     <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "css/bootstrap.min.css" %}{% endblock %}" />
     <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-theme.min.css" %}" />
     <link rel="stylesheet" type="text/css" href="{% static "css/style.css" %}" />
+    <link rel="shortcut icon" type="image/png" href="{{STATIC_URL}}favicon.ico"/>
     {% block extrastyle %}{% endblock %}
     <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% block stylesheet_ie %}{% static "admin/css/ie.css" %}{% endblock %}" /><![endif]-->
     {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}" />{% endif %}

penguins/settings.py

@@ -106,13 +106,15 @@
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
+    'swingers.sauth.backends.EmailBackend',
 )
 
 LOGIN_URL = '/login/'
 LOGIN_REDIRECT_URL = '/'
 LOGIN_REDIRECT_URL_FAILURE = LOGIN_URL
 LOGOUT_URL = '/logout/'
 LOGOUT_REDIRECT_URL = LOGOUT_URL
+ANONYMOUS_USER_ID = -1
 
 # LDAP settings
 AUTH_LDAP_SERVER_URI = os.environ.get('LDAP_SERVER_URI')
@@ -170,6 +172,8 @@
     'INTERCEPT_REDIRECTS': False,
 }
 
+# Application version number
+APPLICATION_VERSION_NO = '0.1a'
 
 JENKINS_TASKS = (
     'django_jenkins.tasks.with_coverage',