README.md | ●●●●● patch | view | raw | blame | history | |
web/ui2/data/menu/datei.json | ●●●●● patch | view | raw | blame | history | |
web/ui2/data/tpl/dlg-ask-save.tpl | ●●●●● patch | view | raw | blame | history | |
web/ui2/data/tpl/dlg-save-as.tpl | ●●●●● patch | view | raw | blame | history | |
web/ui2/index.html | ●●●●● patch | view | raw | blame | history | |
web/ui2/js/app.js | ●●●●● patch | view | raw | blame | history | |
web/ui2/stile.css | ●●●●● patch | view | raw | blame | history |
README.md
@@ -14,26 +14,16 @@ - Hochladen per Drag and Drop direkt in Ordner - Listen- und Kachelansicht Die Bedienoberfläche passt sich an verschiedene Geräteausstattungen an (responsiv). Weitere Informationen zur Dateiverwaltung finden sich auf der [Produktseite](/data/ulrich/prg/file-cms). Die Bedienoberfläche passt sich an verschiedene Geräteausstattungen an (responsiv). ### Konfiguration Die Dateiverwaltung erhält den Ablageort von Dateien über den JNDI-Eintrag ```` <Environment name="wbxFileBase" type="java.lang.String" value="/pfad/zu/den/daten" override="false" /> ```` Wenn die Angabe `wbxFileBase` wie oben als JNDI-Parameter angegeben wird, kann sie beispielsweise in der Datei `$CATALINA_BASE/context.xml` hinterlegt werden. Die Dateiverwaltung bezieht den Ablageort von Dateien über die Systemvariable `wbx.data`. Diese Angabe muss beim Start des Java-Prozesses als Parameter gesetzt sein wie in `java -Dwbx.data=/pfad/zu/den/daten [weitere Parameter]`. #### Automatische Ermittlung des Ablageortes Ist die Angabe `wbxFileBase` nicht zu finden oder leer, wird der Ablageort `../../../daten` ausgehend von `$CATALINA_BASE/webapps` verwendet. Wenn also z.B. das webapps-Verzeichnis in `/usr/local/tomcat/webapps` liegt, dann wird das Datenverzeichnis der Dateiablage in `/usr/daten` vermutet. Liegt es stattdessen in `/media/extmirror/srv/wbx/sys/base/webapps` dann lautet der Datenpfad `/media/extmirror/srv/wbx/daten`. Ist die Angabe `wbxFileBase` nicht zu finden oder leer, wird der Ablageort `../../../daten` ausgehend von `$CATALINA_BASE/webapps` verwendet. ## Webanwendung herstellen @@ -145,11 +135,12 @@ ## ui2 Prototyp Versuch einer neuen Bedienoberfläche basierend auf `app-vorlage` und `app-menu` Unter `file-cms/ui2` entsteht eine neue Bedienoberfläche basierend auf `app-vorlage` und `app-menu` ### Änderungen gegenüber der Bedienoberfläche des file-cms - kein Bootstrap mehr - kein jQuery mehr (allerdings benötigt Fancybox jQuery -> evtl. in separate .html-Datei auslagern) - kein FontAwesome mehr, die wenigen benötigtgten Piktogramme sind mit Hilfe von Fontello aus FontAwesome entnommen und in das file-cms-Projekt kopiert (nur wenige KB) - noch mehr zur Bedienung über berührungsempfindliche sowie kleinere Bildschirme geeignet web/ui2/data/menu/datei.json
@@ -8,19 +8,34 @@ }, "inhalt": [ { "titel": "Neuer Ordner", "umenue": false, "funktion": "app.datei_neuer_ordner" }, { "titel": "Neuer Text", "umenue": false, "funktion": "app.datei_neuer_text" }, { "titel": "noch mehr", "umenue": true, "verweis": "untermenue-2.json" "titel": "Text bearbeiten", "umenue": false, "funktion": "app.fm_edit_as_text" }, { "titel": "Benachrichtigung 2", "titel": "Schliessen", "umenue": false, "funktion": "app.fm_menu_datei_schliessen" }, { "titel": "Nachricht 2", "umenue": false, "funktion": "app.message_2" }, { "titel": "Info-Dialog zeigen", "umenue": false, "funktion": "app.info_dialog_zeigen" } ] } web/ui2/data/tpl/dlg-ask-save.tpl
New file @@ -0,0 +1,13 @@ <div class="dlg-ask-save"> <span class="close-btn pointer-cursor">✖</span> <div class="dlg-behaelter"> <div class="dlg-info-app-titel">Änderungen speichern?</div> <form class="ask-save-form"> <!-- <input id="rollen-id" placeholder="Rolle" type="text" class="nutzer-eingabe"></br> --> <div class="form-button-footer"> <button class="button" type="button" id="cancel-btn">Schließen</button> <button class="button-primary" type="button" id="speichern-btn">Speichern</button> </div> </form> </div> </div> web/ui2/data/tpl/dlg-save-as.tpl
New file @@ -0,0 +1,14 @@ <div class="dlg-save-as"> <span class="close-btn pointer-cursor">✖</span> <div class="dlg-behaelter"> <div class="dlg-info-app-titel">Speichern unter</div> <form class="save-as-form"> <input id="datei-name-in" placeholder="Dateiname" type="text" class="dlg-eingabe"></br> <div class="form-button-footer"> <button class="button" type="button" id="cancel-btn">Abbrechen</button> <button class="button-primary" type="button" id="speichern-btn">Speichern</button> </div> </form> </div> </div> web/ui2/index.html
@@ -6,9 +6,11 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="apple-mobile-web-app-capable" content="yes" /> <link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet"> <link rel="stylesheet" href="/jslib/codemirror/lib/codemirror.css"> <link rel="stylesheet" type="text/css" href="stile.css"> </head> <body> <!-- Kopfzeile --> <div class="nord"> <div id="nav-menu"> @@ -27,34 +29,38 @@ <div class="west"> westliche Seitenleiste </div> <div class="zentrum-behaelter"> <div class="arbeitsbereich"> <!-- Einblendbereich --> <div class="dialog"></div> <!-- Codemirror Start --> <div class="code-editor-container"> <div class="codeeditor-space"> <textarea class="codeeditor" id="editspace"></textarea> <div class="editor-behaelter"> <!-- Codemirror Start --> <div class="code-editor-container"> <div class="codeeditor-space"> <textarea class="codeeditor" id="editspace"></textarea> </div> </div> <!-- Codemirror Ende --> <!-- TinyMCE Start --> <div id="mce-editor" class="pl-3 pr-3"> <textarea class="text-editor" id="text-editspace"></textarea> </div> <!-- TinyMCE Ende --> </div> </div> <!-- Codemirror Ende --> <!-- TinyMCE Start --> <div id="mce-editor" class="pl-3 pr-3"> <textarea class="text-editor" id="text-editspace"></textarea> </div> <!-- TinyMCE Ende --> <!-- Breadcrumb --> <div class="breadcrumb"> <a class="bc-link">Ordner 1</a> / <a class="bc-link">Ordner 2</a> </div> <!-- zentraler Inhaltsbereich --> <div class="zentrum"> <div class="zentraler-inhalt"> <div class="zentrum-liste" id="dateien"> <figure> <i class="icon-folder"> </i> <figcaption class="i-name">icon-folder</figcaption> </figure> <div class="zentrum-behaelter"> <!-- Breadcrumb --> <div class="breadcrumb"> <a class="bc-link">Ordner 1</a> / <a class="bc-link">Ordner 2</a> </div> <!-- zentraler Inhaltsbereich --> <div class="zentrum"> <div class="zentraler-inhalt"> <div class="zentrum-liste" id="dateien"> <figure> <i class="icon-folder"> </i> <figcaption class="i-name">icon-folder</figcaption> </figure> </div> </div> </div> </div> web/ui2/js/app.js
@@ -7,6 +7,8 @@ this.pfad = ''; this.loc; this.modus = 'kacheln'; this.cm; this.tinymce; this.PERS_DIR = "Persoenlich"; this.PUB_DIR = "Oeffentlich"; this.DAV_DIR = "Austausch"; @@ -18,7 +20,12 @@ this.cache = {}; // mustache template cache this.datei_neuer_text = function () { self.meldung_mit_timeout("Neuer Text", 1500); //self.meldung_mit_timeout("Neuer Text", 1500); self.fm_text_edit('Neue Datei'); }; this.datei_neuer_ordner = function() { }; /* Funktionen aus App-Vorlage */ @@ -53,6 +60,8 @@ } else { self.fm_get_list(''); } self.seitenleiste_umschalten(); //fm_init_uploader(); self.loc = window.location.protocol + '//' + window.location.host; @@ -84,7 +93,7 @@ ostDiv.classList.add('ost-open'); ostDiv.style.flexBasis = '6em'; } self.menue_umschalten(); //self.menue_umschalten(); }; this.fusszeile_umschalten = function () { @@ -113,6 +122,79 @@ }, 500); }, timeout); }; this.fm_menu_datei_schliessen = function() { if(self.openEditor === 'text') { if(!self.cm.getDoc().isClean()) { self.fm_ask_for_save(); } else { self.fm_do_close(); } } else { if(self.tinymce.activeEditor.undoManager.hasUndo()) { self.fm_ask_for_save(); } else { self.fm_do_close(); } } }; this.fm_ask_for_save = function() { self.dialog_laden_und_zeigen('data/tpl/dlg-ask-save.tpl', '', function() { // wenn dialog da ist, hier events verknuepfen document.querySelector('#cancel-btn').addEventListener('click', function() { self.fm_do_close(); self.dialog_schliessen(); }); document.querySelector('#speichern-btn').addEventListener('click', function() { self.fm_menu_datei_speichern(function() { self.fm_do_close(); self.dialog_schliessen(); }); }); }); }; this.fm_menu_datei_speichern = function(callback) { //var fname = $('.datei-gewaehlt').text(); var fname = self.openFileName; if(fname !== undefined && fname !== '') { self.fm_save_file(fname, 'saveTextFile', callback); } else { self.fm_menu_datei_speichern_unter(callback); } }; this.fm_menu_datei_speichern_unter = function(callback) { self.dialog_laden_und_zeigen('data/tpl/dlg-save-as.tpl', '', function() { }); /* $('#modal_ok').click(function() { $('#modal_ok').attr('onclick','').unbind('click'); // hier speichern fm_save_file($('#dateiname').val(), 'saveTextFileAs', callback); }); $('#saveModalTitle').text('Datei speichern'); $('#dialogfrage').text("Dateiname?"); var fname = $('.datei-gewaehlt').text(); if(fname !== undefined) { $('#dateiname').val(fname); } else { $('#dateiname').val(''); } $('#dateiname').attr('placeholder', 'Dateiname'); $('#saveModal').modal({ keyboard: false, show: true }); */ }; /* Dialog-Funktionen */ @@ -122,23 +204,22 @@ vurl - URL zur Dialogvorlage msgTpl - URL mit einer Vorlage eines Mitteilungstextes (optional) */ this.dialog_laden_und_zeigen = function (vurl, msgTpl) { if (msgTpl !== '') { fetch(msgTpl) .then(data => { // Handle data self.dialog_zeigen(vurl, data); }).catch(error => { // Handle error this.dialog_laden_und_zeigen = function (vurl, msgTpl, cb) { var vorlage = self.cache[vurl]; if(vorlage === undefined) { self.fm_get(vurl, "text", function(antwort) { self.cache[vurl] = antwort; self.dialog_zeigen(vurl, antwort, cb); //self.vorlage_fuellen(vurl, inhalt, cb); }); } else { self.dialog_zeigen(vurl, ''); self.dialog_zeigen(vurl, vorlage, cb); } }; this.dialog_zeigen = function (vurl, inhalt) { this.dialog_zeigen = function (vurl, inhalt, cb) { var dlg = document.querySelector(".dialog"); self.vorlagen.html_erzeugen( self.html_erzeugen( vurl, inhalt, function (html) { @@ -147,6 +228,11 @@ dlg.innerHTML = html; document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen); //dlg.slideDown(300); if(typeof(cb) !== 'function') { // .. } else { cb(); } }); }; @@ -445,11 +531,16 @@ }); }; this.fm_edit_as_text = function() { self.fm_get_file_content('text'); }; this.fm_get_file_content = function(typ) { var gewaehlte = document.querySelector('.datei-gewaehlt'); //var fname = $(gewaehlte).find('.dateiname').text(); var fname = gewaehlte.textContent; //console.log('fname: ' + fname); self.openFileName = fname; var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + self.pfad + '&p=' + fname; var u = '../svc' + m; @@ -472,6 +563,39 @@ }); }; this.fm_save_file = function(saveFileName, method, callback) { var content; if(self.openEditor === 'text') { content = self.cm.getValue(); self.cm.getDoc().markClean(); } else { content = ed.getContent(); tinymce.activeEditor.undoManager.clear(); } var m = '?c=de.uhilger.filecms.api.FileMgr&m=' + method; var u = '../svc'; // + m; //var data = [self.pfad, saveFileName, content]; //var data = "p=" + self.serialisieren(self.pfad); //data += "&p=" + self.serialisieren(saveFileName); //data += "&p=" + self.serialisieren(content); var data = 'c=de.uhilger.filecms.api.FileMgr&m=' + method + '&p=' + self.pfad + '&p=' + saveFileName + 'p3=' + content; self.http_post(u, data, function(resp) { // hier scheint nichts zurueckzukommen.. }); /* self.fm_post(u, {p: self.pfad, p: saveFileName, p: content}, '', function(resp) { // hier scheint nichts zurueckzukommen.. }); */ self.openFileName = saveFileName; if(typeof (callback) !== 'function') { } else { callback(); } }; /* ---- codemirror editor handling -------- */ @@ -482,7 +606,8 @@ */ this.fm_code_edit = function(content, m) { cm = CodeMirror.fromTextArea(document.getElementById("editspace"), { //console.log('fm_code_edit content: ' + content.substring(0,30)); self.cm = CodeMirror.fromTextArea(document.getElementById("editspace"), { lineNumbers: true, lineWrapping: true, gutters: ["CodeMirror-linenumbers", "breakpoints"], @@ -514,9 +639,9 @@ }); //cm.setValue(htmlDecode(content)); //cm.setValue(content); cm.setValue(unescapeHtml(content)); cm.getDoc().markClean(); cm.on("gutterClick", function(theEditor, lineNumber) { self.cm.setValue(self.unescapeHtml(content)); self.cm.getDoc().markClean(); self.cm.on("gutterClick", function(theEditor, lineNumber) { var info = theEditor.lineInfo(lineNumber); //--lineNumber; //console.log(info.gutterMarkers.breakpoints.message); @@ -547,11 +672,9 @@ /* -------- Editoren --------- */ this.fm_text_edit = function(content, mode) { //fm_filectls_hide(); //$('.codeeditor-space').show(); //$('.code-editor-container').show(); document.querySelector(".codeeditor-space").style.display = "block"; document.querySelector(".code-editor-container").style.display = "block"; document.querySelector(".zentrum-behaelter").style.display = "none"; self.fm_code_edit(content, mode); self.openEditor = 'text'; }; @@ -570,20 +693,18 @@ } }, 200); }; /* function fm_filectls_hide() { $('#zentrum_bc').hide(); $('#dateien').hide(); $('#editMenu').addClass('disabled'); } function fm_filectls_show() { $('#zentrum_bc').show(); $('#dateien').show(); $('#editMenu').removeClass('disabled'); } */ this.fm_do_close = function() { document.querySelector(".codeeditor-space").style.display = "none"; document.querySelector(".code-editor-container").style.display = "none"; document.querySelector(".zentrum-behaelter").style.display = "block"; if(self.cm !== undefined) { self.cm.toTextArea(); } self.openFileName = ''; self.openEditor = ''; self.fm_get_list(self.pfad); }; /* -------- An- und Abmelden ------------- */ @@ -622,6 +743,30 @@ el.parentNode.replaceChild(elClone, el); }; // https://stackoverflow.com/questions/19469881/remove-all-event-listeners-of-specific-type this.escapeHtml = function(text) { text = text.replace(/\u228/g,'ä'); text = text.replace(/\u246/g,'ö'); text = text.replace(/\u252/g,'ü'); text = text.replace(/\u196/g,'Ä'); text = text.replace(/\u214/g,'Ö'); text = text.replace(/\u220/g,'Ü'); text = text.replace(/\u223/g,'ß'); text = text.replace(/\u26/g,'&'); return text; }; this.unescapeHtml = function(text) { text = text.replace(/ä/g, String.fromCharCode(228)); text = text.replace(/ö/g, String.fromCharCode(246)); text = text.replace(/ü/g, String.fromCharCode(252)); text = text.replace(/Ä/g, String.fromCharCode(196)); text = text.replace(/Ö/g, String.fromCharCode(214)); text = text.replace(/Ü/g, String.fromCharCode(220)); text = text.replace(/ß/g, String.fromCharCode(223)); text = text.replace(/&/g, String.fromCharCode(26)); return text; }; /* ---- Vorlagen ---- */ this.html_erzeugen = function(vurl, inhalt, cb) { @@ -657,5 +802,62 @@ xmlhttp.open("GET", url, true); xmlhttp.send(); }; self.fm_post = function(u, d, dtype, scallback) { var xmlhttp = new XMLHttpRequest(); var url = u; xmlhttp.onreadystatechange = function() { if (this.readyState == 4 && this.status == 200) { scallback(this.responseText); } }; xmlhttp.open("POST", url, true); xmlhttp.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); //xmlhttp.send(d); xmlhttp.send(self.serialisieren(d)); /* $.ajax({ url: u, data: d, type: "POST", dataType: dtype, success: scallback, error: function (xhr, status, errorThrown) { $('#fehler').html("Error: " + errorThrown + " Status: " + status); }, complete: function (xhr, status) { //alert( "The request is complete!" ); } }); */ }; this.http_get = function(u, cb) { self.http_call('GET', u, null, cb); }; this.http_post = function(u, data, cb) { self.http_call('POST', u, data, cb); }; this.http_call = function (method, u, data, scallback) { var xhr = new XMLHttpRequest(); var url = u; xhr.onreadystatechange = function() { if (this.readyState === 4 && this.status === 200) { scallback(this.responseText); } }; xhr.open(method, url); if(method === 'GET') { xhr.send(); } else if(method === 'POST' || method === 'PUT') { xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); xhr.send(data); } }; } web/ui2/stile.css
@@ -5,6 +5,37 @@ /* Stile Code-Editor */ .code-editor-container { height: 100%; } .codeeditor { height: 100%; } .codeeditor-space { width: 100%; height: 100%; border: 1px solid lightgrey; } .CodeMirror { height: 100%; } /* Stile MCE-Editor */ .mce-editor { width: 100%; height: 100%; } .text-editor { width: 100%; height: 100%; } @@ -59,6 +90,11 @@ transition: all 0.3s ease-in; background-color: antiquewhite; overflow: hidden; } .arbeitsbereich { display: flex; flex-flow: column; width: 100%; } .zentrum-behaelter { display: flex; @@ -334,4 +370,128 @@ .icon-folder-empty:before { content: '\f114'; } /* '' */ .icon-folder-open-empty:before { content: '\f115'; } /* '' */ .icon-doc-inv:before { content: '\f15b'; } /* '' */ .icon-doc-text-inv:before { content: '\f15c'; } /* '' */ .icon-doc-text-inv:before { content: '\f15c'; } /* '' */ /* von Skeleton */ /* Buttons –––––––––––––––––––––––––––––––––––––––––––––––––– */ .button, button, input[type="submit"], input[type="reset"], input[type="button"] { display: inline-block; height: 38px; padding: 0 30px; color: #555; text-align: center; font-size: 11px; font-weight: 600; line-height: 38px; letter-spacing: .1rem; text-transform: uppercase; text-decoration: none; white-space: nowrap; background-color: transparent; border-radius: 4px; border: 1px solid #bbb; cursor: pointer; box-sizing: border-box; } .button:hover, button:hover, input[type="submit"]:hover, input[type="reset"]:hover, input[type="button"]:hover, .button:focus, button:focus, input[type="submit"]:focus, input[type="reset"]:focus, input[type="button"]:focus { color: #333; border-color: #888; outline: 0; } .button.button-primary, button.button-primary, input[type="submit"].button-primary, input[type="reset"].button-primary, input[type="button"].button-primary { color: #FFF; background-color: #33C3F0; border-color: #33C3F0; } .button.button-primary:hover, button.button-primary:hover, input[type="submit"].button-primary:hover, input[type="reset"].button-primary:hover, input[type="button"].button-primary:hover, .button.button-primary:focus, button.button-primary:focus, input[type="submit"].button-primary:focus, input[type="reset"].button-primary:focus, input[type="button"].button-primary:focus { color: #FFF; background-color: #1EAEDB; border-color: #1EAEDB; } /* Forms –––––––––––––––––––––––––––––––––––––––––––––––––– */ input[type="email"], input[type="number"], input[type="search"], input[type="text"], input[type="tel"], input[type="url"], input[type="password"], textarea, select { height: 38px; padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */ background-color: #fff; border: 1px solid #D1D1D1; border-radius: 4px; box-shadow: none; box-sizing: border-box; } /* Removes awkward default styles on some inputs for iOS */ input[type="email"], input[type="number"], input[type="search"], input[type="text"], input[type="tel"], input[type="url"], input[type="password"], textarea { -webkit-appearance: none; -moz-appearance: none; appearance: none; } textarea { min-height: 65px; padding-top: 6px; padding-bottom: 6px; } input[type="email"]:focus, input[type="number"]:focus, input[type="search"]:focus, input[type="text"]:focus, input[type="tel"]:focus, input[type="url"]:focus, input[type="password"]:focus, textarea:focus, select:focus { border: 1px solid #33C3F0; outline: 0; } label, legend { display: block; margin-bottom: .5rem; font-weight: 600; } fieldset { padding: 0; border-width: 0; } input[type="checkbox"], input[type="radio"] { display: inline; } label > .label-body { display: inline-block; margin-left: .5rem; font-weight: normal; }