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,16 +16,28 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
}}
{{#content "title"}}pa11y-dashboard{{/content}}
{{#if siteMessage}}
<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}}
<div class="col-md-12 clearfix" data-test="alert">
<div class="alert alert-info site-message">
<h3 class="crunch-top"><span class="pull-left glyphicon glyphicon-exclamation-sign"></span> Important</h3>
<p class="h5">{{siteMessage}}</p>
</div>
</div>
{{/if}}
{{/if}}
{{#deleted}}
{{#deleted}}
<div class="col-md-12 clearfix" data-test="alert">
<div class="alert alert-info">
<button aria-hidden="true" data-dismiss="alert" class="close" type="button">×</button>
@@ -33,6 +45,8 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
<p>The URL you selected and its associated results have been deleted.</p>
</div>
</div>
{{/deleted}}
{{/deleted}}
{{> tasks}}
{{> tasks}}
</div>

View File

@@ -15,17 +15,7 @@ You should have received a copy of the GNU General Public License
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">
{{#if readonly}}
<span class="well task-card-link crunch-bottom">
@@ -70,6 +60,4 @@ along with pa11y-dashboard. If not, see <http://www.gnu.org/licenses/>.
{{/unless}}
</li>
{{/each}}
</ul>
</div>
</ul>