climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skhud...@apache.org
Subject svn commit: r1518343 - in /incubator/climate/trunk/rcmet/src/main/ui/app: css/app.css index.html partials/main.html partials/results.html partials/results.list.html partials/selectObservation.html partials/selectRcmed.html results.html
Date Wed, 28 Aug 2013 19:47:22 GMT
Author: skhudiky
Date: Wed Aug 28 19:47:21 2013
New Revision: 1518343

URL: http://svn.apache.org/r1518343
Log:
CLIMATE-278:clean up
- format html and css	
- remove results from app directory
- change add dataset button a primary button to standout 
- update main page
- update results look and feel

Removed:
    incubator/climate/trunk/rcmet/src/main/ui/app/results.html
Modified:
    incubator/climate/trunk/rcmet/src/main/ui/app/css/app.css
    incubator/climate/trunk/rcmet/src/main/ui/app/index.html
    incubator/climate/trunk/rcmet/src/main/ui/app/partials/main.html
    incubator/climate/trunk/rcmet/src/main/ui/app/partials/results.html
    incubator/climate/trunk/rcmet/src/main/ui/app/partials/results.list.html
    incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectObservation.html
    incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectRcmed.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=1518343&r1=1518342&r2=1518343&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 Aug 28 19:47:21 2013
@@ -16,14 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
 **/
-  
 body {
+	
 }
 
 #header-img {
+	
 }
 
 #header-title {
+	
 }
 
 #OCW-powered {
@@ -31,23 +33,19 @@ body {
 }
 
 #main-container {
-	margin-top:80px;
-	min-height:400px;
-	height:auto !important;
-	height:400px; 
+	margin-top: 80px;
+	min-height: 400px;
+	height: auto !important;
+	height: 400px;
 }
 
-#datasetDiv
-{
+#datasetDiv {
 	height: 750px;
 	overflow-y: auto;
 	overflow-x: hidden;
 }
 
-#map 
-{
-	height: 500px;
-}
+#map { height: 500px; }
 
 /* Small preview map that is displayed alongside dataset information */
 .preview-map {
@@ -55,55 +53,56 @@ body {
 	width: 100px;
 }
 
-.small-alert 
-{
+.small-alert {
 	font-size: 12px;
 	color: green;
 	margin-top: 4px;
 	margin-left: 10px;
 }
 
-.colorSquare
-{
+.colorSquare {
 	margin-top: 3px;
-	height: 10px; 
+	height: 10px;
 	width: 10px;
 }
 
-ul 
-{
-	list-style-type: none;
-}
+ul { list-style-type: none; }
 
-.no-color-link {color:#000000;}
-.no-color-link:hover {color:#000000; text-decoration: none;}     
-.no-color-link:visited {color:#000000;}     
-.no-color-link:active {color:#000000;}     
+.no-color-link { color: #000000; }
+.no-color-link:hover { color: #000000; text-decoration: none; }
+.no-color-link:visited { color: #000000; }
+.no-color-link:active { color: #000000; }
 
 /* Remove the grayed out close button in modal headers */
-.modal-header .close {
-	opacity: 1;
-}
+.modal-header .close { opacity: 1; }
 
 /* Remove the grayed out close button in modal footers */
-.modal-footer .close {
-	opacity: 1;
-}
+.modal-footer .close { opacity: 1; }
 
 /** 
   * Timeline 
-  */ 
+  */
 div#OCWtimeline {
 	margin-top: 20px;
 	padding-bottom: 20px;
 }
+
 div.timeline-event {
 	border: none;
 	background: none;
 }
-div.timeline-event-content {
-	margin: 0;
-}
-div.ocw-bar {
-	height: 5px;
+
+div.timeline-event-content { margin: 0; }
+
+div.ocw-bar { height: 5px; }
+
+/**
+  * Results
+  */
+#results-sidebar {
+	min-height: 400px;
+	height: auto !important;
+	height: 400px;
 }
+
+#results-sidebar-header { font-size: 14px; }

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=1518343&r1=1518342&r2=1518343&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/index.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/index.html Wed Aug 28 19:47:21 2013
@@ -39,32 +39,32 @@
 <div class="container">
   <div class="row-fluid">
     <div class="span12">
-	    <!-- Title -->
-	    <div class="row-fluid">
-	      <div class="span12">
-	      <br><br>
-	      <div id="header">
-	        <img id="header-img" src=""/>
-	        <h3 id="header-title">Project Name</h3>
-	        <h5 id="OCW-powered">Powered by Apache Open Climate Workbench</h5>
-	      </div>
-	      </div>
-	    </div>
-	    <!-- Navigation bar -->
-	    <div class="row-fluid">
-			<div class="navbar navbar-fixed-top">
-			  <div class="navbar-inner">
-				  <div class="container">
-				    <a class="brand" href="#">OCW UI</a>
-				    <ul class="nav">
-				      <li ng-class="{ active: $state.includes('main') }"><a href="#">Evaluate</a></li>
-				      <li ng-class="{ active: $state.includes('results') }"><a href="#/results">Results</a></li>
-				    </ul>
-				  </div>
-			  </div>
-			</div>
-	    </div>
-	</div>
+      <!-- Title -->
+      <div class="row-fluid">
+        <div class="span12">
+        <br><br>
+        <div id="header">
+          <img id="header-img" src=""/>
+          <h3 id="header-title">Project Name</h3>
+          <h5 id="OCW-powered">Powered by Apache Open Climate Workbench</h5>
+        </div>
+        </div>
+      </div>
+      <!-- Navigation bar -->
+      <div class="row-fluid">
+      <div class="navbar navbar-fixed-top">
+       <div class="navbar-inner">
+         <div class="container">
+           <a class="brand" href="#">OCW UI</a>
+           <ul class="nav">
+             <li ng-class="{ active: $state.includes('main') }"><a href="#">Evaluate</a></li>
+             <li ng-class="{ active: $state.includes('results') }"><a href="#/results">Results</a></li>
+           </ul>
+         </div>
+       </div>
+      </div>
+      </div>
+    </div>
   </div>
   <!-- Main Content -->
   <div id="main-container" class="container" ui-view ng-animate="{enter:'fade-enter'}"></div>
@@ -117,9 +117,9 @@
   <!--Filters-->
   <script src="js/filters/ISODateToMiddleEndian.js"></script>
 </body>
-<footer class="container well well-small" style="margin-top:10px">
-<div class="span4 offset1">
-<h6>Powered by Apache Open Climate Workbench</h6>
-</div>
+<footer class="container well well-small" style="margin-top: 40px">
+  <div class="span4 offset1">
+    <h6>Powered by Apache Open Climate Workbench</h6>
+  </div>
 </footer>
 </html>

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/partials/main.html
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/partials/main.html?rev=1518343&r1=1518342&r2=1518343&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/partials/main.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/partials/main.html Wed Aug 28 19:47:21 2013
@@ -23,9 +23,10 @@
     </form>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn btn-primary close">Close</a>
+    <a href="#" class="btn btn-warning close">Close</a>
   </div>
   </bootstrap-modal>
+<!-- END - Modal for evaluation settings -->
 
   <div class="row-fluid">
     <div class="span12">
@@ -66,6 +67,7 @@
                 <button class="btn btn-warning cancel" ng-click="close()">Close</button>
               </div>
             </div>
+            <!-- END - Modal for dataset selection -->
             <div class="row-fluid">
               <div class="span12">
               <hr />
@@ -108,9 +110,9 @@
                       <div class="span2 text-center">
                         {{dataset.latlonVals.latMax}}
                       </div>
-                      <div class="span2 text-center">East:</div>
+                      <div class="span2 text-center">West:</div>
                       <div class="span2 text-center">
-                        {{dataset.latlonVals.lonMax}}
+                        {{dataset.latlonVals.lonMin}}
                       </div>
                     </div>
                     <div class="row-fluid">
@@ -118,9 +120,9 @@
                       <div class="span2 text-center">
                         {{dataset.latlonVals.latMin}}
                       </div>
-                      <div class="span2 text-center">West:</div>
+                      <div class="span2 text-center">East:</div>
                       <div class="span2 text-center">
-                        {{dataset.latlonVals.lonMin}}
+                        {{dataset.latlonVals.lonMax}}
                       </div>
                     </div>
                   </div>

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/partials/results.html
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/partials/results.html?rev=1518343&r1=1518342&r2=1518343&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/partials/results.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/partials/results.html Wed Aug 28 19:47:21
2013
@@ -1,8 +1,8 @@
 <div class="row">
   <div class="span3">
-    <div class="pa-sidebar well well-small">
+    <div id="results-sidebar" class="pa-sidebar well well-small">
       <ul class="nav nav-list">
-        <li class="nav-header">Latest Run Results</li>
+        <li id="results-sidebar-header" class="nav-header">Latest Run Results</li>
         <li ng-repeat="result in results"
             ng-class="{ active: $state.includes('results.detail') && $stateParams.resultId
== result }">
           <a href="#/results/{{result.replace('/', '')}}" >{{result}}</a>

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/partials/results.list.html
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/partials/results.list.html?rev=1518343&r1=1518342&r2=1518343&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/partials/results.list.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/partials/results.list.html Wed Aug 28 19:47:21
2013
@@ -1,8 +1,3 @@
-<h4>Select one of your previous run. If none are displayed, go to the main page and
start one!</h4>
-<ul>
-  <li ng-repeat="result in results"
-    ng-class="{ active: $state.includes('results.detail') && $stateParams.resultId
== result }">
-      <a href="#/results/{{result.replace('/', '')}}" >{{result}}</a>
-  </li>
-</ul>
+<h4>Select one of your previous runs. If none are displayed, please return
+  to the main page and start one!</h4>
 

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectObservation.html
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectObservation.html?rev=1518343&r1=1518342&r2=1518343&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectObservation.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectObservation.html Wed Aug
28 19:47:21 2013
@@ -53,6 +53,6 @@
     </div>
   </div>
 
-  <button class="btn pull-left" ng-click="addDataSet()">Add Dataset</button>
+  <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>
\ No newline at end of file

Modified: incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectRcmed.html
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectRcmed.html?rev=1518343&r1=1518342&r2=1518343&view=diff
==============================================================================
--- incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectRcmed.html (original)
+++ incubator/climate/trunk/rcmet/src/main/ui/app/partials/selectRcmed.html Wed Aug 28 19:47:21
2013
@@ -39,6 +39,6 @@
     </div>
   </div>
 
-  <button class="btn pull-left" ng-click="addObservation()">Add Observation</button>
+  <button class="btn btn-primary pull-left" ng-click="addObservation()">Add Observation</button>
   <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div>
 </div>
\ No newline at end of file



Mime
View raw message