Merge pull request #570 from andrewfhart/feature/unify-search

Unify Search
This commit is contained in:
Gustavo Maximiliano Cortez 2014-10-23 23:46:49 -03:00
commit 0b255f5f32
3 changed files with 4 additions and 10 deletions

View File

@ -15,13 +15,7 @@
<a href="/{{item.link}}">{{item.title|translate}}</a> <a href="/{{item.link}}">{{item.title|translate}}</a>
</li> </li>
</ul> </ul>
<form id="search-form" data-ng-controller="SearchController" class="navbar-form navbar-left hidden-xs" role="search" data-ng-submit="search()"> <span class="hidden-xs navbar-form navbar-left" data-ng-include src="'/views/includes/search.html'"></span>
<div class="form-group" data-ng-class="{'has-error': badQuery}">
<input id="search" type="text" class="form-control" data-ng-model="q" data-ng-class="{'loading': loading}"
placeholder="{{'Search for block, transaction or address'|translate}}" data-ng-submit="search()" focus="true">
</div>
<div class="no_matching text-danger" data-ng-show="badQuery" translate>No matching records found!</div>
</form>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li> <li>
<div class="status" data-ng-controller="StatusController"> <div class="status" data-ng-controller="StatusController">

View File

@ -1,6 +1,6 @@
<form id="search-form-mobile" data-ng-controller="SearchController" class="visible-xs" role="search" data-ng-submit="search()"> <form id="search-form" data-ng-controller="SearchController" role="search" data-ng-submit="search()">
<div class="form-group" data-ng-class="{'has-error': badQuery}"> <div class="form-group" data-ng-class="{'has-error': badQuery}">
<input id="search" type="text" class="form-control" data-ng-model="q" data-ng-class="{'loading': loading}" placeholder="Search for block, transaction or address" data-ng-submit="search()" focus="true"> <input id="search" type="text" class="form-control" data-ng-model="q" data-ng-class="{'loading': loading}" placeholder="{{'Search for block, transaction or address'|translate}}" data-ng-submit="search()" focus="true">
</div> </div>
<div class="no_matching text-danger" data-ng-show="badQuery" translate>No matching records found!</div> <div class="no_matching text-danger" data-ng-show="badQuery" translate>No matching records found!</div>
</form> </form>

View File

@ -7,7 +7,7 @@
<div id="home" class="row"> <div id="home" class="row">
<div class="col-xs-12 col-md-8"> <div class="col-xs-12 col-md-8">
<div data-ng-include src="'/views/includes/search.html'"></div> <div id="search-form-mobile" class="visible-xs" data-ng-include src="'/views/includes/search.html'"></div>
<h1 translate>Latest Blocks</h1> <h1 translate>Latest Blocks</h1>
<table class="table table-hover table-striped" style="table-layout: fixed"> <table class="table table-hover table-striped" style="table-layout: fixed">