From 9350c960b07404690ed747ed7725e94313c629fb Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 20 Jan 2021 22:48:25 +0000
Subject: [PATCH] Upload und Bildbetrachtung fertig uebertragen
---
web/ui2/js/data.js | 2 +-
web/ui2/js/app.js | 16 ++++++++++++++--
web/ui2/data/menu/misc.json | 4 ++--
web/ui2/data/menu/hauptmenue.json | 12 +-----------
web/ui2/index.html | 2 ++
5 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/web/ui2/data/menu/hauptmenue.json b/web/ui2/data/menu/hauptmenue.json
index 774675e..098574f 100644
--- a/web/ui2/data/menu/hauptmenue.json
+++ b/web/ui2/data/menu/hauptmenue.json
@@ -86,17 +86,7 @@
"titel": "Sonstiges",
"umenue": true,
"verweis": "misc.json"
- },
- {
- "titel": "",
- "umenue": false,
- "funktion": ""
- },
- {
- "titel": "Über",
- "umenue": false,
- "funktion": "app.info_dialog_zeigen"
- }
+ }
]
}
}
diff --git a/web/ui2/data/menu/misc.json b/web/ui2/data/menu/misc.json
index 159aedc..80e66ca 100644
--- a/web/ui2/data/menu/misc.json
+++ b/web/ui2/data/menu/misc.json
@@ -40,12 +40,12 @@
{
"titel": "Diashow einschalten",
"umenue": false,
- "funktion": ""
+ "funktion": "app.fm_toggle_show_slideshow"
},
{
"titel": "Diashow ausschalten",
"umenue": false,
- "funktion": ""
+ "funktion": "app.fm_toggle_show_slideshow"
},
{
"titel": "",
diff --git a/web/ui2/index.html b/web/ui2/index.html
index f9c096e..ff1d6b9 100644
--- a/web/ui2/index.html
+++ b/web/ui2/index.html
@@ -6,6 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes" />
<link rel="stylesheet" href="/jslib/codemirror/lib/codemirror.css">
+ <link rel="stylesheet" type="text/css" href="/jslib/fancybox/jquery.fancybox.min.css">
+ <link rel="stylesheet" type="text/css" href="/jslib/lightbox/lightbox.css">
<link rel="stylesheet" type="text/css" href="stile.css">
</head>
<body>
diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js
index 4824974..d9e4050 100644
--- a/web/ui2/js/app.js
+++ b/web/ui2/js/app.js
@@ -23,6 +23,7 @@
this.cutCopyOperation;
this.cutCopySrcDir;
this.cutCopyFiles;
+ this.fm_slideshow = false;
this.dateien;
this.cache = {}; // mustache template cache
@@ -103,7 +104,17 @@
this.fm_hilfe = function() {
window.open('/data/dok/wbx-doku.html#wbx-bedienung', '_blank');
};
-
+
+ this.fm_toggle_show_slideshow = function() {
+ if(self.fm_slideshow) {
+ //$('#m-toggle-slideshow').text('Diashow einschalten');
+ self.fm_slideshow = false;
+ } else {
+ //$('#m-toggle-slideshow').text('Diashow ausschalten');
+ self.fm_slideshow = true;
+ }
+ };
+
this.fm_view_slideshow = function() {
// https://localhost:8443/file-cms/fotos/?o=ulrich/bilder/diashow/ordnername
@@ -347,7 +358,8 @@
var elem = ev.target;
if(self.modus == 'kacheln') {
// Kacheln
- var par = elem.parentElement;
+ //var par = elem.parentElement;
+ var par = elem.closest('.datei-figure');
var dElem = par.querySelector('.dateiname');
if(elem.classList.contains("icon-folder")) {
// Ordner
diff --git a/web/ui2/js/data.js b/web/ui2/js/data.js
index 31df16e..6652ff2 100644
--- a/web/ui2/js/data.js
+++ b/web/ui2/js/data.js
@@ -112,7 +112,7 @@
self.fext = fny.substr(dotpos);
}
}
- var path = fm_get_path(app.userid);
+ var path = app.fm_get_path(app.userid);
var imgurl = app.loc + path + '/' + self.fnx + self.fext;
return imgurl;
};
--
Gitblit v1.9.3