Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into…

Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui

cms/static/client_templates/generic_metadata_entry.html → cms/static/client_templates/metadata_string_entry.html

@@ -6,4 +6,4 @@
 		<i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i>
 	</button>
 </div>
-<span class="tip setting-help">'<%= model.get("help") %>'</span>
+<span class="tip setting-help"><%= model.get('help') %></span>
\ No newline at end of file

cms/static/js/views/generic_metadata_editor.js → cms/static/js/views/metadata_string_view.js

@@ -10,7 +10,7 @@ CMS.Views.Metadata.Generic = Backbone.View.extend({
         var self = this;
         // instantiates an editor template for each update in the collection
         window.templateLoader.loadRemoteTemplate("metadata_entry",
-            "/static/client_templates/generic_metadata_entry.html",
+            "/static/client_templates/metadata_string_entry.html",
             function (raw_template) {
                 self.template = _.template(raw_template);
                 self.$el.append(self.template({model: self.model}));

cms/templates/base.html

@@ -52,7 +52,8 @@
 
     <!--TODO: not the right place-->
     <script type="text/javascript" src="${static.url('js/models/metadata_model.js')}"></script>
-    <script type="text/javascript" src="${static.url('js/views/generic_metadata_editor.js')}"></script>
+    <script type="text/javascript" src="${static.url('js/views/metadata_string_view.js')}"></script>
+    <script type="text/javascript" src="${static.url('js/views/metadata_option_view.js')}"></script>
     <script type="text/javascript" src="${static.url('js/models/metadata_editor.js')}"></script>
     <script type="text/javascript" src="${static.url('js/views/metadata_editor_view.js')}"></script>
     <script type="text/javascript" src="${static.url('js/template_loader.js')}"></script>

cms/templates/widgets/html-edit.html

 <%include file="metadata-edit.html" />
 <div class="wrapper-comp-editor" id="editor-tab">
-<section class="html-editor editor">
-  <ul class="editor-tabs">
-    <li><a href="#" class="visual-tab tab current" data-tab="visual">Visual</a></li>
-    <li><a href="#" class="html-tab tab" data-tab="advanced">HTML</a></li>
-  </ul>
-  
-  <div class="row">
-    <textarea class="tiny-mce">${data | h}</textarea>
-    <textarea name="" class="edit-box">${data | h}</textarea>
-  </div>
-</section>
+    <section class="html-editor editor">
+      <ul class="editor-tabs">
+        <li><a href="#" class="visual-tab tab current" data-tab="visual">Visual</a></li>
+        <li><a href="#" class="html-tab tab" data-tab="advanced">HTML</a></li>
+      </ul>
+
+      <div class="row">
+        <textarea class="tiny-mce">${data | h}</textarea>
+        <textarea name="" class="edit-box">${data | h}</textarea>
+      </div>
+    </section>
 </div>

cms/templates/widgets/problem-edit.html

 <%include file="metadata-edit.html" />
+<div class="wrapper-comp-editor" id="editor-tab">
 <section class="problem-editor editor">
     <div class="row">
         %if enable_markdown:
@@ -105,3 +106,4 @@
         </div>
     </article>
 </script>
+</div>
\ No newline at end of file

cms/templates/widgets/raw-edit.html

 <%include file="metadata-edit.html" />
-<section class="raw-edit">
-  <textarea name="" class="edit-box" rows="8" cols="40">${data | h}</textarea>
-</section>
+<div class="wrapper-comp-editor" id="editor-tab">
+    <section class="raw-edit">
+      <textarea name="" class="edit-box" rows="8" cols="40">${data | h}</textarea>
+    </section>
+</div>