pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix webpacking of loading icon.

REL-1_X
Surinder Kumar 2017-07-20 13:38:16 +01:00 committed by Dave Page
parent 54882e061c
commit ae3acbdbbc
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/pgadmin/misc/file_manager/templates/file_manager/index.html
View File

@ -31,9 +31,9 @@
</div>
</div>
<div class="fileinfo">
<span class="activity">
<img src="{{ url_for('browser.static', filename='vendor/aciTree/image/load-root.gif') }}">
</span>
<span class="activity">
<img src="{{ url_for('static', filename='js/generated/img/load-root.gif') }}">
</span>
<div class="file_listing"></div>
<div class="upload_file dropzone"></div>
<div class="allowed_file_types"></div>
@ -52,7 +52,6 @@
<button type='button' class='btn btn_no'>NO</button>
</span>
</div>
</div>
<script>
require(['sources/generated/file_utils'], function() {

8
web/pgadmin/misc/file_manager/templates/file_manager/js/utility.js
View File

@ -8,6 +8,7 @@
* @author Simon Georget <simon (at) linea21 (dot) com>
* @copyright Authors
*/
import loading_icon from 'acitree/image/load-root.gif';
define(['jquery', 'underscore', 'underscore.string',
'sources/alerts/alertify_wrapper', 'sources/gettext',
@ -505,11 +506,14 @@ var getFolderInfo = function(path, file_type) {
} else {
$(".allowed_file_types .change_file_types").show();
}
var img_url = url_for('browser.static') + 'vendor/aciTree/image/load-root.gif';
var loading_icon_url = url_for(
'static', {'filename': 'js/generated/' + loading_icon }
);
// Display an activity indicator.
$('.fileinfo').find('span.activity').html(
"<img src='" + img_url + ">"
'<img src="' + loading_icon_url + '"/>'
);
var post_data = {