Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
Course List cards CSS & HTML tweaks (#648)
Browse files Browse the repository at this point in the history
* CSS & HTML tweaks pending UX review

* Update translations
  • Loading branch information
thallada authored Mar 22, 2017
1 parent 6b35399 commit 1e0960a
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 33 deletions.
Binary file modified analytics_dashboard/conf/locale/en/LC_MESSAGES/django.mo
Binary file not shown.
25 changes: 10 additions & 15 deletions analytics_dashboard/conf/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-13 13:53-0400\n"
"POT-Creation-Date: 2017-03-16 11:31-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -522,7 +522,7 @@ msgstr ""
#. Translators: This is a label to identify the number of learners who ever enrolled in the course.
#. Translators: This is a label to identify the maximum number of learners ever in all of the instructor's courses.
#: courses/templates/courses/enrollment_activity.html:59
#: courses/templates/courses/index.html:32
#: courses/templates/courses/index.html:25
msgid "Total Enrollment"
msgstr ""

Expand All @@ -534,7 +534,7 @@ msgstr ""
#. Translators: This is a label to identify current learner enrollment.
#. Translators: This is a label to identify the current number of learners in all of the instructor's courses.
#: courses/templates/courses/enrollment_activity.html:68
#: courses/templates/courses/index.html:39
#: courses/templates/courses/index.html:32
msgid "Current Enrollment"
msgstr ""

Expand All @@ -546,7 +546,7 @@ msgstr ""
#. Translators: This is a label indicating the change in the number of learners enrolled in a course since the previous week.
#. Translators: This is a label to identify the change in the number of learners in all of the instructor's courses in the last week.
#: courses/templates/courses/enrollment_activity.html:76
#: courses/templates/courses/index.html:46
#: courses/templates/courses/index.html:39
msgid "Change in Last Week"
msgstr ""

Expand All @@ -557,7 +557,7 @@ msgstr ""
#. Translators: This is a label to identify enrollment of learners on the verified track.
#. Translators: This is a label to identify the current number of verified learners in all of the instructor's courses.
#: courses/templates/courses/enrollment_activity.html:84
#: courses/templates/courses/index.html:53
#: courses/templates/courses/index.html:46
msgid "Verified Enrollment"
msgstr ""

Expand Down Expand Up @@ -816,28 +816,23 @@ msgstr ""
msgid "Courses"
msgstr ""

#: courses/templates/courses/index.html:14
#, python-format
msgid "Welcome, %(username)s!"
msgstr ""

#: courses/templates/courses/index.html:23
#: courses/templates/courses/index.html:16
msgid "Across all your courses:"
msgstr ""

#: courses/templates/courses/index.html:33
#: courses/templates/courses/index.html:26
msgid "Total enrollments across all of your courses."
msgstr ""

#: courses/templates/courses/index.html:40
#: courses/templates/courses/index.html:33
msgid "Current enrollments across all of your courses."
msgstr ""

#: courses/templates/courses/index.html:47
#: courses/templates/courses/index.html:40
msgid "Total change in enrollment last week across all of your courses."
msgstr ""

#: courses/templates/courses/index.html:54
#: courses/templates/courses/index.html:47
msgid "Verified enrollments across all of your courses."
msgstr ""

Expand Down
Binary file modified analytics_dashboard/conf/locale/en/LC_MESSAGES/djangojs.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion analytics_dashboard/conf/locale/en/LC_MESSAGES/djangojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-13 13:53-0400\n"
"POT-Creation-Date: 2017-03-16 11:31-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
7 changes: 0 additions & 7 deletions analytics_dashboard/courses/templates/courses/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@
{% block title %}{% trans "Courses" %} {{ block.super }}{% endblock title %}


{% block header-text %}
<h2 class="row">
{% blocktrans with username=request.user.username %}Welcome, {{ username }}!{% endblocktrans %}
</h2>
{% endblock %}


{% block summary-cards %}
<section class="view-section row">
<div class="section-heading bordered">
Expand Down
16 changes: 6 additions & 10 deletions analytics_dashboard/static/sass/_developer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,6 @@ $lens-nav-margin: 15px;
body.view-course-list {
$course-list-vertical-padding: $padding-large-vertical * 2.5;
#content {
margin-top: $course-list-vertical-padding;

.view-section {
margin-bottom: 0px;

Expand All @@ -273,6 +271,10 @@ body.view-course-list {
margin-bottom: $padding-large-vertical * 4;
}

.course-list-header-region {
padding-top: $padding-large-vertical;
}

.section-heading {
margin-bottom: $padding-large-vertical;

Expand All @@ -282,13 +284,7 @@ body.view-course-list {
}

.view-head {
color: $edx-gray-d2;
margin-bottom: $course-list-vertical-padding;

h2 {
margin-top: 0px;
margin-bottom: 0px;
}
margin: 0;
}

.help-msg {
Expand Down Expand Up @@ -847,7 +843,7 @@ body.view-dashboard {
.course-list {
@include backgrid-table(course-list);

.course-list-active-filters {
.course-list-active-filters .col {
min-height: 43px;
}

Expand Down

0 comments on commit 1e0960a

Please sign in to comment.