From 3ad4db4a15b4ba59c65e2af797967941f2cb2ba2 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Tue, 21 Feb 2017 13:40:24 +0000
Subject: [PATCH] SessionManager angepasst
---
web/ui/ui.js | 129 +++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 30 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index 9ec23e2..f4dcedf 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -5,10 +5,11 @@
$('.codeeditor-space').hide();
$('.code-editor-container').hide();
$('#newTextFile').on('click', fm_menu_neue_textdatei);
- $('#editTextFile').on('click', fm_menu_textdatei_bearbeiten);
+ $('#newFolder').on('click', fm_menu_neuer_ordner);
+ $('#editTextFile').on('click', fm_get_file_content);
$('#saveFile').on('click', fm_menu_datei_speichern);
$('#closeFile').on('click', fm_menu_datei_schliessen);
- $('#myModal').on('hidden.bs.modal', function (e) {
+ $('#saveModal').on('hidden.bs.modal', function (e) {
$('#modal_ok').attr('onclick','').unbind('click');
});
$('#logout').click(fm_logout);
@@ -17,20 +18,13 @@
}
function fm_menu_neue_textdatei() {
- $('#dateiansicht').hide();
- $('.codeeditor-space').show();
- $('.code-editor-container').show();
- fm_code_edit('Test');
-}
-
-function fm_menu_textdatei_bearbeiten() {
/*
$('#dateiansicht').hide();
$('.codeeditor-space').show();
$('.code-editor-container').show();
fm_code_edit('Test');
*/
- fm_get_file_content();
+ fm_text_edit('Test');
}
function fm_menu_datei_schliessen() {
@@ -59,41 +53,103 @@
}
}
+function fm_menu_neuer_ordner() {
+ fm_get_new_folder();
+}
+
+function fm_bc_click() {
+ var elem = this;
+ var bcPfad = $(elem).attr('rpath');
+ //console.log(relPath);
+ if(bcPfad !== undefined) {
+ pfad = bcPfad;
+ fm_get_list(bcPfad);
+ } else {
+ pfad = '';
+ fm_get_list('');
+ }
+
+
+ //console.log($(elem).text() + ' ' + $(elem).attr('rpath') + ' ' + $(elem).hasClass('active'));
+}
+
+function fm_text_edit(content) {
+ $('#dateiansicht').hide();
+ $('.codeeditor-space').show();
+ $('.code-editor-container').show();
+ fm_code_edit(content);
+}
+
/* ----- 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) {
+ $('#userMenu').text(resp);
});
+}
+
+function fm_get_new_folder() {
+ $('#modal_ok').click(function() {
+ // hier speichern
+ 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) {
+
+ });
+
+ /*
+ 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');
+ $('#dialogfrage').text("Name?");
+ $('#dateiname').val('');
+ $('#dateiname').attr('placeholder', 'Ordnername');
+ $('#saveModal').modal({
+ keyboard: false,
+ show: true
+ });
}
function fm_get_file_content() {
var fname = $('.datei-gewaehlt').text();
- console.log(pfad + '/' + fname);
+ //console.log(pfad + '/' + fname);
-
- /*
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPath;
+ 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) {
+ /*
+ $('#dateiansicht').hide();
+ $('.codeeditor-space').show();
+ $('.code-editor-container').show();
+ fm_code_edit(resp);
+ */
+ fm_text_edit(resp);
});
- */
+
}
// http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p=
-function fm_get_list(relPath) {
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPath;
+function fm_get_list(relPfad) {
+ 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();
- for(var i = 0; i < resp.List[0].FileRef.length; i++) {
- files.push(new FileRef(resp.List[0].FileRef[i]));
+ if(resp.List[0].FileRef instanceof Array) {
+ for(var i = 0; i < resp.List[0].FileRef.length; i++) {
+ files.push(new FileRef(resp.List[0].FileRef[i]));
+ }
+ } else {
+ files.push(new FileRef(resp.List[0].FileRef));
}
var fl = new FileList(files);
var template = $('#tpl-kacheln').html();
@@ -107,14 +163,15 @@
}
var template;
+ $('.breadcrumb-item').attr('onclick','').unbind('click');
$('#bcnav').empty();
var dirList = new Array();
var rp = '';
- console.log("'" + relPath + "'");
- var dirs = relPath.split('/');
- console.log(dirs.length);
+ //console.log("'" + relPfad + "'");
+ var dirs = relPfad.split('/');
+ //console.log(dirs.length);
dirList.push(new BcrFile(rp, 'Home'));
- if(relPath.length > 0) {
+ if(relPfad.length > 0) {
for(var i = 0; i < dirs.length - 1; i++) {
if(rp.length > 0 ) {
dirList.push(new BcrFile(rp + '/' + dirs[i], dirs[i]));
@@ -145,10 +202,13 @@
$('#bcnav').append($('#tpl-bcr3').html());
} else {
+ pfad = '';
template = $('#tpl-bcr2').html();
Mustache.parse(template); // optional, speeds up future uses
$('#bcnav').append(Mustache.render(template, dirList[0]));
}
+
+ $('.breadcrumb-item').click(fm_bc_click);
});
}
@@ -162,6 +222,16 @@
});
});
+ $('.modal-title').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
@@ -282,7 +352,6 @@
} else {
return self.fr.absolutePath;
}
-
};
}
--
Gitblit v1.9.3