Cleanups

ipb-halle · Oct 30, 2024 · 6fc8e6d · 6fc8e6d
1 parent cac6bfb
commit 6fc8e6d
Show file tree

Hide file tree

Showing 9 changed files with 374 additions and 618 deletions.
diff --git a/MetFragWeb/src/main/webapp/comparespectrad3js.xhtml b/MetFragWeb/src/main/webapp/comparespectrad3js.xhtml
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html">
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns:ui="jakarta.faces.facelets"
+      xmlns:h="jakarta.faces.html">
+
 <h:head>
-	<title><ui:insert name="title">MetFrag</ui:insert></title>
-	<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Lato:wght@300;400&amp;display=swap" />
-	<h:outputStylesheet name='css/style.css' rel='stylesheet'
-		type='text/css' />
-	<h:outputStylesheet name='css/d3js.css' rel='stylesheet'
-		type='text/css' />
+    <title><ui:insert name="title">MetFrag</ui:insert></title>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Lato:wght@300;400&amp;display=swap"/>
+    <h:outputStylesheet name="css/style.css" rel="stylesheet" type="text/css"/>
+    <h:outputStylesheet name="css/d3js.css" rel="stylesheet" type="text/css"/>
 </h:head>
 
-<h:body	style="min-height: 100%; height:100%; margin-right: 0; margin-left: 0; margin-bottom:0; padding:0; font-size: 0.8em;
-	background: #E2E2E2;">
-	<h:panelGroup layout="block" id="container">
-		<div id="header" style="margin-left: auto; margin-right: auto; padding-top: 25px">
-			<ui:insert name="header" >
-				<ui:include src="includes/header.xhtml" />
-			</ui:insert>
-		</div>
-
-		<div id="content" style="margin-left: auto; margin-right: auto;">
-			<ui:insert name="content" >
-				<ui:include src="includes/comparespectraD3JSInclude.xhtml" />
-			</ui:insert>
-		</div>
-
-		<div id="footer">
-			<ui:insert name="footer">
-				<ui:include src="includes/footer.xhtml" />
-			</ui:insert>
-		</div>
-	</h:panelGroup>
+<h:body class="body-style">
+    <h:panelGroup layout="block" id="container">
+        <div id="header">
+            <ui:insert name="header">
+                <ui:include src="includes/header.xhtml"/>
+            </ui:insert>
+        </div>
+
+        <div id="content">
+            <ui:insert name="content">
+                <ui:include src="includes/comparespectraD3JSInclude.xhtml"/>
+            </ui:insert>
+        </div>
+
+        <div id="footer">
+            <ui:insert name="footer">
+                <ui:include src="includes/footer.xhtml"/>
+            </ui:insert>
+        </div>
+    </h:panelGroup>
 </h:body>
 
 </html>
diff --git a/MetFragWeb/src/main/webapp/includes/databasePrime.xhtml b/MetFragWeb/src/main/webapp/includes/databasePrime.xhtml
diff --git a/MetFragWeb/src/main/webapp/index.xhtml b/MetFragWeb/src/main/webapp/index.xhtml
@@ -3,11 +3,11 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns:ui="jakarta.faces.facelets"
       xmlns:h="jakarta.faces.html">
+
 <h:head>
     <title><ui:insert name="title">MetFrag</ui:insert></title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Lato:wght@300;400&amp;display=swap"/>
-    <h:outputStylesheet name='css/style.css' rel='stylesheet' type='text/css'/>
-    <meta name="viewport" content="width=device-width"/>
+    <h:outputStylesheet name="css/style.css" rel="stylesheet" type="text/css"/>
 </h:head>
 
 <h:body class="body-style">

diff --git a/MetFragWeb/src/main/webapp/landing.xhtml b/MetFragWeb/src/main/webapp/landing.xhtml
@@ -18,12 +18,11 @@
             </ui:insert>
         </div>
 
-		<div id="landingPage" class="landing-page-style">
-			<ui:insert name="content">
-				<ui:include src="includes/landingPage.xhtml"/>
-			</ui:insert>
-		</div>
+        <div id="landingPage" class="landing-page-style">
+            <ui:insert name="content">
+                <ui:include src="includes/landingPage.xhtml"/>
+            </ui:insert>
+        </div>
     </h:panelGroup>
 </h:body>
-
 </html>
diff --git a/MetFragWeb/src/main/webapp/resources/css/loader.css b/MetFragWeb/src/main/webapp/resources/css/loader.css
diff --git a/MetFragWeb/src/main/webapp/resources/css/style.css b/MetFragWeb/src/main/webapp/resources/css/style.css
@@ -584,4 +584,9 @@ html,body {
  .landing-page-style {
 	 width: 90%;
 	 margin: 0 auto;
- }
+ }
+
+.upload-parameters-style {
+	width: 90%;
+	margin: 0 auto;
+}
diff --git a/MetFragWeb/src/main/webapp/resources/images/MetLogoCube_Green_small.png b/MetFragWeb/src/main/webapp/resources/images/MetLogoCube_Green_small.png
diff --git a/MetFragWeb/src/main/webapp/resources/images/loading.gif b/MetFragWeb/src/main/webapp/resources/images/loading.gif