Skip to content

C
course-discovery
Commit a4590621 by Waheed Ahmed
Options

Small issues fixed and RTL support.

parent f36f4bb0
Showing with 43 additions and 46 deletions
course_discovery/apps/publisher/tests/test_views.py
......@@ -993,7 +993,7 @@ class DashboardTests(TestCase):
# group-b course
self._create_course_assign_permissions(State.DRAFT, self.group_b)
self.table_class = "data-table-{id} display nowrap"
self.table_class = "data-table-{id} display"
def _create_course_assign_permissions(self, state, group):
""" DRY method to create course and assign the permissions"""
......
course_discovery/static/js/publisher/tabs.js
......@@ -56,7 +56,7 @@ $(function() {
var key = e.which,
focused = $(e.currentTarget),
index = $(e.currentTarget).parent().find('.tab').index(focused),
total = $(e.currentTarget).parent().find('.tab').size() - 1,
total = $(e.currentTarget).parent().find('.tab').length - 1,
panel = $(focused).attr('aria-controls');
switch (key) {
......
course_discovery/static/sass/_build.scss
......@@ -23,5 +23,5 @@
// ------------------------------
@import "base";
@import 'publisher/course_form';
@import 'publisher/course_detail';
@import 'publisher/publisher';
@import 'publisher/dashboard';
course_discovery/static/sass/publisher/dashboard.scss
.publisher-container {
@include padding(5px, 5px, 5px, 5px);
@include margin(0, 0, 0, 0);
@include padding-left(5px);
font-family: "Open Sans", Arial, Helvetica, sans-serif;
.studio-instance-success {
......@@ -91,7 +92,7 @@
}
.tab-panel {
@include padding(35px, 20px, 35px, 20px);
@include padding(20px, 20px, 20px, 20px);
display: none;
border: 2px solid #169bd5;
background-color: #fff;
......@@ -121,7 +122,7 @@
tr {
td {
@include text-align(right);
@include text-align(left);
}
}
}
......@@ -213,4 +214,3 @@
}
}
}
course_discovery/static/sass/publisher/course_detail.scss → course_discovery/static/sass/publisher/publisher.scss
......@@ -228,18 +228,20 @@ $light-gray: rgba(204, 204, 204, 1);
}
}
.layout, .layout-flush {
margin-left: 0;
margin-right: 0;
@include margin-left(0);
@include margin-right(0);
max-width: 100%;
.layout-col-menu {
padding-left: 0;
padding-right: 0;
@include margin-left(0);
@include padding-left(0);
@include padding-right(0);
width: 20%;
}
.layout-col-container {
width: 80%;
@include padding(20px, 20px, 20px, 20px);
width: 78%;
}
.menu-list {
......@@ -353,16 +355,16 @@ $light-gray: rgba(204, 204, 204, 1);
font-size: 18px;
font-weight: 600;
display: inline-block;
margin: 5px 0 5px;
@include margin(5px, 0px, 5px, 0px);
.tab-container {
button {
@include padding(5px, 5px, 5px, 5px);
@include margin(5px, 5px, 5px, 5px);
@include float(left);
display: block;
padding: 10px;
color: #0ea6ec;
@include float(left);
margin: 0 5px;
border: none;
background-color: transparent;
......@@ -370,17 +372,12 @@ $light-gray: rgba(204, 204, 204, 1);
border-bottom: 4px solid #0ea6ec;
color: black;
}
&:first-child {
@include margin-left(30px);
}
}
}
}
#app {
background: #fff;
padding: 0 30px 30px;
}
.alert-messages .alert {
......@@ -388,8 +385,8 @@ $light-gray: rgba(204, 204, 204, 1);
}
.publisher-layout {
@include padding(15px, 15px, 15px, 15px);
background: rgb(242, 242, 242);
padding: 15px;
margin-bottom: 20px;
.layout-title {
......@@ -398,7 +395,7 @@ $light-gray: rgba(204, 204, 204, 1);
}
.course-form {
margin: 0;
@include margin(0px, 0px, 0px, 0px);
box-shadow: none;
}
}
......@@ -415,8 +412,8 @@ select {
.checkbox-inline {
ul {
@include margin-left(0);
list-style: none;
margin-left: 0;
margin-bottom: 15px;
li {
......@@ -424,7 +421,7 @@ select {
@include margin-right(10px);
&:last-child {
margin-right: 0;
@include margin-right(0);
}
}
}
......@@ -452,10 +449,10 @@ select {
font-weight: bold;
}
.course-tabs{
list-style: none;
@include float(left);
@include margin-right(10px);
padding: 10px;
@include padding(10px, 10px, 10px, 10px);
list-style: none;
border-bottom: 3px solid #ccc;
color: #ccc;
text-align: center;
......@@ -472,7 +469,7 @@ select {
.content{
display: none;
p{
margin: 0;
@include margin(0px, 0px, 0px, 0px);
}
p:first-of-type{
margin-bottom: 20px;
......@@ -496,12 +493,12 @@ select {
font-size: 16px;
.btn-copy {
text-decoration: none;
@include margin-left(10px);
padding-top: 2px;
padding-bottom: 2px;
@include padding-left(5px);
@include padding-right(5px);
text-decoration: none;
padding-top: 2px;
padding-bottom: 2px;
}
}
}
......@@ -531,12 +528,12 @@ select {
}
.breadcrumb {
padding: 8px 15px;
@include padding-left(0);
@include padding(8px, 15px, 8px, 15px);
@include margin(0, 0, 1.25rem, 0);
list-style: none;
background: white;
border-radius: 3px;
padding-left: 0;
margin: 0 0 1.25rem;
> li {
display: inline-block;
......@@ -552,8 +549,8 @@ select {
}
+ li:before {
@include padding(0px, 5px, 0px, 5px);
content: " / ";
padding: 0 5px;
color: #ccc;
}
......@@ -570,12 +567,12 @@ select {
.page-header {
@include margin(0, 0, 20px, 0);
padding-top: 10px;
margin: 0 0 20px;
border-bottom: 1px solid #eeeeee;
.hd-1 {
margin: 0;
@include margin(0, 0, 0, 0);
color: black;
font-weight: 600;
}
......@@ -617,7 +614,7 @@ select {
}
.border-left {
border-left: 1px solid;
@include border-left(1px solid);
}
.border-top {
......@@ -625,11 +622,11 @@ select {
}
.empty-courserun-text {
padding: 100px 160px;
@include padding(100px, 160px, 100px, 160px);
p {
padding: 0;
margin: 0;
@include padding(0px, 0px, 0px, 0px);
@include margin(0px, 0px, 0px, 0px);
}
}
......
course_discovery/templates/publisher/dashboard.html
......@@ -21,7 +21,7 @@
</li>
<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>{{ studio_count }}</span>{% trans "STUDIO REQUEST" %}
<span id="studio-count">{{ studio_count }}</span>{% trans "STUDIO REQUEST" %}
</li>
<li role="tab" id="tab-published" class="tab" aria-selected="false" aria-expanded="false"
aria-controls="published" tabindex="-1">
......
course_discovery/templates/publisher/dashboard/_in_progress.html
......@@ -2,7 +2,7 @@
{% if in_progress_count == 0 %}
<p>{% trans "There are no in progress course runs." %}</p>
{% else %}
<table class="data-table-in-progress display nowrap" cellspacing="0" width="100%">
<table class="data-table-in-progress display" cellspacing="0" width="100%">
<thead>
<tr>
<th role="button">
......
course_discovery/templates/publisher/dashboard/_preview_ready.html
......@@ -8,7 +8,7 @@
{% else %}
<p>{% trans "The list below contains all course runs awaiting course team approval. Once approved, the marketing team will push the course run. you will be notified via email when the course runs are live on the production site." %}</p>
<div class="table-view">
<table class="data-table-preview display nowrap" cellspacing="0" width="100%">
<table class="data-table-preview display" cellspacing="0" width="100%">
<thead>
<tr>
<th role="button">
......
course_discovery/templates/publisher/dashboard/_published.html
......@@ -7,7 +7,7 @@
The list below contains all course runs published in the past {{ default_published_days }} days.
{% endblocktrans %}
</p>
<table class="data-table-published display nowrap" cellspacing="0" width="100%">
<table class="data-table-published display" cellspacing="0" width="100%">
<thead>
<tr>
<th role="button">
......
course_discovery/templates/publisher/dashboard/_studio_requests.html
......@@ -6,7 +6,7 @@
<p class="copy-meta"></p>
</div>
<div class="table-view">
<table class="data-table-studio display nowrap" cellspacing="0" width="100%">
<table class="data-table-studio display" cellspacing="0" width="100%">
<thead>
<tr>
<th role="button">
......
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