diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js index ad9e2856d7..cb30dff529 100644 --- a/src/sunstone/public/app/main.js +++ b/src/sunstone/public/app/main.js @@ -35,7 +35,10 @@ require.config({ 'jquery.cookie': '../bower_components/foundation/js/vendor/jquery.cookie', 'fastclick': '../bower_components/foundation/js/vendor/fastclick', 'modernizr': '../bower_components/foundation/js/vendor/modernizr', - 'placeholder': '../bower_components/foundation/js/vendor/placeholder' + 'placeholder': '../bower_components/foundation/js/vendor/placeholder', + + /* Resumable */ + 'resumable': '../bower_components/resumablejs/resumable' }, shim: { /* jQuery */ diff --git a/src/sunstone/public/app/tabs/datastores-tab/dialogs/create.js b/src/sunstone/public/app/tabs/datastores-tab/dialogs/create.js index 70e649ee42..233ff520ce 100644 --- a/src/sunstone/public/app/tabs/datastores-tab/dialogs/create.js +++ b/src/sunstone/public/app/tabs/datastores-tab/dialogs/create.js @@ -10,14 +10,6 @@ define(function(require) { return TemplateHTML({dialogId: DIALOG_ID}); } - var _submit = function() { - var name = $('#zonename', this).val(); - var endpoint = $("#endpoint", this).val(); - var zoneJSON = {"zone" : {"name" : name, "endpoint" : endpoint}}; - Sunstone.runAction("Zone.create", zoneJSON); - return false; - } - var _onShow = function(dialog) { $("#name", dialog).focus(); diff --git a/src/sunstone/public/app/tabs/images-tab.js b/src/sunstone/public/app/tabs/images-tab.js index 51716ec008..a4ee89bc23 100644 --- a/src/sunstone/public/app/tabs/images-tab.js +++ b/src/sunstone/public/app/tabs/images-tab.js @@ -7,9 +7,9 @@ define(function(require) { var TAB_ID = require('./images-tab/tabId'); var DATATABLE_ID = "dataTableImages"; - //var _dialogs = [ - // require('./images-tab/dialogs/create') - //]; + var _dialogs = [ + require('./images-tab/dialogs/create') + ]; var _panels = [ require('./images-tab/panels/info'), @@ -30,7 +30,7 @@ define(function(require) { actions: Actions, dataTable: new Table(DATATABLE_ID, {actions: true, info: true}), panels: _panels, - //dialogs: _dialogs + dialogs: _dialogs }; return Tab; diff --git a/src/sunstone/public/app/tabs/images-tab/dialogs/create.js b/src/sunstone/public/app/tabs/images-tab/dialogs/create.js new file mode 100644 index 0000000000..f7036c3c5b --- /dev/null +++ b/src/sunstone/public/app/tabs/images-tab/dialogs/create.js @@ -0,0 +1,297 @@ +define(function(require) { + var Resumable = require('resumable'); + var TemplateHTML = require('hbs!./create/html'); + var Sunstone = require('sunstone'); + var OpenNebulaError = require('opennebula/error'); + var Notifier = require('utils/notifier'); + var Locale = require('utils/locale'); + var Tips = require('utils/tips'); + var ResourceSelect = require('utils/resource-select') + var DIALOG_ID = require('./create/dialogId'); + + var _html = function() { + return TemplateHTML({dialogId: DIALOG_ID}); + } + + var _onShow = function(dialog) { + $("#img_name", dialog).focus(); + + var ds_id = $('#img_datastore .resource_list_select', dialog).val(); + var ds_id_raw = $('#img_datastore_raw .resource_list_select', dialog).val(); + + // Filter out DS with type system (1) or file (2) + var filter_att = ["TYPE", "TYPE"]; + var filter_val = ["1", "2"]; + + ResourceSelect.insert('div#img_datastore', dialog, "Datastore", + ds_id, false, null, filter_att, filter_val); + + ResourceSelect.insert('div#img_datastore_raw', dialog, "Datastore", + ds_id_raw, false, null, filter_att, filter_val); + + return false; + } + + var _setup = function(dialog) { + Tips.setup(dialog); + + $('.advanced', dialog).hide(); + + $('#advanced_image_create', dialog).click(function() { + $('.advanced', dialog).toggle(); + return false; + }); + + $('select#img_type', dialog).change(function() { + var value = $(this).val(); + switch (value){ + case "DATABLOCK": + $('#datablock_img', dialog).removeAttr("disabled"); + break; + default: + $('#datablock_img', dialog).attr('disabled', 'disabled'); + $('#path_image', dialog).click(); + + } + }); + + $('#img_path,#img_fstype,#img_size,#file-uploader', dialog).closest('.row').hide(); + + $("input[name='src_path']", dialog).change(function() { + var value = $(this).val(); + switch (value){ + case "path": + $('#img_fstype,#img_size,#file-uploader', dialog).closest('.row').hide(); + $('#img_path', dialog).closest('.row').show(); + break; + case "datablock": + $('#img_path,#file-uploader', dialog).closest('.row').hide(); + $('#img_fstype,#img_size', dialog).closest('.row').show(); + break; + case "upload": + $('#img_path,#img_fstype,#img_size', dialog).closest('.row').hide(); + $('#file-uploader', dialog).closest('.row').show(); + break; + }; + }); + + $('#path_image', dialog).click(); + + dialog.on('click', '#add_custom_var_image_button', function() { + var name = $('#custom_var_image_name', dialog).val(); + var value = $('#custom_var_image_value', dialog).val(); + if (!name.length || !value.length) { + Notifier.notifyError(Locale.tr("Custom attribute name and value must be filled in")); + return false; + } + option = ''; + $('select#custom_var_image_box', dialog).append(option); + return false; + }); + + dialog.on('click', '#remove_custom_var_image_button', function() { + $('select#custom_var_image_box :selected', dialog).remove(); + return false; + }); + + + var img_obj; + + if (_getInternetExplorerVersion() > -1) { + $("#upload_image").attr("disabled", "disabled"); + } else { + var uploader = new Resumable({ + target: 'upload_chunk', + chunkSize: 10 * 1024 * 1024, + maxFiles: 1, + testChunks: false, + query: { + csrftoken: ""//TODO csrftoken + } + }); + + uploader.assignBrowse($('#file-uploader-input', dialog)); + + var fileName = ''; + var file_input = false; + + uploader.on('fileAdded', function(file) { + fileName = file.fileName; + file_input = fileName; + + $('#file-uploader-input', dialog).hide() + $("#file-uploader-label", dialog).html(file.fileName); + }); + + uploader.on('uploadStart', function() { + $('#upload_progress_bars').append('