-
 }})
+
 }})
{{ _('Feature rich') }} | {{ _('Maximises PostgreSQL') }} | {{ _('Open Source') }}
{{ _('pgAdmin is an Open Source administration and management tool for the PostgreSQL database. It includes a graphical administration interface, an SQL query tool, a procedural code debugger and much more. The tool is designed to answer the needs of developers, DBAs and system administrators alike.') }}
diff --git a/web/pgadmin/misc/file_manager/static/css/file_manager.css b/web/pgadmin/misc/file_manager/static/css/file_manager.css
index 571e90e83..669bca71d 100644
--- a/web/pgadmin/misc/file_manager/static/css/file_manager.css
+++ b/web/pgadmin/misc/file_manager/static/css/file_manager.css
@@ -31,10 +31,6 @@
margin: 50px auto;
}
-.fm_file {
- font-size: xx-large !important;
-}
-
.file_manager h1 {
font-size: medium;
}
@@ -72,7 +68,6 @@ x:-o-prefocus, .file-input-container {top:16px;width:198px;}
}
div.clip {
- height: 30px;
margin: 10px auto;
overflow: hidden;
}
diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js
index 5e9eb2f08..2466b1481 100644
--- a/web/pgadmin/misc/file_manager/static/js/utility.js
+++ b/web/pgadmin/misc/file_manager/static/js/utility.js
@@ -264,7 +264,7 @@ define([
}
if ($('.fileinfo').data('view') == 'grid') {
- $('.fileinfo span[data-alt="' + oldPath + '"]').parent().next('p span').text(newName);
+ $('.fileinfo span[data-alt="' + oldPath + '"]').parent().next('div span').text(newName);
$('.fileinfo span[data-alt="' + oldPath + '"]').attr('data-alt', newPath);
} else {
$('.fileinfo td[title="' + oldPath + '"]').text(newName);
@@ -537,7 +537,7 @@ define([
} else if ((data[key]).file_type == 'drive') {
class_type = 'fa fa-hdd-o fm_drive';
} else {
- class_type = 'fa fa-file-text fm_file';
+ class_type = 'fa fa-file-text-o fm_file_grid';
}
var fm_filename = (data[key]).Filename;
@@ -617,7 +617,7 @@ define([
icon_type = 'fa fa-hdd-o';
} else {
class_type = 'tbl_file';
- icon_type = 'fa fa-file-text';
+ icon_type = 'fa fa-file-text-o';
}
result += '
';
@@ -641,7 +641,7 @@ define([
} else {
result += ''+
'
' +
- '' +
+ '' +
data_protected +
'' + fm_filename + '' +
'
' +
@@ -1582,32 +1582,32 @@ define([
folder_div =
'
' +
'
' +
- 'New_Folder
' +
+ 'New_Folder
' +
'';
path = $('.currentpath').val();
$file_element = $(folder_div);
- $('.fileinfo #contents.grid').append($file_element);
- $file_element.find('p span').toggle();
- $file_element.find('p input').toggle().val(lg.new_folder).select();
+ $('.fileinfo #contents.grid').prepend($file_element);
+ $file_element.find('div span.less_text').toggle();
+ $file_element.find('div input').toggle().val(lg.new_folder).select();
// rename folder/file on pressing enter key
$('.file_manager').on('keyup', function(e) {
if (e.keyCode == 13) {
e.stopPropagation();
- $file_element.find('p input').trigger('blur');
+ $file_element.find('div input').trigger('blur');
}
});
// rename folder/file on blur
- $file_element.find('p input').on('blur', function() {
+ $file_element.find('div input').on('blur', function() {
$('.file_manager button.create').removeAttr('disabled');
- var text_value = $file_element.find('p input').val();
+ var text_value = $file_element.find('div input').val();
path = $('.currentpath').val();
- $file_element.find('p input').toggle();
- $file_element.find('p span').toggle().html(text_value);
+ $file_element.find('div input').toggle();
+ $file_element.find('div span.less_text').toggle().html(text_value);
if (text_value === undefined) {
text_value = lg.new_folder;
}
@@ -1620,9 +1620,9 @@ define([
folder_div = $(
'
' +
'| ' +
- ''+
'' +
- '' + lg.new_folder + '' +
+ '' + lg.new_folder + '' +
+ ''+
' | '+
' | ' +
' | ' +
@@ -1630,25 +1630,25 @@ define([
);
$file_element_list = $(folder_div);
- $('.fileinfo #contents.list').prepend($file_element_list);
- $file_element_list.find('p span').toggle();
- $file_element_list.find('p input').toggle().val(lg.new_folder).select();
+ $('.fileinfo #contents.file_listing_table tbody').prepend($file_element_list);
+ $file_element_list.find('td span.less_text').toggle();
+ $file_element_list.find('td input').toggle().val(lg.new_folder).select();
// rename folder/file on pressing enter key
$('.file_manager').on('keyup', function(e) {
if (e.keyCode == 13) {
e.stopPropagation();
- $file_element_list.find('p input').trigger('blur');
+ $file_element_list.find('td input').trigger('blur');
}
});
// rename folder/file on blur
- $file_element_list.find('p input').on('blur', function() {
+ $file_element_list.find('td input').on('blur', function() {
$('.file_manager button.create').removeAttr('disabled');
- var text_value = $file_element_list.find('p input').val();
+ var text_value = $file_element_list.find('td input').val();
path = $('.currentpath').val();
- $file_element_list.find('p input').toggle();
- $file_element_list.find('p span').toggle().html(text_value);
+ $file_element_list.find('td input').toggle();
+ $file_element_list.find('td span.less_text').toggle().html(text_value);
if (text_value === undefined) {
text_value = lg.new_folder;
}
diff --git a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
index 45bcfebbf..3a77bfa10 100644
--- a/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
+++ b/web/pgadmin/misc/file_manager/static/scss/_file_manager.scss
@@ -93,13 +93,15 @@
}
}
-.fm_folder_grid {
+.fm_folder_grid, .fm_file_grid {
font-size: xx-large !important;
}
.fm_folder_list,
-.fm_folder_grid {
- color: $color-warning;
+.fm_folder_grid,
+.fm_file_grid,
+.fm_file_list {
+ color: $color-gray-darker;
}
.fm_drive {
@@ -365,4 +367,12 @@
.cap_select_file {
cursor: pointer;
+}
+
+.add-folder-icon {
+ position: relative;
+ top: -8px;
+ left: -6px;
+ font-size: 8px;
+ margin-right: -8px;
}
\ No newline at end of file
diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/index.html b/web/pgadmin/misc/file_manager/templates/file_manager/index.html
index 86cf6fd6e..f41860676 100644
--- a/web/pgadmin/misc/file_manager/templates/file_manager/index.html
+++ b/web/pgadmin/misc/file_manager/templates/file_manager/index.html
@@ -43,6 +43,7 @@