diff --git a/plugins/dynamix/Eth0.page b/plugins/dynamix/Eth0.page index 73753c782..6a48791b4 100644 --- a/plugins/dynamix/Eth0.page +++ b/plugins/dynamix/Eth0.page @@ -22,6 +22,7 @@ $template = "$docroot/webGui/EthX.page"; $ini = '/var/local/emhttp/network.ini'; $validIP4 = '((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'; $validIP6 = '((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7}'; +$width = strstr('gray,azure',$display['theme']) ? [166,305]:[131,300]; // get available ethernet ports (excluding eth0) exec("ls --indicator-style=none /sys/class/net|grep -P '^eth[1-9][0-9]*$'",$ports); @@ -268,7 +269,7 @@ function checkBondingSettings(form,ctrl,port) { $('#bond-members-'+port).hide(me); } else { $('#bond-members-'+port).show(me); - $('#bond-'+port).dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:131}); + $('#bond-'+port).dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:}); } if (ctrl==1) checkBridgingSettings(form,1,port); } @@ -279,7 +280,7 @@ function checkBridgingSettings(form,ctrl,port) { var i = 0; if (form.BRIDGING.value=='yes' && form.BONDING.value=='no') { $('#bridge-members-'+port).show(me); - $('#bridge-'+port).dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:131}); + $('#bridge-'+port).dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:}); } else { $('#bridge-members-'+port).hide(me); } @@ -339,12 +340,12 @@ $(function() { var form = document.eth0_settings; $('#tab1').bind({click:function(){ - $('#bond-eth0').dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:131}); - $('#bridge-eth0').dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:131}); + $('#bond-eth0').dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:}); + $('#bridge-eth0').dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:}); }}); - $('#bond-eth0').dropdownchecklist({emptyText:'None', width:131}); - $('#bridge-eth0').dropdownchecklist({emptyText:'None', width:131}); + $('#bond-eth0').dropdownchecklist({emptyText:'None', width:}); + $('#bridge-eth0').dropdownchecklist({emptyText:'None', width:}); checkBondingSettings(form,0,'eth0'); checkBridgingSettings(form,0,'eth0'); checkNetworkAccess(form,'eth0'); diff --git a/plugins/dynamix/EthX.page b/plugins/dynamix/EthX.page index 3158c5b83..a77a72e82 100644 --- a/plugins/dynamix/EthX.page +++ b/plugins/dynamix/EthX.page @@ -56,12 +56,12 @@ $(function() { var form = document.ethX_settings; $('#tabX').bind({click:function(){ - $('#bond-ethX').dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:131}); - $('#bridge-ethX').dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:131}); + $('#bond-ethX').dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:}); + $('#bridge-ethX').dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:}); }}); - $('#bond-ethX').dropdownchecklist({emptyText:'None', width:131}); - $('#bridge-ethX').dropdownchecklist({emptyText:'None', width:131}); + $('#bond-ethX').dropdownchecklist({emptyText:'None', width:}); + $('#bridge-ethX').dropdownchecklist({emptyText:'None', width:}); checkBondingSettings(form,0,'ethX'); checkBridgingSettings(form,0,'ethX'); checkNetworkAccess(form,'ethX'); diff --git a/plugins/dynamix/NewConfig.page b/plugins/dynamix/NewConfig.page index 7a678ba3a..b15bdd6fd 100644 --- a/plugins/dynamix/NewConfig.page +++ b/plugins/dynamix/NewConfig.page @@ -17,6 +17,7 @@ Tag="hand-paper-o" , firstItemChecksAll:true, explicitClose:'...close'}); $('#s1').dropdownchecklist('disable'); diff --git a/plugins/dynamix/NewPerms.page b/plugins/dynamix/NewPerms.page index f47de3edf..32a2aae16 100644 --- a/plugins/dynamix/NewPerms.page +++ b/plugins/dynamix/NewPerms.page @@ -15,6 +15,8 @@ Tag="hand-paper-o" */ ?> , firstItemChecksAll:true, explicitClose:'...close'}); + $('#s2').dropdownchecklist({emptyText:'None', width:, firstItemChecksAll:true, explicitClose:'...close'}); $('#s1').dropdownchecklist('disable'); $('#s2').dropdownchecklist('disable'); diff --git a/plugins/dynamix/NotificationAgents.page b/plugins/dynamix/NotificationAgents.page index 6b0ad7d8c..6fdb690c7 100644 --- a/plugins/dynamix/NotificationAgents.page +++ b/plugins/dynamix/NotificationAgents.page @@ -8,6 +8,7 @@ var enabledAgents = new Object(); var disabledAgents = new Object(); var openPage = true; + $('#tab3').bind({click:function(){initDropdown();}}); $(function(){if ($('#tab3').is(':checked')) initDropdown();}); @@ -66,7 +67,7 @@ function testService(name) { form.submit(); } function initDropdown() { - if (openPage) {$("[id^='slot_']").dropdownchecklist({width:300,explicitClose:'...close'}); openPage = false;} + if (openPage) {$("[id^='slot_']").dropdownchecklist({width:,explicitClose:'...close'}); openPage = false;} }
diff --git a/plugins/dynamix/ParityCheck.page b/plugins/dynamix/ParityCheck.page index 5444fe759..85c6edfa5 100644 --- a/plugins/dynamix/ParityCheck.page +++ b/plugins/dynamix/ParityCheck.page @@ -15,8 +15,8 @@ Cond="($disks['parity']['status']!='DISK_NP_DSBL')" * all copies or substantial portions of the Software. */ ?> - $(function() { - $("#s1").dropdownchecklist({emptyText:'Every day', width:131, explicitClose:'...close'}); - $("#s2").dropdownchecklist({emptyText:'Every month', width:131, explicitClose:'...close'}); + $("#s1").dropdownchecklist({emptyText:'Every day', width:, explicitClose:'...close'}); + $("#s2").dropdownchecklist({emptyText:'Every month', width:, explicitClose:'...close'}); }); // Simulate a single input field function prepareParity(form) { diff --git a/plugins/dynamix/SecurityAFP.page b/plugins/dynamix/SecurityAFP.page index 21c4285f4..4ca86de12 100644 --- a/plugins/dynamix/SecurityAFP.page +++ b/plugins/dynamix/SecurityAFP.page @@ -15,6 +15,9 @@ Cond="(($var['shareAFPEnabled']!='no') && (isset($name)?array_key_exists($name,$ * all copies or substantial portions of the Software. */ ?> + > This section is used to configure the security settings for the share when accessed using AFP and > appears only when AFP is enabled on the Network Services page. > @@ -242,8 +245,8 @@ function initDropdownAFP(reset) { $('#afp1').dropdownchecklist('destroy'); $('#afp2').dropdownchecklist('destroy'); } - $("#afp1").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:120, explicitClose:'...close'}); - $("#afp2").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:120, explicitClose:'...close'}); + $("#afp1").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:, explicitClose:'...close'}); + $("#afp2").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:, explicitClose:'...close'}); } function readAFP() { var form = document.afp_edit; diff --git a/plugins/dynamix/SecurityNFS.page b/plugins/dynamix/SecurityNFS.page index c314cf13a..0d3dc5d22 100644 --- a/plugins/dynamix/SecurityNFS.page +++ b/plugins/dynamix/SecurityNFS.page @@ -15,6 +15,9 @@ Cond="(($var['shareNFSEnabled']!='no') && (isset($name)?array_key_exists($name,$ * all copies or substantial portions of the Software. */ ?> + > *Read settings from* is used to preset the NFS security settings of the current selected share with the settings of an existing share. > > Select the desired share name and press **Read** to copy the NFS security settings from the selected source. @@ -101,7 +104,7 @@ function initDropdownNFS(reset) { if (reset) { $('#nfs1').dropdownchecklist('destroy'); } - $("#nfs1").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:120, explicitClose:'...close'}); + $("#nfs1").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:, explicitClose:'...close'}); } function readNFS() { var form = document.nfs_edit; diff --git a/plugins/dynamix/SecuritySMB.page b/plugins/dynamix/SecuritySMB.page index e28ed307f..b1b26880f 100644 --- a/plugins/dynamix/SecuritySMB.page +++ b/plugins/dynamix/SecuritySMB.page @@ -15,6 +15,9 @@ Cond="(($var['shareSMBEnabled']!='no') && (isset($name)?array_key_exists($name,$ * all copies or substantial portions of the Software. */ ?> + > *Read settings from* is used to preset the SMB security settings of the current selected share with the settings of an existing share. > > Select the desired share name and press **Read** to copy the SMB security settings from the selected source. @@ -215,8 +218,8 @@ function initDropdownSMB(reset) { $('#smb1').dropdownchecklist('destroy'); $('#smb2').dropdownchecklist('destroy'); } - $("#smb1").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:120, explicitClose:'...close'}); - $("#smb2").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:120, explicitClose:'...close'}); + $("#smb1").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:, explicitClose:'...close'}); + $("#smb2").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:, explicitClose:'...close'}); } function readSMB() { var form = document.smb_edit; diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page index 9ca48a9b7..070037c17 100644 --- a/plugins/dynamix/ShareEdit.page +++ b/plugins/dynamix/ShareEdit.page @@ -15,6 +15,8 @@ Tag="share-alt-square" */ ?> "", @@ -272,10 +274,10 @@ function initDropdown(remove,create) { } if (create) { - $("#s1").dropdownchecklist({emptyText:'All', width:300, explicitClose:'...close'}); - $("#s2").dropdownchecklist({emptyText:'None', width:300, explicitClose:'...close'}); + $("#s1").dropdownchecklist({emptyText:'All', width:, explicitClose:'...close'}); + $("#s2").dropdownchecklist({emptyText:'None', width:, explicitClose:'...close'}); - $("#s3").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:120, explicitClose:'...close'}); + $("#s3").dropdownchecklist({firstItemChecksAll:true, emptyText:'select...', width:, explicitClose:'...close'}); } } diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index ec5a73b95..cba478099 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -34,7 +34,7 @@ $banner = '/boot/config/plugins/dynamix/banner.png'; echo "#header.image{background-image:url("; echo file_exists($banner) ? autov($banner) : '/webGui/images/banner.png'; echo ")}\n"; -if ($display['theme']=='gray' || $display['theme']=='azure') { +if (strstr('gray,azure',$display['theme'])) { $pages = find_pages('Tasks'); foreach ($pages as $page) if ($page['Code']) echo "#nav-item a[href='/{$page['name']}']:before{content:'\\{$page['Code']}'}\n"; }