From 0c223514d28b4b073eeb2303b8a251f3b634da33 Mon Sep 17 00:00:00 2001 From: Tom Mortensen Date: Sat, 13 May 2017 12:19:36 -0700 Subject: [PATCH] Registration page refinements --- plugins/dynamix/Registration.page | 446 +++++++++++------- plugins/dynamix/include/DefaultPageLayout.php | 12 +- 2 files changed, 275 insertions(+), 183 deletions(-) diff --git a/plugins/dynamix/Registration.page b/plugins/dynamix/Registration.page index adcba82f8..360cd4de2 100644 --- a/plugins/dynamix/Registration.page +++ b/plugins/dynamix/Registration.page @@ -17,8 +17,8 @@ Type="xmenu" function my_time2($time) { return $time ? my_time($time) : "Anytime"; } -$device = my_word($var['deviceCount']); -$plural = $var['deviceCount']==1 ? '' : 's'; +$attached_devices="This server has {$var['deviceCount']} attached storage device".($var['deviceCount']==1 ? "" : "s")."."; +$contact_support="Contact Support"; ?> - -Error accessing your physical USB Flash boot device - -Flash GUID: -: Contact Support - - - - - -Blacklisted USB Flash GUID - -Flash GUID: -: - -  -: Contact Support - -
-Your USB Flash boot device has been *blacklisted*. This can occur as a result of transfering your key to -a replacement USB Flash device.
-USB Flash devices may also be *blacklisted* when it is discovered the -GUID is not uninque (this is common with USB card readers). -
- - - - -
- - - -The registered GUID does not match the USB Flash boot device GUID - -Flash GUID: -: - -Registered GUID: -: - -Registered to: -: - -Registered on: -: - - - -Expiration: -: - -This system has attached storage device. -: - - - -Replaceable: -: - - - -This system has attached storage device. -: - - - -This system has attached storage device. -: - - - -
- - - -
- - - -Invalid Trial Installation - -Flash GUID: -: - -Registered GUID: -: - -Registered to: -: - -Registered on: -: - -Expiration: -: - -This system has attached storage device. -: - -
- - - -
- - - -Wrong or Missing Key file. - -Flash GUID: -: - -Registered GUID: -: - -This system has attached storage device. -: - -
-
- + - Thank you for trying unRAID Server OS! -
-Your server will not be usable until you purchase a registration key or install a **free** 30-day *Trial* key. -
Registration keys are bound to your USB Flash boot device GUID (serial number). Please use a high-quality device -between 512MB and 32GB in size. +Your server will not be usable until you purchase a registration key or install a **free** 30-day *Pro Trial* key. + +Registration keys are bound to your USB Flash boot device serial number (GUID). Please use a high quality name brand device +between 1GB and 32GB in size. + +Note: USB memory card readers are generally **not** supported because most do not present unique serial numbers. Important: @@ -167,61 +48,107 @@ between 512MB and 32GB in size. + Please make sure there is a [DNS server](NetworkSettings) specified.
-Flash GUID: -: +Flash Vendor: +: -This system has attached storage device. +Flash Product: +: + +Flash GUID: +: + + :
+ + + +
+ + +Thank you for trying unRAID Server OS! +
+Your *Trial* key includes all the functionality and device support of a *Pro* key. + +After your *Trial* key has reached expiration, your server **still functions normally** until the next time you Stop the array. +At that point, you many either purchase a registration key, or request a *Trial* extension. +
+ +***Trial*** key expires on: +: + +Flash Vendor: +: + +Flash Product: +: + +Flash GUID: +: + + +: + +
+ + + +
- + - Thank you for trying unRAID Server OS! -
Your *Trial* key has expired. To continue using unRAID Server OS you may purchase a registration key. Alternately, you may request a *Trial* extension key. -**Note:** most *Trial* extension requests are processed immediately but please allow up to one business day to receive your *Trial* extension key. +Most *Trial* extension requests are processed immediately but please allow up to one business day to receive your *Trial* extension key.
-Flash GUID: -: +Flash Vendor: +: -This system has attached storage device. +Flash Product: +: + +Flash GUID: +: + + :
- + + +
+Invalid Trial Installation +
+It is not possible to use a *Trial* key with an existing unRAID OS configuration. -Thank you for trying unRAID Server OS! +For more information, please . +
-***Trial*** key expires on: -:   +Flash Vendor: +: + +Flash Product: +: Flash GUID: -: +: -This system has attached storage device. -: - -
- - - - -Thank you for choosing unRAID Server OS! +Registered GUID: +: Registered to: : @@ -229,70 +156,233 @@ Registered to: Registered on: : -Replaceable: -: +Expiration: +: -
- - - -Flash GUID: -: - -This system has attached storage device. -: + +:
+ + + +Thank you for choosing unRAID Server OS! +
+To support more storage devices as your server grows, click Upgrade Key below. +
+ +Registered to: +: + +Registered on: +: + +Replaceable: +: + +
+ + + +Flash GUID: +: + + +: + +
+ + + + - Thank you for choosing unRAID Server OS! +
+To support more storage devices as your server grows, click Upgrade Key below. +
Registered to: : Registered on: -:   +: Replaceable: -: +:
- + Flash GUID: -: +: -This system has attached storage device. -: + +:
- + + Thank you for choosing unRAID Server OS! Registered to: : Registered on: -:   +: Replaceable: -: +: Flash GUID: -: +: -This system has attached storage device. -: + +: + + + + + + +
+ + +Missing Key File +
+It appears that your registration key file is corrupted or missing. The key file should be located in the +[config](Registration/Browse?dir=/boot/config) directory +on your USB Flash boot device. + +If you do not have a backup copy of your key file, . + +If this was a Trial installation, you may purchase a key. +
+ +Flash Vendor: +: + +Flash Product: +: + +Flash GUID: +: + + +: + +
+ + + + + +
+ + +The registered GUID does not match the USB Flash boot device GUID +
+The registration key file does not correspond to the USB Flash boot device. Please copy the correct key file to the [config](Registration/Browse?dir=/boot/config) directory +on your USB Flash boot device. + +If you do not have a backup copy of your key file, . +
+ + +
+If you want to replace your registration key with a new key bound to this USB Flash device, click Replace Key below. An original key may be +replaced anytime. Thereafter, a replacement key may be replaced again after one year has passed. If you require +another replacement key sooner, . + +**Note:** Replacing a registration key results in permanently *blacklisting* the previous USB Flash GUID. +
+ + +Flash Vendor: +: + +Flash Product: +: + +Flash GUID: +: + +Registered GUID: +: + +Registered to: +: + +Registered on: +: + + + +Expiration: +: + + +: -  -: +Replaceable: +: + + + + +: + + + + +: + + + +
+ + + + + +Blacklisted USB Flash GUID +
+This USB Flash boot device has been *blacklisted*. This can occur as a result of transfering your key to +a replacement USB Flash device, and you are currently booted from your old USB Flash device. + +A USB Flash device may also be *blacklisted* if there is no serial number, or if we discover the serial number +is not unique (this is common with USB card readers). + +For more information, please . +
+ +Flash Vendor: +: + +Flash Product: +: + +Flash GUID: +: + + + + + + +Error accessing your physical USB Flash boot device +
+There is a physical problem acessing your USB Flash boot device. Please . +
+ +Flash GUID: +: Error code: diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index e60aba95d..692a23915 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -43,7 +43,7 @@ Shadowbox.init({skipSetup:true}); // server uptime var uptime = ; -var expiretime = ; +var expiretime = ; var before = new Date(); // Page refresh timer @@ -79,12 +79,13 @@ function updateTime() { if (expiretime > 0) { var remainingtime = expiretime - now.getTime()/1000; if (remainingtime <= 0) { - $('#licenseexpire').html(' - Expired').addClass('warning'); + $('#licenseexpire').html(' (click here for details)'); + $('#licensetype').addClass('warning') } else { days = parseInt(remainingtime/86400); hour = parseInt(remainingtime/3600%24); mins = parseInt(remainingtime/60%60); - $('#licenseexpire').html(' - '+((days|hour|mins)?(days?plus(days,'day',true):(hour?plus(hour,'hour',true):plus(mins,'minute',true))):'less than a minute')+' remaining'); + $('#licenseexpire').html(' - '+((days|hour|mins)?(days?plus(days,'day',true):(hour?plus(hour,'hour',true):plus(mins,'minute',true))):'less than a minute')+' remaining (click here for details)'); } } setTimeout(updateTime,1000); @@ -286,7 +287,7 @@ $(document).ajaxSend(function(elm, xhr, s){