From 28b4d2d281f882c315e68e66c6718f72d26f4564 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Wed, 22 Feb 2017 06:31:05 +0000
Subject: [PATCH] Raender angepasst

---
 web/ui/ui.js |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/web/ui/ui.js b/web/ui/ui.js
index 6f17dea..85524b4 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -1,14 +1,16 @@
 var cm;
 var pfad = '';
 var modus = 'kacheln';
+var openFileName = '';
 
 function fm_init() {
   $('.codeeditor-space').hide();
   $('.code-editor-container').hide();
   $('#newTextFile').on('click', fm_menu_neue_textdatei);
-  $('#newFolder').on('click', fm_menu_neuer_ordner);
+  $('#newFolder').on('click', fm_get_new_folder);
   $('#editTextFile').on('click', fm_get_file_content);
   $('#saveFile').on('click', fm_menu_datei_speichern);
+  $('#saveFileAs').on('click', fm_menu_datei_speichern_unter);
   $('#closeFile').on('click', fm_menu_datei_schliessen);
   $('#saveModal').on('hidden.bs.modal', function (e) {
     $('#modal_ok').attr('onclick','').unbind('click');
@@ -42,7 +44,7 @@
 }
 
 function fm_menu_neue_textdatei() {
-  fm_text_edit('Test');
+  fm_text_edit('Neue Datei');
 }
 
 function fm_menu_datei_schliessen() {
@@ -51,6 +53,8 @@
   cm.toTextArea();
   $('#bcnav').show();
   $('#dateien').show();
+  openFileName = '';
+  fm_get_list(pfad);
 }
 
 function fm_dateiwahl() {
@@ -86,10 +90,6 @@
       fm_get_list(pfad);
     }   
   }
-}
-
-function fm_menu_neuer_ordner() {
-  fm_get_new_folder();
 }
 
 function fm_bc_click() {
@@ -128,7 +128,7 @@
     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);
     });
   });
   $('.modal-title').text('Neuer Ordner');
@@ -143,6 +143,7 @@
 
 function fm_get_file_content() {
   var fname = $('.datei-gewaehlt').text();
+  openFileName = fname;
   var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + pfad + '&p=' + fname;
   var u = '../svc' + m;
   fm_get(u, "text", function(resp) {
@@ -247,14 +248,35 @@
 }
 
 function fm_menu_datei_speichern() {
+  //var fname = $('.datei-gewaehlt').text();
+  var fname = openFileName;
+  if(fname !== undefined && fname !== '') {
+    fm_save_file(fname);
+  } else {
+    fm_menu_datei_speichern_unter();
+  }
+}
+
+function fm_save_file(saveFileName) {
+  var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile';
+  var u = '../svc' + m;
+  fm_post(u, {p1: pfad, p2: saveFileName, p3: cm.getValue()}, function(resp) {
+    openFileName = saveFileName;
+  });
+}
+
+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) {
 
     });
+    */
   });
   $('.modal-title').text('Datei speichern');
   $('#dialogfrage').text("Dateiname?");

--
Gitblit v1.9.3