commit 13112323bfdc8b682062508a517038c2e8bcfc78
parent ecc9a1bb13e7caf48e42015ba94f31f3e9696d7a
Author: Felicitus <felicitus@felicitus.org>
Date: Sat, 7 Nov 2015 21:30:35 +0100
Added note about cronjobs, removed cancel button (it's not necessary), open PartKeepr as soon as submit is clicked
Diffstat:
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/web/setup/js/SetupWizard.js b/web/setup/js/SetupWizard.js
@@ -33,7 +33,7 @@ Ext.define('PartKeeprSetup.SetupWizard', {
/**
* The width and height of the window, in pixels
*/
- width: 800,
+ width: 900,
height: 500,
/**
@@ -42,6 +42,11 @@ Ext.define('PartKeeprSetup.SetupWizard', {
initComponent: function ()
{
this.items = this.setupCards();
+ this.on("submit", function () {
+ var target = window.location.href.replace(/setup\/index.html/g, "");
+ window.location.href = target;
+
+ });
this.callParent();
},
/**
@@ -84,8 +89,12 @@ Ext.define('PartKeeprSetup.SetupWizard', {
border: false,
bodyStyle: 'background: none;',
html: "<b>PartKeepr is now set-up.</b><br/><br/>" +
- "If possible, set your web server's document root to the <b>web/</b> directory.<br/><br/>" +
- "To open PartKeepr, open the <b>web</b> directory using your browser.<br/><br/>"
+ "Please remember to setup a cronjob:<br/>"+
+ '<code style="background-color: white; border: 1px solid black;">' +
+ "0 0,6,12,18 * * * /usr/bin/php <path-to-partkeepr>/app/console partkeepr:cron:run" +
+ "</code><br/>The cronjob should run at least every 12 hours.<br/><br/>" +
+ "If possible, set your web server's document root to the <b>web/</b> directory.<br/><br/>" +
+ "PartKeepr will be opened when you click the submit button.<br/><br/>"
}));
return cards;
diff --git a/web/setup/js/wizard/BreadCrumbWizard.js b/web/setup/js/wizard/BreadCrumbWizard.js
@@ -105,12 +105,6 @@ Ext.define('Ext.ux.BreadCrumbWizard', {
itemId: 'nextBtn',
handler: me.onNext,
scope: me
- },
- {
- text: 'Cancel',
- itemId: 'cancelBtn',
- handler: me.onClose,
- scope: me
}
]
}