diff --git a/app/main.py b/app/main.py
index 029dcc39..a1ca55bf 100644
--- a/app/main.py
+++ b/app/main.py
@@ -83,7 +83,7 @@ def custom_openapi():
return app.openapi_schema
openapi_schema = get_openapi(
title="pyagsapi - AGS File Utilities Tools and API",
- version="4.5.3",
+ version="5.0",
description=("The API performs schema validation, data validation and conversion of your AGS files. "
"It also exports a graphical log from AGS data held by NGDC. "
"Schema validation and conversion uses https://gitlab.com/ags-data-format-wg/ags-python-library"),
diff --git a/app/routes.py b/app/routes.py
index d5226ec5..e511214f 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -324,7 +324,6 @@ async def convert(background_tasks: BackgroundTasks,
summary="Generate Graphical Log",
description=("Generate a graphical log (.pdf) from AGS data "
"held by the National Geoscience Data Centre."),
- include_in_schema=False,
response_class=Response,
responses=pdf_responses)
def get_ags_log(bgs_loca_id: str = ags_log_query,
@@ -373,7 +372,6 @@ def get_ags_log(bgs_loca_id: str = ags_log_query,
summary="Export one or more boreholes in .ags format",
description=("Export one or more borehole in .ags format from AGS data "
"held by the National Geoscience Data Centre."),
- include_in_schema=False,
response_class=Response,
responses=ags_export_responses)
def ags_export(bgs_loca_id: str = ags_export_query):
@@ -422,7 +420,6 @@ def ags_export(bgs_loca_id: str = ags_export_query):
description=("Export a number of boreholes in .ags format from AGS data "
"held by the National Geoscience Data Centre, using a"
" polygon using Well-Known-Text."),
- include_in_schema=False,
response_model=BoreholeCountResponse,
responses=ags_export_responses)
def ags_export_by_polygon(polygon: str = polygon_query,
diff --git a/app/static/css/htmlView.css b/app/static/css/htmlView.css
index 96c605d8..f313bec6 100644
--- a/app/static/css/htmlView.css
+++ b/app/static/css/htmlView.css
@@ -21,17 +21,17 @@
font-size: 90%;
cursor:pointer;
box-shadow: 2px 2px 4px #444;
- }
+ }
#resultPopup>h2>input:hover{
border: 1px solid #000;
background-color: #444;
color: #FFF;
box-shadow: 1px 1px 2px #222;
- }
-
+ }
+
input.submitBtn{color:rgb(0,48,66);}
input.submitBtn:disabled{opacity:0.5;color:#888;}
-
+
#resultPopup>p{
padding: 4px 8px;
margin: 0px;
@@ -41,7 +41,7 @@ input.submitBtn:disabled{opacity:0.5;color:#888;}
margin:5px;
background-color: #FFFFFF;
}
-#res_Files>article>h3{color:#FFF;}
+#res_Files>article>h3{color:#FFF;}
#res_Files>article>h3.valid{background-color:#080;}
#res_Files>article>h3.invalid{background-color:#900;color:#FFF;}
#res_Files>article>h3>*{display:inline-block;padding: 2px 4px;}
@@ -69,3 +69,61 @@ input.submitBtn:disabled{opacity:0.5;color:#888;}
#res_Files>article>ul.fileResErrors>li>ul{display:none;}
#res_Files>article>ul.fileResErrors>li>ul>li>span{color:#800000;}
+/* Validation map container */
+#res_Map{height:400px;}
+
+/* Validation map marker popups */
+span.popupContent{}
+span.popupContent>h4{border-bottom:1px solid #000000;margin:0em;}
+span.popupContent>label{color:#444;}
+span.popupContent>strong{color:#000;}
+
+#resultPopup>p#res_LoadMsg{
+ color:#FFF;
+ background-color:#97875B;
+ margin:10px;
+ padding:2px 5px;
+ border-radius:5px;
+ font-size:120%;
+ }
+
+#res_LoadMsg>span{
+ font-weight:bold;
+ display:inline-block;
+ width:24px;
+ height:24px;
+ padding:2px;
+ margin:2px;
+ color:#97875B;
+ background-color:#FFF;
+ border-radius:50%;
+ }
+
+.rotate{animation: rotation 2s linear infinite;}
+
+@keyframes rotation{
+ from {transform: rotate(0deg);}
+ to {transform: rotate(359deg);}
+ }
+
+/* Validation map key and symbols */
+
+p.mapKey{
+ border: 1px solid #CCC;
+ margin: 1px;
+ }
+
+span.symbol {
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ overflow: hidden;
+ border-radius: 50%;
+ margin: 0px;
+ padding: 0px;
+ }
+
+h3>span.symbol{
+ padding: 0px;
+ border:1px solid #FFF;
+ }
diff --git a/app/static/css/jQuerySlideshow.css b/app/static/css/jQuerySlideshow.css
deleted file mode 100644
index 0f456885..00000000
--- a/app/static/css/jQuerySlideshow.css
+++ /dev/null
@@ -1,14 +0,0 @@
-@charset "utf-8";
-/* CSS Document */
-#slideshow {
- min-height: 12em;
-}
-#slideshow img {
- background-color: #bbd3eb;
-}
-#slideshow img:hover {
- cursor: pointer;
-}
-.hideDiv {
- display: none;
-}
diff --git a/app/static/css/jQueryTabbedPanels.css b/app/static/css/jQueryTabbedPanels.css
deleted file mode 100644
index 7326d648..00000000
--- a/app/static/css/jQueryTabbedPanels.css
+++ /dev/null
@@ -1,132 +0,0 @@
-@charset "utf-8";
-/* Tabbed panels */
-.TabbedPanels {
- zoom: 1; /*IE7 hack*/
-}
-.closeBtn {
- position: absolute;
- right: 0.5em;
- top: 0.5em;
- width: 2em;
- background-color: #c7d5ec;
- z-index: 100;
-}
-#midCol .TabbedPanelsTab, #midAndRightCol .TabbedPanelsTab {
- background-color: #c7d5ec;
- border: 0.1em solid #b0b1b3;
- margin: 0.1em;
- padding: 0.5%;
- position: relative;
- cursor: pointer;
- box-shadow: 0.1em 0.1em 0.1em #e2e3e4;
- z-index: 0;
-}
-#midCol .TabbedPanels .TabbedPanelsTab, #midAndRightCol .TabbedPanels .TabbedPanelsTab {
- float: left;
- display: block;
- display: inline-block;
- border-top-right-radius: 0.5em;
- border-top-left-radius: 0.5em;
-}
-.TabbedPanelsTabFake {
- top: 0.1em;
- float: left;
- width: 40%;
- padding: 0.5%;
- cursor: pointer;
-}
-#midCol .TabbedPanelsTabHover, #midAndRightCol .TabbedPanelsTabHover {
- background-color: #b0b1b3;
-}
-#midCol .TabbedPanelsTabSelected, #midAndRightCol .TabbedPanelsTabSelected {
- background-color: #013171;
- color: #fff;
- font-style: italic;
-}
-#midCol .TabbedPanelsTab a, #midAndRightCol .TabbedPanelsTab a {
- color: #000;
- text-decoration: none;
- display: block;
- padding: 0.5%;
-}
-#midCol .TabbedPanelsTabSelected a, #midAndRightCol .TabbedPanelsTabSelected a
-{ color:#fff;}
-#midCol .TabbedPanelsContentGroup, #midAndRightCol .TabbedPanelsContentGroup {
- clear: both;
- position: relative;
- display: block;
-}
-#midCol .TabbedPanels .TabbedPanelsContent, #midAndRightCol .TabbedPanels .TabbedPanelsContent {
- width:98%;
- padding: 0.5%;
- background-color: #fff;
- position: absolute;
- left: 0;
- border: solid 0.1em #b0b1b3;
- z-index: 20;
- display: block;
- margin-top: 0.5em;
-}
-#midCol .VTabbedPanels .TabbedPanelsTab, #midAndRightCol .VTabbedPanels .TabbedPanelsTab {
- margin: 0;
- margin-right: 1%;
- clear: both;
- position: absolute;
- display: block;
- top: 0;
-}
-#midCol .VTabbedPanels .TabbedPanelsTabSelected, #midAndRightCol .VTabbedPanels .TabbedPanelsTabSelected {
- background-color: #013171;
- border-bottom: solid 0.1em #999;
- color: #fff;
-}
-#midCol .VTabbedPanels .TabbedPanelsContentGroup, #midAndRightCol .VTabbedPanels .TabbedPanelsContentGroup {
- clear: none;
- float: left;
- width: 98%;
- position: relative;
- background: #fff;
- padding-bottom: 0.8em;
- display: block;
-}
-#midCol .VTabbedPanels.jQueryTabs, #midAndRightCol .VTabbedPanels.jQueryTabs, #midCol .TabbedPanels.jQueryTabs, #midAndRightCol .TabbedPanels.jQueryTabs {
- position: relative;
- overflow:auto;
-}
-#midCol .sectionBox .sectionBody .VTabbedPanels h3, #midAndRightCol .sectionBox .sectionBody .VTabbedPanels h3 {
- color: #013171;
- margin: 0;
-}
-#midCol .sectionBox .sectionBody .VTabbedPanels.jQueryTabs .TabbedPanelsTabSelected h3, #midAndRightCol .sectionBox .sectionBody .VTabbedPanels.jQueryTabs .TabbedPanelsTabSelected h3 {
- color: #fff;
-}
-#midCol .VTabbedPanels .TabbedPanelsContent, #midAndRightCol .VTabbedPanels .TabbedPanelsContent {
- background: #e2e3e4;
- border: solid 0.1em #b0b1b3;
- padding: 0.5%;
- z-index: 20;
-}
- @media screen and (min-width:35em) {
-#midCol .VTabbedPanels .TabbedPanelsTab, #midAndRightCol .VTabbedPanels .TabbedPanelsTab {
- width: 48% !important;
- border-bottom-left-radius: 0.5em;
- border-top-left-radius: 0.5em;
-}
-#midCol .VTabbedPanels .jQueryTabbedContent, #midAndRightCol .VTabbedPanels .jQueryTabbedContent {
- float: right;
- width: 45.5%;
- border-top-right-radius: 0.5em;
- border-bottom-right-radius: 0.5em;
- padding-right: 2%;
-}
-}
-@media screen and (max-width:35em) {
-#midCol .VTabbedPanels .TabbedPanelsTab, #midAndRightCol .VTabbedPanels .TabbedPanelsTab, #midCol .VTabbedPanels .jQueryTabbedContent, #midAndRightCol .VTabbedPanels .jQueryTabbedContent {
- width: 95%;
- display: block;
-}
-#midCol .VTabbedPanels .jQueryTabbedContent, #midAndRightCol .VTabbedPanels .jQueryTabbedContent {
- margin-top: 2.5em;
- position: absolute;
-}
-}
diff --git a/app/static/css/main.css b/app/static/css/main.css
deleted file mode 100644
index 87ebb087..00000000
--- a/app/static/css/main.css
+++ /dev/null
@@ -1,530 +0,0 @@
-@charset "UTF-8";
-
-/* main.2.css */
-
-:root {
- --blue: rgb(0,48,66);
- --white: rgb(255,255,255);
- --black: rgb(0,0,0);
- --lt-gray: rgb(246,246,245);
- --dk-gray: rgb(51,51,51);
- --highlight: rgb(102,130,140);
- --ochre: rgb(173,156,113);
- --lt-ochre: rgb(206,196,169);
- }
-
-html{
- color:rgb(0,48,66);
- background-color:rgb(255,255,255);
- font-family:aileron, sans-serif;
- font-size:16px;
- }
-
-html * {
- margin:0;
- padding:0;
- }
-
-header, nav, main, footer, section{
- display:block;
- }
-
-h1, h2, h3, h4, p, li{
- margin:0;
- padding:5px;
- }
-
-h1{ font-size:150%;}
-h2{ font-size:135%;}
-h3{ font-size:120%;}
-h4{ font-size:100%;}
-p, li{ font-size:100%;}
-
-header img, nav img, footer img{
- border:none;
- }
-
-/* HEADER */
-header{
- background-color:rgb(255,255,255);
- color:rgb(0,48,66);
- }
-
-/* HEADER :: topnav */
-
-header>section.topnav{
- background-color:rgb(0,48,66);
- color:rgb(255,255,255);
- text-align:right;
- overflow:hidden;
- padding-right:24px;
- }
-
-header>section.topnav>article{
- display:block;
- margin:0% auto;
- max-width:1140px;
- }
-
-header>section.topnav>article>a{
- color:rgb(255,255,255);
- text-decoration:none;
- display:block;
- margin:0px 0px;
- padding:10px 16px;
- padding-top:11px;
- border-right:1px solid rgb(255,255,255);
- text-align:center;
- float:right;
- }
-
-header>section.topnav>article>a:last-child{
- border-left:1px solid rgb(255,255,255);
- }
-
-header>section.topnav>article>a:hover{
- background-color:rgb(102,130,140);
- }
-
-
-
-/* HEADER :: logonav */
-
-header>section.logonav{
- height:80px;
- margin:0% auto;
- max-width:1140px;
- padding:5px 0px;
- }
-
-header>section.logonav>article>img.menubars{
- background-color:rgb(255,255,255);
- width:32px;
- margin:20px 10px;
- padding:4px;
- float:right;
- }
-
-header>section.logonav>article.logo{
- width:200px;
- height:60px;
- background-color:rgb(255,255,255);
- float:left;
- }
-header>section.logonav>article.nav{
- background-color:rgb(255,255,255);
- width:calc(100% - 200px);
- height:60px;
- float:right;
- }
-
-header>section.logonav>article.logo>a>img{
- height:51px;
- width:auto;
- padding:15px;
- }
-
-header>section.logonav>article.nav{
- }
-
-header>section.logonav>article.nav>p{
- display:inline-block;
- width:12%;
- }
-
-header>section.logonav>article.nav>p.About{ width:20%;}
-header>section.logonav>article.nav>p.Research{ width:16%;}
-header>section.logonav>article.nav>p.Data{ width:12%;}
-header>section.logonav>article.nav>p.DiscoGeo{ width:28%;}
-header>section.logonav>article.nav>p.Search{ width:40px;float:right;padding-top:20px;}
-header>section.logonav>article.nav>p.Search>img{display:block;margin:0px;padding:4px;}
-
-
-header>section.logonav>article.nav>p>a{
- display:inline-block;
- border-bottom:3px solid rgb(255,255,255);
- color:rgb(0,0,0);
- padding:5px;
- margin:0px 10px;
- margin-top:20px;
- text-decoration:none;
- }
-
-header>section.logonav>article.nav>p>a:hover, header>section.logonav>article.nav>p>a.open{
- font-weight:bold;
- border-bottom:3px solid rgb(173,156,113);
- }
-
-
-
-/* HEADER :: breadcrumbs */
-
-header>section.breadcrumbs{
- background-color:rgb(246,246,245);
- color:rgb(0,48,66);
- padding:5px;
- box-shadow: 0 -2px 4px 0 rgba(183, 183, 183, 0.5);
- clear:both;
- }
-
-
-header>section.breadcrumbs>article{
- max-width:1140px;
- margin:0px auto;
- font-size:14px;
-
- }
-
-
-header>section.breadcrumbs>article>*{
- display:inline-block;
- padding:5px 5px;
- }
-
-header>section.breadcrumbs>article>a{
- text-decoration:none;
- color:rgb(0,0,0);
- }
-
-header>section.breadcrumbs>article>em{
- background-image:url(../images/arrow.svg);
- background-position:50% 50%;
- background-repeat:no-repeat;
- background-size:12px;
- transform:rotate(270deg);
- }
-
-
-
-/* NAV */
-nav{
- display:block;
- background-color:rgb(255,255,255);
- width:80%;
- position:absolute;
- top:130px;
- /* height:200px; */
- left:10%;
- color:rgb(0,48,66);
- box-shadow: 0 2px 4px 0 rgb(51,51,51);
- border:1px solid rgb(51,51,51);
- border-top:none;
- /* make sure appears in front of maps */
- z-index:999999;
- /* hide while loading */
- opacity:0;
-
- }
-
-nav ul{
- list-style-type:none;
- padding:0em;
- margin:0em;
- }
-
-nav>ul{
- margin:10px;
- width:calc(50% - 10px);
- }
-
-nav>ul#level2{float:left;margin-right:0px;}
-nav>ul.level3{
- display:block;
- margin-left:50%;
- background-color:rgb(246,246,245);
- margin-top:20px;
- margin-bottom:10px;
- }
-
-nav>ul>li{
- display:block;
- padding:10px;
- padding-right:0px;
- }
-
-nav>ul>li>ul{
- padding:0em;
- margin:0em;
- }
-
-nav>ul>li>ul>li{border-top:1px solid rgb(246,246,245);padding:10px;margin:0em;}
-
-nav>ul>li>ul>li:hover, nav>ul>li>ul>li.open{
- background-color:rgb(246,246,245);
- }
-
-
-
-nav>ul>li>ul>li:last-child{
- border-bottom:1px solid rgb(246,246,245);
- }
-
-nav>ul>li>ul>li>a{
- text-decoration:none;
- color:rgb(0,0,0);
- }
-
-nav>ul>li>ul>li:hover>a{
- text-decoration:underline;
- }
-
-nav>ul>li>ul>li>ul{
- display:none;
- }
-
-nav>ul>li>ul>li:hover>ul{
- display:block;
- position:absolute
- margin-left:40%;
- right:0px;
- background-color:rgb(51,51,51);
- }
-
-
-nav ul>li>em{
- background-image:url(../images/arrow.svg);
- background-position:50% 50%;
- background-repeat:no-repeat;
- background-size:14px;
- transform:rotate(270deg);
- display:inline-block;
- padding:5px 5px;
- width:16px;
- height:16px;
- float:right;
- }
-
-nav>ul.level3{
- padding-top:10px;
- }
-
-nav>ul.level3>li{
- padding:5px;
- padding-left:20px;
- border-top:1px solid rgb(246,246,245);
- }
-
-nav>ul.level3>li>a{
- text-decoration:underline;
- color:rgb(0,0,0);
- }
-nav>ul.level3>li:hover>a{
- text-decoration:none;
- }
-
-nav>ul.level3>li.empty{
- display:none;
- }
-
-
-
-/* FOOTER */
-footer{
- background-color:rgb(0,48,66);
- color:rgb(255,255,255);
- }
-
-footer>section.ukri{
- background-color:rgb(51,51,51);
- text-align:center;
- }
-footer>section.ukri>a>img{
- width:300px;
- }
-
-footer>section.links{
- margin:0% auto;
- max-width:1140px;
- text-align:center;
- }
-footer>section.links>article{
- margin:5px;
- padding:0px;
- display:inline-block;
- overflow:hidden;
- min-height:4em;
- width:30%;
- }
-
-footer>section.links>article.useful{min-width:18em;float:left;}
-footer>section.links>article.policy{min-width:18em;}
-footer>section.links>article.news{min-width:18em;float:right;}
-
-
-footer>section.links>article>h3{
- margin:5px;
- padding:5px;
- text-align:left;
- border-bottom:1px solid rgb(255,255,255);
- }
-footer>section.links>article>p{
- margin:5px 10px;
- padding:5px;
- text-align:left;
- }
-
-footer>section.links>article.news>p>a{
- background-color:rgb(173,156,113);
- color:rgb(0,0,0);
- display:inline-block;
- margin:0px;
- padding:10px 20px;
- border-radius:17px;
- font-weight:bold;
- font-size:110%;
- }
-
-footer>section.copy{
- border-top:1px solid rgb(255,255,255);
- margin:0% auto;
- max-width:1140px;
- clear:both;
- text-align:center;
- }
-
-footer>section.copy>p{
- padding:5px;
- padding-bottom:10px;
- margin:5px 0px;
- width:48%;
- display:inline-block;
- text-align:right;
- }
-footer>section.copy>p:first-child{
- text-align:left;
- }
-
-
-
-footer>section a{
- color:rgb(255,255,255);
- text-decoration:none;
- }
-
-footer>section a:hover{
- text-decoration:underline;
- }
-
-footer>section.links>article.news input{padding:10px;margin:0px;border:none;}
-
-
-/* SOCIAL MEDIA */
-footer>section.copy>p.social{}
-footer>section.copy>p.social>a{display:inline-block;padding:2px;}
-footer>section.copy>p.social>a>img{height:30px;width:30px;}
-
-
-/* NEWSLETTER */
-#newsletterEmail{background-color:rgb(255,255,255);width:80%;}
-#newsletterBtn{
- background-color:rgb(206,196,169);
- background-image:url(../images/arrow.svg);
- background-position:50% 50%;
- background-repeat:no-repeat;
- background-size:14px;
- transform:rotate(270deg);
- width:36px;
- height:36px;
- overflow:hidden;
- cursor:pointer;
- }
-#newsletterBtn:hover{
- background-color:rgb(173,156,113);
- }
-
-
-/* */
-body.width1{}
-body.width2{}
-body.width3{}
-body.width4{}
-body.width5{}
-
-
-body.width1>footer>section>article, body.width1>footer>section.links>article.news,
-body.width2>footer>section>article, body.width2>footer>section.links>article.news,
-body.width3>footer>section>article, body.width3>footer>section.links>article.news{
- display:block;
- width:95%;
- float:none;
- }
-
-/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
-body.width1>header>section.logonav>article.nav>p,
-body.width2>header>section.logonav>article.nav>p{
- display:none;
- }
-
-
-/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
-
-#mobileMenu{
- position:absolute;
- left:0px;
- right:0px;
- top:90px;
- height:auto;
- background-color:#FFFFFF;
- z-index:999;
- }
-
-#mobileMenu ul{list-style-type:none;}
-#mobileMenu li{padding:0px;}
-/* #mobileMenu li:hover{background-color:rgb(246,246,245);} */
-#mobileMenu li>a{display:inline-block;color:var(--dk-blue);text-decoration:none;padding:14px 10px;}
-
-#mobileMenu ul>li>em{
- background-image:url(../images/arrow.svg);
- background-position:50% 50%;
- background-repeat:no-repeat;
- background-size:14px;
- transform:rotate(270deg);
- display:inline-block;
- padding:6px;
- width:16px;
- height:16px;
- float:right;
- }
-
-#mobileMenu ul>li{
- border-bottom:1px solid rgb(246,246,245);
- max-width:510px;
- margin:0px auto;
- }
-#mobileMenu ul.mm_lvl_1>li>strong{display:inline-block;color:var(--dk-blue);font-weight:normal;padding:14px 10px;}
-#mobileMenu ul.mm_lvl_2>li>a{}
-#mobileMenu ul.mm_lvl_3>li>a{}
-
-
-#mobileMenu ul.mm_lvl_1>li.open{text-align:center;}
-#mobileMenu ul.mm_lvl_1>li.open>strong{font-weight:bold;}
-#mobileMenu ul.mm_lvl_1>li.open>em{float:left;transform:rotate(90deg);}
-
-#mobileMenu ul.mm_lvl_1>li ul{display:none;}
-#mobileMenu ul.mm_lvl_1>li.open>ul{display:block;text-align:left;background-color:rgb(255,255,255);}
-#mobileMenu ul.mm_lvl_1>li.open>ul>li{}
-
-/*#mobileMenu ul.mm_lvl_1>li.open>ul.mm_lvl_2>li.open>ul{display:block;border:1px solid #FF0000;}
-#mobileMenu ul.mm_lvl_1>li.open>ul.mm_lvl_2>li.open>ul>li{display:block;border:1px solid #000000;}
-#mobileMenu ul.mm_lvl_1>li.open>ul.mm_lvl_2>li.open>a{color:blue;}*/
-
-#mobileMenu ul.mm_lvl_1 li.open ul.mm_lvl_2 li.open{text-align:center;}
-#mobileMenu ul.mm_lvl_1 li.open ul.mm_lvl_2 li.open>a{font-weight:bold;}
-#mobileMenu ul.mm_lvl_1 li.open ul.mm_lvl_2 li.open>ul{display:block;text-align:left;background-color:rgb(255,255,255);}
-#mobileMenu ul.mm_lvl_1 li.open ul.mm_lvl_2 li.open>em{float:left;transform:rotate(90deg);}
-
-#mobileMenu ul.mm_lvl_1>li.open,
-#mobileMenu ul.mm_lvl_1 li.open ul.mm_lvl_2 li.open{
- background-image:linear-gradient(180deg, #EEEEEE, #EEEEEE 36px, #FFFFFF 36px, #FFFFFF);
- }
-
-/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
-
-
-
-body.width3>header>section.logonav>article>img.menubars,
-body.width4>header>section.logonav>article>img.menubars,
-body.width5>header>section.logonav>article>img.menubars{
- display:none;
- }
-
\ No newline at end of file
diff --git a/app/static/css/map.css b/app/static/css/map.css
deleted file mode 100644
index 31cd2a5f..00000000
--- a/app/static/css/map.css
+++ /dev/null
@@ -1,89 +0,0 @@
-@charset "UTF-8";
-
-/*ags-map.css*/
-#agsMap{
- display:block;
- margin:10px auto;
- padding:0px;
- width:90%;
- height:600px;
- }
-
-#agsLeafletMap{
- display:block;
- margin:0px;
- padding:0px;
- width:100%;
- height:600px;
- }
-
-.leaflet-popup-content table{
- margin:4px;
- }
-
-.leaflet-popup-content table>tbody>tr>*{
- padding:2px 4px;
- }
-
-.leaflet-popup-content table>tbody>tr>th{
- background-color:#CCC;
- }
-
-#agsMapLookups{
- padding:0px;
- text-align:center;
- }
-
-#agsMapLookups>article{
- display:inline-block;
- width:45%;
- height:120px;
- overflow:hidden;
- }
-
-#agsMapLookups input{
- padding:4px 8px;
- }
-
-#agsMapLookups input.lookupBtn{
- padding:6px 12px;
- background-color:#246;
- color:#FFFFFF;
- border-radius:5px;
- border:none;
- box-shadow: 2px 2px 4px #444;
- opacity:0.8;
- cursor:pointer;
- }
-
-#agsMapLookups input.lookupBtn:hover{
- box-shadow: 1px 1px 2px #222;
- opacity:1;
- }
-
-#agsMapLookups input.lookupBtn:disabled{
- background-color:#CCC;
- color:#444;
- opacity:0.5;
- box-shadow: 2px 2px 4px #FFF;
- }
-
-#extentStatusMsg{
- display:inline-block;
- border:1px solid #CCC;
- padding:4px 8px;
- }
-
-#drawIcon{
- display:inline-block;
- border:1px solid #CCC;
- padding:0px;
- margin:0px;
- background-image: url("../js/Leaflet/draw/images/spritesheet.svg");
- background-image: linear-gradient(transparent, transparent), url('../js/Leaflet/draw/images/spritesheet.svg');
- background-repeat: no-repeat;
- background-size:200px 20px;
- background-position: -40px 0px;
- width:20px;
- height:20px;
- }
\ No newline at end of file
diff --git a/app/static/css/style.css b/app/static/css/style.css
index 50af6422..433b7525 100644
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -2,6 +2,7 @@
width: 100%;
height: 600px;
cursor: crosshair;
+ border:1px solid var(--blue);
}
#dOpacitySliderBox {
@@ -69,3 +70,107 @@
padding:3px 5px;
float:right;
}
+
+
+/* NEW */
+
+#identification{
+ clear:both;
+ margin-bottom:0px;
+ }
+#identification>h1{
+ margin-bottom:0px;
+ }
+#identification>p{
+ background-color:var(--white);
+ color:var(--blue);
+ padding:10px;
+ margin:10px;
+ }
+#identification>ul{
+ list-style-type:none;
+ display:flex;
+ background-color:var(--blue);
+ padding:0px 5px;
+ margin:0px;
+ border-top-left-radius:5px;
+ border-top-right-radius:5px;
+ }
+#identification>ul>li{
+ flex:1;
+ padding:10px;
+ background-color:var(--lt-ochre);
+ margin:5px;
+ margin-bottom:0px;
+ text-align:center;
+ cursor:pointer;
+ border:1px solid var(--blue);
+ border-top-left-radius:5px;
+ border-top-right-radius:5px;
+ font-weight:bold;
+ }
+#identification>ul>li>a{
+ text-decoration:none;
+ color:var(--blue);
+ }
+
+#identification>ul>li:hover{
+ background-color:var(--lt-gray);
+ }
+
+
+
+
+#identification>ul>li.open{
+ background-color:var(--white);
+ border:1px solid var(--white);
+ }
+
+
+#openapi, #validator, #converter, #ags_data, #deposit{
+ border:1px solid var(--blue);
+ border-top:0px;
+ padding:20px;
+ }
+
+#openapi, #validator, #converter, #deposit{
+ display:none;
+ }
+
+/* FROM _base.html */
+
+.collapsible {
+ background-color: #cec4a9;
+ color: black;
+ cursor: pointer;
+ padding: 18px;
+ width: 100%;
+ border: none;
+ text-align: left;
+ outline: none;
+ font-size: 15px;
+}
+
+.active, .collapsible:hover {
+ background-color: #97875B;
+}
+
+.collapsible:after {
+ content: '\002B';
+ color: black;
+ font-weight: bold;
+ float: right;
+ margin-left: 5px;
+}
+
+.active:after {
+ content: "\2212";
+}
+
+.content {
+ padding: 0 18px;
+ max-height: 0;
+ overflow: hidden;
+ transition: max-height 0.2s ease-out;
+ background-color: #edf3f4;
+}
diff --git a/app/static/css/tooltip.css b/app/static/css/tooltip.css
index e040ce0a..0d3d70c2 100644
--- a/app/static/css/tooltip.css
+++ b/app/static/css/tooltip.css
@@ -8,7 +8,7 @@
.tooltip .tooltiptext {
visibility: hidden;
- width: 120px;
+ width: 240px;
background-color: black;
color: #fff;
text-align: center;
diff --git a/app/static/js/html5shiv-printshiv.js b/app/static/js/html5shiv-printshiv.js
deleted file mode 100644
index 085708e7..00000000
--- a/app/static/js/html5shiv-printshiv.js
+++ /dev/null
@@ -1,524 +0,0 @@
-/**
-* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-;(function(window, document) {
-/*jshint evil:true */
- /** version */
- var version = '3.7.3';
-
- /** Preset options */
- var options = window.html5 || {};
-
- /** Used to skip problem elements */
- var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;
-
- /** Not all elements can be cloned in IE **/
- var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i;
-
- /** Detect whether the browser supports default html5 styles */
- var supportsHtml5Styles;
-
- /** Name of the expando, to work with multiple documents or to re-shiv one document */
- var expando = '_html5shiv';
-
- /** The id for the the documents expando */
- var expanID = 0;
-
- /** Cached data for each document */
- var expandoData = {};
-
- /** Detect whether the browser supports unknown elements */
- var supportsUnknownElements;
-
- (function() {
- try {
- var a = document.createElement('a');
- a.innerHTML = '';
- //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles
- supportsHtml5Styles = ('hidden' in a);
-
- supportsUnknownElements = a.childNodes.length == 1 || (function() {
- // assign a false positive if unable to shiv
- (document.createElement)('a');
- var frag = document.createDocumentFragment();
- return (
- typeof frag.cloneNode == 'undefined' ||
- typeof frag.createDocumentFragment == 'undefined' ||
- typeof frag.createElement == 'undefined'
- );
- }());
- } catch(e) {
- // assign a false positive if detection fails => unable to shiv
- supportsHtml5Styles = true;
- supportsUnknownElements = true;
- }
-
- }());
-
- /*--------------------------------------------------------------------------*/
-
- /**
- * Creates a style sheet with the given CSS text and adds it to the document.
- * @private
- * @param {Document} ownerDocument The document.
- * @param {String} cssText The CSS text.
- * @returns {StyleSheet} The style element.
- */
- function addStyleSheet(ownerDocument, cssText) {
- var p = ownerDocument.createElement('p'),
- parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
-
- p.innerHTML = 'x';
- return parent.insertBefore(p.lastChild, parent.firstChild);
- }
-
- /**
- * Returns the value of `html5.elements` as an array.
- * @private
- * @returns {Array} An array of shived element node names.
- */
- function getElements() {
- var elements = html5.elements;
- return typeof elements == 'string' ? elements.split(' ') : elements;
- }
-
- /**
- * Extends the built-in list of html5 elements
- * @memberOf html5
- * @param {String|Array} newElements whitespace separated list or array of new element names to shiv
- * @param {Document} ownerDocument The context document.
- */
- function addElements(newElements, ownerDocument) {
- var elements = html5.elements;
- if(typeof elements != 'string'){
- elements = elements.join(' ');
- }
- if(typeof newElements != 'string'){
- newElements = newElements.join(' ');
- }
- html5.elements = elements +' '+ newElements;
- shivDocument(ownerDocument);
- }
-
- /**
- * Returns the data associated to the given document
- * @private
- * @param {Document} ownerDocument The document.
- * @returns {Object} An object of data.
- */
- function getExpandoData(ownerDocument) {
- var data = expandoData[ownerDocument[expando]];
- if (!data) {
- data = {};
- expanID++;
- ownerDocument[expando] = expanID;
- expandoData[expanID] = data;
- }
- return data;
- }
-
- /**
- * returns a shived element for the given nodeName and document
- * @memberOf html5
- * @param {String} nodeName name of the element
- * @param {Document} ownerDocument The context document.
- * @returns {Object} The shived element.
- */
- function createElement(nodeName, ownerDocument, data){
- if (!ownerDocument) {
- ownerDocument = document;
- }
- if(supportsUnknownElements){
- return ownerDocument.createElement(nodeName);
- }
- if (!data) {
- data = getExpandoData(ownerDocument);
- }
- var node;
-
- if (data.cache[nodeName]) {
- node = data.cache[nodeName].cloneNode();
- } else if (saveClones.test(nodeName)) {
- node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode();
- } else {
- node = data.createElem(nodeName);
- }
-
- // Avoid adding some elements to fragments in IE < 9 because
- // * Attributes like `name` or `type` cannot be set/changed once an element
- // is inserted into a document/fragment
- // * Link elements with `src` attributes that are inaccessible, as with
- // a 403 response, will cause the tab/window to crash
- // * Script elements appended to fragments will execute when their `src`
- // or `text` property is set
- return node.canHaveChildren && !reSkip.test(nodeName) && !node.tagUrn ? data.frag.appendChild(node) : node;
- }
-
- /**
- * returns a shived DocumentFragment for the given document
- * @memberOf html5
- * @param {Document} ownerDocument The context document.
- * @returns {Object} The shived DocumentFragment.
- */
- function createDocumentFragment(ownerDocument, data){
- if (!ownerDocument) {
- ownerDocument = document;
- }
- if(supportsUnknownElements){
- return ownerDocument.createDocumentFragment();
- }
- data = data || getExpandoData(ownerDocument);
- var clone = data.frag.cloneNode(),
- i = 0,
- elems = getElements(),
- l = elems.length;
- for(;i+~])(' + getElements().join('|') + ')(?=[[\\s,>+~#.:]|$)', 'gi'),
- replacement = '$1' + shivNamespace + '\\:$2';
-
- while (index--) {
- pair = parts[index] = parts[index].split('}');
- pair[pair.length - 1] = pair[pair.length - 1].replace(reElements, replacement);
- parts[index] = pair.join('}');
- }
- return parts.join('{');
- }
-
- /**
- * Removes the given wrappers, leaving the original elements.
- * @private
- * @params {Array} wrappers An array of printable wrappers.
- */
- function removeWrappers(wrappers) {
- var index = wrappers.length;
- while (index--) {
- wrappers[index].removeNode();
- }
- }
-
- /*--------------------------------------------------------------------------*/
-
- /**
- * Shivs the given document for print.
- * @memberOf html5
- * @param {Document} ownerDocument The document to shiv.
- * @returns {Document} The shived document.
- */
- function shivPrint(ownerDocument) {
- var shivedSheet,
- wrappers,
- data = getExpandoData(ownerDocument),
- namespaces = ownerDocument.namespaces,
- ownerWindow = ownerDocument.parentWindow;
-
- if (!supportsShivableSheets || ownerDocument.printShived) {
- return ownerDocument;
- }
- if (typeof namespaces[shivNamespace] == 'undefined') {
- namespaces.add(shivNamespace);
- }
-
- function removeSheet() {
- clearTimeout(data._removeSheetTimer);
- if (shivedSheet) {
- shivedSheet.removeNode(true);
- }
- shivedSheet= null;
- }
-
- ownerWindow.attachEvent('onbeforeprint', function() {
-
- removeSheet();
-
- var imports,
- length,
- sheet,
- collection = ownerDocument.styleSheets,
- cssText = [],
- index = collection.length,
- sheets = Array(index);
-
- // convert styleSheets collection to an array
- while (index--) {
- sheets[index] = collection[index];
- }
- // concat all style sheet CSS text
- while ((sheet = sheets.pop())) {
- // IE does not enforce a same origin policy for external style sheets...
- // but has trouble with some dynamically created stylesheets
- if (!sheet.disabled && reMedia.test(sheet.media)) {
-
- try {
- imports = sheet.imports;
- length = imports.length;
- } catch(er){
- length = 0;
- }
-
- for (index = 0; index < length; index++) {
- sheets.push(imports[index]);
- }
-
- try {
- cssText.push(sheet.cssText);
- } catch(er){}
- }
- }
-
- // wrap all HTML5 elements with printable elements and add the shived style sheet
- cssText = shivCssText(cssText.reverse().join(''));
- wrappers = addWrappers(ownerDocument);
- shivedSheet = addStyleSheet(ownerDocument, cssText);
-
- });
-
- ownerWindow.attachEvent('onafterprint', function() {
- // remove wrappers, leaving the original elements, and remove the shived style sheet
- removeWrappers(wrappers);
- clearTimeout(data._removeSheetTimer);
- data._removeSheetTimer = setTimeout(removeSheet, 500);
- });
-
- ownerDocument.printShived = true;
- return ownerDocument;
- }
-
- /*--------------------------------------------------------------------------*/
-
- // expose API
- html5.type += ' print';
- html5.shivPrint = shivPrint;
-
- // shiv for print
- shivPrint(document);
-
- if(typeof module == 'object' && module.exports){
- module.exports = html5;
- }
-
-}(typeof window !== "undefined" ? window : this, document));
diff --git a/app/static/js/html5shiv.js b/app/static/js/html5shiv.js
deleted file mode 100644
index 45ea723d..00000000
--- a/app/static/js/html5shiv.js
+++ /dev/null
@@ -1,326 +0,0 @@
-/**
-* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-;(function(window, document) {
-/*jshint evil:true */
- /** version */
- var version = '3.7.3';
-
- /** Preset options */
- var options = window.html5 || {};
-
- /** Used to skip problem elements */
- var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;
-
- /** Not all elements can be cloned in IE **/
- var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i;
-
- /** Detect whether the browser supports default html5 styles */
- var supportsHtml5Styles;
-
- /** Name of the expando, to work with multiple documents or to re-shiv one document */
- var expando = '_html5shiv';
-
- /** The id for the the documents expando */
- var expanID = 0;
-
- /** Cached data for each document */
- var expandoData = {};
-
- /** Detect whether the browser supports unknown elements */
- var supportsUnknownElements;
-
- (function() {
- try {
- var a = document.createElement('a');
- a.innerHTML = '';
- //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles
- supportsHtml5Styles = ('hidden' in a);
-
- supportsUnknownElements = a.childNodes.length == 1 || (function() {
- // assign a false positive if unable to shiv
- (document.createElement)('a');
- var frag = document.createDocumentFragment();
- return (
- typeof frag.cloneNode == 'undefined' ||
- typeof frag.createDocumentFragment == 'undefined' ||
- typeof frag.createElement == 'undefined'
- );
- }());
- } catch(e) {
- // assign a false positive if detection fails => unable to shiv
- supportsHtml5Styles = true;
- supportsUnknownElements = true;
- }
-
- }());
-
- /*--------------------------------------------------------------------------*/
-
- /**
- * Creates a style sheet with the given CSS text and adds it to the document.
- * @private
- * @param {Document} ownerDocument The document.
- * @param {String} cssText The CSS text.
- * @returns {StyleSheet} The style element.
- */
- function addStyleSheet(ownerDocument, cssText) {
- var p = ownerDocument.createElement('p'),
- parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
-
- p.innerHTML = 'x';
- return parent.insertBefore(p.lastChild, parent.firstChild);
- }
-
- /**
- * Returns the value of `html5.elements` as an array.
- * @private
- * @returns {Array} An array of shived element node names.
- */
- function getElements() {
- var elements = html5.elements;
- return typeof elements == 'string' ? elements.split(' ') : elements;
- }
-
- /**
- * Extends the built-in list of html5 elements
- * @memberOf html5
- * @param {String|Array} newElements whitespace separated list or array of new element names to shiv
- * @param {Document} ownerDocument The context document.
- */
- function addElements(newElements, ownerDocument) {
- var elements = html5.elements;
- if(typeof elements != 'string'){
- elements = elements.join(' ');
- }
- if(typeof newElements != 'string'){
- newElements = newElements.join(' ');
- }
- html5.elements = elements +' '+ newElements;
- shivDocument(ownerDocument);
- }
-
- /**
- * Returns the data associated to the given document
- * @private
- * @param {Document} ownerDocument The document.
- * @returns {Object} An object of data.
- */
- function getExpandoData(ownerDocument) {
- var data = expandoData[ownerDocument[expando]];
- if (!data) {
- data = {};
- expanID++;
- ownerDocument[expando] = expanID;
- expandoData[expanID] = data;
- }
- return data;
- }
-
- /**
- * returns a shived element for the given nodeName and document
- * @memberOf html5
- * @param {String} nodeName name of the element
- * @param {Document|DocumentFragment} ownerDocument The context document.
- * @returns {Object} The shived element.
- */
- function createElement(nodeName, ownerDocument, data){
- if (!ownerDocument) {
- ownerDocument = document;
- }
- if(supportsUnknownElements){
- return ownerDocument.createElement(nodeName);
- }
- if (!data) {
- data = getExpandoData(ownerDocument);
- }
- var node;
-
- if (data.cache[nodeName]) {
- node = data.cache[nodeName].cloneNode();
- } else if (saveClones.test(nodeName)) {
- node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode();
- } else {
- node = data.createElem(nodeName);
- }
-
- // Avoid adding some elements to fragments in IE < 9 because
- // * Attributes like `name` or `type` cannot be set/changed once an element
- // is inserted into a document/fragment
- // * Link elements with `src` attributes that are inaccessible, as with
- // a 403 response, will cause the tab/window to crash
- // * Script elements appended to fragments will execute when their `src`
- // or `text` property is set
- return node.canHaveChildren && !reSkip.test(nodeName) && !node.tagUrn ? data.frag.appendChild(node) : node;
- }
-
- /**
- * returns a shived DocumentFragment for the given document
- * @memberOf html5
- * @param {Document} ownerDocument The context document.
- * @returns {Object} The shived DocumentFragment.
- */
- function createDocumentFragment(ownerDocument, data){
- if (!ownerDocument) {
- ownerDocument = document;
- }
- if(supportsUnknownElements){
- return ownerDocument.createDocumentFragment();
- }
- data = data || getExpandoData(ownerDocument);
- var clone = data.frag.cloneNode(),
- i = 0,
- elems = getElements(),
- l = elems.length;
- for(;i
+