You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2013/06/25 00:57:26 UTC
svn commit: r1496252 -
/incubator/climate/trunk/rcmet/src/main/ui/app/index.html
Author: joyce
Date: Mon Jun 24 22:57:26 2013
New Revision: 1496252
URL: http://svn.apache.org/r1496252
Log:
CLIMATE-152 progress - Div layout cleanup
- Squash row + span divs for various components.
- Fix indentation problems with new divs.
- Remove useless comments.
Modified:
incubator/climate/trunk/rcmet/src/main/ui/app/index.html
Modified: incubator/climate/trunk/rcmet/src/main/ui/app/index.html
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/index.html?rev=1496252&r1=1496251&r2=1496252&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/index.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/index.html Mon Jun 24 22:57:26 2013
@@ -94,152 +94,140 @@
</div>
</bootstrap-modal>
-<!--New layout test-->
<div class="row">
<div class="span6">
-
- <!--Dataset display-->
- <div ng-controller="DatasetDisplayCtrl">
- <div ng-repeat="dataset in datasets">
- <div class="row displayRow">
- <div class="span4 "><hr /></div>
- </div>
- <div class="row displayRow">
- <div class="span4 ">
- <input class="span4 text-center" type="text" value="{{dataset.name}}" />
- </div>
- </div>
- <!--Time Values!-->
- <div class="row displayRow">
- <div class="span1 text-center">Start Date:</div>
- <div class="span1">
- <input class="span1 text-center" type="text" value="{{dataset.timeVals.start}}" readonly/>
- </div>
- <div class="span1 text-center">End Date:</div>
- <div class="span1">
- <input class="span1 text-center" type="text" value="{{dataset.timeVals.end}}" readonly/>
- </div>
- <div class="span1">
- <a class="btn btn-block" ng-click="removeDataset($index)">Remove</a>
+ <!--Dataset display-->
+ <div ng-controller="DatasetDisplayCtrl">
+ <div ng-repeat="dataset in datasets">
+ <div class="row displayRow">
+ <div class="span4 "><hr /></div>
+ </div>
+ <div class="row displayRow">
+ <div class="span4 ">
+ <input class="span4 text-center" type="text" value="{{dataset.name}}" />
+ </div>
+ </div>
+ <!--Time Values!-->
+ <div class="row displayRow">
+ <div class="span1 text-center">Start Date:</div>
+ <div class="span1">
+ <input class="span1 text-center" type="text" value="{{dataset.timeVals.start}}" readonly/>
+ </div>
+ <div class="span1 text-center">End Date:</div>
+ <div class="span1">
+ <input class="span1 text-center" type="text" value="{{dataset.timeVals.end}}" readonly/>
+ </div>
+ <div class="span1">
+ <a class="btn btn-block" ng-click="removeDataset($index)">Remove</a>
+ </div>
+ <div class="span1" style="background-color: {{fillColors[$index]}}; height: 28px; width: 28px;"></div>
+ </div>
+ <!--Lat/Long Values!-->
+ <div class="row displayRow">
+ <div class="span1 text-center">North:</div>
+ <div class="span1">
+ <input class="span1 text-center" type="text" value="{{dataset.latlonVals.latMax}}" readonly/>
+ </div>
+ <div class="span1 text-center">East:</div>
+ <div class="span1">
+ <input class="span1 text-center" type="text" value="{{dataset.latlonVals.lonMax}}" readonly/>
+ </div>
+ <div class="span1">
+ <label><input type="checkbox" ng-model="dataset.shouldDisplay" /> Display Overlay</label>
+ </div>
+ </div>
+ <div class="row displayRow">
+ <div class="span1 text-center">South:</div>
+ <div class="span1">
+ <input class="span1 text-center" type="text" value="{{dataset.latlonVals.latMin}}" readonly/>
+ </div>
+ <div class="span1 text-center">West:</div>
+ <div class="span1">
+ <input class="span1 text-center" type="text" value="{{dataset.latlonVals.lonMin}}" readonly/>
+ </div>
+ <div class="span2">
+ <label>
+ <input type="checkbox" ng-model="dataset.regrid" ng-click="setRegridBase($index)"/>
+ Regrid Base
+ </label>
+ </div>
</div>
- <div class="span1" style="background-color: {{fillColors[$index]}}; height: 28px; width: 28px;"></div>
- </div>
- <!--Lat/Long Values!-->
- <div class="row displayRow">
- <div class="span1 text-center">North:</div>
- <div class="span1">
- <input class="span1 text-center" type="text" value="{{dataset.latlonVals.latMax}}" readonly/>
- </div>
- <div class="span1 text-center">East:</div>
- <div class="span1">
- <input class="span1 text-center" type="text" value="{{dataset.latlonVals.lonMax}}" readonly/>
- </div>
- <div class="span1">
- <label><input type="checkbox" ng-model="dataset.shouldDisplay" /> Display Overlay</label>
- </div>
- </div>
- <div class="row displayRow">
- <div class="span1 text-center">South:</div>
- <div class="span1">
- <input class="span1 text-center" type="text" value="{{dataset.latlonVals.latMin}}" readonly/>
- </div>
- <div class="span1 text-center">West:</div>
- <div class="span1">
- <input class="span1 text-center" type="text" value="{{dataset.latlonVals.lonMin}}" readonly/>
- </div>
- <div class="span2">
- <label>
- <input type="checkbox" ng-model="dataset.regrid" ng-click="setRegridBase($index)"/>
- Regrid Base
- </label>
</div>
- </div>
</div>
</div>
-
- </div>
<div class="span6">
-
- <div class="row span6">
- <div ng-controller="WorldMapCtrl">
+ <div class="row span6" ng-controller="WorldMapCtrl">
<leaflet-map id="map"></leaflet-map>
</div>
- </div>
-
- <!-- Timeline -->
- <div class="row span6">
- <div ng-controller="TimelineCtrl">
+
+ <!-- Timeline -->
+ <div class="row span6" ng-controller="TimelineCtrl">
<div class="timeline"></div>
</div>
- </div>
-
- <div class="row span6">
- <div ng-controller="ParameterSelectCtrl">
- <div class="row">
- <div class="span1 text-center">Start Date:</div>
- <div class="span1">
- <form>
- <input ng-disabled="shouldDisableControls()" on-blur="checkParameters();" ng-model="displayParams.start" ui-date="datepickerSettings" ui-date-format="yy-mm-dd" type="text" class="text-center span1" />
- </form>
- </div>
- <div class="span1 text-center">End Date:</div>
- <div class="span1">
- <form>
- <input ng-disabled="shouldDisableControls()" on-blur="checkParameters();" ng-model="displayParams.end" ui-date="datepickerSettings" ui-date-format="yy-mm-dd" type="text" class="text-center span1" />
- </form>
- </div>
- <div class="span1">
- <button class="btn btn-block btn-success" bootstrap-modal-open="datasetSelect">Select</button>
- </div>
- <!--<div class="span1">-->
- <!--<button ng-click="clearDatasets()" ng-hide="shouldDisableClearButton()" class="btn btn-block btn-warning">Clear</button>-->
- <!--</div>-->
- <!--<div class="span1">-->
- <!--<button ng-click="runEvaluation()" ng-hide="shouldDisableControls()" ng-disabled="runningEval" class="btn btn-block btn-primary">-->
- <!--<div ng-hide="runningEval">Evaluate</div>-->
- <!--<div ng-show="runningEval"><i class="icon-spinner icon-spin"></i></div>-->
- <!--</button>-->
- <!--</div>-->
- <!--<div class="span1">-->
- <!--<button class="btn btn-block btn-primary" ng-hide="shouldDisableResultsView()" bootstrap-modal-open="evaluationResults">Results</button>-->
- <!--</div>-->
- <!--<div class="span1">-->
- <!--<button class="btn btn-block" background="false" bootstrap-modal-open="evaluationSettings"><i class="icon-cogs"></i></button>-->
- <!--</div>-->
- </div>
- <div class="row">
- <div class="span1 text-center">North:</div>
- <div class="span1">
- <form action="">
- <input ng-disabled="shouldDisableControls()" ng-model="displayParams.latMax" on-blur="checkParameters();" type="text" class="span1 text-center" />
- </form>
- </div>
- <div class="span1 text-center">South:</div>
- <div class="span1">
- <form action="">
- <input ng-disabled="shouldDisableControls()" ng-model="displayParams.latMin" on-blur="checkParameters();" type="text" class="span1 text-center" />
- </form>
- </div>
- </div>
- <div class="row">
- <div class="span1 text-center">East:</div>
- <div class="span1">
- <form>
- <input ng-disabled="shouldDisableControls()" ng-model="displayParams.lonMax" on-blur="checkParameters();" type="text" class="span1 text-center" />
- </form>
- </div>
- <div class="span1 text-center">West:</div>
- <div class="span1">
- <form>
- <input ng-disabled="shouldDisableControls()" ng-model="displayParams.lonMin" on-blur="checkParameters();"; type="text" class="span1 text-center" />
- </form>
+
+ <div class="row span6" ng-controller="ParameterSelectCtrl">
+ <div class="row">
+ <div class="span1 text-center">Start Date:</div>
+ <div class="span1">
+ <form>
+ <input ng-disabled="shouldDisableControls()" on-blur="checkParameters();" ng-model="displayParams.start" ui-date="datepickerSettings" ui-date-format="yy-mm-dd" type="text" class="text-center span1" />
+ </form>
+ </div>
+ <div class="span1 text-center">End Date:</div>
+ <div class="span1">
+ <form>
+ <input ng-disabled="shouldDisableControls()" on-blur="checkParameters();" ng-model="displayParams.end" ui-date="datepickerSettings" ui-date-format="yy-mm-dd" type="text" class="text-center span1" />
+ </form>
+ </div>
+ <div class="span1">
+ <button class="btn btn-block btn-success" bootstrap-modal-open="datasetSelect">Select</button>
+ </div>
+ <!--<div class="span1">-->
+ <!--<button ng-click="clearDatasets()" ng-hide="shouldDisableClearButton()" class="btn btn-block btn-warning">Clear</button>-->
+ <!--</div>-->
+ <!--<div class="span1">-->
+ <!--<button ng-click="runEvaluation()" ng-hide="shouldDisableControls()" ng-disabled="runningEval" class="btn btn-block btn-primary">-->
+ <!--<div ng-hide="runningEval">Evaluate</div>-->
+ <!--<div ng-show="runningEval"><i class="icon-spinner icon-spin"></i></div>-->
+ <!--</button>-->
+ <!--</div>-->
+ <!--<div class="span1">-->
+ <!--<button class="btn btn-block btn-primary" ng-hide="shouldDisableResultsView()" bootstrap-modal-open="evaluationResults">Results</button>-->
+ <!--</div>-->
+ <!--<div class="span1">-->
+ <!--<button class="btn btn-block" background="false" bootstrap-modal-open="evaluationSettings"><i class="icon-cogs"></i></button>-->
+ <!--</div>-->
+ </div>
+ <div class="row">
+ <div class="span1 text-center">North:</div>
+ <div class="span1">
+ <form action="">
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.latMax" on-blur="checkParameters();" type="text" class="span1 text-center" />
+ </form>
+ </div>
+ <div class="span1 text-center">South:</div>
+ <div class="span1">
+ <form action="">
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.latMin" on-blur="checkParameters();" type="text" class="span1 text-center" />
+ </form>
+ </div>
+ </div>
+ <div class="row">
+ <div class="span1 text-center">East:</div>
+ <div class="span1">
+ <form>
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.lonMax" on-blur="checkParameters();" type="text" class="span1 text-center" />
+ </form>
+ </div>
+ <div class="span1 text-center">West:</div>
+ <div class="span1">
+ <form>
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.lonMin" on-blur="checkParameters();"; type="text" class="span1 text-center" />
+ </form>
+ </div>
</div>
</div>
</div>
- </div>
-
-<!--new layout test-->
-</div>
</div>
<!--Libraries-->