diff --git a/Gruntfile.js b/Gruntfile.js index ee3d5e89e..7b5629f36 100644 --- a/Gruntfile.js +++ b/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" ] } } diff --git a/ooiui/core/routes/common.py b/ooiui/core/routes/common.py index 621dca36b..8af95c86e 100644 --- a/ooiui/core/routes/common.py +++ b/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(): diff --git a/ooiui/static/css/common/pioneerArray.css b/ooiui/static/css/common/landingPages.css similarity index 100% rename from ooiui/static/css/common/pioneerArray.css rename to ooiui/static/css/common/landingPages.css diff --git a/ooiui/static/img/Pioneer_Array_Config.png b/ooiui/static/img/Pioneer_Array_Config.png deleted file mode 100644 index 20b7ea3dd..000000000 Binary files a/ooiui/static/img/Pioneer_Array_Config.png and /dev/null differ diff --git a/ooiui/static/img/landingPages/EnduranceArray/Endurance-Array-Map_2013_04-17_ver_0-02.jpg b/ooiui/static/img/landingPages/EnduranceArray/Endurance-Array-Map_2013_04-17_ver_0-02.jpg new file mode 100644 index 000000000..fc8435c7f Binary files /dev/null and b/ooiui/static/img/landingPages/EnduranceArray/Endurance-Array-Map_2013_04-17_ver_0-02.jpg differ diff --git a/ooiui/static/img/landingPages/EnduranceArray/Endurance_OR_2013-04-03_ver_1-02.png b/ooiui/static/img/landingPages/EnduranceArray/Endurance_OR_2013-04-03_ver_1-02.png new file mode 100644 index 000000000..1fd244f08 Binary files /dev/null and b/ooiui/static/img/landingPages/EnduranceArray/Endurance_OR_2013-04-03_ver_1-02.png differ diff --git a/ooiui/static/img/landingPages/EnduranceArray/Endurance_WA_2013-04-17_ver_1-02.png b/ooiui/static/img/landingPages/EnduranceArray/Endurance_WA_2013-04-17_ver_1-02.png new file mode 100644 index 000000000..1908a00f8 Binary files /dev/null and b/ooiui/static/img/landingPages/EnduranceArray/Endurance_WA_2013-04-17_ver_1-02.png differ diff --git a/ooiui/static/img/landingPages/OOI-Station-Map_Cabled_Array_2015-01-12.jpg b/ooiui/static/img/landingPages/OOI-Station-Map_Cabled_Array_2015-01-12.jpg new file mode 100644 index 000000000..749180287 Binary files /dev/null and b/ooiui/static/img/landingPages/OOI-Station-Map_Cabled_Array_2015-01-12.jpg differ diff --git a/ooiui/static/img/landingPages/argentineBasin/argentine-basin.jpg b/ooiui/static/img/landingPages/argentineBasin/argentine-basin.jpg new file mode 100644 index 000000000..e4eed8cba Binary files /dev/null and b/ooiui/static/img/landingPages/argentineBasin/argentine-basin.jpg differ diff --git a/ooiui/static/img/landingPages/argentineBasin/southern-ocean-instruments.jpg b/ooiui/static/img/landingPages/argentineBasin/southern-ocean-instruments.jpg new file mode 100644 index 000000000..8266b372e Binary files /dev/null and b/ooiui/static/img/landingPages/argentineBasin/southern-ocean-instruments.jpg differ diff --git a/ooiui/static/img/landingPages/cabledArray/Axial_Base_2013-06-06-web.jpg b/ooiui/static/img/landingPages/cabledArray/Axial_Base_2013-06-06-web.jpg new file mode 100644 index 000000000..4fb6c78d2 Binary files /dev/null and b/ooiui/static/img/landingPages/cabledArray/Axial_Base_2013-06-06-web.jpg differ diff --git a/ooiui/static/img/landingPages/cabledArray/Axial_Summit_2013-06-06-web.jpg b/ooiui/static/img/landingPages/cabledArray/Axial_Summit_2013-06-06-web.jpg new file mode 100644 index 000000000..1ca62d0f3 Binary files /dev/null and b/ooiui/static/img/landingPages/cabledArray/Axial_Summit_2013-06-06-web.jpg differ diff --git a/ooiui/static/img/landingPages/cabledArray/Cabled_Array_Map_2014-12-02.jpg b/ooiui/static/img/landingPages/cabledArray/Cabled_Array_Map_2014-12-02.jpg new file mode 100644 index 000000000..4236b6980 Binary files /dev/null and b/ooiui/static/img/landingPages/cabledArray/Cabled_Array_Map_2014-12-02.jpg differ diff --git a/ooiui/static/img/landingPages/cabledArray/Primary-Infrastructure-2012-02-14-ver-0-01.jpg b/ooiui/static/img/landingPages/cabledArray/Primary-Infrastructure-2012-02-14-ver-0-01.jpg new file mode 100644 index 000000000..7c47e1233 Binary files /dev/null and b/ooiui/static/img/landingPages/cabledArray/Primary-Infrastructure-2012-02-14-ver-0-01.jpg differ diff --git a/ooiui/static/img/landingPages/cabledArray/RSN_Endurance_2013-04-16_ver_0-01-web.jpg b/ooiui/static/img/landingPages/cabledArray/RSN_Endurance_2013-04-16_ver_0-01-web.jpg new file mode 100644 index 000000000..2763739a7 Binary files /dev/null and b/ooiui/static/img/landingPages/cabledArray/RSN_Endurance_2013-04-16_ver_0-01-web.jpg differ diff --git a/ooiui/static/img/landingPages/cabledArray/RSN_Moorings_2013-04-16_ver_0-01-web.jpg b/ooiui/static/img/landingPages/cabledArray/RSN_Moorings_2013-04-16_ver_0-01-web.jpg new file mode 100644 index 000000000..2ebef6da5 Binary files /dev/null and b/ooiui/static/img/landingPages/cabledArray/RSN_Moorings_2013-04-16_ver_0-01-web.jpg differ diff --git a/ooiui/static/img/landingPages/cabledArray/SecondaryInfrastructure_2013-02-13_ver_0-01-web.jpg b/ooiui/static/img/landingPages/cabledArray/SecondaryInfrastructure_2013-02-13_ver_0-01-web.jpg new file mode 100644 index 000000000..9176eeb57 Binary files /dev/null and b/ooiui/static/img/landingPages/cabledArray/SecondaryInfrastructure_2013-02-13_ver_0-01-web.jpg differ diff --git a/ooiui/static/img/landingPages/cabledArray/Slope_Base_2013-06-06-web.jpg b/ooiui/static/img/landingPages/cabledArray/Slope_Base_2013-06-06-web.jpg new file mode 100644 index 000000000..e5e004437 Binary files /dev/null and b/ooiui/static/img/landingPages/cabledArray/Slope_Base_2013-06-06-web.jpg differ diff --git a/ooiui/static/img/landingPages/cabledArray/Southern_Hydrate_Ridge_2013-06-06-web.jpg b/ooiui/static/img/landingPages/cabledArray/Southern_Hydrate_Ridge_2013-06-06-web.jpg new file mode 100644 index 000000000..ff9b26db5 Binary files /dev/null and b/ooiui/static/img/landingPages/cabledArray/Southern_Hydrate_Ridge_2013-06-06-web.jpg differ diff --git a/ooiui/static/img/landingPages/irmingerSea/irminger-sea-1.jpg b/ooiui/static/img/landingPages/irmingerSea/irminger-sea-1.jpg new file mode 100644 index 000000000..3d9707af2 Binary files /dev/null and b/ooiui/static/img/landingPages/irmingerSea/irminger-sea-1.jpg differ diff --git a/ooiui/static/img/landingPages/irmingerSea/southern-ocean-instruments.jpg b/ooiui/static/img/landingPages/irmingerSea/southern-ocean-instruments.jpg new file mode 100644 index 000000000..8266b372e Binary files /dev/null and b/ooiui/static/img/landingPages/irmingerSea/southern-ocean-instruments.jpg differ diff --git a/ooiui/static/img/PioneerArray_structure.png b/ooiui/static/img/landingPages/pioneerArray/PioneerArray_structure.png similarity index 100% rename from ooiui/static/img/PioneerArray_structure.png rename to ooiui/static/img/landingPages/pioneerArray/PioneerArray_structure.png diff --git a/ooiui/static/img/landingPages/pioneerArray/Pioneer_Array_Config.png b/ooiui/static/img/landingPages/pioneerArray/Pioneer_Array_Config.png new file mode 100644 index 000000000..4018bb9ab Binary files /dev/null and b/ooiui/static/img/landingPages/pioneerArray/Pioneer_Array_Config.png differ diff --git a/ooiui/static/img/pioneerArray/pioneerArray-header.png b/ooiui/static/img/landingPages/pioneerArray/pioneerArray-header.png similarity index 100% rename from ooiui/static/img/pioneerArray/pioneerArray-header.png rename to ooiui/static/img/landingPages/pioneerArray/pioneerArray-header.png diff --git a/ooiui/static/img/landingPages/pioneerArray/pioneerArrayStructure.png b/ooiui/static/img/landingPages/pioneerArray/pioneerArrayStructure.png new file mode 100644 index 000000000..efb016375 Binary files /dev/null and b/ooiui/static/img/landingPages/pioneerArray/pioneerArrayStructure.png differ diff --git a/ooiui/static/img/pioneer_map.jpg b/ooiui/static/img/landingPages/pioneerArray/pioneer_map.jpg similarity index 100% rename from ooiui/static/img/pioneer_map.jpg rename to ooiui/static/img/landingPages/pioneerArray/pioneer_map.jpg diff --git a/ooiui/static/img/landingPages/southernOcean/southern-ocean-instruments.jpg b/ooiui/static/img/landingPages/southernOcean/southern-ocean-instruments.jpg new file mode 100644 index 000000000..8266b372e Binary files /dev/null and b/ooiui/static/img/landingPages/southernOcean/southern-ocean-instruments.jpg differ diff --git a/ooiui/static/img/landingPages/southernOcean/southern-ocean.jpg b/ooiui/static/img/landingPages/southernOcean/southern-ocean.jpg new file mode 100644 index 000000000..c7f2f0576 Binary files /dev/null and b/ooiui/static/img/landingPages/southernOcean/southern-ocean.jpg differ diff --git a/ooiui/static/img/landingPages/stationPapa/StationPapa_labeled_2015-02-05.jpg b/ooiui/static/img/landingPages/stationPapa/StationPapa_labeled_2015-02-05.jpg new file mode 100644 index 000000000..73114657c Binary files /dev/null and b/ooiui/static/img/landingPages/stationPapa/StationPapa_labeled_2015-02-05.jpg differ diff --git a/ooiui/static/img/landingPages/stationPapa/ooi_map_GP_2014-12-221.jpg b/ooiui/static/img/landingPages/stationPapa/ooi_map_GP_2014-12-221.jpg new file mode 100644 index 000000000..6dc4773cc Binary files /dev/null and b/ooiui/static/img/landingPages/stationPapa/ooi_map_GP_2014-12-221.jpg differ diff --git a/ooiui/static/js/pioneerArrayJS.js b/ooiui/static/js/landingPagesJS.js similarity index 100% rename from ooiui/static/js/pioneerArrayJS.js rename to ooiui/static/js/landingPagesJS.js diff --git a/ooiui/static/js/models/common/PioneerArrayModel.js b/ooiui/static/js/models/common/PioneerArrayModel.js deleted file mode 100644 index c3ae4db4c..000000000 --- a/ooiui/static/js/models/common/PioneerArrayModel.js +++ /dev/null @@ -1,68 +0,0 @@ -"use strict"; - -/* -* header goes here" -*/ - -var NewEventModel = Backbone.Model.extend({ - url: '/api/new_event', - new_event: function() { - var self = this; - this.save(null, { - async: false, - success: function(model, response, options) { - var date = new Date(); - date.setTime(date.getTime() + (model.get('expiration') * 1000)); - $.cookie('ooiusertoken', model.get('token'), {expires: date}); - }, - error: function(model, response, options) { - console.error("ERROR"); - self.set({ - password: "", - token: "", - attempts: self.get('attempts') + 1 - }); - } - }); - console.log("Returning"); - return this; - }, - loggedIn: function() { - if(this.get('token') != '') { - return true; - } - return false; - }, - logOut: function() { - console.log("Log Out"); - $.removeCookie('ooiusertoken', { path: '/' }); - this.set(this.defaults); - }, - fetch: function() { - var tokenString = $.cookie('ooiusertoken'); - if(typeof tokenString !== "undefined") { - this.set("token", tokenString); - console.log("Set token"); - } - return this; - }, - parse: function(response) { - var expiration = response.expiration; - console.log("expiration"); - console.log(parseInt(expiration)); - return { - new_event: this.get('new_event'), - token: response.token, - expiration: parseInt(response.expiration), - password: "", - attempts: 0 // on success reset attempts, we're logged in - } - }, - defaults: { - new_event: "", - password: "", - token: "", - expiration: "", - attempts: 0 - } -}); diff --git a/ooiui/static/js/ooi.js b/ooiui/static/js/ooi.js index c6b92f860..5d47bb7ee 100644 --- a/ooiui/static/js/ooi.js +++ b/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(); } - diff --git a/ooiui/static/js/partials/ArgentineBasin.html b/ooiui/static/js/partials/ArgentineBasin.html new file mode 100644 index 000000000..5abe48a58 --- /dev/null +++ b/ooiui/static/js/partials/ArgentineBasin.html @@ -0,0 +1,43 @@ +
Comming Soon....
+Comming Soon...
+Click here to download a PDF of all Infrastructure Tables
+The global component of the OOI design includes a network of moorings at critical, yet under sampled, high-latitude locations such as within the Argentine Basin in the South Atlantic. Moorings located in the Argentine Basin will support sensors for measurement of air-sea fluxes of heat, moisture and momentum, and physical, biological and chemical properties throughout the water column. The array will have a combination of fixed platforms (moorings) with moored profilers to address the requirement to sample the full water column and mobile platforms (gliders) that will provide simultaneous spatial and temporal sampling capabilities. The array will be composed of a Surface Mooring containing fixed instruments situated on the buoy and through the top 1500 m of the water column. A subsurface Global Profiler Mooring made up of two wire-following profilers, one operating from 310 m to 2,645 m and the other 2,665 m to 5,000 m. Two Flanking Moorings will be deployed to form a triangular array ~62 km on a side. These Moorings have their uppermost flotation at ~30 m depth and instruments at discrete depths along the mooring line. Open-Ocean Gliders will be equipped with acoustic modems to relay data from the Flanking Moorings to shore via satellite telemetry. Some gliders will sample within and around the triangular array, while others will sample the upper water column near the Global Profiler Mooring. These gliders will carry sensor suites (see below) with the capability to alter sampling rates during a mission.
+ +Click here for the online Technical Data Package
+Comming Soon...
+Comming Soon...
+Click here to download a PDF of all Infrastructure Tables
+Click here for the online Technical Data Package
+Click here for Cabled Technology Descriptions
+**All graphics courtesy of the OOI Cabled Array program and the Center for Environmental Visualization, University of Washington. (Disclaimer: Graphics are conceptual designs and are not yet finalized. All data are subject to revision without notice.)
+The Endurance Array, located on the continental shelf and slope off Oregon and Washington, will provide a long-term network of moorings, benthic nodes, cabled and uncabled sensors, and gliders. The array will consist of two lines of moorings, one off Newport, Oregon (the Oregon Line) and the other off Grays Harbor, Washington (the Washington Line). Gliders will sample between the mooring lines. The array will focus on observing the influence of the Columbia River on the coastal ecosystem as well as sample a prototypical upwelling regime on a narrow continental shelf where anoxia events are common. Some of the Endurance Array Oregon Line infrastructure will be connected to the RSN cabled network providing enhanced power and communications for observing water column and seafloor processes.
+The first phase of the Pioneer Array deployment took place in November 2013, with the installation of three moorings – a surface mooring at the central site, a profiler mooring at the upstream inshore site and a profiler mooring at the upstream offshore site. In April 2014, during the second deployment phase, five Wire-Following Profile Moorings were deployed at the Pioneer Array with three gliders. The third and final deployment phase is scheduled for Fall 2014.
+Click here to download a PDF of all Infrastructure Tables
+Click here to download a PDF of all Infrastructure Tables
+Click here for the online Technical Data Package
+Commming Soon...
+Comming Soon...
+Click here to download a PDF of all Infrastructure Tables
+The global component of the OOI design includes a network of moorings at critical, yet under sampled, high-latitude locations such as within the Argentine Basin in the South Atlantic. Moorings located in the Argentine Basin will support sensors for measurement of air-sea fluxes of heat, moisture and momentum, and physical, biological and chemical properties throughout the water column. The array will have a combination of fixed platforms (moorings) with moored profilers to address the requirement to sample the full water column and mobile platforms (gliders) that will provide simultaneous spatial and temporal sampling capabilities. The array will be composed of a Surface Mooring containing fixed instruments situated on the buoy and through the top 1500 m of the water column. A subsurface Global Profiler Mooring made up of one wire-following profiler operating from ~240 m to 2400 m. Two Flanking Moorings will be deployed to form a triangular array ~20 km on a side. These flanking Moorings have their uppermost flotation at ~40 m depth and instruments at discrete depths along the mooring line. Open-Ocean Gliders will be equipped with acoustic modems to relay data from the Flanking Moorings to shore via satellite telemetry. Some gliders will sample within and around the triangular array, while others will sample the upper water column near the Global Profiler Mooring. These gliders will carry sensor suites (see below) with the capability to alter sampling rates during a mission.
+ +Click here for the online Technical Data Package
+The Pioneer Array is a network of platforms and sensors operating on the continental shelf and slope south of New England. A moored array will be centered at the shelf break in the mid-Atlantic Bight south of Cape Cod, Massachusetts. Autonomous underwater vehicles (AUVs) will sample the frontal region in the vicinity of the moored array, and gliders will resolve mesoscale features on the outer shelf and the slope sea between the shelf break front and the Gulf Stream.
+The first phase of the Pioneer Array deployment took place in November 2013, with the installation of three moorings – a surface mooring at the central site, a profiler mooring at the upstream inshore site and a profiler mooring at the upstream offshore site. In April 2014, during the second deployment phase, five Wire-Following Profile Moorings were deployed at the Pioneer Array with three gliders. The third and final deployment phase is scheduled for Fall 2014.
+
- Final Pioneer Mooring Array Configuration (plan view)
-
- Nominal latitude and longitude, approximate depths, and distances
- between mooring sites can be viewed in the plan view figure
- linked below. Contours are marked in fathoms, mooring site
- centers are marked by a black “+” and encircled by an approximate
- 0.5-nautical mile radius buffer zone (voluntary area to avoid).
- Distances between buffer zones are shown between arrows. Red “X”
- symbols denote the locations of know “hangs” avoided by mobile-gear
- fishermen.
-
+ Final Pioneer Mooring Array Configuration (plan view) +
+ Nominal latitude and longitude, approximate depths, and distances + between mooring sites can be viewed in the plan view figure + linked below. Contours are marked in fathoms, mooring site + centers are marked by a black “+” and encircled by an approximate + 0.5-nautical mile radius buffer zone (voluntary area to avoid). + Distances between buffer zones are shown between arrows. Red “X” + symbols denote the locations of know “hangs” avoided by mobile-gear + fishermen. +
+Coming Soon...
+Coming Soon...
+Click to download a PDF of all Infrastructure Tables
+The global component of the OOI design includes a network of moorings at critical, yet under sampled, high-latitude locations such as within the Southern Ocean, southwest of Chile. Moorings located in the Southern Ocean will support sensors for measurement of air-sea fluxes of heat, moisture and momentum, and physical, biological and chemical properties throughout the water column. The array will have a combination of fixed platforms (moorings) with moored profilers to address the requirement to sample the full water column and mobile platforms (gliders) that will provide simultaneous spatial and temporal sampling capabilities. The array will have a combination of fixed platforms (moorings) with moored profilers to address the requirement to sample the full water column and mobile platforms (gliders) that will provide simultaneous spatial and temporal sampling capabilities. The array will be composed of a Surface Mooring containing fixed instruments situated on the buoy and through the top 1500 m of the water column. A subsurface Global Profiler Mooring made up of two wire-following profilers, one operating from 310 m to 2,445 m and the other 2,470 m to 4,605 m. Two Flanking Moorings will be deployed to form a triangular array ~50 km on a side. These Moorings have their uppermost flotation at ~30 m depth and instruments at discrete depths along the mooring line. Open-Ocean Gliders will be equipped with acoustic modems to relay data from the Flanking Moorings to shore via satellite telemetry. Some gliders will sample within and around the triangular array, while others will sample the upper water column near the Global Profiler Mooring. These gliders will carry sensor suites (see below) with the capability to alter sampling rates during a mission.
+ +Click here for the online Technical Data Package
+Comming Soon...
+Comming Soon...
+Click here to download a PDF of all Infrastructure Tables
+The global component of the OOI design includes a network of moorings at critical, yet under-sampled, high-latitude locations such as Station Papa in the North Pacific. The array at Station Papa will be occupied in coordination with the National Oceanic and Atmospheric Administration (NOAA), which maintains a surface mooring there. As one of the oldest oceanic time series sites, with surveying conducted in the area since 1949, Station Papa has been an important location in the global network of OceanSITES. OOI is designed to add to the existing infrastructure at Station Papa by adding three additional moorings to the area as well as mobile platforms (gliders) to sample in the space between the moorings. The Global Profiler Mooring is composed of two Wire-Following Profilers, one operating from 307 m to 2,174 m and the other 2,195 m to 4,061 m. Two Flanking Moorings will be deployed to form a triangular array ~40 km on a side. These Moorings have their uppermost flotation at ~20 m depth and instruments at discrete depths along the mooring line. Open-Ocean Gliders will be equipped with acoustic modems to relay data from the Flanking Moorings to shore via satellite telemetry. Some gliders will sample within and around the triangular array, while others will sample the upper water column near the Global Profiler Mooring. These gliders will carry sensor suites (see below) with the capability to alter sampling rates during a mission.
+In July 2013, the first of the OOI infrastructure was deployed at Station Papa, including – one Global Profiler Mooring, two Mesoscale Flanking Moorings and three Global Gliders, totaling 57 instruments. Click here to read the July 2013 Station Papa Deployment Cruise Report.
+ +Click here for the online Technical Data Package
+