Skip to content

Show location in the settings xblock. #11999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andy-armstrong merged 2 commits into from
Sep 16, 2016
Merged

Show location in the settings xblock. #11999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
943757a
Show location in the settings xblock.
oksana-slu Oct 22, 2015
e3f55af
Changed "Location ID" to "Component Location ID"
oksana-slu Sep 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cms/static/js/views/metadata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog,
courseKey = self.$el.closest('[data-course-key]').data('course-key');

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(
function (model) {
Expand Down
7 changes: 6 additions & 1 deletion cms/static/sass/elements/_xblocks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@
}
}

.wrapper-comp-setting {
.wrapper-comp-setting, .wrapper-comp-setting-text {
min-width: 300px;
top: 0;
vertical-align: top;
Expand Down Expand Up @@ -703,6 +703,11 @@
vertical-align: top;
}

.setting-text {
display: inline;
white-space: nowrap;
}



// TYPE: enumerated lists of metadata sets
Expand Down
6 changes: 6 additions & 0 deletions cms/templates/js/metadata-editor.underscore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,10 @@
<li class="field comp-setting-entry metadata_entry">
</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>