@@ -28,9 +33,8 @@
-
-
-
+
+
+
+
+
diff --git a/public/js/filemanager.js b/public/js/filemanager.js
index 930703e..328328b 100644
--- a/public/js/filemanager.js
+++ b/public/js/filemanager.js
@@ -77,12 +77,26 @@ $('#multi_selection_toggle').click(function () {
});
*/
-
+$(document).on('click', '#lfm_add-file', function () {
+ performLfmRequest('add-file', {})
+ .done(function (data) {
+ hideNavAndShowEditor(data, function () {
+ performLfmRequest('add-dofile', {
+ working_dir: $("#working_dir").val(),
+ file_type: $("#from_file_type").val(),
+ // file_name: $("#form_file_name").val(),
+ file_content: $("#form_file_content").val(),
+ }).done(refreshFoldersAndItems);
+ });
+ });
+});
$(document).on('click', '#lfm_add-folder', function () {
dialog(lang['message-name'], '', createFolder);
});
+
+
$(document).on('click', '#lfm_upload', function () {
$('#uploadModal').modal('show');
});
@@ -177,6 +191,16 @@ function toggleActions() {
colors(item);
});
+ $('a[data-action=item_crop]').on('click', function (e) {
+ item = getOneSelectedElement($(this).parents('.file-item').data('id'));
+ crop(item);
+ });
+
+ $('a[data-action=item_resize]').on('click', function (e) {
+ item = getOneSelectedElement($(this).parents('.file-item').data('id'));
+ resize(item);
+ });
+
$('a[data-action=item_trash]').on('click', function () {
var items = [];
items.push(getOneSelectedElement($(this).parents('.file-item').data('id')));
@@ -207,9 +231,12 @@ function toggleActions() {
});
+
+
/* var one_selected = selected.length === 1;
var many_selected = selected.length >= 1;
var only_image = getSelectedItems()
+
.filter(function (item) { return !item.is_image; })
.length === 0;
var only_file = getSelectedItems()
@@ -342,10 +369,11 @@ var refreshFoldersAndItems = function (data) {
}
};
-var hideNavAndShowEditor = function (data) {
- $('#nav-buttons > ul').addClass('d-none');
- $(lfm_content).html(data).removeClass('preserve_actions_space');
- clearSelected();
+var hideNavAndShowEditor = function (data, callback = false) {
+ // $('#nav-buttons > ul').addClass('d-none');
+ //console.log(data);
+ notify(data, callback);
+
};
function loadItems() {
@@ -359,9 +387,7 @@ function loadItems() {
lfm_items = response.items;
var hasItems = lfm_items.length !== 0;
$('#lfm_empty').toggleClass('d-none', hasItems);
-
//$(lfm_content).html(''); //.removeAttr('class');
-
var toprev = $('
');
$(lfm_content).html('').append(toprev);
@@ -403,19 +429,39 @@ function loadItems() {
}
});
-
if (item.thumb_url) {
var image = $('
').addClass('file-item-img').css('background-image', 'url("' + item.thumb_url + '?timestamp=' + item.time + '")');
+ var dot = $('
').addClass('badge badge-dot badge-default indicator').css({"background-color":item.color});
} else {
var image = $('').addClass('file-item-icon fa ' + item.icon).css({"color":item.color});
+ var dot = $('
').addClass('badge badge-dot badge-default indicator').css({"background-color":item.color});
+
+
}
- if(!item.is_file){
+ if(!item.is_image){ //no image
+ template.find('.link-item-crop').remove();
+ template.find('.link-item-resize').remove();
+ }else{
+ // template.find('.link-item-color').remove();
+ }
+
+ if(!item.is_file){ //dirs
template.find('.link-item-download').remove();
}
+
template.find('.file-item-name').before(image);
template.find('.file-item-name').text(item.name);
- template.find('file-item-changed').text((new Date(item.time * 1000)).toLocaleString());
+ template.find('.file-item-name').append(dot);
+ var str = "";
+ if(item.dimension){
+ str += item.dimension + " | "
+ }
+ if(item.size){
+ str += item.size + " | "
+ }
+ str += (new Date(item.time * 1000)).toLocaleString();
+ template.find('.file-item-changed').text(str);
$(lfm_content).append(template);
});
}
@@ -489,12 +535,15 @@ function rename(item) {
}
function colors(item) {
- colorshue(lang['message-color'], item.color, function (color) {
- performLfmRequest('colorshue', {
- file: item.name,
- new_color: color
- }).done(refreshFoldersAndItems);
- });
+ performLfmRequest('colorhue', {color: item.color})
+ .done(function (data) {
+ hideNavAndShowEditor(data, function () {
+ performLfmRequest('docolorhue', {
+ file: item.name,
+ new_color: $('#notify').find('input').val(),
+ }).done(refreshFoldersAndItems);
+ });
+ });
}
function trash(items) {
@@ -557,7 +606,11 @@ function preview(item) {
if(item.icon == "fa-image" || item.icon == "fa-file-pdf"){
media.find('.media-preview').attr('src', item.url + '?timestamp=' + item.time).removeClass('d-none');
-
+ }else if(item.icon == "fab fa-youtube-square"){
+ media.find('.embed-responsive-item').attr('src', 'https://www.youtube.com/embed/' +item.content + '?rel=0');
+ media.find('.embed-responsive').removeClass('d-none');
+ media.find('.media-content').val(item.content);
+ media.find('.media-content').parent().removeClass('d-none');
}else{
var icon = $('').addClass('file-item-icon fa ' + item.icon).css('color', item.color);
media.find('.file-manager-col-view').html(icon).removeClass('d-none');
@@ -578,8 +631,6 @@ function preview(item) {
.append($('
'));
*/
-
-
notify(media);
}
@@ -800,26 +851,4 @@ function dialog(title, value, callback) {
}
});
$('#dialog').modal('show').find('.modal-title').text(title);
-}
-
-function colorshue(title, color, callback) {
- console.log(color);
- $('#minicolors-hue').minicolors('value', color);
- $('#colorhue').on('shown.bs.modal', function () {
- //$('#colorhue').find('input').focus();
- });
- $('#colorhue').find('.btn-primary').unbind('click').click(function (e) {
- callback($('#colorhue').find('input').val());
- });
- $('#colorhue').find('input').unbind('keypress.key13').bind('keypress.key13', function (e) {
- if (e.which === 13) {
- $('#colorhue').find('.btn-primary').click();
- }
- });
- $('#colorhue').modal('show').find('.modal-title').text(title);
-}
-
-$('#minicolors-hue').minicolors({
- control: 'hue',
- position: 'bottom ' + 'left',
-});
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/resources/views/iq/content/assets/index.blade.php b/resources/views/iq/content/assets/index.blade.php
index 7315f52..2ff7e4e 100755
--- a/resources/views/iq/content/assets/index.blade.php
+++ b/resources/views/iq/content/assets/index.blade.php
@@ -66,6 +66,17 @@
.messages-card {
overflow: visible;
}
+ .badge.indicator {
+ margin-left: 0.8em;
+ width: 0.8em;
+ height: 0.8em;
+ }
+ .file-manager-row-view .file-item-changed {
+ width: auto;
+ }
+ .default-style .file-manager-row-view .file-item-name {
+ width: auto;
+ }
@@ -79,10 +90,10 @@
-
+
@@ -103,7 +114,7 @@
-
+
@@ -223,6 +237,9 @@
-
+
+
+
diff --git a/storage/app/public/files/shares/root/Bilder/4.jpg b/storage/app/public/files/shares/4.jpg
similarity index 100%
rename from storage/app/public/files/shares/root/Bilder/4.jpg
rename to storage/app/public/files/shares/4.jpg
diff --git a/storage/app/public/files/shares/8.jpg b/storage/app/public/files/shares/8.jpg
new file mode 100644
index 0000000..1a3013d
Binary files /dev/null and b/storage/app/public/files/shares/8.jpg differ
diff --git a/storage/app/public/files/shares/Baustein-Q-Board-Zeus.xls b/storage/app/public/files/shares/Baustein-Q-Board-Zeus.xls
new file mode 100644
index 0000000..6c389b8
Binary files /dev/null and b/storage/app/public/files/shares/Baustein-Q-Board-Zeus.xls differ
diff --git a/storage/app/public/files/shares/VHJACKODURUmkehrdachbegruentDE.pdf b/storage/app/public/files/shares/VHJACKODURUmkehrdachbegruentDE.pdf
new file mode 100644
index 0000000..9413379
Binary files /dev/null and b/storage/app/public/files/shares/VHJACKODURUmkehrdachbegruentDE.pdf differ
diff --git a/storage/app/public/files/shares/Wir-STERN-TOURS.youtube b/storage/app/public/files/shares/Wir-STERN-TOURS.youtube
new file mode 100644
index 0000000..e6dc1da
--- /dev/null
+++ b/storage/app/public/files/shares/Wir-STERN-TOURS.youtube
@@ -0,0 +1 @@
+Rpo5py2fjrg
\ No newline at end of file
diff --git a/storage/app/public/files/shares/root/Bilder/3.jpg b/storage/app/public/files/shares/root/Bilder/3.jpg
deleted file mode 100644
index b659958..0000000
Binary files a/storage/app/public/files/shares/root/Bilder/3.jpg and /dev/null differ
diff --git a/storage/app/public/files/shares/root/Bilder/4_cropped_1574181421.jpg b/storage/app/public/files/shares/root/Bilder/4_cropped_1574181421.jpg
new file mode 100644
index 0000000..d13364b
Binary files /dev/null and b/storage/app/public/files/shares/root/Bilder/4_cropped_1574181421.jpg differ
diff --git a/storage/app/public/files/shares/root/Bilder/5_cropped_1574182410.jpg b/storage/app/public/files/shares/root/Bilder/5_cropped_1574182410.jpg
new file mode 100644
index 0000000..852dd77
Binary files /dev/null and b/storage/app/public/files/shares/root/Bilder/5_cropped_1574182410.jpg differ
diff --git a/storage/app/public/files/shares/root/Bilder/5.jpg b/storage/app/public/files/shares/root/Bilder/8.jpg
similarity index 100%
rename from storage/app/public/files/shares/root/Bilder/5.jpg
rename to storage/app/public/files/shares/root/Bilder/8.jpg
diff --git a/storage/app/public/files/shares/root/Bilder/Bilder-in/2.jpg b/storage/app/public/files/shares/root/Bilder/Bilder-in/2.jpg
deleted file mode 100644
index 4250a32..0000000
Binary files a/storage/app/public/files/shares/root/Bilder/Bilder-in/2.jpg and /dev/null differ
diff --git a/storage/app/public/files/shares/root/Bilder/Bilder-in/thumbs/2.jpg b/storage/app/public/files/shares/root/Bilder/Bilder-in/thumbs/2.jpg
deleted file mode 100644
index ee8949c..0000000
Binary files a/storage/app/public/files/shares/root/Bilder/Bilder-in/thumbs/2.jpg and /dev/null differ
diff --git a/storage/app/public/files/shares/root/Bilder/thumbs/4_cropped_1574181421.jpg b/storage/app/public/files/shares/root/Bilder/thumbs/4_cropped_1574181421.jpg
new file mode 100644
index 0000000..acc3e67
Binary files /dev/null and b/storage/app/public/files/shares/root/Bilder/thumbs/4_cropped_1574181421.jpg differ
diff --git a/storage/app/public/files/shares/root/Bilder/thumbs/5_cropped_1574182410.jpg b/storage/app/public/files/shares/root/Bilder/thumbs/5_cropped_1574182410.jpg
new file mode 100644
index 0000000..dbeff4f
Binary files /dev/null and b/storage/app/public/files/shares/root/Bilder/thumbs/5_cropped_1574182410.jpg differ
diff --git a/storage/app/public/files/shares/root/Bilder/thumbs/5.jpg b/storage/app/public/files/shares/root/Bilder/thumbs/8.jpg
similarity index 100%
rename from storage/app/public/files/shares/root/Bilder/thumbs/5.jpg
rename to storage/app/public/files/shares/root/Bilder/thumbs/8.jpg
diff --git a/storage/app/public/files/shares/root/youtube/Wir-STERN-TOURS.youtube b/storage/app/public/files/shares/root/youtube/Wir-STERN-TOURS.youtube
new file mode 100644
index 0000000..e6dc1da
--- /dev/null
+++ b/storage/app/public/files/shares/root/youtube/Wir-STERN-TOURS.youtube
@@ -0,0 +1 @@
+Rpo5py2fjrg
\ No newline at end of file
diff --git a/storage/app/public/files/shares/root/youtube/thumbs/Wir-STERN-TOURS.jpg b/storage/app/public/files/shares/root/youtube/thumbs/Wir-STERN-TOURS.jpg
new file mode 100644
index 0000000..e7a7764
Binary files /dev/null and b/storage/app/public/files/shares/root/youtube/thumbs/Wir-STERN-TOURS.jpg differ
diff --git a/storage/app/public/files/shares/root/youtube/youtube-in/Wir-STERN-TOURS.youtube b/storage/app/public/files/shares/root/youtube/youtube-in/Wir-STERN-TOURS.youtube
new file mode 100644
index 0000000..e6dc1da
--- /dev/null
+++ b/storage/app/public/files/shares/root/youtube/youtube-in/Wir-STERN-TOURS.youtube
@@ -0,0 +1 @@
+Rpo5py2fjrg
\ No newline at end of file
diff --git a/storage/app/public/files/shares/root/youtube/youtube-in/thumbs/Wir-STERN-TOURS.jpg b/storage/app/public/files/shares/root/youtube/youtube-in/thumbs/Wir-STERN-TOURS.jpg
new file mode 100644
index 0000000..e7a7764
Binary files /dev/null and b/storage/app/public/files/shares/root/youtube/youtube-in/thumbs/Wir-STERN-TOURS.jpg differ
diff --git a/storage/app/public/files/shares/root2/8.jpg b/storage/app/public/files/shares/root2/8.jpg
deleted file mode 100644
index 5f46042..0000000
Binary files a/storage/app/public/files/shares/root2/8.jpg and /dev/null differ
diff --git a/storage/app/public/files/shares/root2/thumbs/8.jpg b/storage/app/public/files/shares/root2/thumbs/8.jpg
deleted file mode 100644
index e26ea52..0000000
Binary files a/storage/app/public/files/shares/root2/thumbs/8.jpg and /dev/null differ
diff --git a/storage/app/public/files/shares/root/Bilder/thumbs/4.jpg b/storage/app/public/files/shares/thumbs/4.jpg
similarity index 100%
rename from storage/app/public/files/shares/root/Bilder/thumbs/4.jpg
rename to storage/app/public/files/shares/thumbs/4.jpg
diff --git a/storage/app/public/files/shares/thumbs/8.jpg b/storage/app/public/files/shares/thumbs/8.jpg
new file mode 100644
index 0000000..6535e8d
Binary files /dev/null and b/storage/app/public/files/shares/thumbs/8.jpg differ
diff --git a/storage/app/public/files/shares/thumbs/Wir-STERN-TOURS.jpg b/storage/app/public/files/shares/thumbs/Wir-STERN-TOURS.jpg
new file mode 100644
index 0000000..e7a7764
Binary files /dev/null and b/storage/app/public/files/shares/thumbs/Wir-STERN-TOURS.jpg differ
diff --git a/vendor.zip b/vendor.zip
new file mode 100644
index 0000000..9a14dff
Binary files /dev/null and b/vendor.zip differ