Merge remote-tracking branch 'origin/Felix'

This commit is contained in:
Naumann 2020-06-08 07:40:02 +02:00
commit 8fb7428a44
6 changed files with 67 additions and 57 deletions

View File

@ -10,22 +10,41 @@
<div class="Titel">
<h1>Katalog</h1>
</div>
<!--
<div class="Eingabe">
<h2>Eingabe</h2>
<textarea name="Titel" class="text" placeholder="Titel"></textarea>
<textarea name="Author" class="text" placeholder="Author"></textarea>
<textarea name="Country" class="text" placeholder="Country"></textarea>
<textarea name="Link" class="text" placeholder="Link"></textarea>
<textarea name="Language" class="text" placeholder="Language"></textarea>
<textarea name="Pages" class="text" type="number" placeholder="Pages"></textarea>
<textarea name="Year" class="text" type="number" placeholder="Year"></textarea>
<textarea name="Category" class="text" placeholder="Category"></textarea>
<textarea name="ImageLink" class="text" placeholder="ImageLink"></textarea>
<textarea name="LendTime" class="text" type="number" placeholder="LendTime"></textarea>
<textarea name="LendType" class="text" placeholder="LendType"></textarea>
<button id="go">Go</button>
</div>
Das war die alte version. -->
<div class="Eingabe">
<h2>Eingabe</h2>
<textarea name="Titel" id="text" placeholder="Titel"></textarea>
<textarea name="Author" id="text" placeholder="Author"></textarea>
<textarea name="Country" id="text" placeholder="Country"></textarea>
<textarea name="Linnk" id="text" placeholder="Link"></textarea>
<textarea name="Language" id="text" placeholder="Language"></textarea>
<textarea name="Pages" id="text" placeholder="Pages"></textarea>
<textarea name="Year" id="text" placeholder="Year"></textarea>
<textarea name="Category" id="text" placeholder="Category"></textarea>
<textarea name="ImageLink" id="text" placeholder="ImageLink"></textarea>
<textarea name="LendTime" id="text" placeholder="LendTime"></textarea>
<textarea name="LendType" id="text" placeholder="LendType"></textarea>
<button id="go">Go</button>
<form action="catalogue_search.php">
<input type="text" name="Title" id="input" placeholder="Titel">
<input type="text" name="Author" id="input" placeholder="Autor">
<input type="text" name="Country" id="input" placeholder="Herkunft">
<input type="url" name="Link" id="input" placeholder="Link">
<input type="text" name="Language" id="input" placeholder="Sprache">
<input type="number" name="Pages" id="input" placeholder="Seiten">
<input type="date" name="Year" id="input" placeholder="Erscheinungsjahr"> <!-- Nur YYYY--> <!--funktioniert nur über ein Skript, alternativ type="number" mit min und max restrictions-->
<input type="text" name="Category" id="input" placeholder="Kategorie"> <!-- Nur Auswahl (per select?) -->
<input type="url" name="ImageLink" id="input" placeholder="Bild">
<input type="number" name="LendTime" id="input" placeholder="Verteihdauer">
<input type="text" name="LendType" id="input" placeholder="Verleihtyp">
<input type="submit" name="go" id="go">
</form>
</div>
<div class="Ausgabe">
<h2>Ausgabe</h2>

View File

@ -4,9 +4,9 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Bücherwurm WebInterface</title>
<link rel="stylesheet" href="scss/main.css">
<link rel="stylesheet" href="scss/menu.css">
<link rel="stylesheet" href="scss/tables.css">
<link rel="stylesheet" type="text/css" href="scss/main.css" media="screen" />
<!--<link rel="stylesheet" href="tables.css">
<link rel="stylesheet" href="menu.css">-->
</head>
<body class="theme-1">
<div name="main"><!-- der ganze Inhalt ohne Hintergrund. Soll mobileFirst Senkrecht ausgerichtet sein -->
@ -21,10 +21,10 @@
Buch im Katalog
<select name="selection" id="selection" onchange="location.assign(this.value);">
<option></option>
<option value=katalog/find.html>Finden</option>
<Option value="katalog/add.html">Hinzufügen</Option>
<option value="katalog/change.html">Bearbeiten</option>
<option value="katalog/delete.html">Löschen</option>
<option value=find.html>Finden</option>
<Option value="add.html">Hinzufügen</Option>
<option value="katalog.htm">Bearbeiten</option>
<option value="delete.html">Löschen</option>
</select>
</dd>
<dt>
@ -34,10 +34,10 @@
Buch im Inventar
<select name="selection" id="selection" onchange="location.assign(this.value);">
<option></option>
<option value=inventar/find.html>Finden</option>
<Option value="inventar/add.html">Hinzufügen</Option>
<option value="inventar/change.html">Bearbeiten</option>
<option value="inventar/delete.html">Löschen</option>
<option value=find.html>Finden</option>
<Option value="add.html">Hinzufügen</Option>
<option value="change.html">Bearbeiten</option>
<option value="delete.html">Löschen</option>
</select>
</dd>
<dt>
@ -47,10 +47,10 @@
Verleihvorgang
<select name="selection" id="selection" onchange="location.assign(this.value);">
<option></option>
<option value=verleihvorgang/find.html>Finden</option>
<Option value="verleihvorgang/add.html">Hinzufügen</Option>
<option value="verleihvorgang/change.html">Bearbeiten</option>
<option value="verleihvorgang/delete.html">Löschen</option>
<option value=find.html>Finden</option>
<Option value="add.html">Hinzufügen</Option>
<option value="change.html">Bearbeiten</option>
<option value="delete.html">Löschen</option>
</select>
</dd>
</form>

View File

@ -1,12 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Katalogeintrag ändern</title>
</head>
<body>
hier ändert man später mal einen Katalogeintrag.
<a href="../index.html">zurück</a>
</body>
</html>

View File

@ -31,6 +31,14 @@ body {
border: 1px solid black;
}
.Eingabe input {
resize: none;
overflow: auto;
width: 90%;
height: 3%;
margin-left: 5%;
}
.Eingabe #go {
margin-left: 40%;
margin-top: 5%;
@ -56,14 +64,6 @@ h2, h1 {
text-align: center;
}
textarea {
resize: none;
overflow: auto;
width: 90%;
height: 3%;
margin-left: 5%;
}
table {
margin-left: 3%;
margin-right: 3%;

View File

@ -1,6 +1,6 @@
{
"version": 3,
"mappings": "AAAA,AAAA,IAAI,CACA;EACI,gBAAgB,EAAE,MAAM;EACxB,OAAO,EAAE,IAAI;EACb,qBAAqB,EAAE,cAAc;EACrC,QAAQ,EAAE,IAAI;EACd,QAAQ,EAAE,CAAC;EACX,YAAY,EAAE,EAAE;EAChB,aAAa,EAAG,EAAE;CAErB;;AACL,AAAA,MAAM,CACF;EACI,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,KAAK;EAClB,QAAQ,EAAE,CAAC;CAGd;;AACL,AAAA,QAAQ,CACJ;EACI,WAAW,EAAE,KAAK;EAClB,QAAQ,EAAE,GAAG;EACb,gBAAgB,EAAE,SAAS;EAC3B,MAAM,EAAE,eAAe;CAS1B;;AAdL,AAMQ,QANA,CAMA,GAAG,CACH;EACI,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,EAAE;EACd,WAAW,EAAE,MAAM;EACnB,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI;CACf;;AAGT,AAAA,QAAQ,CACJ;EACI,WAAW,EAAE,KAAK;EAClB,QAAQ,EAAE,GAAG;EACb,gBAAgB,EAAE,SAAS;EAC3B,MAAM,EAAE,eAAe;CAC1B;;AACL,AAAA,EAAE,EAAC,EAAE,CACD;EACA,UAAU,EAAE,MAAM;CACjB;;AAEL,AAAA,QAAQ,CACJ;EACA,MAAM,EAAE,IAAI;EACZ,QAAQ,EAAE,IAAI;EACd,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,EAAE;EACV,WAAW,EAAE,EAAE;CACd;;AAEL,AAAA,KAAK,CAAA;EACD,WAAW,EAAE,EAAE;EACf,YAAY,EAAE,EAAE;EAChB,eAAe,EAAE,IAAI;CAgBxB;;AAnBD,AAII,KAJC,CAID,EAAE,EAJN,KAAK,CAIG,EAAE,CACN;EACI,MAAM,EAAE,eAAe;CAC1B;;AAPL,AAUQ,KAVH,CAQD,IAAI,CAEA,QAAQ,CAAC;EACL,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,GAAG;EACV,IAAI,EAAE,CAAC;EACP,GAAG,EAAE,IAAI;EACT,gBAAgB,EAAE,GAAG;EACrB,UAAU,EAAE,IAAI;CACjB",
"mappings": "AAAA,AAAA,IAAI,CACA;EACI,gBAAgB,EAAE,MAAM;EACxB,OAAO,EAAE,IAAI;EACb,qBAAqB,EAAE,cAAc;EACrC,QAAQ,EAAE,IAAI;EACd,QAAQ,EAAE,CAAC;EACX,YAAY,EAAE,EAAE;EAChB,aAAa,EAAG,EAAE;CAErB;;AACL,AAAA,MAAM,CACF;EACI,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,KAAK;EAClB,QAAQ,EAAE,CAAC;CAGd;;AACL,AAAA,QAAQ,CACJ;EACI,WAAW,EAAE,KAAK;EAClB,QAAQ,EAAE,GAAG;EACb,gBAAgB,EAAE,SAAS;EAC3B,MAAM,EAAE,eAAe;CAiB1B;;AAtBL,AAMQ,QANA,CAMA,KAAK,CACL;EACI,MAAM,EAAE,IAAI;EACZ,QAAQ,EAAE,IAAI;EACd,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,EAAE;EACV,WAAW,EAAE,EAAE;CAClB;;AAbT,AAcQ,QAdA,CAcA,GAAG,CACH;EACI,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,EAAE;EACd,WAAW,EAAE,MAAM;EACnB,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,IAAI;CACf;;AAGT,AAAA,QAAQ,CACJ;EACI,WAAW,EAAE,KAAK;EAClB,QAAQ,EAAE,GAAG;EACb,gBAAgB,EAAE,SAAS;EAC3B,MAAM,EAAE,eAAe;CAC1B;;AACL,AAAA,EAAE,EAAC,EAAE,CACD;EACA,UAAU,EAAE,MAAM;CACjB;;AAIL,AAAA,KAAK,CAAA;EACD,WAAW,EAAE,EAAE;EACf,YAAY,EAAE,EAAE;EAChB,eAAe,EAAE,IAAI;CAkBxB;;AArBD,AAII,KAJC,CAID,EAAE,EAJN,KAAK,CAIG,EAAE,CACN;EACI,MAAM,EAAE,eAAe;CAC1B;;AAPL,AAUQ,KAVH,CAQD,IAAI,CAEA,QAAQ,CAAC;EACL,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,GAAG;EACV,IAAI,EAAE,CAAC;EACP,GAAG,EAAE,IAAI;EACT,gBAAgB,EAAE,GAAG;EACrB,UAAU,EAAE,IAAI;CACjB",
"sources": [
"style.scss"
],

View File

@ -23,6 +23,14 @@ body
grid-row: 2/6;
background-color: lightgrey;
border: 1px solid black;
input
{
resize: none;
overflow: auto;
width: 90%;
height: 3%;
margin-left: 5%;
}
#go
{
margin-left: 40%;
@ -45,14 +53,7 @@ h2,h1
text-align: center;
}
textarea
{
resize: none;
overflow: auto;
width: 90%;
height: 3%;
margin-left: 5%;
}
table{
margin-left: 3%;
@ -73,4 +74,6 @@ table{
margin-top: -1px;
}
}
}