Merge pull request #261 from oceanzus/r3_hotfix_lp

R3 Landing Pages HotFix

Gruntfile.js

@@ -170,7 +170,7 @@ module.exports = function(grunt) {
             "ooiui/static/js/partials/Event.html",
             "ooiui/static/js/partials/LoggedInNavItems.html"
           ],
-          "ooiui/static/js/partials/compiled/pioneerArray.js": [
+          "ooiui/static/js/partials/compiled/landingPages.js": [
             "ooiui/static/js/partials/DropdownMessages.html",
             "ooiui/static/js/partials/DropdownMessage.html",
             "ooiui/static/js/partials/DropdownUserLoggedIn.html",
@@ -184,13 +184,57 @@ module.exports = function(grunt) {
             "ooiui/static/js/partials/Chart.html",
             "ooiui/static/js/partials/FakeTable.html",
             "ooiui/static/js/partials/OrgSidebar.html",
-            "ooiui/static/js/partials/PioneerArrayTOC.html",
+            "ooiui/static/js/partials/LandingPagesTOC.html",
+            "ooiui/static/js/partials/EnduranceArray.html",
+            "ooiui/static/js/partials/EnduranceLocationSampling.html",
+            "ooiui/static/js/partials/EnduranceDescriptionInfrastructureArray.html",
+            "ooiui/static/js/partials/EnduranceStationSummary.html",
+            "ooiui/static/js/partials/EnduranceDeploymentSchedule.html",
+            "ooiui/static/js/partials/EnduranceInfrastructureTables.html",
+            "ooiui/static/js/partials/EnduranceTechnicalDrawings.html",
+            "ooiui/static/js/partials/CabledArray.html",
+            "ooiui/static/js/partials/CabledArrayLocationSampling.html",
+            "ooiui/static/js/partials/CabledArrayPrimaryInfrastructure.html",
+            "ooiui/static/js/partials/CabledArraySecondaryInfrastructure.html",
+            "ooiui/static/js/partials/CabledArrayStationSummary.html",
+            "ooiui/static/js/partials/CabledArrayDeploymentSchedual.html",
+            "ooiui/static/js/partials/CabledArrayDetailedInfrastructureTables.html",
+            "ooiui/static/js/partials/CabledArrayTechnicalDrawings.html",
+            "ooiui/static/js/partials/StationPapa.html",
+            "ooiui/static/js/partials/StationPapaTechnicalDrawing.html",
+            "ooiui/static/js/partials/StationPapaStationSummary.html",
+            "ooiui/static/js/partials/StationPapaLocationSampling.html",
+            "ooiui/static/js/partials/StationPapaDetailedInfrastructureTables.html",
+            "ooiui/static/js/partials/StationPapaDescriptionInfrastructure.html",
+            "ooiui/static/js/partials/StationPapaDeployment.html",
+            "ooiui/static/js/partials/IrmingerSea.html",
+            "ooiui/static/js/partials/IrmingerSeaLocationSampling.html",
+            "ooiui/static/js/partials/IrmingerSeaDescriptionInfrastructure.html",
+            "ooiui/static/js/partials/IrmingerSeaStationSummary.html",
+            "ooiui/static/js/partials/IrmingerSeaDeployment.html",
+            "ooiui/static/js/partials/IrmingerSeaDetailedInfrastructure.html",
+            "ooiui/static/js/partials/IrmingerSeaTechnicalDrawings.html",
+            "ooiui/static/js/partials/ArgentineBasin.html",
+            "ooiui/static/js/partials/ArgentineBasinTechnicalDrawing.html",
+            "ooiui/static/js/partials/ArgentineBasinStationSummary.html",
+            "ooiui/static/js/partials/ArgentineBasinLocationSampling.html",
+            "ooiui/static/js/partials/ArgentineBasinDetailedInfrastructureTables.html",
+            "ooiui/static/js/partials/ArgentineBasinDescriptionInfrastructure.html",
+            "ooiui/static/js/partials/ArgentineBasinDeployment.html",
+            "ooiui/static/js/partials/SouthernOcean.html",
+            "ooiui/static/js/partials/SouthernOceanTechnicalDrawing.html",
+            "ooiui/static/js/partials/SouthernOceanStationSummary.html",
+            "ooiui/static/js/partials/SouthernOceanLocationSampling.html",
+            "ooiui/static/js/partials/SouthernOceanDetailedInfrastructureTables.html",
+            "ooiui/static/js/partials/SouthernOceanDescriptionInfrastructure.html",
+            "ooiui/static/js/partials/SouthernOceanDeployment.html",
             "ooiui/static/js/partials/PioneerArray.html",
-            "ooiui/static/js/partials/InfrastructureArray.html",
-            "ooiui/static/js/partials/StationSummaryArray.html",
-            "ooiui/static/js/partials/DeploymentSchedule.html",
-            "ooiui/static/js/partials/InfrastructureTables.html",
-            "ooiui/static/js/partials/TechnicalDrawings.html",
+            "ooiui/static/js/partials/PioneerLocationSampling.html",
+            "ooiui/static/js/partials/PioneerInfrastructureArray.html",
+            "ooiui/static/js/partials/PioneerStationSummaryArray.html",
+            "ooiui/static/js/partials/PioneerDeploymentSchedule.html",
+            "ooiui/static/js/partials/PioneerInfrastructureTables.html",
+            "ooiui/static/js/partials/PioneerTechnicalDrawings.html",
             "ooiui/static/js/partials/Watch.html",
             "ooiui/static/js/partials/EventList.html",
             "ooiui/static/js/partials/TimeLineEvent.html",
@@ -578,7 +622,7 @@ module.exports = function(grunt) {
             'ooiui/static/js/views/science/StreamTableView.js',
             'ooiui/static/js/views/science/StreamDownloadFormView.js'
           ],
-          'ooiui/static/js/compiled/pioneerArray.js' : [
+          'ooiui/static/js/compiled/landingPages.js' : [
             // Libs
             'ooiui/static/lib/jquery-cookie/jquery.cookie.js',
             'ooiui/static/lib/underscore/underscore.js',
@@ -599,20 +643,64 @@ module.exports = function(grunt) {
             // Views
             'ooiui/static/js/views/common/DropdownMessagesView.js',
             'ooiui/static/js/views/common/DropdownUserView.js',
-            "ooiui/static/js/views/common/NavbarView.js",
+            'ooiui/static/js/views/common/NavbarView.js',
             'ooiui/static/js/views/common/LoginView.js',
             'ooiui/static/js/views/common/ModalDialogView.js',
             'ooiui/static/js/views/common/PanelView.js',
             'ooiui/static/js/views/common/FakeTableView.js',
             'ooiui/static/js/views/common/ChartView.js',
             'ooiui/static/js/views/common/ChartViews.js',
-            'ooiui/static/js/views/common/PioneerArrayTOCView.js',
+            'ooiui/static/js/views/common/LandingPagesTOCView.js',
+            'ooiui/static/js/views/common/EnduranceArrayView.js',
+            'ooiui/static/js/views/common/EnduranceLocationSamplingView.js',
+            'ooiui/static/js/views/common/EnduranceDescriptionInfrastructureArrayView.js',
+            'ooiui/static/js/views/common/EnduranceStationSummaryView.js',
+            'ooiui/static/js/views/common/EnduranceDeploymentScheduleView.js',
+            'ooiui/static/js/views/common/EnduranceInfrastructureTablesView.js',
+            'ooiui/static/js/views/common/EnduranceTechnicalDrawingsView.js',
+            'ooiui/static/js/views/common/CabledArrayView.js',
+            'ooiui/static/js/views/common/CabledArrayLocationSamplingView.js',
+            'ooiui/static/js/views/common/CabledArrayPrimaryInfrastructureView.js',
+            'ooiui/static/js/views/common/CabledArraySecondaryInfrastructureView.js',
+            'ooiui/static/js/views/common/CabledArrayStationSummaryView.js',
+            'ooiui/static/js/views/common/CabledArrayDeploymentSchedualView.js',
+            'ooiui/static/js/views/common/CabledArrayDetailedInfrastructureTablesView.js',
+            'ooiui/static/js/views/common/CabledArrayTechnicalDrawingsView.js',
+            'ooiui/static/js/views/common/StationPapaView.js',
+            'ooiui/static/js/views/common/StationPapaTechnicalDrawingView.js',
+            'ooiui/static/js/views/common/StationPapaStationSummaryView.js',
+            'ooiui/static/js/views/common/StationPapaLocationSamplingView.js',
+            'ooiui/static/js/views/common/StationPapaDetailedInfrastructureTablesView.js',
+            'ooiui/static/js/views/common/StationPapaDescriptionInfrastructureView.js',
+            'ooiui/static/js/views/common/StationPapaDeploymentView.js',
+            'ooiui/static/js/views/common/IrmingerSeaView.js',
+            'ooiui/static/js/views/common/IrmingerSeaLocationSamplingView.js',
+            'ooiui/static/js/views/common/IrmingerSeaDescriptionInfrastructureView.js',
+            'ooiui/static/js/views/common/IrmingerSeaStationSummaryView.js',
+            'ooiui/static/js/views/common/IrmingerSeaDeploymentView.js',
+            'ooiui/static/js/views/common/IrmingerSeaDetailedInfrastructureView.js',
+            'ooiui/static/js/views/common/IrmingerSeaTechnicalDrawingsView.js',
+            'ooiui/static/js/views/common/ArgentineBasinView.js',
+            'ooiui/static/js/views/common/ArgentineBasinTechnicalDrawingView.js',
+            'ooiui/static/js/views/common/ArgentineBasinStationSummaryView.js',
+            'ooiui/static/js/views/common/ArgentineBasinLocationSamplingView.js',
+            'ooiui/static/js/views/common/ArgentineBasinDetailedInfrastructureTablesView.js',
+            'ooiui/static/js/views/common/ArgentineBasinDescriptionInfrastructureView.js',
+            'ooiui/static/js/views/common/ArgentineBasinDeploymentView.js',
+            'ooiui/static/js/views/common/SouthernOceanView.js',
+            'ooiui/static/js/views/common/SouthernOceanTechnicalDrawingView.js',
+            'ooiui/static/js/views/common/SouthernOceanStationSummaryView.js',
+            'ooiui/static/js/views/common/SouthernOceanLocationSamplingView.js',
+            'ooiui/static/js/views/common/SouthernOceanDetailedInfrastructureTablesView.js',
+            'ooiui/static/js/views/common/SouthernOceanDescriptionInfrastructureView.js',
+            'ooiui/static/js/views/common/SouthernOceanDeploymentView.js',
+            'ooiui/static/js/views/common/PioneerLocationSamplingView.js',
             'ooiui/static/js/views/common/PioneerArrayView.js',
-            'ooiui/static/js/views/common/InfrastructureArrayView.js',
-            'ooiui/static/js/views/common/StationSummaryArrayView.js',
-            'ooiui/static/js/views/common/DeploymentScheduleView.js',
-            'ooiui/static/js/views/common/InfrastructureTablesView.js',
-            'ooiui/static/js/views/common/TechnicalDrawingsView.js',
+            'ooiui/static/js/views/common/PioneerInfrastructureArrayView.js',
+            'ooiui/static/js/views/common/PioneerStationSummaryArrayView.js',
+            'ooiui/static/js/views/common/PioneerDeploymentScheduleView.js',
+            'ooiui/static/js/views/common/PioneerInfrastructureTablesView.js',
+            'ooiui/static/js/views/common/PioneerTechnicalDrawingsView.js',
           ]
         }
       },
@@ -679,7 +767,7 @@ module.exports = function(grunt) {
           "ooiui/static/css/compiled/svgplot.css" : [
             "ooiui/static/css/common/AnnotationTableView.css",
             "ooiui/static/lib/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css",
-            "ooiui/static/lib/bootstrap-select/dist/css/bootstrap-select.css",            
+            "ooiui/static/lib/bootstrap-select/dist/css/bootstrap-select.css",
             "ooiui/static/css/common/scienceLayout.css",
             "ooiui/static/lib/metis-menu/dist/metisMenu.css",
             "ooiui/static/css/common/loginDemo.css",
@@ -712,13 +800,13 @@ module.exports = function(grunt) {
             "ooiui/static/css/common/newEvent.css",
             "ooiui/static/css/common/ModalForm.css"
           ],
-          "ooiui/static/css/compiled/pioneerArray.css" : [
+          "ooiui/static/css/compiled/landingPages.css" : [
             "ooiui/static/lib/metis-menu/dist/metisMenu.css",
             "ooiui/static/lib/bootstrap3-datetimepicker/build/css/bootstrap-datetimepicker.min.css",
             "ooiui/static/css/common/loginDemo.css",
             "ooiui/static/css/common/timeline.css",
             "ooiui/static/css/common/orgsidebarview.css",
-            "ooiui/static/css/common/pioneerArray.css"
+            "ooiui/static/css/common/landingPages.css"
           ]
         }
       }

ooiui/core/routes/common.py

@@ -40,9 +40,33 @@ def create_ticket():
 def user_login():
     return render_template('common/loginDemo.html')
 
-@app.route('/pioneerarray')
+@app.route('/pioneer-array')
 def pioneer_array():
-    return render_template('common/pioneerArray.html')
+    return render_template('landing/pioneerArray.html')
+
+@app.route('/endurance-array')
+def endurance_array():
+    return render_template('landing/enduranceArray.html')
+
+@app.route('/cabled-array')
+def cabled_array():
+    return render_template('landing/cabledArray.html')
+
+@app.route('/station-papa')
+def station_papa():
+    return render_template('landing/stationPapa.html')
+
+@app.route('/irminger-sea')
+def irminger_sea():
+    return render_template('landing/irmingerSea.html')
+
+@app.route('/argentine-basin')
+def argentine_basin():
+    return render_template('landing/argentineBasin.html')
+
+@app.route('/southern-ocean')
+def southern_ocean():
+    return render_template('landing/southernOcean.html')
 
 @app.route('/infrastructure')
 def infrastructure():

ooiui/static/js/ooi.js

@@ -41,14 +41,14 @@ OOI.RelationalModel = Backbone.Model.extend({
           options = {};
         }
         // The data parameters are defined by the relation
-        if(options && options.data) { 
+        if(options && options.data) {
           delete options.data;
         }
 
         // This is where the URL parameter is generated ?key=id
         var params = {};
         params[self.relation.reverseRelation.key] = self.get("id");
-        options.data = $.param(params); 
+        options.data = $.param(params);
         // Call the original method
         collection.prototype.fetch.call(this, options);
       }.bind(this[this.relation.key]); // override "this" and bind it to our instance
@@ -76,4 +76,3 @@ OOI.prototype.onLogin = function() {
 OOI.prototype.onLogout = function() {
   location.reload();
 }
-

ooiui/static/js/partials/ArgentineBasin.html

@@ -0,0 +1,43 @@
+<div class="col-md-6">
+  <div style="float:left;">
+    <h3 align="left"title="Disclaimer: All data are subject to revision without notice; exact locations of mooring sites are not yet finalized; exact depths of sensors will be determined at the time of deployment.">Description<i class="fa fa-info-circle" style="font-size: 12px;"></i></h3>
+    <em class="disclamer"></em></strong>
+
+    <p>Comming Soon....</p>
+  </div>  <!-- col-md-6 -->
+
+  <div style="clear:both;">
+    <h3>Summary</h3>
+    <p>Comming Soon...</p>
+  </div>  <!-- col-md-6 -->
+</div>  <!-- col-md-6 -->
+
+<!-- HEADER IMAGE -->
+<div class="col-md-6">
+  <div  id="contact">
+    <a href="#headerImgModal" data-toggle="modal"><img class="delayImg" delayedSrc="/img/landingPages/argentineBasin/argentine-basin.jpg" style="width:446px; height:358px;" /></a>
+    <div id="headerImgModal" class="modal fade" tabindex="-1">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      </div>
+      <div class="modal-body" style="text-align:center;">
+        <img class="delayImg" delayedSrc="/img/landingPages/argentineBasin/argentine-basin.jpg" style="width:800px; margin-top:30px;" />
+      </div>
+      <div class="modal-footer">
+        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+      </div>
+    </div>
+  </div>  <!-- col-md-6 -->
+</div>  <!-- Description-row -->
+
+<!-- fade in image -->
+<script>
+$(document).ready(function() {
+  $(".delayImg").each(function() {
+    this.onload = function() {
+      $(this).animate({opacity: 1}, 2000);
+    };
+    this.src = this.getAttribute("delayedSrc");
+  });
+});
+</script>

ooiui/static/js/partials/ArgentineBasinDeployment.html

@@ -0,0 +1,21 @@
+<!-- ==========================================((((((((((())))))))))))==================================================== -->
+<!-- ========================================Argentine Basin Deployment=================================================== -->
+<!-- ==========================================((((((((((())))))))))))==================================================== -->
+<div class="panel panel-default">
+  <div class="panel-heading" role="tab" id="headingFour">
+    <h4 class="panel-title">
+      <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="false" aria-controls="collapseFour">
+        Argentine Basin Deployment Schedule
+      </a>
+    </h4>
+  </div>
+  <div id="collapseFour" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFour">
+    <div class="panel-body">
+      <dl style="list-style-type:disk">
+        <br />
+        <p><a href="http://oceanobservatories.org/infrastructure/planned-installation-schedule/">
+          OOI Planned Installation Schedule</a></p>
+        </dl>
+      </div>
+    </div>
+  </div><!-- panel panel-default 4-->

ooiui/static/js/partials/ArgentineBasinDescriptionInfrastructure.html

@@ -0,0 +1,27 @@
+<!-- ==========================================((((((((((())))))))))))==================================================== -->
+<!-- ========================================Description Infrastructure=================================================== -->
+<!-- ==========================================((((((((((())))))))))))==================================================== -->
+<div class="panel panel-default">
+  <div class="panel-heading" role="tab" id="headingTwo">
+    <h4 class="panel-title">
+      <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+        Description of Infrastructure
+      </a>
+    </h4>
+  </div>
+  <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
+    <div class="panel-body">
+      <div class="row">
+        <dl style="list-style-type:disk">
+          <div class="col-md-12">
+            <li>One Global Surface Mooring, with battery, wind and solar powered buoy and satellite telemetry</li>
+            <li>One Global Profiler mooring with two wire-following profilers</li>
+            <li>Two Flanking Moorings with fixed sensors and acoustic communications to gliders</li>
+            <li>Three Open-Ocean Gliders with extended endurance and acoustic communications that fly within and between the mooring array</li>
+            <li>Two Profiling Open-Ocean gliders that sample the upper water column near the Global Profiler Mooring</li>
+          </dl>
+        </div>
+      </div><!-- row -->
+    </div>
+  </div>
+</div><!-- panel panel-default 2-->