Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0

common/lib/xmodule/xmodule/course_module.py

@@ -29,7 +29,7 @@ class CourseDescriptor(SequenceDescriptor):
     
     def has_started(self):
         return time.gmtime() > self.start
-    
+
     @classmethod
     def id_to_location(cls, course_id):
         org, course, name = course_id.split('/')
@@ -40,6 +40,10 @@ class CourseDescriptor(SequenceDescriptor):
         return "/".join([self.location.org, self.location.course, self.location.name])
 
     @property
+    def start_date_text(self):
+        return time.strftime("%m/%d/%y", self.start)
+
+    @property
     def title(self):
         return self.metadata['display_name']
     
@@ -86,8 +90,8 @@ class CourseDescriptor(SequenceDescriptor):
                 with self.system.resources_fs.open(path("about") / section_key + ".html") as htmlFile:
                     return htmlFile.read().decode('utf-8')
             except ResourceNotFoundError:
-                log.exception("Missing about section {key} in course {url}".format(key=section_key, url=self.location.url()))
-                return "! About section missing !"
+                log.warning("Missing about section {key} in course {url}".format(key=section_key, url=self.location.url()))
+                return None
         elif section_key == "title":
             return self.metadata.get('display_name', self.name)
         elif section_key == "university":

lms/static/js/toggle_login_modal.js

@@ -48,6 +48,11 @@
           })
 
           $(modal_id).fadeTo(200,1);
+          $(modal_id).find(".notice").hide().html("");
+          var notice = $(this).data('notice')
+          if(notice !== undefined) {
+            $(modal_id).find(".notice").show().html(notice);
+          }
           e.preventDefault();
 
         });

lms/static/sass/shared/_modal.scss

@@ -115,7 +115,16 @@
       padding: 12px;
     }
 
-    .activation-message, .message {
+    .activation-message, .message, .notice {
+      background: $yellow;
+      border: 1px solid darken($yellow, 60%);
+      color: darken($yellow, 60%);
+      display: none;
+      margin-bottom: 20px;
+      padding: 12px;
+    }
+
+    .activation-message {
       padding: 0 40px 10px;
 
       p {

lms/templates/course.html

@@ -23,7 +23,7 @@
       </div>
       <div class="bottom">
         <a href="#" class="university">${course.get_about_section('university')}</a>
-        <span class="start-date">7/23/12</span>
+        <span class="start-date">${course.start_date_text}</span>
       </div>
     </section>
   </div>

lms/templates/portal/course_about.html

@@ -15,16 +15,22 @@
         </hgroup>
 
         <div class="main-cta">
-          <a href="${reverse('enroll', args=[course.id])}" class="register">Register</a>
+          %if user.is_authenticated():
+            <a href="${reverse('enroll', args=[course.id])}" class="register">Register</a>
+          %else:
+            <a href="#signup-modal" class="register" rel="leanModal" data-notice="You must register in order to enroll">Register</a>
+          %endif
         </div>
 
       </section>
+      % if course.get_about_section("video"):
       <a href="#video-modal" class="media" rel="leanModal">
         <div class="hero">
           <img src="${static.url('images/courses/circuits.jpeg')}" />
           <div class="play-intro"></div>
         </div>
       </a>
+      % endif
     </div>
   </header>
 
@@ -62,7 +68,7 @@
         </header>
 
         <ol class="important-dates">
-          <li><div class="icon start-icon"></div><p>Classes Start</p><span class="start-date">7/12/12</span></li>
+          <li><div class="icon start-icon"></div><p>Classes Start</p><span class="start-date">${course.start_date_text}</span></li>
           ##<li><div class="icon final-icon"></div><p>Final Exam</p><span class="final-date">12/09/12</span></li>
           ##<li><div class="icon length-icon"></div><p>Course Length</p><span class="course-length">15 weeks</span></li>
           <li><div class="icon number-icon"></div><p>Course Number</p><span class="course-number">${course.number}</span></li>

lms/templates/signup_modal.html

@@ -10,7 +10,9 @@
       </header>
 
       <form id="enroll_form" method="post" data-remote="true" action="/create_account">
+        <div class="notice"></div>
         <div id="enroll_error" class="modal-form-error" name="enroll_error"></div>
+        <div id="enroll_error" name="enroll_error"></div>
         <label>E-mail</label>
         <input name="email" type="email" placeholder="E-mail">
         <label>Password</label>