Skip to content

Commit

Permalink
a lot of (ongoing) refactoring, dummy pages for scan modes
Browse files Browse the repository at this point in the history
  • Loading branch information
@guterwhine
guterwhine committed Dec 9, 2014
1 parent 78358ae commit 80c03f1
Show file tree
Hide file tree
Showing 9 changed files with 213 additions and 195 deletions.
37 changes: 31 additions & 6 deletions client/templates/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@
</div>
<nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
<ul class="nav navbar-nav">
<li>
<a href="{{pathFor 'findPage'}}">Find</a>
</li>
<li>
<a href="{{pathFor 'scanPage'}}">Scan</a>
</li>
{{> findNav}}
{{> scanNav}}
<li>
<a href="{{pathFor 'mapsPage'}}">Map</a>
</li>
Expand All @@ -30,3 +26,32 @@
</div>
</header>
</template>


<template name="scanNav">
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-expanded="false">
Scan <span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li role="presentation"><a role="menuitem" tabindex="-1" href="{{pathFor 'relocatePage'}}">relocate</a></li>

<li role="presentation"><a role="menuitem" tabindex="-1" href="{{pathFor 'singlePage'}}">single</a></li>

<li role="presentation"><a role="menuitem" tabindex="-1" href="{{pathFor 'bulkPage'}}">bulk</a></li>
</ul>
</li>
</template>

<template name="findNav">
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-expanded="false">
Find <span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li role="presentation"><a role="menuitem" tabindex="-1" href="{{pathFor 'findPageFull'}}">using attributes</a></li>

<li role="presentation"><a role="menuitem" tabindex="-1" href="{{pathFor 'findPageId'}}">using ID</a></li>
</ul>
</li>
</template>
61 changes: 61 additions & 0 deletions client/templates/pages/bulk.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<template name="bulkPage">
<div class="row">
<div class="col-sm-6">
{{> bulkScan}}
{{> bulkList}}
</div>
<div class="col-sm-6">
{{> bulkForm}}
</div>
</div>
</template>

<template name="bulkScan">
<form class="form-horizontal" role="form">
<div class="form-group">
<label for="scan" class="col-sm-3 control-label">Scan</label>
<div class="col-sm-9">
<input class="form-control" id="scan" placeholder="barcode">
</div>
</div>
</form>
</template>

<template name="scan">
<li class="list-group-item {{#if valid}}list-group-item-success{{else}}list-group-item-danger{{/if}} row">
<span class="col-xs-2 col-lg-1 text-right">
<strong>ID</strong>
</span>
<span class="col-xs-10 col-lg-3">{{this.scan}}</span>
<span class="col-xs-2 text-right">
<strong>Name</strong>
</span>
<span class="col-xs-10 col-lg-6">{{this.name}}</span>
</li>
</template>

<template name="bulkList">
<ul class="list-group">
{{#each scans}}
{{>scan}}
{{/each}}
</ul>
<div class="col-sm-2">
<button class="btn btn-default clear">clear scans</button>
</div>
</template>

<template name="bulkForm">
<form class="form-horizontal" role="form">
{{> submissionGroup id="submissionName" name="Name"}}
{{> submissionGroup id="submissionTeam" name="Team"}}
{{> submissionGroup id="submissionVendor" name="Vendor"}}
{{> submissionGroup id="submissionBy" name="User"}}
{{> locationGroup}}
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-default">submit query</button>
</div>
</div>
</form>
</template>
5 changes: 5 additions & 0 deletions client/templates/pages/byId.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<template name="findPageId">
{{> findId}}
{{> presentId}}
</template>

<template name="findById">
<ul class="list-group">
<!-- add all basic fields here -->
Expand Down
28 changes: 3 additions & 25 deletions client/templates/pages/find.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,11 @@
<div class="jumbotron">
<h1>suchfeld und data</h1>
</div>
{{> searchTab}}
</template>

<!-- Tabs to toggle search modes -->
<template name="searchTab">
<div role="tabpanel">
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active">
<a href="#fullSearch" aria-controls="fullSearch" role="tab" data-toggle="tab">Full Search</a>
</li>
<li role="presentation">
<a href="#findId" aria-controls="findId" role="tab" data-toggle="tab">Find ID</a>
</li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="fullSearch">
{{> searchForm}}
{{> searchResults}}
</div>
<div role="tabpanel" class="tab-pane" id="findId">
{{> findId}}
{{> presentId}}
</div>
</div>
</div>
<template name="findPageFull">
{{> searchForm}}
{{> searchResults}}
</template>

<!-- Big ass form to search for a single item using full text search on fields -->
Expand Down
23 changes: 23 additions & 0 deletions client/templates/pages/relocate.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<template name="relocatePage">
<div class="row">
<div class="col-sm-6">
{{> relocateScan}}
{{> relocateResult}}
</div>
<div class="col-sm-6">
{{> relocateForm}}
</div>
</div>
</template>

<template name="relocateScan">
scan
</template>

<template name="relocateResult">
result
</template>

<template name="relocateForm">
form
</template>
145 changes: 31 additions & 114 deletions client/templates/pages/scan.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,134 +2,51 @@
<div class="jumbotron">
<h1>scanning</h1>
</div>
<div class="row">
<div class="col-sm-6">
{{> scanForm}}
{{> scanResults}}
</div>
<div class="col-sm-6">
{{> submissionForm}}
</div>
</div>
</template>

<template name="scanForm">
<form class="form-horizontal" role="form">
<template name="submissionGroup">
<div class="form-group">
<label for="scan1" class="col-sm-3 control-label">Scan</label>
<div class="col-sm-9">
<input class="form-control" id="scan1" placeholder="barcode">
<label for="{{id}}" class="col-sm-2 control-label">
{{name}}
</label>
<div class="col-sm-10">
<input class="form-control" id="{{id}}" placeholder="{{name}}">
</div>
</div>
</form>
</template>

<template name="submissionForm">
<form class="form-horizontal" role="form">

<div class="form-group {{#if nameError}}has-error{{/if}}">
<label for="submissionName1" class="col-sm-2 control-label">Name</label>
<div class="col-sm-10">
<input class="form-control" id="submissionName1" placeholder="Name">
</div>
</div>

<div class="form-group {{#if teamError}}has-error{{/if}}">
<label type="text" for="submissionTeam1" class="col-sm-2 control-label">Team</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="submissionTeam1" placeholder="Team">
</div>
</div>

<div class="form-group {{#if vendorError}}has-error{{/if}}">
<label type="text" for="submissionVendor1" class="col-sm-2 control-label">Vendor</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="submissionVendor1" placeholder="Vendor">
</div>
</div>

<div class="form-group">
<label type="text" for="submissionBy1" class="col-sm-2 control-label">User</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="submissionBy1" placeholder="submitted by (aka your name here)">
<template name="locationGroup">
<div class="form-group">
<label type="text" for="submissionLocations1" class="col-sm-4 control-label">Location</label>
<div class="col-sm-4">
<div class="radio">
<label>
<input id="submissionLocations1" name="locationsRadio1" value="world" type="radio" checked> World
</label>
</div>
</div>

<div class="form-group">
<label type="text" for="submissionLocations1" class="col-sm-4 control-label">Location</label>
<div class="col-sm-4">
<div class="radio">
<label>
<input id="submissionLocations1" name="locationsRadio1" value="world" type="radio" checked> World
</label>
</div>
</div>
<div class="col-sm-4">
<div class="radio">
<label>
<input id="submissionLocations2" name="locationsRadio1" value="halleh" type="radio"> HalleH
</label>
</div>
<div class="col-sm-4">
<div class="radio">
<label>
<input id="submissionLocations2" name="locationsRadio1" value="halleh" type="radio"> HalleH
</label>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-4 col-sm-4">
<div class="radio">
<label>
<input id="submissionLocations3" name="locationsRadio1" value="cch" type="radio"> CCH
</label>
</div>
</div>
<div class="col-sm-4">
<div class="radio">
<label>
<input id="submissionLocations4" name="locationsRadio1" value="transport" type="radio"> Transport
</label>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-4 col-sm-4">
<div class="radio">
<label>
<input id="submissionLocations3" name="locationsRadio1" value="cch" type="radio"> CCH
</label>
</div>
</div>

{{#if locationWorld}}
world
{{/if}}
{{#if locationHalleH}}
halleh
{{/if}}
{{#if locationCCH}}
cch
{{/if}}
{{#if locationTransport}}
transport
{{/if}}

<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-default">submit query</button>
<div class="col-sm-4">
<div class="radio">
<label>
<input id="submissionLocations4" name="locationsRadio1" value="transport" type="radio"> Transport
</label>
</div>
</div>
</form>
</template>

<template name="scan">
<li class="list-group-item {{#if valid}}list-group-item-success{{else}}list-group-item-danger{{/if}} row">
<span class="col-xs-2 col-lg-1 text-right">
<strong>ID</strong>
</span>
<span class="col-xs-10 col-lg-3">{{this.scan}}</span>
<span class="col-xs-2 text-right">
<strong>Name</strong>
</span>
<span class="col-xs-10 col-lg-6">{{this.name}}</span>
</li>
</template>

<template name="scanResults">
<ul class="list-group">
{{#each results}}
{{>scan}}
{{/each}}
</ul>
<div class="col-sm-2">
<button class="btn btn-default clear">clear scans</button>
</div>
</template>
Loading

0 comments on commit 80c03f1

Please sign in to comment.