From d804f637dd658a65de5276dfb8f1bc542011cecb Mon Sep 17 00:00:00 2001
From: Jonathan Piacenti <kelketek@gmail.com>
Date: Wed, 14 Jan 2015 16:54:54 +0000
Subject: [PATCH] Add wrapper to discussion topic dropdown.
---
common/static/coffee/spec/discussion/discussion_spec_helper.coffee | 38 ++++++++++++++++++++------------------
common/templates/discussion/_underscore_templates.html | 36 +++++++++++++++++++-----------------
2 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee b/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
index bc6b289..a8e0187 100644
--- a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
+++ b/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
</script>
<script aria-hidden="true" type="text/template" id="topic-template">
- <div class="field-label">
- <span class="field-label-text">Topic Area:</span><div class="field-input post-topic">
- <a href="#" class="post-topic-button">
- <span class="sr">Discussion topics; current selection is: </span>
- <span class="js-selected-topic"></span>
- <span class="drop-arrow" aria-hidden="true">▾</span>
- </a>
- <div class="topic-menu-wrapper">
- <label class="topic-filter-label">
- <span class="sr">Filter topics</span>
- <input type="text" class="topic-filter-input" placeholder="Filter topics">
- </label>
- <ul class="topic-menu" role="menu"><%= topics_html %></ul>
- </div>
- </div>
- </div><span class="field-help">
- Add your post to a relevant topic to help others find it.
- </span>
+ <div class="topic-wrapper">
+ <div class="field-label">
+ <span class="field-label-text">Topic Area:</span><div class="field-input post-topic">
+ <a href="#" class="post-topic-button">
+ <span class="sr">Discussion topics; current selection is: </span>
+ <span class="js-selected-topic"></span>
+ <span class="drop-arrow" aria-hidden="true">▾</span>
+ </a>
+ <div class="topic-menu-wrapper">
+ <label class="topic-filter-label">
+ <span class="sr">Filter topics</span>
+ <input type="text" class="topic-filter-input" placeholder="Filter topics">
+ </label>
+ <ul class="topic-menu" role="menu"><%= topics_html %></ul>
+ </div>
+ </div>
+ </div><span class="field-help">
+ Add your post to a relevant topic to help others find it.
+ </span>
+ </div>
</script>
diff --git a/common/templates/discussion/_underscore_templates.html b/common/templates/discussion/_underscore_templates.html
index f2920a8..58b7047 100644
--- a/common/templates/discussion/_underscore_templates.html
+++ b/common/templates/discussion/_underscore_templates.html
@@ -486,24 +486,26 @@ from django_comment_client.permissions import has_permission
<script aria-hidden="true" type="text/template" id="topic-template">
## Using div here instead of label because we are using a non-native control
- <div class="field-label">
- <span class="field-label-text">${_("Topic Area:")}</span><div class="field-input post-topic">
- <a href="#" class="post-topic-button">
- <span class="sr">${_("Discussion topics; current selection is: ")}</span>
- <span class="js-selected-topic"></span>
- <span class="drop-arrow" aria-hidden="true">▾</span>
- </a>
- <div class="topic-menu-wrapper">
- <label class="topic-filter-label">
- <span class="sr">${_("Filter topics")}</span>
- <input aria-describedby="field_help_topic_area" type="text" class="topic-filter-input" placeholder="${_('Filter topics')}">
- </label>
- <ul class="topic-menu" role="menu">${'<%= topics_html %>'}</ul>
+ <div class="topic-wrapper">
+ <div class="field-label">
+ <span class="field-label-text">${_("Topic Area:")}</span><div class="field-input post-topic">
+ <a href="#" class="post-topic-button">
+ <span class="sr">${_("Discussion topics; current selection is: ")}</span>
+ <span class="js-selected-topic"></span>
+ <span class="drop-arrow" aria-hidden="true">▾</span>
+ </a>
+ <div class="topic-menu-wrapper">
+ <label class="topic-filter-label">
+ <span class="sr">${_("Filter topics")}</span>
+ <input aria-describedby="field_help_topic_area" type="text" class="topic-filter-input" placeholder="${_('Filter topics')}">
+ </label>
+ <ul class="topic-menu" role="menu">${'<%= topics_html %>'}</ul>
+ </div>
</div>
- </div>
- </div><span class="field-help" id="field_help_topic_area">
- ${_("Add your post to a relevant topic to help others find it.")}
- </span>
+ </div><span class="field-help" id="field_help_topic_area">
+ ${_("Add your post to a relevant topic to help others find it.")}
+ </span>
+ </div>
</script>
<%def name="primaryAction(action_class, icon, sr_label, unchecked_label, checked_label)">
--
libgit2 0.26.0