Re-design Courses page, add Events page and Bug fixes

.hound.yml

@@ -1,6 +1,6 @@
 eslint:
   enabled: true
-  config_file: .eslintrc.json
-  ignore_file: .eslintignore
+  config_file: frontend/.eslintrc.json
+  ignore_file: frontend/.eslintignore
 scss:
   enabled: false

coursebuilder/models/courses.py

@@ -2631,7 +2631,7 @@ def create_course_settings_schema(cls, reg, course):
                 common.tags.EditorBlacklists.COURSE_SCOPE},
             optional=True))
         opts.add_property(schema_fields.SchemaField(
-            'course:instructor_details', 'Instructor Details', 'html',
+            'course:instructor_details', 'Display Image URL', 'html',
             description=messages.HOMEPAGE_INSTRUCTOR_DETAILS_DESCRIPTION,
             optional=True))
 

coursebuilder/models/messages.py

@@ -183,7 +183,7 @@
 """
 
 HOMEPAGE_INSTRUCTOR_DETAILS_DESCRIPTION = """
-The instructor details are displayed to students on the course homepage.
+Link to the course image displayed to students on the courses page (aspect ratio of 2:1).
 """
 
 HOMEPAGE_SHOW_GPLUS_BUTTON_DESCRIPTION = """

coursebuilder/modules/explorer/_static/components/course-cards/course-card.html

@@ -6,28 +6,18 @@
 <dom-module id="course-card">
   <template>
 
-      <div class="col m12 l6">
-          <div class="card horizontal course-card">
-              <div class="card-image">
-                  <img src="/modules/explorer/_static/images/explorer-course-icon.png">
-              </div>
-              <div class="card-stacked">
-                  <div class="card-content">
-                      <h2>[[course.title]]</h2>
-                      <p>
-                          <unsafe-html html="[[course.abstract]]" body></unsafe-html>
-                      </p>
-                  </div>
-                  <div class="card-action">
-                      <div>
-                          <a href="[[_getUrl(course)]]">
-                              <button class="btn waves-effect waves-dark">Explore</button>
-                          </a>
-                      </div>
-                  </div>
-              </div>
+    <div class="col l4 m6 s12">
+      <a href="[[_getUrl(course)]]" class="course-link">
+        <div class="card course-card">
+          <div class="course-overlay"></div>
+          <img src="[[course.instructorDetails]]" alt="please add image with aspect ration of 2:1">
+          <div class="course-card-content">
+            <h4 class="free-course">FREE</h4>
+            <h3>[[course.title]]</h3>
           </div>
-      </div>
+        </div>
+      </a>
+    </div>
 
   </template>
   <script>
@@ -66,7 +56,8 @@ <h2>[[course.title]]</h2>
         if (date.getFullYear() != new Date().getFullYear()) {
           result += ', ' + date.getFullYear();
         }
-        return result;
+        return result;gst
+
       },
       _hasAtLeastOneDate: function(course) {
         return course.startDate || course.endDate;

coursebuilder/modules/explorer/_static/components/course-explorer/course-explorer.html

@@ -12,6 +12,8 @@
 <link rel="import" href="/modules/explorer/_static/components/pages/tools-page.html">
 <link rel="import" href="/modules/explorer/_static/components/pages/partners-page.html">
 <link rel="import" href="/modules/explorer/_static/components/pages/feedback-page.html">
+<link rel="import" href="/modules/explorer/_static/components/pages/help-page.html">
+<link rel="import" href="/modules/explorer/_static/components/pages/events-page.html">
 
 
 <dom-module id="course-explorer">
@@ -28,6 +30,10 @@
 
         <feedback-page></feedback-page>
 
+        <help-page></help-page>
+
+        <events-page></events-page>
+
 
       <div id="explorer" class="page-wrapper">
 
@@ -80,6 +86,8 @@ <h2>Topic Library</h2>
                   <div class="section topic-library">
                       <div class="simple-container">
 
+                        <h3 class="explorer-title">Featured Courses</h3>
+
                               <filter-sidebar
                                       filter-options="{{ filterOptions }}"
                                       categories="[[categories]]"
@@ -141,7 +149,7 @@ <h2>Topic Library</h2>
             '{site {title, logo {url, altText},' +
             '  courseExplorer {extraContent}}, ' +
             'currentUser {' +
-            '  email, loggedIn, canViewDashboard, loginUrl (destUrl: "/"),' +
+            '  email, loggedIn, canViewDashboard, loginUrl (destUrl: "/#!explorer"),' +
             '  logoutUrl (destUrl: "/")}}'
         }
       },

coursebuilder/modules/explorer/_static/components/pages/events-page.html

@@ -0,0 +1,148 @@
+<link rel="import" href="/static/polymer-1.2.0/polymer/polymer.html">
+
+
+<dom-module id="events-page">
+  <template>
+    <div id="events" class="page-wrapper">
+
+      <div class="section blue-section">
+        <div class="blue-section-inner">
+          <h2>Face to Face</h2>
+
+          <div class="container">
+            <div class="partners-containter">
+              <ul class="tabs">
+                <li class="tab"><a href="#triaining-session" class="active">Training sessions</a></li>
+                <li class="tab"><a href="#one-on-one">1-on-1 mentoring</a></li>
+              </ul>
+            </div>
+          </div>
+
+        </div>
+      </div>
+
+      <div class="container section">
+        <div class="partners-containter">
+
+          <div id="triaining-session" class="row">
+
+            <div class="col s12 m6 l6">
+              <div class="card">
+                <h3>Sheffield - Free face-to-face training at Google Digital Garage (OPEN NOW)</h3>
+                <div class="card-image center">
+                  <img
+                      src="https://lh3.googleusercontent.com/QfURteGZIdeSbARSclIJeLnP4oP2K9kUtGk0ak6Zb0Upo-cH3xV3KsltZRR6m1yxSkXfPt__kC5JAjLSCPL8lVL2=s0">
+                </div>
+                <div class="event-content">
+                  <a href="#!" class="event-register">REGISTER NOW</a>
+                  <p>
+                    Come visit us at 15 Barker's Pool, Sheffield, S1 2HB for free digital skills mentoring. Open from
+                    28th April, 2017. Opening hours: M-F: 10am to 6pm Sat: 10am to 5pm Sun: 10am to 4pm
+                  </p>
+                </div>
+              </div>
+            </div>
+
+            <div class="col s12 m6 l6">
+              <div class="card">
+                <h3>Sheffield - Free face-to-face training at Google Digital Garage (OPEN NOW)</h3>
+                <div class="card-image center">
+                  <img
+                      src="https://lh3.googleusercontent.com/PxX2W_RYkyV3HPjLyFe0VaApRKe6LRwnFcA5I37D1vcLHJ10EhCTL_wn5BoEM9UfgI_iIaucst3c9XNO7PyiVw=s0">
+                </div>
+                <div class="event-content">
+                  <a href="#!" class="event-register">REGISTER NOW</a>
+                  <p>
+                    Come visit us at 15 Barker's Pool, Sheffield, S1 2HB for free digital skills mentoring. Open from
+                    28th April, 2017. Opening hours: M-F: 10am to 6pm Sat: 10am to 5pm Sun: 10am to 4pm
+                  </p>
+                </div>
+              </div>
+            </div>
+
+            <div class="col s12 m6 l6">
+              <div class="card">
+                <h3>Sheffield - Free face-to-face training at Google Digital Garage (OPEN NOW)</h3>
+                <div class="card-image center">
+                  <img
+                      src="https://lh3.googleusercontent.com/QfURteGZIdeSbARSclIJeLnP4oP2K9kUtGk0ak6Zb0Upo-cH3xV3KsltZRR6m1yxSkXfPt__kC5JAjLSCPL8lVL2=s0">
+                </div>
+                <div class="event-content">
+                  <a href="#!" class="event-register">REGISTER NOW</a>
+                  <p>
+                    Come visit us at 15 Barker's Pool, Sheffield, S1 2HB for free digital skills mentoring. Open from
+                    28th April, 2017. Opening hours: M-F: 10am to 6pm Sat: 10am to 5pm Sun: 10am to 4pm
+                  </p>
+                </div>
+              </div>
+            </div>
+
+            <div class="col s12 m6 l6">
+              <div class="card">
+                <h3>Sheffield - Free face-to-face training at Google Digital Garage (OPEN NOW)</h3>
+                <div class="card-image center">
+                  <img
+                      src="https://lh3.googleusercontent.com/PxX2W_RYkyV3HPjLyFe0VaApRKe6LRwnFcA5I37D1vcLHJ10EhCTL_wn5BoEM9UfgI_iIaucst3c9XNO7PyiVw=s0">
+                </div>
+                <div class="event-content">
+                  <a href="#!" class="event-register">REGISTER NOW</a>
+                  <p>
+                    Come visit us at 15 Barker's Pool, Sheffield, S1 2HB for free digital skills mentoring. Open from
+                    28th April, 2017. Opening hours: M-F: 10am to 6pm Sat: 10am to 5pm Sun: 10am to 4pm
+                  </p>
+                </div>
+              </div>
+            </div>
+
+          </div>
+          <div id="one-on-one" class="row">
+            <div class="col s12 m6 l6">
+              <div class="card">
+                <h3>Sheffield - Free face-to-face training at Google Digital Garage (OPEN NOW)</h3>
+                <div class="card-image center">
+                  <img
+                      src="https://lh3.googleusercontent.com/XFDQjClzh8tkyp2QwC4FfNxk7Ut79R7jd88VAQGNH2OpO9jihO02SnNExr6OtOsjjnogY36P_6GQOXOPzOd1A9Y=s0">
+                </div>
+                <div class="event-content">
+                  <a href="#!" class="event-register">REGISTER NOW</a>
+                  <p>
+                    Come visit us at 15 Barker's Pool, Sheffield, S1 2HB for free digital skills mentoring. Open from
+                    28th April, 2017. Opening hours: M-F: 10am to 6pm Sat: 10am to 5pm Sun: 10am to 4pm
+                  </p>
+                </div>
+              </div>
+            </div>
+
+            <div class="col s12 m6 l6">
+              <div class="card">
+                <h3>Sheffield - Free face-to-face training at Google Digital Garage (OPEN NOW)</h3>
+                <div class="card-image center">
+                  <img
+                      src="https://lh3.googleusercontent.com/TaH9I3GrivjWEHFk858XTtZ89d1MXoo4sFsyxSUszPiDDSnfuA5gMXnDhpAthHhaDPjhsKlXk7S95CLEuVQqbQ=s0">
+                </div>
+                <div class="event-content">
+                  <a href="#!" class="event-register">REGISTER NOW</a>
+                  <p>
+                    Come visit us at 15 Barker's Pool, Sheffield, S1 2HB for free digital skills mentoring. Open from
+                    28th April, 2017. Opening hours: M-F: 10am to 6pm Sat: 10am to 5pm Sun: 10am to 4pm
+                  </p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </template>
+
+  <script>
+    Polymer({
+      is: 'events-page',
+      properties: {
+        currentUser: Object,
+        site: Object
+      }
+    })
+  </script>
+</dom-module>