Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
course-discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
course-discovery
Commits
d88587f5
Commit
d88587f5
authored
Feb 01, 2017
by
tasawernawaz
Committed by
Tasawer Nawaz
Feb 02, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feedback addressed
parent
e65ee54b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
24 deletions
+24
-24
course_discovery/static/js/publisher/comparing-objects.js
+3
-3
course_discovery/static/sass/publisher/publisher.scss
+1
-1
course_discovery/templates/publisher/course_revision_history.html
+20
-20
No files found.
course_discovery/static/js/publisher/comparing-objects.js
View file @
d88587f5
...
...
@@ -7,7 +7,7 @@ $(document).on('click', '.btn-show-changes', function (e) {
$
(
this
).
text
(
gettext
(
'Hide changes'
));
$
(
this
).
removeClass
(
'show'
);
}
else
{
$
(
'.object'
).
show
();
$
(
'.
history-
object'
).
show
();
$
(
'.show-diff'
).
hide
();
$
(
this
).
text
(
gettext
(
'Show changes'
));
$
(
this
).
addClass
(
'show'
);
...
...
@@ -17,9 +17,9 @@ $(document).on('click', '.btn-show-changes', function (e) {
var
dmp
=
new
diff_match_patch
();
function
showDiff
(
$object
,
$historyObject
,
$outputDiv
)
{
var
d
=
dmp
.
diff_main
(
$
.
trim
(
$object
.
text
()),
$
.
trim
(
$historyObject
.
text
()
));
var
d
=
dmp
.
diff_main
(
$
historyObject
.
text
(),
$object
.
text
(
));
$outputDiv
.
html
(
dmp
.
diff_prettyHtml
(
d
));
$
o
bject
.
hide
();
$
historyO
bject
.
hide
();
$outputDiv
.
show
();
}
...
...
course_discovery/static/sass/publisher/publisher.scss
View file @
d88587f5
...
...
@@ -930,7 +930,7 @@ select {
font-weight
:
600
;
}
.
history-
object
{
.object
{
display
:
none
;
}
...
...
course_discovery/templates/publisher/course_revision_history.html
View file @
d88587f5
...
...
@@ -28,74 +28,74 @@
<div
class=
"field-container"
>
<div
class=
"field-title"
>
{% trans "Course Title" %}
</div>
<span
class=
"object"
>
{{
history_
object.title }}
</span>
<span
class=
"history-object"
>
{{ object.title }}
</span>
<span
class=
"object"
>
{{ object.title }}
</span>
<span
class=
"history-object"
>
{{
history_
object.title }}
</span>
<span
class=
"show-diff"
></span>
</div>
<div
class=
"field-container"
>
<div
class=
"field-title"
>
{% trans "Course Number" %}
</div>
<span
class=
"object"
>
{{
history_
object.number }}
</span>
<span
class=
"history-object"
>
{{ object.number }}
</span>
<span
class=
"object"
>
{{ object.number }}
</span>
<span
class=
"history-object"
>
{{
history_
object.number }}
</span>
<span
class=
"show-diff"
></span>
</div>
<div
class=
"field-container"
>
<div
class=
"field-title"
>
{% trans "Brief Description" %}
</div>
<span
class=
"object"
>
{{
history_
object.short_description }}
</span>
<span
class=
"history-object"
>
{{ object.short_description }}
</span>
<span
class=
"object"
>
{{ object.short_description }}
</span>
<span
class=
"history-object"
>
{{
history_
object.short_description }}
</span>
<span
class=
"show-diff"
></span>
</div>
<div
class=
"field-container"
>
<div
class=
"field-title"
>
{% trans "Full Description" %}
</div>
<span
class=
"object"
>
{{
history_
object.full_description }}
</span>
<span
class=
"history-object"
>
{{ object.full_description }}
</span>
<span
class=
"object"
>
{{ object.full_description }}
</span>
<span
class=
"history-object"
>
{{
history_
object.full_description }}
</span>
<span
class=
"show-diff"
></span>
</div>
<div
class=
"field-container"
>
<div
class=
"field-title"
>
{% trans "Expected Learnings" %}
</div>
<span
class=
"object"
>
{{
history_
object.expected_learnings }}
</span>
<span
class=
"history-object"
>
{{ object.expected_learnings }}
</span>
<span
class=
"object"
>
{{ object.expected_learnings }}
</span>
<span
class=
"history-object"
>
{{
history_
object.expected_learnings }}
</span>
<span
class=
"show-diff"
></span>
</div>
<div
class=
"field-container"
>
<div
class=
"field-title"
>
{% trans "Primary Subject" %}
</div>
<span
class=
"object"
>
{{
history_
object.primary_subject }}
</span>
<span
class=
"history-object"
>
{{ object.primary_subject }}
</span>
<span
class=
"object"
>
{{ object.primary_subject }}
</span>
<span
class=
"history-object"
>
{{
history_
object.primary_subject }}
</span>
<span
class=
"show-diff"
></span>
</div>
<div
class=
"field-container"
>
<div
class=
"field-title"
>
{% trans "Secondary Subject" %}
</div>
<span
class=
"object"
>
{{
history_
object.secondary_subject }}
</span>
<span
class=
"history-object"
>
{{ object.secondary_subject }}
</span>
<span
class=
"object"
>
{{ object.secondary_subject }}
</span>
<span
class=
"history-object"
>
{{
history_
object.secondary_subject }}
</span>
<span
class=
"show-diff"
></span>
</div>
<div
class=
"field-container"
>
<div
class=
"field-title"
>
{% trans "Tertiary Subject" %}
</div>
<span
class=
"object"
>
{{
history_
object.tertiary_subject }}
</span>
<span
class=
"history-object"
>
{{ object.tertiary_subject }}
</span>
<span
class=
"object"
>
{{ object.tertiary_subject }}
</span>
<span
class=
"history-object"
>
{{
history_
object.tertiary_subject }}
</span>
<span
class=
"show-diff"
></span>
</div>
<div
class=
"field-container"
>
<div
class=
"field-title"
>
{% trans "Prerequisites" %}
</div>
<span
class=
"object"
>
{{
history_
object.prerequisites }}
</span>
<span
class=
"history-object"
>
{{ object.prerequisites }}
</span>
<span
class=
"object"
>
{{ object.prerequisites }}
</span>
<span
class=
"history-object"
>
{{
history_
object.prerequisites }}
</span>
<span
class=
"show-diff"
></span>
</div>
<div
class=
"field-container"
>
<div
class=
"field-title"
>
{% trans "Course Level" %}
</div>
<span
class=
"object"
>
{{
history_
object.level_type }}
</span>
<span
class=
"history-object"
>
{{ object.level_type }}
</span>
<span
class=
"object"
>
{{ object.level_type }}
</span>
<span
class=
"history-object"
>
{{
history_
object.level_type }}
</span>
<span
class=
"show-diff"
></span>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment