Fix observation select view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/071bb5a9 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/071bb5a9 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/071bb5a9 Branch: refs/heads/master Commit: 071bb5a98890c95056c889f2d801601ac6baa51d Parents: 51030e7 Author: Michael Joyce <[email protected]> Authored: Thu Jul 17 08:08:48 2014 -0700 Committer: Michael Joyce <[email protected]> Committed: Thu Jul 17 08:08:48 2014 -0700 ---------------------------------------------------------------------- .../app/views/selectobservation.html | 88 ++++++++++++-------- 1 file changed, 55 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/071bb5a9/ocw-ui/frontend-new/app/views/selectobservation.html ---------------------------------------------------------------------- diff --git a/ocw-ui/frontend-new/app/views/selectobservation.html b/ocw-ui/frontend-new/app/views/selectobservation.html index c560b6f..a16c4e4 100644 --- a/ocw-ui/frontend-new/app/views/selectobservation.html +++ b/ocw-ui/frontend-new/app/views/selectobservation.html @@ -18,41 +18,63 @@ --> <div ng-controller="ObservationSelectCtrl"> - <form class="form-inline" autocomplete="off"> - <input id="observationFileInput" predictive-file-browser-input ng-model="filePathInput" type="text" class="input-xlarge" autocomplete="off" /> - <button class="btn" ng-click="uploadLocalFile()" ng-disabled="shouldDisableLoadButton()"> - <div ng-hide="loadingFile">Parse File</div> - <div ng-show="loadingFile"><i class="icon-spinner icon-spin"></i></div> - </button> - </form> - <div class="row"> - <div class="span2 text-center"> - Evaluation Variable - </div> - <div class="span3"> - <select ng-model="paramSelect" ng-options="param for param in params"></select> - </div> - <div class="span2 text-center"> - Latitude Variable - </div> - <div class="span3"> - <select ng-model="latsSelect" ng-options="lat for lat in lats"></select> - </div> - <div class="span2 text-center"> - Longitude Variable + <div class="col-md-12"> + <div class="row"> + <!--<form class="form-inline" autocomplete="off">--> + <form class="form" autocomplete="off"> + <div class="form-group"> + <div class="col-md-9"> + <input id="observationFileInput" predictive-file-browser-input ng-model="filePathInput" type="text" class="form-control" autocomplete="off" /> + </div> + <div class="col-md-2"> + <button class="btn" ng-click="uploadLocalFile()" ng-disabled="shouldDisableLoadButton()"> + <div ng-hide="loadingFile">Parse File</div> + <div ng-show="loadingFile"><i class="icon-spinner icon-spin"></i></div> + </button> + </div> + </div> + </form> + </div> + <hr /> + <div class="row"> + <div class="col-md-6 text-center"> + Evaluation Variable + </div> + <div class="col-md-5 col-md-offset-1"> + <select ng-model="paramSelect" ng-options="param for param in params"></select> + </div> + </div> + <div class="row"> + <div class="col-md-6 text-center"> + Latitude Variable + </div> + <div class="col-md-5 col-md-offset-1"> + <select ng-model="latsSelect" ng-options="lat for lat in lats"></select> + </div> + </div> + <div class="row"> + <div class="col-md-6 text-center"> + Longitude Variable + </div> + <div class="col-md-5 col-md-offset-1"> + <select ng-model="lonsSelect" ng-options="lon for lon in lons"></select> + </div> + </div> + <div class="row"> + <div class="col-md-6 text-center"> + Date/Time Variable + </div> + <div class="col-md-5 col-md-offset-1"> + <select ng-model="timeSelect" ng-options="time for time in times"></select> + </div> + </div> </div> - <div class="span3"> - <select ng-model="lonsSelect" ng-options="lon for lon in lons"></select> - </div> - <div class="span2 text-center"> - Date/Time Variable - </div> - <div class="span3"> - <select ng-model="timeSelect" ng-options="time for time in times"></select> + </div> + <div class="row"> + <div class="col-md-4 col-md-offset-1"> + <button class="btn btn-primary btn-block" ng-click="addDataSet()">Add Dataset</button> </div> + <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div> </div> - - <button class="btn btn-primary pull-left" ng-click="addDataSet()">Add Dataset</button> - <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div> </div>
