diff --git a/emhttp/plugins/dynamix.my.servers/Registration.page b/emhttp/plugins/dynamix.my.servers/Registration.page index 04bb0b400..99b030d90 100644 --- a/emhttp/plugins/dynamix.my.servers/Registration.page +++ b/emhttp/plugins/dynamix.my.servers/Registration.page @@ -4,252 +4,6 @@ Title="Registration" Icon="icon-registration" Tag="pencil" --- - - - - -_(Thank you for trying Unraid OS)_! - - - -_(Thank you for choosing Unraid OS)_! - - - - - -
-:registration_1_plug: -Your server will not be usable until you purchase a Registration key or install a free 30 day *Trial* key. A *Trial* -key provides all the functionality of a *Pro* Registration key. - -Registration keys are bound to your USB Flash boot device serial number (GUID). Please use a high quality name brand device -at least 1GB in size (min 4GB recommended). - -Note: USB memory card readers are generally **not** supported because most do not present unique serial numbers. -:end -
- - - - - -
-:registration_3_plug: -Your *Trial* key includes all the functionality and device support of a *Pro* Registration 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 may either purchase a Registration key, or request a *Trial* extension. -:end -
- - - - - -
-_(Cannot connect to key-server)_! - -_(Your *Trial* key requires an internet connection)_. _(Please check your)_ [_(Network Settings)_](NetworkSettings). -
- - - - - -
-_(Release has been withdrawn)_! - -_(This release has been withdrawn for use with *Trial* keys)_. -
- - - - - -
-_(Your *Trial* key has expired)_. - - -:registration_4_plug: -To continue using Unraid OS you may purchase a Registration key. Alternately, you may request a *Trial* extension key. -:end - -:registration_trial_extension_ineligible_plug: -You have used all your Trial extensions. To continue using Unraid OS you may purchase a Registration key. -:end - -
- - - - - -_(Invalid *Trial* Installation)_ -
-:registration_5_plug: -It is not possible to use a *Trial* key with an existing Unraid OS installation. - -You may purchase a Registration key corresponding to this USB Flash device to continue using this installation. - -For more information, please [Contact Support](https://lime-technology.com/contact). -:end -
- - - - - -_(Missing Key File)_ -
-:registration_6_plug: -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 Registration key file, [Contact Support](https://lime-technology.com/contact). - -If this was a *Trial* installation, you may purchase a Registration key. -:end -
- - - - - -_(The registered GUID does not match the USB Flash boot device GUID)_ - - - -
-:registration_7_plug: -*Trial* installations are only valid with the originally registered USB Flash device. - -To continue using this installation with this USB Flash device, you may purchase a Registration key. -:end -
- - - -
-:registration_8_plug: -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, [Contact Support](https://lime-technology.com/contact). - -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, [Contact Support](https://lime-technology.com/contact). - -**Note:** Replacing a Registration key results in permanently *blacklisting* the previous USB Flash GUID. -:end -
- - - - - - -_(Blacklisted USB Flash GUID)_ -
-:registration_9_plug: -This USB Flash boot device has been *blacklisted*. This can occur as a result of transfering your Registration 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 [Contact Support](https://lime-technology.com/contact). -:end -
- - - - - -_(***Trial*** key expires on)_: -: - - - - - -_(Expiration)_: -: - - - - - -_(Registered to)_: -: - -_(Registered on)_: -: - - - - - -_(Registered GUID)_: -: - - - - - -_(Error accessing your physical USB Flash boot device)_ -
-_(There is a physical problem accessing your USB Flash boot device)_. _(Please)_ [Contact Support](https://lime-technology.com/contact). - -_(Flash GUID)_: -: _(Error code)_: - - - -_(Flash GUID)_: -: - - - -_(Flash Vendor)_: -: - -_(Flash Product)_: -: - - - -_(Replaceable)_: -: - - - - - -
- - - -  -: + + + diff --git a/emhttp/plugins/dynamix.my.servers/data/server-state.php b/emhttp/plugins/dynamix.my.servers/data/server-state.php index 9c2afa414..4cc087f99 100644 --- a/emhttp/plugins/dynamix.my.servers/data/server-state.php +++ b/emhttp/plugins/dynamix.my.servers/data/server-state.php @@ -1,4 +1,4 @@ -getServerStateJson(); diff --git a/emhttp/plugins/dynamix.my.servers/include/myservers1.php b/emhttp/plugins/dynamix.my.servers/include/myservers1.php index 612b363ae..fce1941c6 100644 --- a/emhttp/plugins/dynamix.my.servers/include/myservers1.php +++ b/emhttp/plugins/dynamix.my.servers/include/myservers1.php @@ -16,6 +16,15 @@ margin-left: auto; height: 100%; } + +/** + * Tools page, rotate the Downgrade icon to prevent needing to add a new icon to the icon font. + * The pseudo element is targeted here otherwise the rotation of the span would mess up spacing with the text. + */ +a[href="/Tools/Downgrade"] .icon-update:before { + display: inline-block; /* required otherwise the rotation won't work */ + rotate: 180deg; +} '; } else { echo ''; -} \ No newline at end of file +} diff --git a/emhttp/plugins/dynamix.my.servers/include/myservers2.php b/emhttp/plugins/dynamix.my.servers/include/myservers2.php index b65f26524..30b80ddc9 100644 --- a/emhttp/plugins/dynamix.my.servers/include/myservers2.php +++ b/emhttp/plugins/dynamix.my.servers/include/myservers2.php @@ -1,10 +1,13 @@ - + + + + diff --git a/emhttp/plugins/dynamix.plugin.manager/Update.page b/emhttp/plugins/dynamix.plugin.manager/Update.page index c92cc9192..3618ae0bf 100644 --- a/emhttp/plugins/dynamix.plugin.manager/Update.page +++ b/emhttp/plugins/dynamix.plugin.manager/Update.page @@ -3,182 +3,39 @@ Title="Update OS" Icon="icon-update" Tag="upload" --- - - - - - - - - -
_(Component)__(Author)__(Version)__(Status)__(Branch)_
+ + + + diff --git a/emhttp/plugins/dynamix.plugin.manager/scripts/showchanges b/emhttp/plugins/dynamix.plugin.manager/scripts/showchanges index 1f0ffbb7a..f5b85fba0 100755 --- a/emhttp/plugins/dynamix.plugin.manager/scripts/showchanges +++ b/emhttp/plugins/dynamix.plugin.manager/scripts/showchanges @@ -22,7 +22,7 @@ $login_locale = _var($display,'locale'); require_once "$docroot/webGui/include/Translations.php"; $file = realpath($argv[1]??''); -$valid = ['/var/tmp/','/tmp/plugins/']; +$valid = ['/var/tmp/','/tmp/plugins/','/boot/previous']; $good = false; foreach ($valid as $check) if (strncmp($file,$check,strlen($check))===0) $good = true; diff --git a/emhttp/plugins/dynamix/InstallKey.page b/emhttp/plugins/dynamix/InstallKey.page index bffe832f0..75c9f8129 100644 --- a/emhttp/plugins/dynamix/InstallKey.page +++ b/emhttp/plugins/dynamix/InstallKey.page @@ -1,7 +1,7 @@ Menu="Registration" Title="Install Key" Tag="flag" -Cond="($var['regTy']!='Pro')" +Cond="($var['regTy']!='Pro' || $var['regTy']!='Lifetime')" --- "; ?> @@ -504,15 +501,6 @@ function removeRebootNotice(message=""); -} -function showUpgrade(text,noDismiss=false) { - if ($.cookie('os_upgrade')==null) { - if (osUpgradeWarning) removeBannerWarning(osUpgradeWarning); - osUpgradeWarning = addBannerWarning(text.replace(/(.+?)<\/a>/,"$1").replace(/(.*)<\/b>/,"$1"),false,noDismiss); - } -} function hideUpgrade(set) { removeBannerWarning(osUpgradeWarning); if (set) @@ -626,11 +614,11 @@ $.ajaxPrefilter(function(s, orig, xhr){
showNotice(" "); - - - showUpgrade(" ",true); - - showUpgrade(" ",true); - - showUpgrade("Unraid OS v . \"> "); - addBannerWarning(" . .",true,true); diff --git a/emhttp/plugins/dynamix/scripts/flash_backup b/emhttp/plugins/dynamix/scripts/flash_backup index 59a5a3183..1631f5f74 100755 --- a/emhttp/plugins/dynamix/scripts/flash_backup +++ b/emhttp/plugins/dynamix/scripts/flash_backup @@ -20,7 +20,8 @@ $out = ['prev','previous']; $server = isset($var['NAME']) ? str_replace(' ','_',strtolower($var['NAME'])) : 'tower'; $mydate = date('Ymd-Hi'); -$backup = "$server-flash-backup-$mydate.zip"; +$osVersion = @$var['version'] ?? '_unknown'; +$backup = "$server-v$osVersion-flash-backup-$mydate.zip"; $used = exec("df /boot|awk 'END{print $3}'") * 1.5; $free = exec("df /|awk 'END{print $4}'"); diff --git a/emhttp/plugins/dynamix/styles/default-black.css b/emhttp/plugins/dynamix/styles/default-black.css index 34fa87119..301696913 100644 --- a/emhttp/plugins/dynamix/styles/default-black.css +++ b/emhttp/plugins/dynamix/styles/default-black.css @@ -45,7 +45,7 @@ select.slot{min-width:44rem;max-width:44rem} input.narrow{width:166px} input.trim{width:76px;min-width:76px} textarea{resize:none} -#header{position:absolute;top:0;left:0;width:100%;min-width:1260px;height:91px;z-index:102;margin:0;color:#1c1b1b;background-color:#f2f2f2;background-size:100% 90px;background-repeat:no-repeat} +#header{position:absolute;top:0;left:0;width:100%;height:91px;z-index:102;margin:0;color:#1c1b1b;background-color:#f2f2f2;background-size:100% 90px;background-repeat:no-repeat} #header .logo{float:left;margin-left:10px;color:#e22828;text-align:center} #header .logo svg{width:160px;display:block;margin:25px 0 8px 0} #header .block{margin:0;float:right;text-align:right;background-color:rgba(242,242,242,0.2);padding:10px 12px} diff --git a/emhttp/plugins/dynamix/styles/default-white.css b/emhttp/plugins/dynamix/styles/default-white.css index e71b6b4e6..c2e152c85 100644 --- a/emhttp/plugins/dynamix/styles/default-white.css +++ b/emhttp/plugins/dynamix/styles/default-white.css @@ -45,7 +45,7 @@ select.slot{min-width:44rem;max-width:44rem} input.narrow{width:166px} input.trim{width:76px;min-width:76px} textarea{resize:none} -#header{position:absolute;top:0;left:0;width:100%;min-width:1260px;height:91px;z-index:102;margin:0;color:#f2f2f2;background-color:#1c1b1b;background-size:100% 90px;background-repeat:no-repeat} +#header{position:absolute;top:0;left:0;width:100%;height:91px;z-index:102;margin:0;color:#f2f2f2;background-color:#1c1b1b;background-size:100% 90px;background-repeat:no-repeat} #header .logo{float:left;margin-left:10px;color:#e22828;text-align:center} #header .logo svg{width:160px;display:block;margin:25px 0 8px 0} #header .block{margin:0;float:right;text-align:right;background-color:rgba(28,27,27,0.2);padding:10px 12px}