Merge branch 'filter-urls' of github.com:nature/pa11y-dashboard into develop

Conflicts:
	view/partial/tasks.html
This commit is contained in:
Rowan Manning
2014-03-05 09:57:18 +00:00
2 changed files with 77 additions and 75 deletions

View File

@@ -16,6 +16,18 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
}} }}
{{#content "title"}}pa11y-dashboard{{/content}} {{#content "title"}}pa11y-dashboard{{/content}}
<div data-control="task-list">
<div class="clearfix">
<div class="col-md-6 col-md-offset-3 filter-toggle no-js-hide text-center">
<label for="filter-input" class="filter-trigger" data-toggle="collapse" data-target="#filter-input">Filter<span class="glyphicon glyphicon-filter"></span>
</label>
<div id="filter-input" class="collapse">
<input class="form-control" id="task-filter" type="text" data-role="input" placeholder="Type filter term (name or standard)"/>
</div>
</div>
</div>
{{#if siteMessage}} {{#if siteMessage}}
<div class="col-md-12 clearfix" data-test="alert"> <div class="col-md-12 clearfix" data-test="alert">
<div class="alert alert-info site-message"> <div class="alert alert-info site-message">
@@ -36,3 +48,5 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
{{/deleted}} {{/deleted}}
{{> tasks}} {{> tasks}}
</div>

View File

@@ -15,16 +15,6 @@ You should have received a copy of the GNU General Public License
along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>. along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
}} }}
<div data-control="task-list">
<div class="col-md-6 col-md-offset-3 filter-toggle no-js-hide text-center">
<label for="filter-input" class="filter-trigger" data-toggle="collapse" data-target="#filter-input">Filter<span class="glyphicon glyphicon-filter"></span>
</label>
<div id="filter-input" class="collapse">
<input class="form-control" id="task-filter" type="text" data-role="input" placeholder="Type filter term (name or standard)"/>
</div>
</div>
<ul class="list-unstyled clearfix crunch-bottom"> <ul class="list-unstyled clearfix crunch-bottom">
<li class="col-md-4 col-sm-6 task-card add-task"> <li class="col-md-4 col-sm-6 task-card add-task">
{{#if readonly}} {{#if readonly}}
@@ -71,5 +61,3 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
</div>