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 | 200 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 178 insertions(+), 22 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index a5e4de9..fbceedc 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -24,6 +24,7 @@
var openEditor;
var userid;
var tmo;
+var tmo2;
var cutCopySrcDir;
var cutCopyFiles;
var cutCopyOperation;
@@ -46,10 +47,12 @@
$('#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');
@@ -123,11 +126,11 @@
* Konfiguration TinyMCE
*/
tinymce.init({
- content_css : "mce.css",
+ 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',
+ 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: {
@@ -137,6 +140,7 @@
},
*/
resize: 'both',
+ importcss_append: true,
width: "100%",
height: '100%',
document_base_url : base + "/",
@@ -315,7 +319,7 @@
}
fm_get_list(pfad);
}
- } else if($(elem).children(0).hasClass('fa-file')) {
+ } else if($(elem).children(0).hasClass('datei')) {
if(/*ev.shiftKey || */ ev.ctrlKey) {
// mehrere Dateien sollen gewaehlt werden
} else {
@@ -378,18 +382,27 @@
fm_filectls_hide();
fm_dok_editor_init(userid);
$("#mce-editor").show();
- ed.setContent(content);
- openEditor = 'dok';
+
+ 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 ------------- */
@@ -459,6 +472,50 @@
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);
+ });
}
/*
@@ -645,38 +702,30 @@
//var fname = $('.datei-gewaehlt').text();
var fname = openFileName;
if(fname !== undefined && fname !== '') {
- fm_save_file(fname);
+ fm_save_file(fname, 'saveTextFile');
} else {
fm_menu_datei_speichern_unter();
}
}
-function fm_save_file(saveFileName) {
+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=saveTextFile';
+ 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() {
-
+function fm_menu_datei_speichern_unter() {
$('#modal_ok').click(function() {
// hier speichern
- fm_save_file($('#dateiname').val());
- /*
- 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');
});
$('#saveModalTitle').text('Datei speichern');
$('#dialogfrage').text("Dateiname?");
@@ -707,6 +756,10 @@
/* ---- codemirror editor handling -------- */
+function htmlDecode(value){
+ return $('<div/>').html(value).text();
+}
+
function fm_code_edit(content, m) {
cm = CodeMirror.fromTextArea(document.getElementById("editspace"), {
lineNumbers: true,
@@ -721,7 +774,9 @@
}
}
});
- cm.setValue(content);
+ //cm.setValue(htmlDecode(content));
+ //cm.setValue(content);
+ cm.setValue(unescapeHtml(content));
}
@@ -764,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) {
@@ -773,6 +853,7 @@
function FileRef(obj) {
var self = this;
this.fr = obj;
+ this.fnx;
this.typeClass = function() {
if(modus == 'kacheln') {
@@ -790,13 +871,88 @@
}
};
- 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);
+ }
+
};
}
--
Gitblit v1.9.3