Merge branch 'master' of github.com:hacklabr/timtec

hacklabr · Nov 11, 2013 · 2c3823e · 2c3823e
2 parents 575ed4c + 6f59d5f
commit 2c3823e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/core/models.py b/core/models.py
@@ -15,6 +15,7 @@
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import Group
+from django.contrib.staticfiles.storage import staticfiles_storage
 
 from allauth.account.signals import user_signed_up
 
@@ -211,6 +212,14 @@ def save(self, **kwargs):
     def __unicode__(self):
         return self.name
 
+    def thumbnail(self):
+        try:
+            first_vid_unit = self.units.exclude(video=None).order_by('position')[0]
+            thumbnail = 'http://i1.ytimg.com/vi/' + first_vid_unit.video.youtube_id + '/hqdefault.jpg'
+            return thumbnail
+        except IndexError:
+            return staticfiles_storage.url('img/lesson-default.png')
+
     def activity_count(self):
         return self.units.exclude(activity=None).count()
 

diff --git a/core/templates/admin/_base.html b/core/templates/admin/_base.html
@@ -24,7 +24,7 @@
 <body id="admin" ng-controller="CourseEdit">
 
   <!-- NAVBAR -->
-  <div id="main-navbar" class="navbar navbar-fixed-top navbar-inverse">
+  <div id="main-navbar" class="navbar navbar-inverse">
     <div class="container">
       <a class="navbar-brand" href="/">TIM Tec - ADMIN</a>
       <ul class="nav navbar-nav pull-right">

diff --git a/core/templates/course.html b/core/templates/course.html
@@ -91,8 +91,8 @@ <h3><i class="icon-double-angle-right"></i> {% trans "Lessons" %}</h3>
               {% for lesson in course.public_lessons %}
               <li>
                 <div class="row">
-                  <div class="col-lg-3 col-md-3 col-sm-3 hidden-xs">
-                    <p><img src="{% static 'img/lesson-default.png' %}" class="thumbnail"></p>
+                  <div class="col-lg-3 col-sm-3 col-sm-3 hidden-xs">
+                    <img src="{{ lesson.thumbnail }}" class="thumbnail">
                   </div>
                   <div class="col-lg-9 col-md-9 col-sm-9 col-xs-12">
                     <p>