climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r1502049 - in /incubator/climate/trunk/rcmet/src/main/ui/app: css/app.css index.html
Date Wed, 10 Jul 2013 23:09:22 GMT
Author: joyce
Date: Wed Jul 10 23:09:22 2013
New Revision: 1502049

URL: http://svn.apache.org/r1502049
Log:
CLIMATE-187 - Add thumbnail maps to dataset display

- Update CSS with new preview map class.
- Change dataset display to include a small thumbnail map.

Modified:
    incubator/climate/trunk/rcmet/src/main/ui/app/css/app.css
    incubator/climate/trunk/rcmet/src/main/ui/app/index.html

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/css/app.css
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/css/app.css?rev=1502049&r1=1502048&r2=1502049&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/css/app.css (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/css/app.css Wed Jul 10 23:09:22 2013
@@ -29,6 +29,11 @@
 	height: 500px;
 }
 
+/* Small preview map that is displayed alongside dataset information */
+.preview-map {
+	height: 100px;
+}
+
 .small-alert 
 {
 	font-size: 12px;

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=1502049&r1=1502048&r2=1502049&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/index.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/index.html Wed Jul 10 23:09:22 2013
@@ -104,6 +104,7 @@
             <div ng-controller="DatasetDisplayCtrl" id="datasetDiv">
               <div ng-repeat="dataset in datasets">
                 <div class="row-fluid">
+                  <!--Data section-->
                   <div class="span8 muted">
                     {{dataset.name}}
                   </div>
@@ -115,46 +116,55 @@
                 </div>
                 <!--Time Values!-->
                 <div class="row-fluid">
-                  <div class="span2 text-center">Start Date:</div>
-                  <div class="span2">
-                    <div class="span2 text-center">{{dataset.timeVals.start | ISODateToMiddleEndian}}</div>
-                  </div>
-                  <div class="span2 text-center">End Date:</div>
-                  <div class="span2">
-                    <div class="span2 text-center">{{dataset.timeVals.end | ISODateToMiddleEndian}}</div>
-                  </div>
-                  <div class="span2">
-                    <div class="colorSquare" style="background-color: {{fillColors[$index]}};"></div>
-                  </div>
-                </div>
-                <!--Lat/Long Values!-->
-                <div class="row-fluid">
-                  <div class="span2 text-center">North:</div>
-                  <div class="span2 text-center">
-                    {{dataset.latlonVals.latMax}}
-                  </div>
-                  <div class="span2 text-center">East:</div>
-                  <div class="span2 text-center">
-                    {{dataset.latlonVals.lonMax}}
-                  </div>
-                  <div class="span2">
-                    <label><input type="checkbox" ng-model="dataset.shouldDisplay"
/> Overlay</label>
-                  </div>
-                </div>
-                <div class="row-fluid">
-                  <div class="span2 text-center">South:</div>
-                  <div class="span2 text-center">
-                    {{dataset.latlonVals.latMin}}
-                  </div>
-                  <div class="span2 text-center">West:</div>
-                  <div class="span2 text-center">
-                    {{dataset.latlonVals.lonMin}}
+                  <!--Dataset Info Section-->
+                  <div class="span10">
+                    <div class="row-fluid">
+                      <div class="span2 text-center">Start Date:</div>
+                      <div class="span2">
+                        <div class="span2 text-center">{{dataset.timeVals.start | ISODateToMiddleEndian}}</div>
+                      </div>
+                      <div class="span2 text-center">End Date:</div>
+                      <div class="span2">
+                        <div class="span2 text-center">{{dataset.timeVals.end | ISODateToMiddleEndian}}</div>
+                      </div>
+                      <div class="span2">
+                        <div class="colorSquare" style="background-color: {{fillColors[$index]}};"></div>
+                      </div>
+                    </div>
+                    <!--Lat/Long Values!-->
+                    <div class="row-fluid">
+                      <div class="span2 text-center">North:</div>
+                      <div class="span2 text-center">
+                        {{dataset.latlonVals.latMax}}
+                      </div>
+                      <div class="span2 text-center">East:</div>
+                      <div class="span2 text-center">
+                        {{dataset.latlonVals.lonMax}}
+                      </div>
+                      <div class="span2">
+                        <label><input type="checkbox" ng-model="dataset.shouldDisplay"
/> Overlay</label>
+                      </div>
+                    </div>
+                    <div class="row-fluid">
+                      <div class="span2 text-center">South:</div>
+                      <div class="span2 text-center">
+                        {{dataset.latlonVals.latMin}}
+                      </div>
+                      <div class="span2 text-center">West:</div>
+                      <div class="span2 text-center">
+                        {{dataset.latlonVals.lonMin}}
+                      </div>
+                      <div class="span2">
+                        <label>
+                          <input type="checkbox" ng-model="dataset.regrid" ng-click="setRegridBase($index)"/>

+                          Regrid 
+                        </label>
+                      </div>
+                    </div>
                   </div>
+                  <!--Preview Map Section-->
                   <div class="span2">
-                    <label>
-                      <input type="checkbox" ng-model="dataset.regrid" ng-click="setRegridBase($index)"/>

-                      Regrid 
-                    </label>
+                    <div preview-map="dataset"></div>
                   </div>
                 </div>
                 <div class="row-fluid">
@@ -288,6 +298,7 @@
 
   <!--Directives-->
   <script src="js/directives/LeafletMap.js"></script>
+  <script src="js/directives/PreviewMap.js"></script>
   <script src="js/directives/BootstrapModal.js"></script>
   <script src="js/directives/BootstrapModalOpen.js"></script>
   <script src="js/directives/PredictiveFileBrowserInput.js"></script>



Mime
View raw message