Skip to content

C
course-discovery
Commit 1052a3d3 by Roderick Morales Committed by Awais Qureshi
Options

CSS changes for forms and tables in dashboard

parent 265d6a5d
Showing with 164 additions and 183 deletions
course_discovery/apps/publisher/tests/test_views.py
......@@ -1477,7 +1477,7 @@ class DashboardTests(TestCase):
response = self.client.get(self.page_url)
self.assertEqual(response.status_code, 200)
self.assertContains(response, 'COURSE ABOUT PAGES')
self.assertContains(response, 'Course About Pages')
self.assertContains(response, 'EdX Publisher is used to create course About pages.')
self.assertEqual(len(response.context['studio_request_courses']), studio_count)
......
course_discovery/conf/locale/en/LC_MESSAGES/django.po
......@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-08 13:53+0500\n"
"POT-Creation-Date: 2017-06-08 18:57+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"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
#: apps/api/filters.py
#, python-brace-format
......@@ -674,6 +674,7 @@ msgid "XSeries"
msgstr ""
#: apps/publisher/forms.py templates/publisher/course_run_detail/_all.html
#: templates/publisher/course_run_detail/_drupal.html
msgid "MicroMasters"
msgstr ""
......@@ -686,6 +687,7 @@ msgid "XSeries Name"
msgstr ""
#: apps/publisher/forms.py templates/publisher/course_run_detail/_all.html
#: templates/publisher/course_run_detail/_drupal.html
msgid "Professional Certificate Name"
msgstr ""
......@@ -1471,21 +1473,6 @@ msgid "BIO1.1x; BIO1.2x etc."
msgstr ""
#: templates/publisher/add_course_form.html
#, python-format
msgid ""
"After you select %(strong_start)sCreate New Course%(strong_end)s, pages for "
"the course and for one course run are created in Publisher. You can add "
"About page information to the course and course run pages at any time."
msgstr ""
#: templates/publisher/add_course_form.html
msgid ""
"Additionally, edX will create a URL for the course in Studio. When the "
"Studio URL is ready, you will receive an email notification. You can then go"
" to Studio and enter content for the course."
msgstr ""
#: templates/publisher/add_course_form.html
msgid "I want to add a run to this course at this time"
msgstr ""
......@@ -1496,13 +1483,6 @@ msgstr ""
#: templates/publisher/add_courserun_form.html
msgid ""
"\n"
" The information on this page is based on the latest published course run, if a published course run exists.\n"
" "
msgstr ""
#: templates/publisher/add_courserun_form.html
msgid ""
"\n"
" When you create a course run, Publisher immediately creates a page for the course run in Publisher, and the edX team creates a Studio URL for the course run. You will receive an email message when edX has created the Studio URL.\n"
" "
msgstr ""
......@@ -1702,16 +1682,6 @@ msgstr ""
#: templates/publisher/course_edit_form.html
msgid ""
"To add or edit information about this course, make changes on this page and "
"then select"
msgstr ""
#: templates/publisher/course_edit_form.html
msgid "Update Course."
msgstr ""
#: templates/publisher/course_edit_form.html
msgid ""
"All required fields must be complete before this course can be sent for "
"review."
msgstr ""
......@@ -2114,7 +2084,7 @@ msgid "500 character limit, including spaces."
msgstr ""
#: templates/publisher/course_edit_form.html
msgid "UPDATE COURSE"
msgid "Update Course"
msgstr ""
#: templates/publisher/course_revision_history.html
......@@ -2141,10 +2111,8 @@ msgstr ""
#: templates/publisher/course_run/edit_run_form.html
#, python-format
msgid ""
"To add or edit information about this course run, make changes on this page "
"and then select %(strong_start)sUpdate Course Run%(strong_end)s. All "
"required fields must be complete before this course run can be sent for "
"review."
"%(span_start)s* All required fields must be complete before this course run "
"can be sent for review.%(span_end)s"
msgstr ""
#: templates/publisher/course_run/edit_run_form.html
......@@ -2610,7 +2578,7 @@ msgid "Runs"
msgstr ""
#: templates/publisher/dashboard.html
msgid "COURSE ABOUT PAGES"
msgid "Course About Pages"
msgstr ""
#: templates/publisher/dashboard.html
......@@ -2639,19 +2607,19 @@ msgid "Course runs"
msgstr ""
#: templates/publisher/dashboard.html
msgid "IN DEVELOPMENT"
msgid "In Development"
msgstr ""
#: templates/publisher/dashboard.html
msgid "IN PREVIEW"
msgid "In Preview"
msgstr ""
#: templates/publisher/dashboard.html
msgid "STUDIO REQUEST"
msgid "Studio Request"
msgstr ""
#: templates/publisher/dashboard.html
msgid "PUBLISHED ABOUT PAGES"
msgid "Published About Pages"
msgstr ""
#: templates/publisher/dashboard/_in_preview.html
......
course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po
......@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-08 13:53+0500\n"
"POT-Creation-Date: 2017-06-08 18:57+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"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
#: static/js/catalogs-change-form.js
msgid "Preview"
......
course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po
......@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-08 13:53+0500\n"
"POT-Creation-Date: 2017-06-08 18:57+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"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: static/js/catalogs-change-form.js
......
course_discovery/static/sass/_build.scss
......@@ -30,8 +30,8 @@
@import 'publisher/buttons-links';
@import 'publisher/navigations';
@import 'publisher/tabs';
@import 'publisher/tables';
@import 'publisher/forms';
@import 'publisher/course_form';
@import 'publisher/publisher';
@import 'publisher/dashboard';
@import 'publisher/tables';
course_discovery/static/sass/publisher/color-palette.scss
$white: #fff;
$gray: #474747;
$gray-border: #e5e5e5;
......@@ -14,5 +15,5 @@ $nav-active: #243342;
$nav-color: #dbe2e2;
$tab-default: #474747;
$tab-border: #DEE1E2;
\ No newline at end of file
$tab-default: $gray;
$tab-border: #DEE1E2;
course_discovery/static/sass/publisher/forms.scss
form.form div.layout{
padding: 0em;
background: none;
&-no-bkg{
background: none;
}
}
fieldset{
& > .row{
-webkit-box-shadow: 0 8px 6px -6px rgba(0,0,0,0.05);
-moz-box-shadow: 0 8px 6px -6px rgba(0,0,0,0.05);
box-shadow: 0 8px 6px -6px rgba(0,0,0,0.05);
}
}
input,
select {
max-width: 100%;
......@@ -5,11 +22,13 @@ select {
.required {
color: red;
font-size: 12px;
font-size: 15px;
}
.optional {
font-weight: normal;
font-size: 15px;
color: $gray;
}
.checkbox-inline {
......
course_discovery/static/sass/publisher/lib.scss
......@@ -36,3 +36,4 @@
.actions {
margin-top: 30px;
}
course_discovery/static/sass/publisher/publisher.scss
......@@ -183,7 +183,7 @@
}
.course-information {
margin-bottom: 30px;
margin-bottom: 0px;
input, select {
margin-bottom: 15px;
......@@ -201,10 +201,14 @@
}
.field-title {
border-bottom: 1px solid rgb(51, 51, 51);
padding-bottom: 10px;
margin-bottom: 20px;
margin-top: 20px;
border: 0px solid #e2e2e2;
border-bottom: 0px;
padding: 18px 10px;
margin-top: 36px;
background: $gray-background;
-webkit-box-shadow: 0 -8px 6px -6px rgba(0,0,0,0.05);
-moz-box-shadow: 0 -8px 6px -6px rgba(0,0,0,0.05);
box-shadow: 0 -8px 6px -6px rgba(0,0,0,0.05);
}
.field-label {
font-weight: bold;
......@@ -222,8 +226,8 @@
@include margin-right(10px);
@include padding(10px, 10px, 10px, 10px);
list-style: none;
border-bottom: 3px solid #ccc;
color: #ccc;
border-bottom: 3px solid $gray;
color: $gray;
cursor: pointer;
text-align: center;
......@@ -281,6 +285,8 @@
.row {
@include margin(0, 0, 0, 0);
max-width: 100%;
background: #fff;
padding: 1em 2%;
}
}
}
......
course_discovery/static/sass/publisher/tables.scss
......@@ -29,6 +29,32 @@ table {
}
}
.dataTables_wrapper .dataTables_length{
margin-bottom: 15px;
}
table.dataTable.display{
& thead th{
padding: 14px 18px;
border-top: 1px solid #979797;
border-bottom-color: #979797;
}
& tbody tr:first-child td{
border-top-width: 0 !important;
}
& td{
text-align: center;
border-top: 1px solid #DEE1E2 !important;
}
& td:nth-child(1){
@include text-align(left);
}
&.no-footer{
border-bottom-color: #979797;
}
}
.table-view {
display: table;
width: 100%;
......@@ -73,9 +99,33 @@ table {
&:nth-child(odd) {
.table-col {
background: #f2f2f2;
background: #F9FAFC;
}
}
}
}
}
.dataTables_wrapper .dataTables_paginate .paginate_button.current
, .dataTables_wrapper .dataTables_paginate .paginate_button.current:hover{
padding: 0.1em 0.5em;
border-radius: 30px;
border: 1px solid #0491CB !important;
background: #00A0E3 !important;
color: #fff !important;
font-weight: bold;
font-size: 14px;
}
//reseting plugins colors
table.dataTable.order-column tbody tr > .sorting_1,
table.dataTable.order-column tbody tr > .sorting_2,
table.dataTable.order-column tbody tr > .sorting_3,
table.dataTable.display tbody tr > .sorting_1,
table.dataTable.display tbody tr > .sorting_2,
table.dataTable.display tbody tr > .sorting_3{
background: transparent !important;
}
course_discovery/static/sass/publisher/tabs.scss
......@@ -28,7 +28,7 @@
border: {
width: 0px;
style: solid;
color: #f2f2f2;
color: $gray;
bottom-width: 0;
}
......
course_discovery/static/sass/publisher/typography.scss
html{
font-size: 100%;
}
body{
font-size: 0.9375em;
line-height: 1.5;
}
.hd-3 {
color: #646262;
font-size: 24px;
......
course_discovery/templates/publisher/add_course_form.html
......@@ -26,7 +26,7 @@
<div class="course-form">
<div class="course-information">
<fieldset class="form-group grid-container grid-manual">
<div class="field-title">{% trans "COURSE TITLE" %}</div>
<div class="field-title">{% trans "COURSE TITLE" %} <span class="required float-right">* Required</span></div>
<div class="row">
<div class="col col-6 help-text">
<div class="row">
......@@ -92,7 +92,7 @@
</div>
</div>
<div class="field-title">{% trans "COURSE NUMBER" %}</div>
<div class="field-title">{% trans "COURSE NUMBER" %} <span class="required float-right">* Required</span></div>
<div class="row">
<div class="col col-6 help-text">
<div class="row">
......@@ -132,14 +132,7 @@
</div>
</div>
</div>
<div class="layout-full layout">
<p>
{% blocktrans with strong_start='<strong>' strong_end='</strong>' trimmed %}
After you select {{ strong_start }}Create New Course{{ strong_end }}, pages for the course and for one course run are created in Publisher. You can add About page information to the course and course run pages at any time.
{% endblocktrans %}
</p>
<p>{% trans "Additionally, edX will create a URL for the course in Studio. When the Studio URL is ready, you will receive an email notification. You can then go to Studio and enter content for the course." %}</p>
</div>
<div class="course-form">
<div class="course-information action-buttons">
<div class="field">
......
course_discovery/templates/publisher/add_courserun_form.html
......@@ -10,12 +10,6 @@
<div xmlns="http://www.w3.org/1999/html">
<h1 class="hd-1 emphasized">{% trans "New Course Run" %}</h1>
<div class="copy-base">
<span class="required">* Required</span>
<p>
{% blocktrans %}
The information on this page is based on the latest published course run, if a published course run exists.
{% endblocktrans %}
</p>
<p>
{% blocktrans %}
When you create a course run, Publisher immediately creates a page for the course run in Publisher, and the edX team creates a Studio URL for the course run. You will receive an email message when edX has created the Studio URL.
......@@ -31,7 +25,7 @@
<div class="course-information">
<fieldset class="form-group grid-container grid-manual">
{% if from_dashboard %}
<div class="field-title">{% trans "FIND COURSE" %}</div>
<div class="field-title">{% trans "FIND COURSE" %} <span class="required float-right">* Required</span></div>
<div class="row">
<div class="col col-6 help-text">
<p>
......@@ -57,7 +51,7 @@
</div>
{% endif %}
<div class="field-title">{% trans "COURSE START DATE" %}</div>
<div class="field-title">{% trans "COURSE START DATE" %} <span class="required float-right">* Required</span></div>
<div class="row">
<div class="col col-6 help-text">
<ul>
......@@ -78,7 +72,7 @@
</div>
</div>
<div class="field-title">{% trans "PACING TYPE" %}</div>
<div class="field-title">{% trans "PACING TYPE" %}<span class="required float-right">* Required</span></div>
<div class="row">
<div class="col col-6 help-text">
<p>{% trans "Instructor-paced courses include individual assignments that have specific due dates before the course end date." %} </p>
......@@ -99,7 +93,7 @@
<div class="course-information">
<fieldset class="form-group grid-container grid-manual">
<div class="field-title">{% trans "COURSE END DATE" %}</div>
<div class="field-title">{% trans "COURSE END DATE" %} <span class="required float-right">* Required</span></div>
<div class="row">
<div class="col col-6 help-text">
{% trans "Specify a month, day, and year. If you are unsure of the exact date, specify a day that is close to the estimated end date. For example, if your course will end near the end of March, specify March 31." %}
......@@ -110,7 +104,7 @@
</div>
</div>
<div class="field-title">{% trans "CERTIFICATE TYPE AND PRICE" %}</div>
<div class="field-title">{% trans "CERTIFICATE TYPE AND PRICE" %} <span class="optional float-right">Optional</span></div>
<div class="row">
<div class="col col-6 help-text">
{% trans "If the course offers a verified or professional education certificate, select the certificate type and enter the price for the certificate." %}
......
course_discovery/templates/publisher/course_run/edit_run_form.html
......@@ -21,8 +21,8 @@
{% endfor %}
{% endif %}
<p>
{% blocktrans with strong_start='<strong>' strong_end='</strong>' trimmed %}
To add or edit information about this course run, make changes on this page and then select {{ strong_start }}Update Course Run{{ strong_end }}. All required fields must be complete before this course run can be sent for review.
{% blocktrans with span_start='<span class="required">' span_end='</span>' trimmed %}
{{ span_start }}* All required fields must be complete before this course run can be sent for review.{{ span_end }}
{% endblocktrans %}
</p>
<p>
......@@ -36,7 +36,7 @@
<div class="course-form">
<div class="course-information">
<fieldset class="form-group grid-container grid-manual">
<div class="field-title">{% trans "COURSE START DATE" %}</div>
<div class="field-title">{% trans "COURSE START DATE" %} <span class="required float-right">* Required for review</span></div>
<div class="row">
<div class="col col-6 help-text">
<ul>
......@@ -65,7 +65,7 @@
</div>
</div>
<div class="field-title">{% trans "COURSE END DATE" %}</div>
<div class="field-title">{% trans "COURSE END DATE" %} <span class="required float-right">* Required for review</span></div>
<div class="row">
<div class="col col-6 help-text">
{% trans "Note that times use UTC. Specify a month, day, and year. If you are unsure of the exact date, specify a day that is close to the estimated end date. For example, if your course will end near the end of March, specify March 31." %}
......@@ -76,7 +76,7 @@
</div>
</div>
<div class="field-title">{% trans "COURSE PACING" %}</div>
<div class="field-title">{% trans "COURSE PACING" %} <span class="required float-right">* Required for review</span></div>
<div class="row">
<div class="col col-6 help-text">
<p>{% trans "Instructor-paced courses include individual assignments that have specific due dates before the course end date." %} </p>
......@@ -88,7 +88,7 @@
</div>
</div>
<div class="field-title">{% trans "STUDIO URL" %}</div>
<div class="field-title">{% trans "STUDIO URL" %} <span class="required float-right">* Required for review</span></div>
<div class="row">
<div class="col col-6 help-text">
<p>{% trans "The Studio URL for this course run." %}</p>
......@@ -113,7 +113,7 @@
</div>
<div id="about-page" class="course-information {% if publisher_hide_features_for_pilot %}hidden{% endif %}">
<fieldset class="form-group grid-container grid-manual">
<div class="field-title">{% trans "PROGRAM ASSOCIATION" %}</div>
<div class="field-title">{% trans "PROGRAM ASSOCIATION" %} <span class="optional float-right">Optional</span></div>
<div class="row">
<div class="col col-6 help-text">
{% trans "If this course is part of a program, select the program type, and then enter the name of the program." %}
......@@ -173,7 +173,7 @@
</div>
</div>
<div class="field-title">{% trans "CERTIFICATE TYPE AND PRICE" %}</div>
<div class="field-title">{% trans "CERTIFICATE TYPE AND PRICE" %} <span class="required float-right">* Required for review</span></div>
<div class="row">
<div class="col col-6 help-text">
{% trans "If the course offers a verified or professional education certificate, select the certificate type and enter the price for the certificate." %}
......@@ -203,13 +203,13 @@
</div>
</div>
<div class="field-title">{% trans "COURSE STAFF" %}</div>
<div class="field-title">{% trans "COURSE STAFF" %} <span class="required float-right">* Required for review</span></div>
<div class="row">
<div class="col col-6 help-text">
{% trans "The primary instructor or instructors for the course." %}
</div>
<div class="col col-6 instructor-select">
<label class="field-label ">{{ run_form.staff.label_tag }}</label>
<label class="field-label ">{{ run_form.staff.label_tag }} <span class="required">*</span></label>
{{ run_form.staff }}
<div class="selected-instructor">
{% if publisher_add_instructor_feature %}
......@@ -219,7 +219,7 @@
</div>
</div>
<div class="field-title">{% trans "ESTIMATED EFFORT" %}</div>
<div class="field-title">{% trans "ESTIMATED EFFORT" %} <span class="optional float-right">Optional</span></div>
<div class="row">
<div class="col col-6">
{% trans "The number of hours per week the learner should expect to spend on the course. This may be a range." %}
......@@ -241,16 +241,16 @@
</div>
</div>
<div class="field-title">{% trans "LANGUAGE(S)" %}</div>
<div class="field-title">{% trans "LANGUAGE(S)" %} <span class="required float-right">* Required for review</span></div>
<div class="row">
<div class="col col-6 help-text">
{% trans "The languages available for videos, video transcripts, and other course content." %}
</div>
<div class="col col-6">
<label class="field-label ">{{ run_form.language.label_tag }}</label>
<label class="field-label ">{{ run_form.language.label_tag }} <span class="required">*</span></label>
{{ run_form.language}}
<label class="field-label ">{{ run_form.transcript_languages.label_tag }}</label>
<label class="field-label ">{{ run_form.transcript_languages.label_tag }} <span class="required">*</span></label>
{{ run_form.transcript_languages}}
<label class="field-label margin-top20">{{ run_form.video_language.label_tag }}</label>
......@@ -258,7 +258,7 @@
</div>
</div>
<div class="field-title">{% trans "LENGTH" %}</div>
<div class="field-title">{% trans "LENGTH" %} <span class="optional float-right">Optional</span></div>
<div class="row">
<div class="col col-6 help-text">
{% trans "The length of the course, in weeks, rounded to the nearest whole number." %}
......
course_discovery/templates/publisher/dashboard.html
......@@ -9,7 +9,7 @@
{% block page_content %}
<div class="about-and-add-buttons clearfix">
<h2 class="hd-2 emphasized">{% trans "COURSE ABOUT PAGES" %}</h2>
<h2 class="hd-2 emphasized">{% trans "Course About Pages" %}</h2>
<div class="col-60 float-left">
<p class="about-publisher">{% trans "EdX Publisher is used to create course About pages. Users enter, review, and approve content in Publisher. Publisher keeps track of the details and sends email updates when actions are necessary." %}</p>
......@@ -31,21 +31,21 @@
<ul role="tablist" class="tabs">
<li role="tab" id="tab-progress" class="tab" aria-selected="true" aria-expanded="false"
aria-controls="progress" tabindex="0">
<span>{{ in_progress_count }}</span>{% trans "IN DEVELOPMENT" %}
<span>{{ in_progress_count }}</span>{% trans "In Development" %}
</li>
<li role="tab" id="tab-preview" class="tab" aria-selected="false" aria-expanded="false"
aria-controls="preview" tabindex="-1">
<span>{{ preview_count }}</span>{% trans "IN PREVIEW" %}
<span>{{ preview_count }}</span>{% trans "In Preview" %}
</li>
{% if is_project_coordinator %}
<li role="tab" id="tab-studio" class="tab" aria-selected="false" aria-expanded="true"
aria-controls="studio" tabindex="-1" data-studio-count="{{ studio_count }}">
<span id="studio-count">{{ studio_count }}</span>{% trans "STUDIO REQUEST" %}
<span id="studio-count">{{ studio_count }}</span>{% trans "Studio Request" %}
</li>
{% endif %}
<li role="tab" id="tab-published" class="tab" aria-selected="false" aria-expanded="false"
aria-controls="published" tabindex="-1">
<span>{{ published_count }}</span>{% trans "PUBLISHED ABOUT PAGES" %}
<span>{{ published_count }}</span>{% trans "Published About Pages" %}
</li>
</ul>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment