Skip to content

E
edx-platform
Commit 8a67454f by Peter Fogg
Options

Prevent creation of unnecessary template divs, and rename .single_templates to… 

Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention.
parent d3ec1cb9
Showing with 52 additions and 50 deletions
cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
...@@ -32,7 +32,7 @@ def click_component_from_menu(instance_id, expected_css): ...@@ -32,7 +32,7 @@ def click_component_from_menu(instance_id, expected_css):
if len(elements) == 1: # Multiple templates if len(elements) == 1: # Multiple templates
world.css_click(elem_css) world.css_click(elem_css)
else: # Single template else: # Single template
assert(len(filter(lambda ele: ele.has_class('single_template'), elements)) == 1) assert(len(filter(lambda ele: ele.has_class('single-template'), elements)) == 1)
assert_equal(1, len(world.css_find(expected_css))) assert_equal(1, len(world.css_find(expected_css)))
......
cms/static/coffee/src/views/unit.coffee
class CMS.Views.UnitEdit extends Backbone.View class CMS.Views.UnitEdit extends Backbone.View
events: events:
'click .new-component .new-component-type a.multiple_templates': 'showComponentTemplates' 'click .new-component .new-component-type a.multiple-templates': 'showComponentTemplates'
'click .new-component .new-component-type a.single_template': 'saveNewComponent' 'click .new-component .new-component-type a.single-template': 'saveNewComponent'
'click .new-component .cancel-button': 'closeNewComponent' 'click .new-component .cancel-button': 'closeNewComponent'
'click .new-component-templates .new-component-template a': 'saveNewComponent' 'click .new-component-templates .new-component-template a': 'saveNewComponent'
'click .new-component-templates .cancel-button': 'closeNewComponent' 'click .new-component-templates .cancel-button': 'closeNewComponent'
......
cms/templates/unit.html
...@@ -54,12 +54,12 @@ ...@@ -54,12 +54,12 @@
<h5>Add New Component</h5> <h5>Add New Component</h5>
<ul class="new-component-type"> <ul class="new-component-type">
% for type, templates in sorted(component_templates.items()): % for type, templates in sorted(component_templates.items()):
<li> <li>
% if type == 'advanced' or len(templates) > 1: % if type == 'advanced' or len(templates) > 1:
<a href="#" class="multiple_templates" data-type="${type}"> <a href="#" class="multiple-templates" data-type="${type}">
% else: % else:
<a href="#" class="single_template" data-type="${type}" data-location="${templates[0][1]}"> <a href="#" class="single-template" data-type="${type}" data-location="${templates[0][1]}">
% endif % endif
<span class="large-template-icon large-${type}-icon"></span> <span class="large-template-icon large-${type}-icon"></span>
<span class="name">${type}</span> <span class="name">${type}</span>
</a> </a>
...@@ -68,50 +68,52 @@ ...@@ -68,50 +68,52 @@
</ul> </ul>
</div> </div>
% for type, templates in sorted(component_templates.items()): % for type, templates in sorted(component_templates.items()):
% if len(templates) > 1 or type == 'advanced':
<div class="new-component-templates new-component-${type}"> <div class="new-component-templates new-component-${type}">
% if type == "problem": % if type == "problem":
<div class="tab-group tabs"> <div class="tab-group tabs">
<ul class="problem-type-tabs nav-tabs"> <ul class="problem-type-tabs nav-tabs">
<li class="current"> <li class="current">
<a class="link-tab" href="#tab1">Common Problem Types</a> <a class="link-tab" href="#tab1">Common Problem Types</a>
</li> </li>
<li> <li>
<a class="link-tab" href="#tab2">Advanced</a> <a class="link-tab" href="#tab2">Advanced</a>
</li> </li>
</ul>
% endif
<div class="tab current" id="tab1">
<ul class="new-component-template">
% for name, location, has_markdown in templates:
% if has_markdown or type != "problem":
<li class="editor-md">
<a href="#" id="${location}" data-location="${location}">
<span class="name"> ${name}</span>
</a>
</li>
% endif
%endfor
</ul>
</div>
% if type == "problem":
<div class="tab" id="tab2">
<ul class="new-component-template">
% for name, location, has_markdown in templates:
% if not has_markdown:
<li class="editor-manual">
<a href="#" id="${location}" data-location="${location}">
<span class="name"> ${name}</span>
</a>
</li>
% endif
% endfor
</ul> </ul>
</div> % endif
</div> <div class="tab current" id="tab1">
% endif <ul class="new-component-template">
<a href="#" class="cancel-button">Cancel</a> % for name, location, has_markdown in templates:
</div> % if has_markdown or type != "problem":
<li class="editor-md">
<a href="#" id="${location}" data-location="${location}">
<span class="name"> ${name}</span>
</a>
</li>
% endif
%endfor
</ul>
</div>
% if type == "problem":
<div class="tab" id="tab2">
<ul class="new-component-template">
% for name, location, has_markdown in templates:
% if not has_markdown:
<li class="editor-manual">
<a href="#" id="${location}" data-location="${location}">
<span class="name"> ${name}</span>
</a>
</li>
% endif
% endfor
</ul>
</div>
</div>
% endif
<a href="#" class="cancel-button">Cancel</a>
</div>
% endif
% endfor % endfor
</li> </li>
</ol> </ol>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment