Skip to content

Commit

Permalink
updated breadcrumb, added search icon
Browse files Browse the repository at this point in the history
  • Loading branch information
bbirman committed Jun 18, 2012
1 parent 8df0286 commit 63660c5
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 14 deletions.
8 changes: 6 additions & 2 deletions src/main/resources/web/build-output.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

<form class="form-search" style="float:right; padding-top:2%">
<input type="text" id="global-search" data-provide="typeahead" class="search-query" placeholder="Search all">
<button type="submit" class="btn">Search</button>
<button type="submit" class="btn"><i class="icon-search"></i> Search</button>
</form>
</div>
<!-- #aaccdd -->
Expand Down Expand Up @@ -171,7 +171,11 @@ <h3 style="outline: 0">Run 7</h3>
<!--Body content-->

<ul class="breadcrumb">
<li class="active">Run # Test Results</li>
<li>
${run.name}
<span class="divider">|</span>
</li>
<li class="active">Build Output</li>
</ul>

<div class="page-header">
Expand Down
9 changes: 6 additions & 3 deletions src/main/resources/web/test-result.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<html style="">
<head>
<title>Test Results</title>
<title> ${test.runName} ${test.name} </title>

<link rel="stylesheet" href="scripts/bootstrap/css/bootstrap.css"/>

Expand Down Expand Up @@ -57,7 +57,7 @@

<form class="form-search" style="float:right; padding-top:2%">
<input type="text" id="global-search" data-provide="typeahead" class="search-query" placeholder="Search all">
<button type="submit" class="btn">Search</button>
<button type="submit" class="btn"><i class="icon-search"></i> Search</button>
</form>
</div>
<!-- #aaccdd -->
Expand Down Expand Up @@ -172,7 +172,10 @@ <h3>Run 4</h3>

<ul class="breadcrumb">
<li>
<a href="#">Run # Test Results</a> <span class="divider">/</span>
${run.name} <span class="divider">|</span>
</li>
<li>
<a href=""> Test Results </a> <span class="divider">/</span>
</li>
<li class="active">Sample Test</li>
</ul>
Expand Down
23 changes: 14 additions & 9 deletions src/main/resources/web/tests-summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<form class="form-search" style="float:right; padding-top:2%">
<input type="text" id="global-search" data-provide="typeahead" class="search-query" placeholder="Search all">
<button type="submit" class="btn">Search</button>
<button type="submit" class="btn"> <i class="icon-search"></i> Search</button>
</form>
</div>
<!-- #aaccdd -->
Expand Down Expand Up @@ -90,7 +90,7 @@ <h3> <a href="#">Test Inventory</a> </h3>
<!-- <#assign runs = ${runs}>
<#list runs as run>
<h3><a href="#">${run.name}</a>
<h3 style="outline: 0 none; -moz-outline: 0 none"><a href="#">${run.name}</a>
<#if run.status == "running"> <img src="loading-snake.gif" alt="loading icon" style="padding-bottom: 6px; vertical-align:middle"/> </#if>
</h3>
<div>
Expand All @@ -114,7 +114,7 @@ <h3><a href="#">${run.name}</a>
</#if>
</div> -->
<!-- BEGIN: To delete once data is available-->
<h3> Run 2</h3>
<h3 style="outline: 0 none; -moz-outline: 0 none"> Run 2</h3>
<div>
&nbsp;&nbsp;<strong>Start Time</strong> 10:30 21-03-2012 <br/>
&nbsp;&nbsp;<strong>End Time</strong> 20:30 21-03-2012 <br/>
Expand All @@ -123,13 +123,13 @@ <h3> Run 2</h3>
&nbsp;&nbsp; <span class="badge">6</span> <a href="#">Test Results</a> <br/>
&nbsp;&nbsp; <span class="badge">6</span> <a href="#">Code Coverage</a> <br/>
</div>
<h3>Run 3 <img src="loading-snake.gif" alt="loading icon" style="padding-bottom: 6px; vertical-align:middle"/> </h3>
<h3 style="outline: 0">Run 3 <img src="loading-snake.gif" alt="loading icon" style="padding-bottom: 6px; vertical-align:middle"/> </h3>
<div>
&nbsp;&nbsp;<strong>Start Time</strong> 10:30 21-03-2012 <br/>
&nbsp;&nbsp;<em>Generating Results...</em><br/>

</div>
<h3>Run 4</h3>
<h3 style="outline: 0">Run 4</h3>
<div>
&nbsp;&nbsp;<strong>Start Time</strong> 10:30 21-03-2012 <br/>
&nbsp;&nbsp;<strong>End Time</strong> 20:30 21-03-2012 <br/>
Expand All @@ -138,7 +138,7 @@ <h3>Run 4</h3>
&nbsp;&nbsp;<i class="icon-chevron-right"></i> <a href="#">Test Results</a> <span class="badge badge-important">6</span><br/>
&nbsp;&nbsp;<i class="icon-chevron-right"></i> <a href="#">Code Coverage</a> <span class="badge badge-success">91%</span><br/>
</div>
<h3>Run 4</h3>
<h3 style="outline: 0">Run 5</h3>
<div>
&nbsp;&nbsp;<strong>Start</strong> 10:30 21-03-2012 <br/>
&nbsp;&nbsp;<strong>End</strong> 20:30 21-03-2012 <br/>
Expand All @@ -147,7 +147,7 @@ <h3>Run 4</h3>
&nbsp;&nbsp;<a href="#">Test Results</a> <span class="badge badge-important">6</span><br/>
&nbsp;&nbsp;<a href="#">Code Coverage</a> <span class="badge badge-success">91%</span><br/>
</div>
<h3>Run 4</h3>
<h3 style="outline: 0">Run 6</h3>
<div>
&nbsp;&nbsp;<strong>Start Time</strong> 10:30 21-03-2012 <br/>
&nbsp;&nbsp;<strong>End Time</strong> 20:30 21-03-2012 <br/>
Expand All @@ -156,7 +156,7 @@ <h3>Run 4</h3>
&nbsp;&nbsp;<i class="icon-chevron-right"></i> <a href="#">Test Results</a> <span class="badge badge-important">6</span><br/>
&nbsp;&nbsp;<i class="icon-chevron-right"></i> <a href="#">Code Coverage</a> <span class="badge badge-success">91%</span><br/>
</div>
<h3>Run 4</h3>
<h3 style="outline: 0">Run 7</h3>
<div>
&nbsp;&nbsp;<strong>Start Time</strong> 10:30 21-03-2012 <br/>
&nbsp;&nbsp;<strong>End Time</strong> 20:30 21-03-2012 <br/>
Expand All @@ -173,7 +173,12 @@ <h3>Run 4</h3>
<!--Body content-->

<ul class="breadcrumb">
<li class="active">Run # Test Summary</li>
<li>
${run.name}
<span class="divider">|</span>
</li>

<li class="active">Test Results</li>
</ul>

<div style="float:right">
Expand Down

0 comments on commit 63660c5

Please sign in to comment.