From 943757a79e8eb3bfb2f19be09496072648af2d36 Mon Sep 17 00:00:00 2001
From: Oksana Slusarenro <oksana.slu@gmail.com>
Date: Thu, 22 Oct 2015 16:22:53 +0300
Subject: [PATCH 1/2] Show location in the settings xblock.

---
 cms/static/js/views/metadata.js             | 2 +-
 cms/static/sass/elements/_xblocks.scss      | 7 ++++++-
 cms/templates/js/metadata-editor.underscore | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cms/static/js/views/metadata.js b/cms/static/js/views/metadata.js
index 1c805171b98f..d1bda4c8a387 100644
--- a/cms/static/js/views/metadata.js
+++ b/cms/static/js/views/metadata.js
@@ -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) {
diff --git a/cms/static/sass/elements/_xblocks.scss b/cms/static/sass/elements/_xblocks.scss
index 61940d0b71c8..a3d73b07489e 100644
--- a/cms/static/sass/elements/_xblocks.scss
+++ b/cms/static/sass/elements/_xblocks.scss
@@ -599,7 +599,7 @@
       }
     }
 
-    .wrapper-comp-setting {
+    .wrapper-comp-setting, .wrapper-comp-setting-text {
       min-width: 300px;
       top: 0;
       vertical-align: top;
@@ -703,6 +703,11 @@
       vertical-align: top;
     }
 
+    .setting-text {
+      display: inline;
+      white-space: nowrap;
+    }
+
 
 
     // TYPE: enumerated lists of metadata sets
diff --git a/cms/templates/js/metadata-editor.underscore b/cms/templates/js/metadata-editor.underscore
index 67898a77b63b..eaf41e1e20e6 100644
--- a/cms/templates/js/metadata-editor.underscore
+++ b/cms/templates/js/metadata-editor.underscore
@@ -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("Location ID") %></label>
+            <span class="setting-text"><%- locator %></span>
+        </div>
+    </li>
 </ul>

From e3f55afc41f9af970ffa12fd7df2dfa9e0f40194 Mon Sep 17 00:00:00 2001
From: Oksana Slusarenro <oksana.slu@gmail.com>
Date: Thu, 15 Sep 2016 10:52:00 +0300
Subject: [PATCH 2/2] Changed "Location ID" to "Component Location ID"

---
 cms/templates/js/metadata-editor.underscore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/templates/js/metadata-editor.underscore b/cms/templates/js/metadata-editor.underscore
index eaf41e1e20e6..da4e32fc73ff 100644
--- a/cms/templates/js/metadata-editor.underscore
+++ b/cms/templates/js/metadata-editor.underscore
@@ -5,7 +5,7 @@
     <% }) %>
     <li class="field comp-setting-entry metadata_entry">
         <div class="wrapper-comp-setting-text">
-            <label class="label setting-label"><%- gettext("Location ID") %></label>
+            <label class="label setting-label"><%- gettext("Component Location ID") %></label>
             <span class="setting-text"><%- locator %></span>
         </div>
     </li>