Skip to content

Commit

Permalink
Prototype updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@scurran
scurran committed Jun 23, 2015
1 parent 371a078 commit acf0ba6
Show file tree
Hide file tree
Showing 14 changed files with 289 additions and 24 deletions.
1 change: 0 additions & 1 deletion logistics/reports/sales/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
<div class="row">
<div class="col-xs-12">
<h3 class="page-header">Sales volumes <small>2014</small></h3>

<div class="table-responsive">
<table class="table table-condensed table-hover">
<thead>
Expand Down
2 changes: 1 addition & 1 deletion pfs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ table.weekly-volumes tr td input {
}

.application-alert-saving {
bottom:0px;
top:65px;
}

.btn-toggle-active {
Expand Down
12 changes: 10 additions & 2 deletions prototype/config-manage-products.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="active"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Configuration <span class="caret"></span></a>
<li><a class="dropdown-toggle" data-toggle="dropdown" href="#">Configuration <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="config-manage-sites.html">Manage sites</a></li>
<li><a href="config-manage-terminals.html">Manage terminals</a></li>
Expand All @@ -82,7 +82,15 @@
</ul>
</div>
</div>
</div>
</div>
<!-- Footer -->
<div class="navbar navbar-default navbar-fixed-bottom">
<ol class="breadcrumb text-muted small">
<li>PUMPS</li>
<li>Configuration</li>
<li>Manage products</li>
</ol>
</div>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
Expand Down
12 changes: 10 additions & 2 deletions prototype/config-manage-regulatory-data.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="active"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Configuration <span class="caret"></span></a>
<li><a class="dropdown-toggle" data-toggle="dropdown" href="#">Configuration <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="config-manage-sites.html">Manage sites</a></li>
<li><a href="config-manage-terminals.html">Manage terminals</a></li>
Expand All @@ -82,7 +82,15 @@
</ul>
</div>
</div>
</div>
</div>
<!-- Footer -->
<div class="navbar navbar-default navbar-fixed-bottom">
<ol class="breadcrumb text-muted small">
<li>PUMPS</li>
<li>Configuration</li>
<li>Manage regulatory data</li>
</ol>
</div>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
Expand Down
12 changes: 10 additions & 2 deletions prototype/config-manage-retail-products.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="active"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Configuration <span class="caret"></span></a>
<li><a class="dropdown-toggle" data-toggle="dropdown" href="#">Configuration <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="config-manage-sites.html">Manage sites</a></li>
<li><a href="config-manage-terminals.html">Manage terminals</a></li>
Expand All @@ -82,7 +82,15 @@
</ul>
</div>
</div>
</div>
</div>
<!-- Footer -->
<div class="navbar navbar-default navbar-fixed-bottom">
<ol class="breadcrumb text-muted small">
<li>PUMPS</li>
<li>Configuration</li>
<li>Manage retail products</li>
</ol>
</div>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
Expand Down
12 changes: 10 additions & 2 deletions prototype/config-manage-sites.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="active"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Configuration <span class="caret"></span></a>
<li><a class="dropdown-toggle" data-toggle="dropdown" href="#">Configuration <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li class="active"><a href="config-manage-sites.html">Manage sites</a></li>
<li><a href="config-manage-terminals.html">Manage terminals</a></li>
Expand All @@ -82,7 +82,15 @@
</ul>
</div>
</div>
</div>
</div>
<!-- Footer -->
<div class="navbar navbar-default navbar-fixed-bottom">
<ol class="breadcrumb text-muted small">
<li>PUMPS</li>
<li>Configuration</li>
<li>Manage sites</li>
</ol>
</div>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
Expand Down
12 changes: 10 additions & 2 deletions prototype/config-manage-terminals.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="active"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Configuration <span class="caret"></span></a>
<li><a class="dropdown-toggle" data-toggle="dropdown" href="#">Configuration <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="config-manage-sites.html">Manage sites</a></li>
<li class="active"><a href="config-manage-terminals.html">Manage terminals</a></li>
Expand All @@ -82,7 +82,15 @@
</ul>
</div>
</div>
</div>
</div>
<!-- Footer -->
<div class="navbar navbar-default navbar-fixed-bottom">
<ol class="breadcrumb text-muted small">
<li>PUMPS</li>
<li>Configuration</li>
<li>Manage terminals</li>
</ol>
</div>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
Expand Down
9 changes: 8 additions & 1 deletion prototype/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,14 @@
</ul>
</div>
</div>
</div>
</div>
<!-- Footer -->
<div class="navbar navbar-default navbar-fixed-bottom">
<ol class="breadcrumb text-muted small">
<li>PUMPS</li>
<li>Dashboard</li>
</ol>
</div>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
Expand Down
37 changes: 35 additions & 2 deletions prototype/logistics-inventory-historic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@
</span>
</div>
</div>
<div class="col-xs-12 col-sm-6">
<div class="col-xs-12 col-sm-5">
<button type="button" class="btn btn-default" data-toggle="collapse" data-target="#collapseExample">
<span class="glyphicon glyphicon-chevron-down"></span>
Import data
</button>
</div>
<div class="col-xs-12 col-sm-3">
<div class="col-xs-12 col-sm-4">
<div class="input-group">
<span class="input-group-addon" id="basic-addon1"><span class="glyphicon glyphicon-search"></span></span>
<input type="text" class="form-control" placeholder="Search for a term">
Expand All @@ -126,6 +126,39 @@
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="table-responsive">
<table class="table table-condensed table-hover">
<thead>
<tr><th>Location</th><th>Site</th><th>Tank</th><th>Opening</th><th>Closing</th><th>Sales</th><th>Delivery</th><th>Fuel</th><th>Capacity</th><th>Variance</th></tr>
</thead>
<tbody>
<tr><td>Mayo Avenue</td><td>2</td><td>1</td><td>21029</td><td>28080</td><td>5085</td><td>12200</td><td>ULP</td><td>43130</td><td>-64</td></tr>
<tr><td>Mayo Avenue</td><td>2</td><td>2</td><td>27494</td><td>28584</td><td>5877</td><td>7000</td><td>ULP</td><td>43130</td><td>-33</td></tr>
<tr><td>Mayo Avenue</td><td>2</td><td>3</td><td>36025 </td><td>33962 </td><td>8570 </td><td>6500 </td><td>ULD </td><td>43130</td><td> 7</td></tr>
<tr><td>Mayo Avenue</td><td>2</td><td>4</td><td>10931 </td><td>9935 </td><td>7967 </td><td>7000 </td><td>ULD </td><td>21565</td><td> -29</td></tr>
<tr><td>Mayo Avenue</td><td>2</td><td>5</td><td>9636 </td><td>13925 </td><td>1688 </td><td>6000 </td><td>ULD </td><td>21565</td><td> -23</td></tr>
<tr><td>Enterprise 5</td><td>3</td><td>1</td><td>20775 </td><td>10658 </td><td>10180 </td><td>0 </td><td>ULP</td><td> 51775</td><td> 63</td></tr>
<tr><td>Enterprise 5</td><td>3</td><td>2</td><td>22206 </td><td>10923 </td><td>11194 </td><td>0 </td><td>ULP </td><td>51775 </td><td>-89</td></tr>
<tr><td>Enterprise 5</td><td>3</td><td>3</td><td>9447 </td><td>15071 </td><td>7122 </td><td>13000 </td><td>ULD </td><td>51775 </td><td>-254</td></tr>
<tr><td>Enterprise 5</td><td>3</td><td>4</td><td>15306 </td><td>23236 </td><td>8843 </td><td>17000 </td><td>ULD </td><td>32348</td><td> -227</td></tr>
<tr><td>Enterprise 5</td><td>3</td><td>5</td><td>9239 </td><td>10984 </td><td>4240 </td><td>6000 </td><td>ULD </td><td>32348</td><td> -15</td></tr>
<tr><td>Enterprise 5</td><td>3</td><td>6 </td><td>2305 </td><td>1672 </td><td>691 </td><td>0 </td><td>LPG </td><td>4000</td><td> 58</td></tr>
<tr><td>Victoria</td><td>4</td><td>1 </td><td>15306 </td><td>14125 </td><td>7403 </td><td>6200 </td><td>ULP</td><td> 43187</td><td> 22</td></tr>
<tr><td>Victoria</td><td>4</td><td>2 </td><td>14814 </td><td>14712 </td><td>6116 </td><td>6000 </td><td>ULD</td><td> 43187</td><td> 14</td></tr>
<tr><td>Victoria</td><td>4</td><td>3 </td><td>4269 </td><td>9568 </td><td>6699 </td><td>11999 </td><td>ULD</td><td> 47506</td><td> -1</td></tr>
<tr><td>Victoria</td><td>4</td><td>4 </td><td>16699 </td><td>15749 </td><td>7986 </td><td>6998 </td><td>ULP</td><td> 47506</td><td> 38</td></tr>
<tr><td>Victoria</td><td>4</td><td>5 </td><td>13940 </td><td>17134 </td><td>3807 </td><td>7000 </td><td>ULD</td><td> 30230</td><td> 1</td></tr>
<tr><td>Keighley</td><td>5</td><td>1 </td><td>56120 </td><td>57808 </td><td>10523 </td><td>12200 </td><td>ULP</td><td> 81688</td><td> 11</td></tr>
<tr><td>Keighley</td><td>5</td><td>2 </td><td>31502 </td><td>35465 </td><td>3104 </td><td>6999 </td><td>ULP</td><td> 39887</td><td> 68</td></tr>
<tr><td>Keighley</td><td>5</td><td>3 </td><td>19984 </td><td>21362 </td><td>18638 </td><td>19997 </td><td>ULD</td><td> 39887</td><td> 19</td></tr>
<tr><td>Keighley</td><td>5</td><td>4 </td><td>3444 </td><td>2823 </td><td>632 </td><td>0 </td><td>LPG</td><td> 5610</td><td> 11</td></tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!-- Footer -->
<div class="navbar navbar-default navbar-fixed-bottom">
Expand Down
Loading

0 comments on commit acf0ba6

Please sign in to comment.