Skip to content

Commit

Permalink
Build
Browse files Browse the repository at this point in the history
  • Loading branch information
c-martinez committed May 6, 2016
1 parent f22d7f1 commit b6d4382
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</nvd3>
</div>
<div class="row col-md-12">
<div class="col-md-3" ng-repeat="(yearIdx,yearData) in vm.forceGraph.data" ng-if="vm.yearsInSight(yearIdx)">
<div class="col-md-4" ng-repeat="(yearIdx,yearData) in vm.forceGraph.data" ng-if="vm.yearsInSight(yearIdx)">
<span class="label label-default">{{ vm.getYearLabel(yearIdx) }}</span>
<nvd3
data='yearData'
Expand Down
24 changes: 9 additions & 15 deletions webapp/dist/app/components/shico/trackerParameters.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,25 @@
</div>

<div class="form-group form-inline col-md-4">
<label for="sumDistances">Sum distances</label>
<input type="checkbox" ng-model="vm.parameters.sumDistances" class="form-control" id="sumDistances">
<label for="sumDistances">Boost method</label>
<select ng-model="vm.parameters.boostMethod" name="boostMethod">
<option data-ng-repeat="method in vm.boostMethods" value="{{ method }}">{{ method }}</option>
</select>
</div>

<div class="form-group form-inline col-md-4">
<label for="algorithm">Algorithm: </label>
<label uib-popover-html="vm.tooltips['algorithm']"
popover-trigger="click" popover-placement="bottom" for="algorithm">Algorithm: </label>
<select ng-model="vm.parameters.algorithm" name="algorithm">
<option data-ng-repeat="algo in vm.algorithms" value="{{ algo }}">{{ algo }}</option>
</select>
</div>

<div class="form-group col-md-12"><!-- TODO: Should this be col-md-4 ?-->
<label for="forward">Track direction</label>
<div class="radio">
<label>
<input type="radio" ng-model="vm.parameters.forwards" ng-value="true" id="forward">
Forwards
</label>
</div>
<div class="radio">
<label>
<input type="radio" ng-model="vm.parameters.forwards" ng-value="false" id="forward">
Backwards
</label>
</div>
<select ng-model="vm.parameters.forwards" name="forward">
<option data-ng-repeat="dir in vm.directions" value="{{ dir }}">{{ dir }}</option>
</select>
</div>

<div class="form-group form-inline col-md-4">
Expand Down
6 changes: 6 additions & 0 deletions webapp/dist/help/algorithm.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
### Algorithm

The vocabulary monitor contains can use two different algorithms for generating vocabularies. These control which words are used as seed terms for each model:

- The non-adaptive vocabulary generator uses the same seed terms each time to generate the related terms.
- The adaptive vocabulary generator uses the related terms generated by one semantic model as seed terms for the next semantic model. This adds an additional possibility: it allows for the semantic models to be used in chronological order, or in reverse chronological order -- searching forwards or backwards in time.
4 changes: 2 additions & 2 deletions webapp/dist/index.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!doctype html><html ng-app="shico"><head><meta charset="utf-8"><title>shico</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="styles/vendor-3b947dc9fd.css"><link rel="stylesheet" href="styles/app-e4a4643d56.css"></head><body><!--[if lt IE 10]>
<!doctype html><html ng-app="shico"><head><meta charset="utf-8"><title>shico</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="styles/vendor.css"><link rel="stylesheet" href="styles/app.css"></head><body><!--[if lt IE 10]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]--><div class="container" ng-controller="FormController as vm" cg-busy="vm.trackerPromise"><div class="jumbotron"><form ng-submit="vm.doPost()"><tracker-parameters></tracker-parameters><div class="form-horizontal col-md-12"><div class="form-group"><button type="submit" class="btn btn-success">Submit</button></div></div></form><parameter-io></parameter-io></div><tracker-graphs></tracker-graphs></div><script src="scripts/vendor-a9f3cd09d2.js"></script><script src="scripts/app-6d28362ea6.js"></script></body></html>
<![endif]--><div class="container" ng-controller="FormController as vm" cg-busy="vm.trackerPromise"><div class="jumbotron"><form ng-submit="vm.doPost()"><tracker-parameters></tracker-parameters><div class="form-horizontal col-md-12"><div class="form-group"><button type="submit" class="btn btn-success">Submit</button></div></div></form><parameter-io></parameter-io></div><tracker-graphs></tracker-graphs></div><script src="scripts/vendor.js"></script><script src="scripts/app.js"></script></body></html>
1 change: 0 additions & 1 deletion webapp/dist/maps/scripts/app-6d28362ea6.js.map

This file was deleted.

1 change: 1 addition & 0 deletions webapp/dist/maps/scripts/app.js.map

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion webapp/dist/maps/scripts/vendor-a9f3cd09d2.js.map

This file was deleted.

1 change: 1 addition & 0 deletions webapp/dist/maps/scripts/vendor.js.map

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion webapp/dist/maps/styles/app-e4a4643d56.css.map

This file was deleted.

1 change: 1 addition & 0 deletions webapp/dist/maps/styles/app.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion webapp/dist/maps/styles/vendor-3b947dc9fd.css.map

This file was deleted.

1 change: 1 addition & 0 deletions webapp/dist/maps/styles/vendor.css.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions webapp/dist/scripts/app-6d28362ea6.js

This file was deleted.

Loading

0 comments on commit b6d4382

Please sign in to comment.