Commit c0bb70e4 by Dirk Benkert

added alert message while creating zip archive

connected JS Crud.js and Alert.js
parent cfd67702
......@@ -37,6 +37,10 @@ return array(
'classname' => 'Cli\Job\Cleanup',
'execute' => 'daily', // or use seconds e.g. 86400 for daily execution
),
'cleanup-zip' => array(
'classname' => 'Cli\Job\CleanupZip',
'execute' => 'daily', // or use seconds e.g. 86400 for daily execution
),
),
),
'emails' => array(
......
......@@ -33,7 +33,7 @@ final class Version
/**
* Application version identification - see compareVersion()
*/
const VERSION = '1.0.5';
const VERSION = '1.0.6';
/**
* Compare the specified Zend Framework version string $version
......
......@@ -67,7 +67,7 @@
<i class="fa fa-cloud-upload fa-2x"></i>
</a>
<?php }?>
<a class="btn btn-primary" href="<?php
<a class="btn btn-primary alertMessage" data-alertmessage="<?php echo htmlentities('{"class": "info", "message": "The download will start after the zip archive has been prepared."}'); ?>" href="<?php
echo $this->url('application/default', array(
'action' => 'zipdownload',
'controller' => 'files',
......
{
"name": "share-application",
"version": "1.0.5",
"version": "1.0.6",
"license": "Apache License, Version 2.0",
"description": "simple filesharing application",
"main": "",
......
......@@ -10229,9 +10229,6 @@ embed {
* See the License for the specific language governing permissions and
* limitations under the License.
*/
.modFile .inner {
min-height: 150px;
}
.modFile .dz-message {
border: 1px solid #cccccc;
border-radius: 4px;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -5392,6 +5392,7 @@ define('modules/Crud',['require','jquery','Module'],function(require) {
* @return void
*/
onInit: function() {
var that = this;
this.sandbox.listen('RemoteDialog.done', this, 'onRemoteDialogDone');
var remoteDialog = this.sandbox.getPlugin('RemoteDialog');
......@@ -5399,6 +5400,13 @@ define('modules/Crud',['require','jquery','Module'],function(require) {
plugin.run();
});
var alert = this.sandbox.getPlugin('Alert');
jQuery.when(alert).done(function(plugin) {
jQuery('.alertMessage').on('click', function() {
that.showMessage(plugin, this);
});
});
this.sandbox.listen('AjaxForm.onHtmlResponse', this, 'onHtmlResponse');
this.sandbox.listen('AjaxForm.onRedirect', this, 'onRedirect');
this.sandbox.listen('AjaxForm.onSuccess', this, 'onSuccess');
......@@ -5532,7 +5540,12 @@ define('modules/Crud',['require','jquery','Module'],function(require) {
params['sortColumn'] = columnName;
params['sortOrder'] = sortOrder;
this.reloadPage(params);
}
},
showMessage: function(alertPlugin, item) {
var jsonString = jQuery(item).attr('data-alertmessage');
var messageView = jQuery.parseJSON(jsonString);
alertPlugin.run(messageView, true);
},
});
return Crud;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -52,6 +52,7 @@ define(function(require) {
* @return void
*/
onInit: function() {
var that = this;
this.sandbox.listen('RemoteDialog.done', this, 'onRemoteDialogDone');
var remoteDialog = this.sandbox.getPlugin('RemoteDialog');
......@@ -59,6 +60,13 @@ define(function(require) {
plugin.run();
});
var alert = this.sandbox.getPlugin('Alert');
jQuery.when(alert).done(function(plugin) {
jQuery('.alertMessage').on('click', function() {
that.showMessage(plugin, this);
});
});
this.sandbox.listen('AjaxForm.onHtmlResponse', this, 'onHtmlResponse');
this.sandbox.listen('AjaxForm.onRedirect', this, 'onRedirect');
this.sandbox.listen('AjaxForm.onSuccess', this, 'onSuccess');
......@@ -192,7 +200,12 @@ define(function(require) {
params['sortColumn'] = columnName;
params['sortOrder'] = sortOrder;
this.reloadPage(params);
}
},
showMessage: function(alertPlugin, item) {
var jsonString = jQuery(item).attr('data-alertmessage');
var messageView = jQuery.parseJSON(jsonString);
alertPlugin.run(messageView, true);
},
});
return Crud;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment