Skip to content

E
edx-platform
Commit d804f637 by Jonathan Piacenti
Options

Add wrapper to discussion topic dropdown.

parent e28dde32
Showing with 39 additions and 35 deletions
common/static/coffee/spec/discussion/discussion_spec_helper.coffee
...@@ -405,24 +405,26 @@ browser and pasting the output. When that file changes, this one should be rege ...@@ -405,24 +405,26 @@ browser and pasting the output. When that file changes, this one should be rege
</script> </script>
<script aria-hidden="true" type="text/template" id="topic-template"> <script aria-hidden="true" type="text/template" id="topic-template">
<div class="field-label"> <div class="topic-wrapper">
<span class="field-label-text">Topic Area:</span><div class="field-input post-topic"> <div class="field-label">
<a href="#" class="post-topic-button"> <span class="field-label-text">Topic Area:</span><div class="field-input post-topic">
<span class="sr">Discussion topics; current selection is: </span> <a href="#" class="post-topic-button">
<span class="js-selected-topic"></span> <span class="sr">Discussion topics; current selection is: </span>
<span class="drop-arrow" aria-hidden="true">▾</span> <span class="js-selected-topic"></span>
</a> <span class="drop-arrow" aria-hidden="true">▾</span>
<div class="topic-menu-wrapper"> </a>
<label class="topic-filter-label"> <div class="topic-menu-wrapper">
<span class="sr">Filter topics</span> <label class="topic-filter-label">
<input type="text" class="topic-filter-input" placeholder="Filter topics"> <span class="sr">Filter topics</span>
</label> <input type="text" class="topic-filter-input" placeholder="Filter topics">
<ul class="topic-menu" role="menu"><%= topics_html %></ul> </label>
</div> <ul class="topic-menu" role="menu"><%= topics_html %></ul>
</div> </div>
</div><span class="field-help"> </div>
Add your post to a relevant topic to help others find it. </div><span class="field-help">
</span> Add your post to a relevant topic to help others find it.
</span>
</div>
</script> </script>
......
common/templates/discussion/_underscore_templates.html
...@@ -486,24 +486,26 @@ from django_comment_client.permissions import has_permission ...@@ -486,24 +486,26 @@ from django_comment_client.permissions import has_permission
<script aria-hidden="true" type="text/template" id="topic-template"> <script aria-hidden="true" type="text/template" id="topic-template">
## Using div here instead of label because we are using a non-native control ## Using div here instead of label because we are using a non-native control
<div class="field-label"> <div class="topic-wrapper">
<span class="field-label-text">${_("Topic Area:")}</span><div class="field-input post-topic"> <div class="field-label">
<a href="#" class="post-topic-button"> <span class="field-label-text">${_("Topic Area:")}</span><div class="field-input post-topic">
<span class="sr">${_("Discussion topics; current selection is: ")}</span> <a href="#" class="post-topic-button">
<span class="js-selected-topic"></span> <span class="sr">${_("Discussion topics; current selection is: ")}</span>
<span class="drop-arrow" aria-hidden="true">▾</span> <span class="js-selected-topic"></span>
</a> <span class="drop-arrow" aria-hidden="true">▾</span>
<div class="topic-menu-wrapper"> </a>
<label class="topic-filter-label"> <div class="topic-menu-wrapper">
<span class="sr">${_("Filter topics")}</span> <label class="topic-filter-label">
<input aria-describedby="field_help_topic_area" type="text" class="topic-filter-input" placeholder="${_('Filter topics')}"> <span class="sr">${_("Filter topics")}</span>
</label> <input aria-describedby="field_help_topic_area" type="text" class="topic-filter-input" placeholder="${_('Filter topics')}">
<ul class="topic-menu" role="menu">${'<%= topics_html %>'}</ul> </label>
<ul class="topic-menu" role="menu">${'<%= topics_html %>'}</ul>
</div>
</div> </div>
</div> </div><span class="field-help" id="field_help_topic_area">
</div><span class="field-help" id="field_help_topic_area"> ${_("Add your post to a relevant topic to help others find it.")}
${_("Add your post to a relevant topic to help others find it.")} </span>
</span> </div>
</script> </script>
<%def name="primaryAction(action_class, icon, sr_label, unchecked_label, checked_label)"> <%def name="primaryAction(action_class, icon, sr_label, unchecked_label, checked_label)">
......
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