Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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
edx-platform
Commits
8b8339b1
Commit
8b8339b1
authored
Sep 15, 2016
by
Andy Armstrong
Committed by
GitHub
Sep 15, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #11999 from raccoongang/kssl/show_location_id_xblock
Show location in the settings xblock.
parents
6d2468d0
e3f55afc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
cms/static/js/views/metadata.js
+1
-1
cms/static/sass/elements/_xblocks.scss
+6
-1
cms/templates/js/metadata-editor.underscore
+6
-0
No files found.
cms/static/js/views/metadata.js
View file @
8b8339b1
...
@@ -20,7 +20,7 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog,
...
@@ -20,7 +20,7 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog,
courseKey
=
self
.
$el
.
closest
(
'[data-course-key]'
).
data
(
'course-key'
);
courseKey
=
self
.
$el
.
closest
(
'[data-course-key]'
).
data
(
'course-key'
);
this
.
template
=
this
.
loadTemplate
(
'metadata-editor'
);
this
.
template
=
this
.
loadTemplate
(
'metadata-editor'
);
this
.
$el
.
html
(
this
.
template
({
numEntries
:
this
.
collection
.
length
}));
this
.
$el
.
html
(
this
.
template
({
numEntries
:
this
.
collection
.
length
,
locator
:
locator
}));
this
.
collection
.
each
(
this
.
collection
.
each
(
function
(
model
)
{
function
(
model
)
{
...
...
cms/static/sass/elements/_xblocks.scss
View file @
8b8339b1
...
@@ -608,7 +608,7 @@
...
@@ -608,7 +608,7 @@
}
}
}
}
.wrapper-comp-setting
{
.wrapper-comp-setting
,
.wrapper-comp-setting-text
{
min-width
:
300px
;
min-width
:
300px
;
top
:
0
;
top
:
0
;
vertical-align
:
top
;
vertical-align
:
top
;
...
@@ -712,6 +712,11 @@
...
@@ -712,6 +712,11 @@
vertical-align
:
top
;
vertical-align
:
top
;
}
}
.setting-text
{
display
:
inline
;
white-space
:
nowrap
;
}
// TYPE: enumerated lists of metadata sets
// TYPE: enumerated lists of metadata sets
...
...
cms/templates/js/metadata-editor.underscore
View file @
8b8339b1
...
@@ -3,4 +3,10 @@
...
@@ -3,4 +3,10 @@
<li class="field comp-setting-entry metadata_entry">
<li class="field comp-setting-entry metadata_entry">
</li>
</li>
<% }) %>
<% }) %>
<li class="field comp-setting-entry metadata_entry">
<div class="wrapper-comp-setting-text">
<label class="label setting-label"><%- gettext("Component Location ID") %></label>
<span class="setting-text"><%- locator %></span>
</div>
</li>
</ul>
</ul>
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