From 7f2a41a253e6d980b882c21986e350dc96664cd6 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Sat, 11 Mar 2017 17:32:35 +0000 Subject: [PATCH] Bildausgabe Miniaturansicht --- web/ui/ui.js | 834 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 723 insertions(+), 111 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 4895b59..fbceedc 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -1,73 +1,366 @@ +/* + Dateiverwaltung - File management in your browser + Copyright (C) 2017 Ulrich Hilger, http://uhilger.de + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + var cm; var pfad = ''; +var modus = 'kacheln'; +var openFileName = ''; +var ed; +var openEditor; +var userid; +var tmo; +var tmo2; +var cutCopySrcDir; +var cutCopyFiles; +var cutCopyOperation; function fm_init() { + $("#mce-editor").hide(); $('.codeeditor-space').hide(); $('.code-editor-container').hide(); + //$('.ost').attr('flex-basis', 0); $('#newTextFile').on('click', fm_menu_neue_textdatei); - $('#newFolder').on('click', fm_menu_neuer_ordner); - $('#editTextFile').on('click', fm_menu_textdatei_bearbeiten); + $('#newDoc').on('click', fm_menu_neues_dokument); + $('#newFolder').on('click', fm_get_new_folder); + $('#viewFile').on('click', fm_view_file); + $('#editTextFile').on('click', function() { + fm_get_file_content('text'); + }); + $('#editDocFile').on('click', function() { + fm_get_file_content('dok'); + }); $('#saveFile').on('click', fm_menu_datei_speichern); + $('#saveFileAs').on('click', fm_menu_datei_speichern_unter); $('#closeFile').on('click', fm_menu_datei_schliessen); + $('#renameFile').on('click', fm_menu_datei_umbenennen); + $('#m-del').on('click', fm_menu_delete); + $('#m-cut').on('click', fm_menu_cut); + $('#m-copy').on('click', fm_menu_copy); + $('#m-paste').on('click', fm_menu_paste); + $('#m-shrink').on('click', fm_menu_shrink); + $('#m-test').on('click', fm_menu_test); $('#saveModal').on('hidden.bs.modal', function (e) { $('#modal_ok').attr('onclick','').unbind('click'); }); $('#logout').click(fm_logout); fm_get_login(); fm_get_list(''); + fm_init_uploader(); +} + +function fm_resize_editor() { + window.clearTimeout(tmo); + tmo = window.setTimeout(function () { + try { + var myHeight = $('.zentrum').height() - $('.nord').height() - 4; + ed.theme.resizeTo('100%', myHeight); // sets the dimensions of the editable area + } catch (err) { + } + }, 200); +} + +function fm_get_path(uid) { + //console.log('pfad: ' + pfad); + var restdir; + if(pfad.indexOf('Oeffentlich') > -1) { + restdir = pfad.substr('Oeffentlich'.length); + } else if(pfad.indexOf('Persoenlicher Ordner') > -1) { + restdir = pfad.substr('Persoenlicher Ordner'.length); + } + if(restdir !== undefined && restdir.startsWith('/')) { + restdir = restdir.substr(1); + } + var pdir = fm_get_base(uid); + //console.log('path: ' + pdir + "/" + restdir); + if(restdir.length > 1) { + return pdir + "/" + restdir; + } else { + return pdir; + } +} + +function fm_get_base(uid) { + //console.log('pfad: ' + pfad); + var pdir; + if(pfad.indexOf('Oeffentlich') > -1) { + pdir = '/data/'; + } else if(pfad.indexOf('Persoenlicher Ordner') > -1) { + pdir = '/home/'; + } + //console.log('base: ' + pdir + uid); + return pdir + uid; +} + +function fm_dok_editor_init(uid) { + var base = fm_get_path(uid); + //console.log("calling tinymce.init with base: " + base + "/"); + + /* + * vgl. + * http://stackoverflow.com/questions/4651676/how-do-i-remove-tinymce-and-then-re-add-it + */ + //tinymce.EditorManager.execCommand('mceRemoveControl',true, 'textarea.text-editor'); + //tinymce.EditorManager.execCommand('mceAddControl',true, editor_id); + if(ed !== undefined) { + ed.destroy(); + } + tinymce.remove('textarea.text-editor'); + tinymce.EditorManager.editors = []; + + /* + * Konfiguration TinyMCE + */ + tinymce.init({ + content_css : "/file-cms/ui/mce.css", + selector: "textarea.text-editor", + statusbar: false, + menubar: false, + plugins: 'advlist charmap code image link lists media print preview save table textcolor importcss', + toolbar: 'undo redo | styleselect | image | link unlink | bullist numlist | outdent indent | code', + /* + menu: { + file: {title: 'File', items: 'savevers | exit'}, + edit: {title: 'Edit', items: 'undo redo | cut copy paste pastetext | selectall'}, + view: {title: 'View', items: 'visualaid | code | link image media | template hr'}, + }, + */ + resize: 'both', + importcss_append: true, + width: "100%", + height: '100%', + document_base_url : base + "/", + setup: function (editor) { + ed = editor; + } + }); + + $(window).on('resize', fm_resize_editor); + fm_resize_editor(); +} + +/* ----- Uploader Anfang ----------*/ + +var dateien = new Array(); + +function fm_init_uploader() { + var dropzone = document.getElementById("dateien"); + dropzone.ondragover = dropzone.ondragenter = function(event) { + event.stopPropagation(); + event.preventDefault(); + }; + + dropzone.ondrop = function(event) { + event.stopPropagation(); + event.preventDefault(); + var fileList = event.dataTransfer.files; + for (var i=0; i<fileList.length; i++) { + dateien.push(fileList[i]); + } + sendFile(dateien.pop()); + }; +} + +function sendFile(datei) { + var uri = "../api/upload"; + var xhr = new XMLHttpRequest(); + var fd = new FormData(); + xhr.open("POST", uri, true); + xhr.onreadystatechange = function() { + if (xhr.readyState == 4 && xhr.status == 200) { + fm_get_list(pfad); + if(dateien.length > 0) { + sendFile(dateien.pop()); + } + } + }; + fd.append('dateiauswahlfeld', datei); + fd.append('pfad', pfad); + xhr.send(fd); +} + +/* ----- Uploader Ende --------------- */ + +/* ------- Dateifunktionen Start ----------- */ + +function fm_menu_cut() { + //alert('fm_menu_cut'); + fm_cut_files(); +} +function fm_menu_copy() { + //alert('fm_menu_copy'); + fm_copy_files(); +} +function fm_menu_paste() { + //alert('fm_menu_paste'); + fm_paste_files(); +} +function fm_menu_delete() { + $('#confirmOk').click(function() { + fm_del_files(); + }); + $('#confirmModalTitle').text("Löschen"); + $('#confirmModalBody').text("Wirklich löschen?"); + $('#confirmModal').modal({ + keyboard: false, + show: true + }); +} + +/* + * Gewaehlte Dateien feststellen + * + * @returns {String} eine per JSON.stringify schon vorbereitete List zum + * Absenden als Parameter an den Server + */ +function fm_gewaehlte_dateien() { + var gewaehlte = $('.datei-gewaehlt'); + //console.log('anzahl: ' + gewaehlte.length); + var fnames = new Array(); + var i = 0; + while(i < gewaehlte.length) { + var str = { "java.lang.String": $(gewaehlte[i]).text()}; + fnames.push(str); + //console.log('loeschen ' + pfad + ' ' + $(gewaehlte[i]).text()); + //i += 2; + i++; + } + var liste = '{"List":' + JSON.stringify(fnames) + '}'; + // 'liste' enthaelt: + // {"List":[{"java.lang.String":"test3.txt"},{"java.lang.String":"Test1.txt"},{"java.lang.String":"Test2.txt"}]} + // und wird auf dem Server zu einer List[ArrayList<String>] bei der jede ArrayList<String> nur ein Element hat + return liste; +} +/* --------- Dateifunktionen Ende ---------- */ + +function fm_menu_test() { + var w = $('.ost').width(); + if(w == 0) { + $('.ost').width('20%'); + $('.ost').text('Hallo Welt!'); + } else { + $('.ost').empty(); + $('.ost').width(0); + } +} + +function fm_ansicht_umschalten() { + if($('#ansicht').children(0).hasClass('fa-th-list')) { + $('#ansicht').children(0).addClass('fa-th-large'); + $('#ansicht').children(0).removeClass('fa-th-list'); + modus = 'liste'; + } else { + $('#ansicht').children(0).addClass('fa-th-list'); + $('#ansicht').children(0).removeClass('fa-th-large'); + modus = 'kacheln'; + } + fm_get_list(pfad); +} + +function fm_set_modus() { + if(modus == 'kacheln') { + $('#ansicht').children(0).addClass('fa-th-list'); + $('#ansicht').children(0).removeClass('fa-th-large'); + } else { + $('#ansicht').children(0).addClass('fa-th-large'); + $('#ansicht').children(0).removeClass('fa-th-list'); + } } function fm_menu_neue_textdatei() { - $('#dateiansicht').hide(); - $('.codeeditor-space').show(); - $('.code-editor-container').show(); - fm_code_edit('Test'); + fm_text_edit('Neue Datei'); } -function fm_menu_textdatei_bearbeiten() { - /* - $('#dateiansicht').hide(); - $('.codeeditor-space').show(); - $('.code-editor-container').show(); - fm_code_edit('Test'); - */ - fm_get_file_content(); +function fm_menu_neues_dokument() { + fm_dok_edit(''); } function fm_menu_datei_schliessen() { $('.codeeditor-space').hide(); $('.code-editor-container').hide(); - cm.toTextArea(); - $('#dateiansicht').show(); -} - -function fm_dateiwahl() { - var elem = this; - //console.log('datei gewaehlt ' + $(elem).text().trim()); - if($(elem).children(0).hasClass('fa-folder')) { - var ordner = $(elem).text().trim(); - if(pfad.length > 0) { - pfad = pfad + '/' + ordner; - } else { - pfad = ordner; - } - fm_get_list(pfad); - } else if($(elem).children(0).hasClass('fa-file')) { - $('.datei-gewaehlt').removeClass('datei-gewaehlt'); - $(elem).children(0).addClass('datei-gewaehlt'); - } else { - //console.log('kein folder oder file...'); + $("#mce-editor").hide(); + if(cm !== undefined) { + cm.toTextArea(); } + openFileName = ''; + openEditor = ''; + fm_get_list(pfad); + fm_filectls_show(); } -function fm_menu_neuer_ordner() { - fm_get_new_folder(); +function fm_dateiwahl(ev) { + var elem = this; + //console.log('dateiwahl nach click, event shift: ' + ev.shiftKey + ", event ctrl: " + ev.ctrlKey); + if(modus == 'kacheln') { + // Kacheln + if($(elem).children(0).hasClass('fa-folder')) { + if(/*ev.shiftKey || */ ev.ctrlKey) { + $(elem).find('.dateiname').addClass('datei-gewaehlt'); + } else { + var ordner = $(elem).text().trim(); + if(pfad.length > 0) { + pfad = pfad + '/' + ordner; + } else { + pfad = ordner; + } + fm_get_list(pfad); + } + } else if($(elem).children(0).hasClass('datei')) { + if(/*ev.shiftKey || */ ev.ctrlKey) { + // mehrere Dateien sollen gewaehlt werden + } else { + $('.datei-gewaehlt').removeClass('datei-gewaehlt'); + } + $(elem).find('.dateiname').addClass('datei-gewaehlt'); + } else { + //console.log('kein folder oder file...'); + } + } else { + // Liste + if($(elem).find('.datei-elem').children(0).hasClass('fa-file-o')) { + // Datei + if(/*ev.shiftKey || */ ev.ctrlKey) { + // mehrere Dateien sollen gewaehlt werden + } else { + $('.table-info').removeClass('table-info'); + $('.datei-gewaehlt').removeClass('datei-gewaehlt'); + } + $(elem).addClass('table-info'); + $(elem).find('.dateiname').addClass('datei-gewaehlt'); + } else { + // Ordner + if(/*ev.shiftKey || */ ev.ctrlKey) { + $(elem).children(0).addClass('datei-gewaehlt'); + } else { + var ordner = $(elem).find('.dateiname').text(); + if(pfad.length > 0) { + pfad = pfad + '/' + ordner; + } else { + pfad = ordner; + } + fm_get_list(pfad); + } + } + } } function fm_bc_click() { var elem = this; var bcPfad = $(elem).attr('rpath'); - //console.log(relPath); if(bcPfad !== undefined) { pfad = bcPfad; fm_get_list(bcPfad); @@ -75,18 +368,51 @@ pfad = ''; fm_get_list(''); } - - - //console.log($(elem).text() + ' ' + $(elem).attr('rpath') + ' ' + $(elem).hasClass('active')); } +function fm_text_edit(content, mode) { + fm_filectls_hide(); + $('.codeeditor-space').show(); + $('.code-editor-container').show(); + fm_code_edit(content, mode); + openEditor = 'text'; +} + +function fm_dok_edit(content) { + fm_filectls_hide(); + fm_dok_editor_init(userid); + $("#mce-editor").show(); + + window.clearTimeout(tmo2); + tmo2 = window.setTimeout(function () { + try { + ed.setContent(content); + openEditor = 'dok'; + } catch (err) { + } + }, 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'); +} /* ----- API Calls ------------- */ function fm_get_login() { - var m = '?c=de.uhilger.um.pub.SessionManager&m=getSessionUser'; - var u = '../../um/pub' + m; - fm_get(u, "json", function(resp) { - $('#userMenu').text(resp.UserData.firstName); + var m = '?c=de.uhilger.filecms.pub.SessionManager&m=getSessionUser'; + var u = '../pub' + m; + fm_get(u, "text", function(resp) { + userid = resp; + $('#userMenu').text(resp); + //fm_dok_editor_init(resp); }); } @@ -96,18 +422,10 @@ var m = '?c=de.uhilger.filecms.api.FileMgr&m=newFolder&p=' + pfad + '&p=' + $('#dateiname').val(); var u = '../svc' + m; fm_get(u, "json", function(resp) { - + fm_get_list(pfad); }); - - /* - var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile'; - var u = '../svc' + m; - fm_post(u, {p1: pfad, p2: $('#dateiname').val(), p3: cm.getValue()}, function(resp) { - - }); - */ }); - $('.modal-title').text('Neuer Ordner'); + $('#saveModalTitle').text('Neuer Ordner'); $('#dialogfrage').text("Name?"); $('#dateiname').val(''); $('#dateiname').attr('placeholder', 'Ordnername'); @@ -117,27 +435,201 @@ }); } -function fm_get_file_content() { +function fm_get_file_content(typ) { + var gewaehlte = $('.datei-gewaehlt'); + //var fname = $(gewaehlte).find('.dateiname').text(); - var fname = $('.datei-gewaehlt').text(); - - //console.log(pfad + '/' + fname); - - - /* - var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPath; + var fname = $(gewaehlte[0]).text(); + openFileName = fname; + var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + pfad + '&p=' + fname; var u = '../svc' + m; - fm_get(u, "json", function(resp) { - + fm_get(u, "text", function(resp) { + if(typ == 'text') { + var mode = "text/x-java"; + if(fname.endsWith('js')) { + mode = 'javascript'; + } else if(fname.endsWith('xml')) { + mode = 'xml'; + } else if(fname.endsWith('properties')) { + mode = 'xml'; + } + fm_text_edit(resp, mode); + } else { + fm_dok_edit(resp); + } }); + +} + +function fm_view_file() { + // http://localhost:8080/file-cms/ui/# + // http://localhost:8080/file-cms/data/admin/usw. + + var userid = $('#userMenu').text(); + var gewaehlte = $('.datei-gewaehlt'); + var fname = $(gewaehlte[0]).text(); + + var path = fm_get_path(userid); + + window.open(path + '/' + fname, '_blank'); +} + +function fm_menu_datei_umbenennen() { + var gewaehlte = $('.datei-gewaehlt'); + var fname = $(gewaehlte[0]).text(); + + $('#modal_ok').click(function() { + // hier umbenennen + fm_rename_file(fname, pfad, $('#dateiname').val()) + }); + $('#saveModalTitle').text('Datei umbenennen'); + $('#dialogfrage').text("Neuer Dateiname?"); + + if(fname !== undefined) { + $('#dateiname').val(fname); + $('#dateiname').attr('placeholder', 'Dateiname'); + $('#saveModal').modal({ + keyboard: false, + show: true + }); + } +} + +function fm_rename_file(fn, p, neuerName) { + var m = '?c=de.uhilger.filecms.api.FileMgr&m=renameFile'; + m = m + '&p=' + p; + m = m + '&p=' + fn; + m = m + '&p=' + neuerName; + var u = '../svc' + m; + fm_get(u, "text", function(resp) { + fm_get_list(pfad); + }); +} + +function fm_menu_shrink() { + var gewaehlte = $('.datei-gewaehlt'); + var fname = $(gewaehlte[0]).text(); + var m = '?c=de.uhilger.filecms.api.FileMgr&m=bildVerkleinern'; + m = m + '&p=' + pfad; + m = m + '&p=' + fname; + var u = '../svc' + m; + fm_get(u, "text", function(resp) { + fm_get_list(pfad); + }); +} + +/* + * Hier merkt sich die Dateiverwalting die markierten Dateien fuer + * eine Dateioperation. Bei cut wird in der 'paste' Operation auf dem Server + * fuer die 'gemerkten' Dateien ein Move gemacht. Die Dateien werden + * vom gewaehlten Ort zum Zielort verschoben. + * + * @returns {undefined} + */ +function fm_cut_files() { + cutCopySrcDir = pfad; + cutCopyFiles = fm_gewaehlte_dateien(); + cutCopyOperation = 'cut'; +} + +/* + * Hier merkt sich die Dateiverwalting die markierten Dateien fuer + * eine Dateioperation. Bei copy wird in der 'paste' Operation auf dem Server + * fuer die 'gemerkten' Dateien eine Kopie gemacht. Die Dateien werden + * am gewaehlten Ort behalten und am Zielort wird eine Kopier der + * gewaehlten DAteien erstellt + * + * @returns {undefined} + */ +function fm_copy_files() { + cutCopySrcDir = pfad; + cutCopyFiles = fm_gewaehlte_dateien(); + cutCopyOperation = 'copy'; +} + +/* + * Hier wird fuer eine zuvor markierte Liste von Dateien, fuer die + * Cut oder Copy gewaehlt wurde, die Operations ausgefuehrt (move oder copy) + * @returns {undefined} + */ +function fm_paste_files() { + var m; + if(cutCopyOperation === 'cut') { + //m = '?c=de.uhilger.filecms.api.FileMgr&m=moveFiles'; //&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(liste); + m = '?c=de.uhilger.filecms.api.FileMgr&m=moveFiles&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(cutCopyFiles); + } else { + //m = '?c=de.uhilger.filecms.api.FileMgr&m=copyFiles'; //&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(liste); + m = '?c=de.uhilger.filecms.api.FileMgr&m=copyFiles&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(cutCopyFiles); + } + var u = '../svc' + m; + fm_get(u, "text", function(resp) { + // console.log('deleteFiles gab folgendes zurueck: ' + resp); + fm_get_list(pfad); + }); + /* + fm_post(u, {p1: encodeURIComponent(cutCopySrcDir), p2: encodeURIComponent(pfad), p3: encodeURIComponent(cutCopyFiles)},'text', function(resp) { + // resp evtl. zeigen.. + fm_get_list(pfad); + }); + */ +} + +function fm_del_files() { + var liste = fm_gewaehlte_dateien(); + var m = '?c=de.uhilger.filecms.api.FileMgr&m=deleteFiles&p=' + pfad + '&p=' + encodeURIComponent(liste); + var u = '../svc' + m; + fm_get(u, "text", function(resp) { + // console.log('deleteFiles gab folgendes zurueck: ' + resp); + fm_get_list(pfad); + }); +} + +function fm_render_list(fl) { + if(modus == 'kacheln') { + // Kachelansicht + var template = $('#tpl-kacheln').html(); + Mustache.parse(template); // optional, speeds up future uses + $('.datei-zeile').attr('onclick','').unbind('click'); + $('#dateien').empty(); + $('#dateien').html(Mustache.render(template, fl)); + $('.figure').click(fm_dateiwahl); + } else { + // Listenansicht + var template = $('#tpl-liste').html(); + Mustache.parse(template); // optional, speeds up future uses + $('.figure').attr('onclick','').unbind('click'); + $('#dateien').empty(); + $('#dateien').html(Mustache.render(template, fl)); + $('.datei-zeile').click(fm_dateiwahl); + } + /* + if(modus == 'kacheln') { + // Kachelansicht + $.get('tpl-kacheln.txt', function(template) { + $('#dateien').empty(); + $('#dateien').html(Mustache.render(template, fl)); + $('.figure').click(fm_dateiwahl); + }); + $('.datei-zeile').attr('onclick','').unbind('click'); + } else { + // Listenansicht + $.get('tpl-liste.txt', function(template) { + $('#dateien').empty(); + $('#dateien').html(Mustache.render(template, fl)); + $('.datei-zeile').click(fm_dateiwahl); + }); + $('.figure').attr('onclick','').unbind('click'); + } */ } // http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p= function fm_get_list(relPfad) { + $('#ansicht').attr('onclick','').unbind('click'); var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPfad; var u = '../svc' + m; fm_get(u, "json", function(resp) { + if(resp.List[0].FileRef !== undefined) { var files = new Array(); if(resp.List[0].FileRef instanceof Array) { @@ -148,16 +640,12 @@ files.push(new FileRef(resp.List[0].FileRef)); } var fl = new FileList(files); - var template = $('#tpl-kacheln').html(); - Mustache.parse(template); // optional, speeds up future uses - $('.figure').attr('onclick','').unbind('click'); - $('#dateien').empty(); - $('#dateien').html(Mustache.render(template, fl)); - $('.figure').click(fm_dateiwahl); + fm_render_list(fl); } else { $('#dateien').empty(); } + // Breadcrumb-Ansicht var template; $('.breadcrumb-item').attr('onclick','').unbind('click'); $('#bcnav').empty(); @@ -178,7 +666,7 @@ } } var bl = new BcrFiles(dirList); - + if(dirList.length > 0) { template = $('#tpl-bcr').html(); Mustache.parse(template); // optional, speeds up future uses @@ -201,46 +689,58 @@ pfad = ''; template = $('#tpl-bcr2').html(); Mustache.parse(template); // optional, speeds up future uses - $('#bcnav').append(Mustache.render(template, dirList[0])); + $('#bcnav').append(Mustache.render(template, dirList[0])); + $('#bcnav').append($('#tpl-bcr3').html()); } - $('.breadcrumb-item').click(fm_bc_click); - }); + $('#ansicht').click(fm_ansicht_umschalten); + fm_set_modus(); + }); } function fm_menu_datei_speichern() { - + //var fname = $('.datei-gewaehlt').text(); + var fname = openFileName; + if(fname !== undefined && fname !== '') { + fm_save_file(fname, 'saveTextFile'); + } else { + fm_menu_datei_speichern_unter(); + } +} + +function fm_save_file(saveFileName, method) { + var content; + if(openEditor === 'text') { + content = cm.getValue(); + } else { + content = ed.getContent(); + } + var m = '?c=de.uhilger.filecms.api.FileMgr&m=' + method; + var u = '../svc' + m; + fm_post(u, {p1: pfad, p2: saveFileName, p3: content}, function(resp) { + openFileName = saveFileName; + }); +} + +function fm_menu_datei_speichern_unter() { $('#modal_ok').click(function() { // hier speichern - var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile'; - var u = '../svc' + m; - fm_post(u, {p1: pfad, p2: $('#dateiname').val(), p3: cm.getValue()}, function(resp) { - - }); + fm_save_file($('#dateiname').val(), 'saveTextFileAs'); }); - $('.modal-title').text('Datei speichern'); + $('#saveModalTitle').text('Datei speichern'); $('#dialogfrage').text("Dateiname?"); - $('#dateiname').val(''); + + var fname = $('.datei-gewaehlt').text(); + if(fname !== undefined) { + $('#dateiname').val(fname); + } else { + $('#dateiname').val(''); + } $('#dateiname').attr('placeholder', 'Dateiname'); $('#saveModal').modal({ keyboard: false, show: true }); - - - // FileRef saveTextFile(String relPath, String fileName, String contents) - - - /* - var t = new Template(-2, $('#filename').val(), self.cm.getValue(), 3); - var u = '../api/tr/?c=de.uhilger.webbox.api.ContentApi&m=newTemplate'; - self.post(u, {p: self.serialise(t)}, function (resp) { - self.isnew = false; - self.editid = resp.Template.id; - $('#contlist').append(self.buildContListItem(3, resp.Template.name, resp.Template.id)); - $('#templateeditor').addClass('hidden'); - }); - */ } function fm_logout() { @@ -256,14 +756,14 @@ /* ---- codemirror editor handling -------- */ -function fm_code_edit(content) { - //var windowHeight = $(window).height(); - //$("editspace").empty(); - //self.cm.toTextArea(); +function htmlDecode(value){ + return $('<div/>').html(value).text(); +} +function fm_code_edit(content, m) { cm = CodeMirror.fromTextArea(document.getElementById("editspace"), { lineNumbers: true, - mode: "xml", + mode: m, viewportMargin : Infinity, extraKeys: { "F9": function(cm) { @@ -274,7 +774,9 @@ } } }); - cm.setValue(content); + //cm.setValue(htmlDecode(content)); + //cm.setValue(content); + cm.setValue(unescapeHtml(content)); } @@ -297,12 +799,12 @@ }); } -function fm_post(u, d, scallback) { +function fm_post(u, d, dtype, scallback) { $.ajax({ url: u, data: d, type: "POST", - dataType: "json", + dataType: dtype, success: scallback, error: function (xhr, status, errorThrown) { $('#fehler').html("Error: " + errorThrown + " Status: " + status); @@ -317,6 +819,31 @@ return '{"' + obj.constructor.name + '":' + JSON.stringify(obj) + '}'; } +function escapeHtml(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; +} + +function unescapeHtml(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; +} + + /* ----- Objekte ----- */ function FileList(fl) { @@ -326,22 +853,106 @@ function FileRef(obj) { var self = this; this.fr = obj; + this.fnx; this.typeClass = function() { - if(self.fr.isDirectory) { - return 'fa-folder'; + if(modus == 'kacheln') { + if(self.fr.isDirectory) { + return 'fa-folder ordner'; + } else { + return 'fa-file datei'; + } } else { - return 'fa-file'; + if(self.fr.isDirectory) { + return 'fa-folder ordner'; + } else { + return 'fa-file-o datei'; + } } }; - this.fileName = function() { + this.mini = function() { + var miniatur = false; var namen = self.fr.absolutePath.split('/'); if(namen.length > 0) { - return namen[namen.length - 1]; + self.fnx = decodeURIComponent(namen[namen.length - 1]); } else { - return self.fr.absolutePath; + self.fnx = decodeURIComponent(self.fr.absolutePath); } + if(self.fnx.indexOf('.jpg') > -1 || self.fnx.indexOf('.png') > -1 || self.fnx.indexOf('.gif') > -1 || self.fnx.indexOf('.jpeg') > -1) { + miniatur = true; + } + return miniatur; + }; + + this.miniurl = function() { + var userid = $('#userMenu').text(); + var ext = ''; + var dotpos = self.fnx.indexOf('.'); + if(dotpos > -1) { + var fny = self.fnx; + self.fnx = self.fnx.substring(0, dotpos); + ext = fny.substr(dotpos); + } + var path = fm_get_path(userid); + var imgurl = 'http://localhost:8079' + path + '/' + self.fnx + '_tn' + ext; + return imgurl; + + }; + + /* + this.kachel = function() { + var htm; + var fnx; // = self.fileName; + var namen = self.fr.absolutePath.split('/'); + if(namen.length > 0) { + fnx = decodeURIComponent(namen[namen.length - 1]); + } else { + fnx = decodeURIComponent(self.fr.absolutePath); + } + + + if(fnx.indexOf('.jpg') > -1 || fnx.indexOf('.png') > -1 || fnx.indexOf('.gif') > -1 || fnx.indexOf('.jpeg') > -1) { + var userid = $('#userMenu').text(); + var ext = ''; + var dotpos = fnx.indexOf('.'); + if(dotpos > -1) { + fnx = fnx.substring(0, dotpos); + ext = fnx.substr(dotpos); + } + var path = fm_get_path(userid); + var imgurl = path + '/' + fnx + '_tn' + ext; + htm = "img src='" + imgurl + "'"; + } else { + var cl; + if(modus == 'kacheln') { + if(self.fr.isDirectory) { + cl = 'fa-folder ordner'; + } else { + cl = 'fa-file datei'; + } + } else { + if(self.fr.isDirectory) { + cl = 'fa-folder ordner'; + } else { + cl = 'fa-file-o datei'; + } + } + htm = "i class='fa " + cl + " fa-3x'></i"; + } + return htm; + }; + */ + + this.fileName = function() { + + var namen = self.fr.absolutePath.split('/'); + if(namen.length > 0) { + return decodeURIComponent(namen[namen.length - 1]); + } else { + return decodeURIComponent(self.fr.absolutePath); + } + }; } @@ -353,3 +964,4 @@ this.relPath = rp; this.fName = n; } + -- Gitblit v1.9.3