Front-end disign of history page (no diff) ECOM-7010

course_discovery/conf/locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-01 11:44+0500\n"
+"POT-Creation-Date: 2017-02-01 14:55+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -485,25 +485,30 @@ msgstr ""
 
 #: apps/publisher/forms.py templates/publisher/add_courserun_form.html
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Course Title"
 msgstr ""
 
-#: apps/publisher/forms.py templates/publisher/dashboard/_studio_requests.html
+#: apps/publisher/forms.py templates/publisher/course_revision_history.html
+#: templates/publisher/dashboard/_studio_requests.html
 msgid "Course Number"
 msgstr ""
 
 #: apps/publisher/forms.py apps/publisher/models.py
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Brief Description"
 msgstr ""
 
 #: apps/publisher/forms.py apps/publisher/models.py
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Full Description"
 msgstr ""
 
 #: apps/publisher/forms.py apps/publisher/models.py
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 #: templates/publisher/course_run_detail/_all.html
 msgid "Prerequisites"
 msgstr ""
@@ -629,6 +634,7 @@ msgid "Level Type"
 msgstr ""
 
 #: apps/publisher/models.py templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Expected Learnings"
 msgstr ""
 
@@ -1603,14 +1609,17 @@ msgid "Course Team Admin"
 msgstr ""
 
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Primary Subject"
 msgstr ""
 
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Secondary Subject"
 msgstr ""
 
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Tertiary Subject"
 msgstr ""
 
@@ -1619,6 +1628,7 @@ msgid "Course Image"
 msgstr ""
 
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 #: templates/publisher/course_run_detail/_all.html
 #: templates/publisher/course_run_detail/_salesforce.html
 msgid "Course Level"
@@ -1649,6 +1659,15 @@ msgstr ""
 msgid "UPDATE COURSE"
 msgstr ""
 
+#: templates/publisher/course_revision_history.html
+msgid "Revision History"
+msgstr ""
+
+#: templates/publisher/course_revision_history.html
+#, python-format
+msgid "%(date)s by %(name)s"
+msgstr ""
+
 #: templates/publisher/course_run_detail.html
 msgid "Course Run Detail"
 msgstr ""

course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-01 11:44+0500\n"
+"POT-Creation-Date: 2017-02-01 14:55+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

course_discovery/conf/locale/eo/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-01 11:44+0500\n"
+"POT-Creation-Date: 2017-02-01 14:55+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -601,25 +601,30 @@ msgstr "Örgänïzätïön Nämé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α
 
 #: apps/publisher/forms.py templates/publisher/add_courserun_form.html
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Course Title"
 msgstr "Çöürsé Tïtlé Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
 
-#: apps/publisher/forms.py templates/publisher/dashboard/_studio_requests.html
+#: apps/publisher/forms.py templates/publisher/course_revision_history.html
+#: templates/publisher/dashboard/_studio_requests.html
 msgid "Course Number"
 msgstr "Çöürsé Nümßér Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
 
 #: apps/publisher/forms.py apps/publisher/models.py
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Brief Description"
 msgstr "Brïéf Désçrïptïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
 
 #: apps/publisher/forms.py apps/publisher/models.py
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Full Description"
 msgstr "Füll Désçrïptïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
 
 #: apps/publisher/forms.py apps/publisher/models.py
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 #: templates/publisher/course_run_detail/_all.html
 msgid "Prerequisites"
 msgstr "Préréqüïsïtés Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
@@ -747,6 +752,7 @@ msgid "Level Type"
 msgstr "Lévél Týpé Ⱡ'σяєм ιρѕυм ∂σłσ#"
 
 #: apps/publisher/models.py templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Expected Learnings"
 msgstr "Éxpéçtéd Léärnïngs Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт#"
 
@@ -1936,14 +1942,17 @@ msgid "Course Team Admin"
 msgstr "Çöürsé Téäm Àdmïn Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
 
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Primary Subject"
 msgstr "Prïmärý Süßjéçt Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
 
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Secondary Subject"
 msgstr "Séçöndärý Süßjéçt Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
 
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 msgid "Tertiary Subject"
 msgstr "Tértïärý Süßjéçt Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
 
@@ -1952,6 +1961,7 @@ msgid "Course Image"
 msgstr "Çöürsé Ìmägé Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
 
 #: templates/publisher/course_detail.html
+#: templates/publisher/course_revision_history.html
 #: templates/publisher/course_run_detail/_all.html
 #: templates/publisher/course_run_detail/_salesforce.html
 msgid "Course Level"
@@ -1985,6 +1995,15 @@ msgstr ""
 msgid "UPDATE COURSE"
 msgstr "ÛPDÀTÉ ÇÖÛRSÉ Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
 
+#: templates/publisher/course_revision_history.html
+msgid "Revision History"
+msgstr "Révïsïön Hïstörý Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
+
+#: templates/publisher/course_revision_history.html
+#, python-format
+msgid "%(date)s by %(name)s"
+msgstr "%(date)s ßý %(name)s Ⱡ'σяєм ιρѕυм ∂σłσ#"
+
 #: templates/publisher/course_run_detail.html
 msgid "Course Run Detail"
 msgstr "Çöürsé Rün Détäïl Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"

course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-01 11:44+0500\n"
+"POT-Creation-Date: 2017-02-01 14:55+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

course_discovery/static/sass/publisher/publisher.scss

@@ -885,3 +885,54 @@ select {
     display: none;
   }
 }
+
+.parent-course-history {
+  @include margin-left(15px);
+  margin-top: 10px;
+  font-family: 'Open Sans', sans-serif;
+  display: inline-block;
+
+  .title {
+    font-weight: 700;
+    font-size: 32px;
+    margin-bottom: 10px;
+  }
+
+  .btn-show-changes {
+    @include margin-left(60px);
+    cursor: pointer;
+    color: #ffffff;
+    background-color: #169BD5;
+    border-color: #169BD5;
+    width: 120px;
+    text-align: center;
+    font-size: 13px;
+    font-weight: 600;
+    border-radius: 5px;
+  }
+
+  .hr-line {
+    float: left;
+    width: 882px;
+  }
+
+  .changed-by {
+    font-weight: 400;
+    font-size: 20px;
+  }
+
+  .field-container {
+    margin-bottom: 20px;
+
+    .field-title {
+      margin-bottom: 10px;
+      font-size: 18px;
+      font-weight: 600;
+    }
+
+    span {
+      font-size: 14px;
+      font-weight: 400;
+    }
+  }
+}

course_discovery/templates/publisher/course_revision_history.html

-<!DOCTYPE html>
-<html>
-<head lang="en">
-  <meta charset="UTF-8">
-  <title></title>
-</head>
-<body>
-
-{#TODO revision template will be added in other subtask#}
-
-</body>
-</html>
+{% extends 'base.html' %}
+{% load i18n %}
+{% block title %}
+  {% trans "Revision History" %}
+{% endblock title %}
+
+{% block content %}
+  <div class="parent-course-history">
+    <div class="title">{% trans "Revision History" %}</div>
+
+    <div>
+      <p class="changed-by">
+        {% with date=history_object.history_date|date:"d-m-Y" name=history_object.history_user.full_name %}
+          {% blocktrans trimmed %}
+            {{ date }} by {{ name }}
+          {% endblocktrans %}
+        {% endwith %}
+        <button class="btn-show-changes">Show changes</button>
+      </p>
+    </div>
+
+    <div>
+      <hr class="hr-line"/>
+    </div>
+
+    <div class="field-container">
+      <div class="field-title">{% trans "Course Title" %}</div>
+      <span>{{ history_object.title }}</span>
+    </div>
+
+    <div class="field-container">
+      <div class="field-title">{% trans "Course Number" %}</div>
+      <span>{{ history_object.number }}</span>
+    </div>
+
+
+    <div class="field-container">
+      <div class="field-title">{% trans "Brief Description" %}</div>
+      <span>{{ history_object.short_description }}</span>
+    </div>
+
+
+    <div class="field-container">
+      <div class="field-title">{% trans "Full Description" %}</div>
+      <span>{{ history_object.full_description }}</span>
+    </div>
+
+    <div class="field-container">
+      <div class="field-title">{% trans "Expected Learnings" %}</div>
+      <span>{{ history_object.expected_learnings }}</span>
+    </div>
+
+    <div class="field-container">
+      <div class="field-title">{% trans "Primary Subject" %}</div>
+      <span>{{ history_object.primary_subject }}</span>
+    </div>
+
+    <div class="field-container">
+      <div class="field-title">{% trans "Secondary Subject" %}</div>
+      <span>{{ history_object.secondary_subject }}</span>
+    </div>
+
+    <div class="field-container">
+      <div class="field-title">{% trans "Tertiary Subject" %}</div>
+      <span>{{ history_object.tertiary_subject }}</span>
+    </div>
+
+    <div class="field-container">
+      <div class="field-title">{% trans "Prerequisites" %}</div>
+      <span>{{ history_object.prerequisites }}</span>
+    </div>
+
+    <div class="field-container">
+      <div class="field-title">{% trans "Course Level" %}</div>
+      <span>{{ history_object.level_type }}</span>
+    </div>
+  </div>
+
+{% endblock %}