fixed html

3449add0 · Hannes Warnestad · f186523f · 3449add0 · 3449add0 · 3449add0
Commit 3449add0 authored Nov 19, 2020 by Hannes Warnestad
--- a/index.html
+++ b/index.html
-<html>
-
+<html lang="sv">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  <title>Forms</title>
  <header>
    <div style="height: 100px;width: 100%; position: relative; border-radius: 5px; background-color: #f64c4f;">
      <h1
-        style="text-align: center; color: white; vertical-align: middle;font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;line-height: 100px;height: 100px;">
+        style="text-align: center; color: white; vertical-align: middle;font-family:'Times New Roman';line-height: 100px;height: 100px;">
        Placeholder text
      </h1>
    </div>

--- a/index1.html
+++ b/index1.html
-<html>
-
+<html lang="sv">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  <title>Kategori: Hållbara transporter</title>
@@ -7,8 +6,8 @@
  <header>
    <div style="height: 100px;width: 100%; position: relative; border-radius: 5px; background-color: #f64c4f;">
      <h1
-        style="text-align: center; color: white; vertical-align: middle;font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;line-height: 100px;height: 100px;">
-        Hållbara transporter 1
+      style="text-align: center; color: white; vertical-align: middle;font-family:'Times New Roman';line-height: 100px;height: 100px;">
+      Hållbara transporter 1
      </h1>
    </div>
  </header>

--- a/index2.html
+++ b/index2.html
-<html>
-
+<html lang="sv">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  <title>Kategori: Hållbara transporter</title>
@@ -7,8 +6,8 @@
    <script src="form2.bundle.js"></script>
    <div style="height: 100px;width: 100%; position: relative; border-radius: 5px; background-color: #f64c4f;">
      <h1
-        style="text-align: center; color: white; vertical-align: middle;font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;line-height: 100px;height: 100px;">
-        Hållbara transporter 2
+      style="text-align: center; color: white; vertical-align: middle;font-family:'Times New Roman';line-height: 100px;height: 100px;">
+      Hållbara transporter 2
      </h1>
    </div>
  </header>

--- a/index3.html
+++ b/index3.html
-<html>
-
+<html lang="sv">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  <title>Kategori: Hälsomedvetenhet</title>
@@ -7,8 +6,8 @@
    <script src="form3.bundle.js"></script>
    <div style="height: 100px;width: 100%; position: relative; border-radius: 5px; background-color: #f64c4f;">
      <h1
-        style="text-align: center; color: white; vertical-align: middle;font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;line-height: 100px;height: 100px;">
-        Hälsomedvetenhet 1
+      style="text-align: center; color: white; vertical-align: middle;font-family:'Times New Roman';line-height: 100px;height: 100px;">
+      Hälsomedvetenhet 1
      </h1>
    </div>
  </header>

--- a/index4.html
+++ b/index4.html
-<html>
-
+<html lang="sv">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  <title>Kategori: Hälsomedvetenhet</title>
@@ -7,8 +6,8 @@
    <script src="form4.bundle.js"></script>
    <div style="height: 100px;width: 100%; position: relative; border-radius: 5px; background-color: #f64c4f;">
      <h1
-        style="text-align: center; color: white; vertical-align: middle;font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;line-height: 100px;height: 100px;">
-        Hälsomedvetenhet 2
+      style="text-align: center; color: white; vertical-align: middle;font-family:'Times New Roman';line-height: 100px;height: 100px;">
+      Hälsomedvetenhet 2
      </h1>
    </div>
  </header>

--- a/index5.html
+++ b/index5.html
-<html>
-
+<html lang="sv">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  <title>Kategori: Hållbar konsumtion</title>
@@ -7,8 +6,8 @@
    <script src="form5.bundle.js"></script>
    <div style="height: 100px;width: 100%; position: relative; border-radius: 5px; background-color: #f64c4f;">
      <h1
-        style="text-align: center; color: white; vertical-align: middle;font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;line-height: 100px;height: 100px;">
-        Hållbar konsumtion 1
+      style="text-align: center; color: white; vertical-align: middle;font-family:'Times New Roman';line-height: 100px;height: 100px;">
+      Hållbar konsumtion 1
      </h1>
    </div>
  </header>

--- a/index6.html
+++ b/index6.html
-<html>
-
+<html lang="sv">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  <title>Kategori: Hållbar konsumtion</title>
@@ -7,8 +6,8 @@
    <script src="form6.bundle.js"></script>
    <div style="height: 100px;width: 100%; position: relative; border-radius: 5px; background-color: #f64c4f;">
      <h1
-        style="text-align: center; color: white; vertical-align: middle;font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;line-height: 100px;height: 100px;">
-        Hållbar konsumtion 2
+      style="text-align: center; color: white; vertical-align: middle;font-family:'Times New Roman';line-height: 100px;height: 100px;">
+      Hållbar konsumtion 2
      </h1>
    </div>
  </header>

--- a/index7.html
+++ b/index7.html
-<html>
-
+<html lang="sv">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  <title>Resultat: Hållbara transporter</title>
@@ -7,8 +6,8 @@
    <script src="form7.bundle.js"></script>
    <div style="height: 100px;width: 100%; position: relative; border-radius: 5px; background-color: #f64c4f;">
      <h1
-        style="text-align: center; color: white; vertical-align: middle;font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;line-height: 100px;height: 100px;">
-        Resultat: Hållbara transporter
+      style="text-align: center; color: white; vertical-align: middle;font-family:'Times New Roman';line-height: 100px;height: 100px;">
+      Resultat: Hållbara transporter
      </h1>
    </div>
  </header>

--- a/index8.html
+++ b/index8.html
-<html>
-
+<html lang="sv">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  <title>Resultat: Hälsomedvetenhet</title>
@@ -8,8 +7,8 @@

    <div style="height: 100px;width: 100%; position: relative; border-radius: 5px; background-color: #f64c4f;">
      <h1
-        style="text-align: center; color: white; vertical-align: middle;font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;line-height: 100px;height: 100px;">
-        Resultat: Hälsomedvetenhet
+      style="text-align: center; color: white; vertical-align: middle;font-family:'Times New Roman';line-height: 100px;height: 100px;">
+      Resultat: Hälsomedvetenhet
      </h1>
    </div>
  </header>

--- a/index9.html
+++ b/index9.html
-<html>
-
+<html lang="sv">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  <title>Resultat: Hållbar konsumtion</title>
@@ -7,8 +6,8 @@
    <script src="form9.bundle.js"></script>
    <div style="height: 100px;width: 100%; position: relative; border-radius: 5px; background-color: #f64c4f;">
      <h1
-        style="text-align: center; color: white; vertical-align: middle;font-family:'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;line-height: 100px;height: 100px;">
-        Resultat: Hållbar konsumtion
+      style="text-align: center; color: white; vertical-align: middle;font-family:'Times New Roman';line-height: 100px;height: 100px;">
+      Resultat: Hållbar konsumtion
      </h1>
    </div>
  </header>

--- a/rplp_backend/src/User.java
+++ b/rplp_backend/src/User.java
@@ -7,6 +7,10 @@ public class User{
    public int id;
    @Column
    public int questions [][] = new int [4][4];
+
+    public static testSum (int num1, int num2){
+        return num1 + num2;
+    }
    // public int q11;
    // public int q12;
    // public int q13;

--- a/src/css/multiRB.css
+++ b/src/css/multiRB.css
 label{
-    font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
+    font-family: 'Times New Roman';
    font-size: 16px;
 }


--- a/src/test.jsp
+++ b/src/test.jsp
+<%@ page import="deleteconfig"%>
+<%
+   deleteconfig.initiate();
+%>
\ No newline at end of file
--- a/src/webapp/formBase.js
+++ b/src/webapp/formBase.js
@@ -77,9 +77,10 @@ class formBase extends WC {
    }

    getData(){
+       //console.log(com.rplp.mypackage.testSum(1,2))
        // var user = new package.com.rplp.mypackage.User;
-        // user.id = 1;
-        // console.log(user.id)
+        user.id = 1;
+        console.log(user.id)
        return "Hello";
    }
 }