Merge branch 'develop' of 10.196.211.3:222]:maru21/templateGen

into develop
This commit is contained in:
maru21 2023-09-23 14:05:30 +02:00
commit ca697d40df
18 changed files with 3264 additions and 3239 deletions

View File

@ -49,3 +49,9 @@ a {text-decoration: none;}
textarea { textarea {
resize: none; resize: none;
} }
.logo {
border: #202e3f;
border-style: solid;
}

View File

@ -16,7 +16,7 @@
<link rel="stylesheet" href="css/font-awesome/css/all.min.css" /> <link rel="stylesheet" href="css/font-awesome/css/all.min.css" />
<link rel="stylesheet" href="css/styles.css" /> <link rel="stylesheet" href="css/styles.css" />
<script type="module" src="js/9.5/main.js"></script> <script type="module" src="js/9.7/main.js"></script>
<body> <body>
@ -93,7 +93,7 @@
href="." href="."
id="siteTitle" id="siteTitle"
class="w3-left-align w3-button w3-padding-large w3-flat-wet-asphalt" class="w3-left-align w3-button w3-padding-large w3-flat-wet-asphalt"
>Template Gen</a ><img class="logo" src="logo.png" alt="logo" height="30px"></a
> >
</div> </div>
@ -265,9 +265,6 @@
<div class="w3-modal-content w3-margin-top"> <div class="w3-modal-content w3-margin-top">
<div class="w3-container w3-padding-32 w3-flat-clouds"> <div class="w3-container w3-padding-32 w3-flat-clouds">
<form method="post" action="javascript:void(0)" id="loginForm"> <form method="post" action="javascript:void(0)" id="loginForm">
<h1>Welcome to stenoDok</h1>
<br>
<br>
<label> enter password: </label> <label> enter password: </label>
<input <input
type="password" type="password"

View File

@ -69,7 +69,9 @@ function createTemplate(template = false) {
function loadTemplateSidebar(templates) { function loadTemplateSidebar(templates) {
let sidebarList = document.createElement("ul"); let sidebarList = document.createElement("ul");
sidebarList.classList.add("w3-ul"); sidebarList.classList.add("w3-ul");
if (!templates.includes('_textBlocks')) {
templates.push('_textBlocks'); templates.push('_textBlocks');
}
for (let template of templates) { for (let template of templates) {

View File

@ -45,7 +45,14 @@ function loadTemplate(template, newFlag = false, loadOnly = false) {
cdata = retrieveData("userInputForce"); cdata = retrieveData("userInputForce");
} }
if (cdata != "") { if (cdata != "") {
retrieveForm(JSON.parse(cdata)); let res = "";
try {
res = JSON.parse(cdata);
} catch (e) {
console.log("error", cdata);
return;
}
retrieveForm(res);
} }
//select first object and focus on it //select first object and focus on it
@ -77,7 +84,14 @@ function loadNavBar() {
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function () { xhttp.onreadystatechange = function () {
if (this.readyState == 4 && this.status == 200) { if (this.readyState == 4 && this.status == 200) {
let res = JSON.parse(this.responseText); let res = "";
try {
res = JSON.parse(this.responseText);
} catch (e) {
console.log("error", this.responseText);
return;
}
let divMob = document.getElementById("navMob"); let divMob = document.getElementById("navMob");
for (let x in res) { for (let x in res) {
let aMob = document.createElement("a"); let aMob = document.createElement("a");
@ -117,7 +131,13 @@ function initTextBlocks() {
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function () { xhttp.onreadystatechange = function () {
if (this.readyState == 4 && this.status == 200) { if (this.readyState == 4 && this.status == 200) {
let res = JSON.parse(this.responseText); let res = "";
try {
res = JSON.parse(this.responseText);
} catch (e) {
console.log("error", this.responseText)
return;
}
const textBlocksHolder = document.getElementById("textBlocks"); const textBlocksHolder = document.getElementById("textBlocks");
const divReg = document.getElementById("navTb"); const divReg = document.getElementById("navTb");
for (let x in res) { for (let x in res) {

BIN
logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB