Merge pull request #4060 from PeterFeicht/fix_layout

This commit is contained in:
Renato Botelho 2019-05-30 18:13:07 -03:00
commit b6129dc4b2
44 changed files with 90 additions and 92 deletions

View File

@ -231,7 +231,7 @@ switch ($action) {
$section = new Form_Section('Information');
$group = new Form_Group('Select a drive and type:');
$group->add(new Form_Input(
$form->addGlobal(new Form_Input(
'action',
null,
'hidden',
@ -274,7 +274,7 @@ switch ($action) {
$section = new Form_Section('View Logs');
$group = new Form_Group('Select a device and log');
$group->add(new Form_Input(
$form->addGlobal(new Form_Input(
'action',
null,
'hidden',
@ -318,7 +318,7 @@ switch ($action) {
$section = new Form_Section('Perform self-tests');
$group = new Form_Group('Select a drive and test');
$group->add(new Form_Input(
$form->addGlobal(new Form_Input(
'action',
null,
'hidden',
@ -363,7 +363,7 @@ switch ($action) {
$section = new Form_Section('Abort Tests');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'action',
null,
'hidden',

View File

@ -205,7 +205,7 @@ $section->addInput(new Form_Input(
))->setHelp('A description may be entered here for administrative reference (not parsed).');
if (isset($id) && $a_npt[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -647,7 +647,7 @@ $section->addInput(new Form_Input(
))->setHelp('A description may be entered here for administrative reference (not parsed).');
if (isset($id) && $a_out[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',
@ -655,7 +655,7 @@ if (isset($id) && $a_out[$id]) {
));
}
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'after',
null,
'hidden',

View File

@ -442,7 +442,7 @@ $group->add(new Form_Button(
$section->add($group);
if (isset($id) && $a_schedules[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',
@ -618,7 +618,7 @@ if ($getSchedule) {
'fa-trash'
))->setAttribute('type','button')->addClass('btn-xs btn-warning');
$group->add(new Form_Input(
$form->addGlobal(new Form_Input(
'schedule' . $counter,
null,
'hidden',

View File

@ -426,7 +426,7 @@ $section->addInput(new Form_Input(
))->setHelp('A description may be entered here for administrative reference (not parsed).');
if (isset($id) && $a_vip[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',
@ -434,7 +434,7 @@ if (isset($id) && $a_vip[$id]) {
));
}
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'uniqid',
null,
'hidden',

View File

@ -1869,13 +1869,13 @@ if ($show_address_controls) {
'IPv4/IPv6 Configuration',
"This interface type does not support manual address configuration on this page. "
));
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'type',
null,
'hidden',
'none'
));
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'type6',
null,
'hidden',
@ -2648,7 +2648,7 @@ function build_ipv6interface_list() {
foreach ($dynv6ifs as $iface => $ifacedata) {
$list[$iface] = $ifacedata['name'];
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'ipv6-num-prefix-ids-' . $iface,
null,
'hidden',
@ -2677,7 +2677,7 @@ $section->addInput(new Form_Input(
sprintf("%x", $pconfig['track6-prefix-id'])
))->setHelp('(%1$shexadecimal%2$s from 0 to %3$s) The value in this field is the (Delegated) IPv6 prefix ID. This determines the configurable network ID based on the dynamic IPv6 connection. The default value is 0.', '<b>', '</b>', '<span id="track6-prefix-id-range"></span>');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'track6-prefix-id-max',
null,
'hidden',
@ -3005,7 +3005,7 @@ if (isset($wancfg['wireless'])) {
['off' => gettext('Off'), 'cts' => gettext('CTS to self'), 'rtscts' => gettext('RTS and CTS')]
))->setHelp('For IEEE 802.11g, use the specified technique for protecting OFDM frames in a mixed 11b/11g network.');
} else {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'protmode',
null,
'hidden',

View File

@ -625,7 +625,7 @@ foreach ($ifacelist as $ifn => $ifdescr) {
$i++;
}
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'bridgeif',
null,
'hidden',
@ -633,7 +633,7 @@ $section->addInput(new Form_Input(
));
if (isset($id) && $a_bridges[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -220,7 +220,7 @@ $section->addInput(new Form_Input(
$pconfig['descr']
))->setHelp('A description may be entered here for administrative reference (not parsed).');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'gifif',
null,
'hidden',
@ -228,7 +228,7 @@ $section->addInput(new Form_Input(
));
if (isset($id) && $a_gifs[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -206,7 +206,7 @@ $section->addInput(new Form_Input(
$pconfig['descr']
))->setHelp('A description may be entered here for administrative reference (not parsed).');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'greif',
null,
'hidden',
@ -214,7 +214,7 @@ $section->addInput(new Form_Input(
));
if (isset($id) && $a_gres[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -245,7 +245,7 @@ $section->addInput(new Form_Input(
$pconfig['descr']
))->setHelp("Enter a description here for reference only (Not parsed).");
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'laggif',
null,
'hidden',
@ -253,7 +253,7 @@ $section->addInput(new Form_Input(
));
if (isset($id) && $a_laggs[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -293,7 +293,7 @@ $section->addInput(new Form_StaticText(
));
if (isset($id) && $a_qinqs[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -189,7 +189,7 @@ $section->addInput(new Form_Input(
$pconfig['descr']
))->setHelp('A description may be entered here for administrative reference (not parsed).');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'cloneif',
null,
'hidden',
@ -197,7 +197,7 @@ $section->addInput(new Form_Input(
));
if (isset($id) && $a_clones[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -819,7 +819,7 @@ if ($pconfig['page']['logouttext']) {
))->addClass('btn btn-danger btn-xs')->setAttribute("target", "_blank");
$section->add($group);
}
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'zone',
null,
'hidden',

View File

@ -156,7 +156,7 @@ if ($_REQUEST['act'] == 'add') {
$section = new Form_Section('Upload a New File');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'zone',
null,
'hidden',

View File

@ -195,7 +195,7 @@ $section->addInput(new Form_Input(
$pconfig['bw_down']
))->setHelp('Enter a download limit to be enforced on this Hostname in Kbit/s');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'zone',
null,
'hidden',
@ -203,7 +203,7 @@ $section->addInput(new Form_Input(
));
if (isset($id) && $a_allowedhostnames[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -238,7 +238,7 @@ $section->addInput(new Form_Input(
$pconfig['bw_down']
))->setHelp('Enter a download limit to be enforced on this address in Kbit/s');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'zone',
null,
'hidden',
@ -246,7 +246,7 @@ $section->addInput(new Form_Input(
));
if (isset($id) && $a_allowedips[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -236,7 +236,7 @@ $section->addInput(new Form_Input(
$pconfig['bw_down']
))->setHelp('Enter a download limit to be enforced on this MAC in Kbit/s');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'zone',
null,
'hidden',
@ -244,7 +244,7 @@ $section->addInput(new Form_Input(
));
if (isset($id) && $a_passthrumacs[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',
@ -253,7 +253,7 @@ if (isset($id) && $a_passthrumacs[$id]) {
}
if (isset($pconfig['username']) && $pconfig['username']) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'username',
null,
'hidden',

View File

@ -548,14 +548,14 @@ $section->addPassword(new Form_Input(
$pconfig['vouchersyncpass']
))->setHelp('This is the password of the master voucher nodes webConfigurator.');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'zone',
null,
'hidden',
$cpzone
));
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'exponent',
null,
'hidden',

View File

@ -191,7 +191,7 @@ $section->addInput(new Form_Input(
$pconfig['descr']
))->setHelp('Can be used to further identify this roll. Ignored by the system.');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'zone',
null,
'hidden',
@ -199,7 +199,7 @@ $section->addInput(new Form_Input(
));
if (isset($id) && $a_roll[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -162,7 +162,7 @@ $section->addInput(new Form_Input(
))->setHelp('A description may be entered here for administrative reference (not parsed).');
if (isset($id) && $a_checkip[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -999,7 +999,7 @@ $btnaddopt->removeClass('btn-primary')->addClass('btn-success btn-sm');
$section->addInput($btnaddopt);
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'if',
null,
'hidden',

View File

@ -245,7 +245,7 @@ if ($netboot_enabled) {
}
if (isset($id) && $a_maps[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',
@ -253,7 +253,7 @@ if (isset($id) && $a_maps[$id]) {
));
}
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'if',
null,
'hidden',

View File

@ -156,7 +156,7 @@ $section->addInput(new Form_Input(
))->setHelp('A description may be entered here for administrative reference (not parsed).');
if (isset($id) && $a_domainOverrides[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -225,7 +225,7 @@ $section->addInput(new Form_Input(
))->setHelp('A description may be entered here for administrative reference (not parsed).');
if (isset($id) && $a_hosts[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -424,7 +424,7 @@ $section->addInput(new Form_Input(
'This field will be used in the Dynamic DNS Status Widget for Custom services.', '<br />');
if (isset($id) && $a_dyndns[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -184,7 +184,7 @@ $section->addInput(new Form_Input(
'This setting is optional, and by default the threshold is 1.');
if (isset($id) && $a_igmpproxy[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -538,7 +538,7 @@ $section->addInput(new Form_StaticText(
// Hidden fields
if (isset($id)) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',
@ -547,7 +547,7 @@ if (isset($id)) {
}
if (isset($pconfig['pppoeid'])) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'pppoeid',
null,
'hidden',

View File

@ -299,7 +299,7 @@ $section->addInput(new Form_Input(
))->setHelp('A description may be entered here for administrative reference (not parsed).');
if (isset($id) && $a_rfc2136[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -458,7 +458,7 @@ $section->addInput(new Form_Checkbox(
$pconfig['rasamednsasdhcp6']
));
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'if',
null,
'hidden',

View File

@ -189,14 +189,14 @@ if ($act == "new" || $act == "edit") {
$section = new Form_Section('New Access List');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'aclid',
null,
'hidden',
$id
));
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'act',
null,
'hidden',

View File

@ -157,7 +157,7 @@ $section->addInput(new Form_Input(
))->setHelp('A description may be entered here for administrative reference (not parsed).');
if (isset($id) && $a_domainOverrides[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -219,7 +219,7 @@ $section->addInput(new Form_Input(
))->setHelp('A description may be entered here for administrative reference (not parsed).');
if (isset($id) && $a_hosts[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -84,7 +84,7 @@ $section->addInput(new Form_Textarea(
$_POST['vouchers']
))->setHelp('Enter multiple vouchers separated by space or newline. All valid vouchers will be marked as expired.');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'zone',
null,
'hidden',

View File

@ -88,7 +88,7 @@ $section->addInput(new Form_Textarea(
$_POST['vouchers']
))->setHelp('Enter multiple vouchers separated by space or newline. The remaining time, if valid, will be shown for each voucher.');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'zone',
null,
'hidden',

View File

@ -827,7 +827,7 @@ $section->addInput(new Form_Select(
if (isset($id) && $a_server[$id])
{
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -1068,21 +1068,21 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) {
))->setWidth(7)
->setHelp('Paste the certificate received from the certificate authority here.');
if (isset($id) && $a_cert[$id]) {
$section->addInput(new Form_Input(
if (isset($id) && $a_cert[$id]) {
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',
$id
));
));
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'act',
null,
'hidden',
'csr'
));
}
));
}
$form->add($section);

View File

@ -116,7 +116,6 @@ if ($act == "exp") {
}
if ($act == "addcert") {
unset($input_errors);
$pconfig = $_REQUEST;
@ -339,18 +338,17 @@ $tab_array[] = array(gettext("Certificate Revocation"), true, "system_crlmanager
display_top_tabs($tab_array);
if ($act == "new" || $act == gettext("Save") || $input_errors) {
$form = new Form();
$section = new Form_Section('Create new Revocation List');
if (!isset($id)) {
$form = new Form();
$section = new Form_Section('Create new Revocation List');
$section->addInput(new Form_Select(
'method',
'*Method',
$pconfig['method'],
build_method_list()
));
}
$section->addInput(new Form_Input(
@ -402,7 +400,7 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) {
$form->add($section);
if (isset($id) && $thiscrl) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',
@ -431,14 +429,14 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) {
$pconfig['crltext']
))->setHelp('Paste a Certificate Revocation List in X.509 CRL format here.');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',
$id
));
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'act',
null,
'hidden',
@ -541,21 +539,21 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) {
$section->add($group);
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',
$crl['refid']
));
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'act',
null,
'hidden',
'addcert'
));
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'crlref',
null,
'hidden',

View File

@ -330,7 +330,7 @@ $section->addInput(new Form_Input(
))->setHelp('A description may be entered here for administrative reference (not parsed).');
if (isset($id) && $a_gateway_groups[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -210,7 +210,7 @@ $btnclear->setAttribute('type','button')->addClass('btn btn-warning');
$form->addGlobal($btnclear);
if (isset($userid)) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'userid',
null,
'hidden',

View File

@ -970,7 +970,7 @@ $section->addInput(new Form_Input(
))->setHelp('Number of consecutive failures allowed before disconnect. ');
if (isset($p1index) && $a_phase1[$p1index]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'p1index',
null,
'hidden',
@ -979,7 +979,7 @@ if (isset($p1index) && $a_phase1[$p1index]) {
}
if ($pconfig['mobile']) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'mobile',
null,
'hidden',
@ -987,7 +987,7 @@ if ($pconfig['mobile']) {
));
}
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'ikeid',
null,
'hidden',

View File

@ -717,7 +717,7 @@ $section->addInput(new Form_IpAddress(
// Hidden inputs
if ($pconfig['mobile']) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'mobile',
null,
'hidden',
@ -725,7 +725,7 @@ if ($pconfig['mobile']) {
));
}
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'ikeid',
null,
'hidden',
@ -733,7 +733,7 @@ $section->addInput(new Form_Input(
));
if (!empty($pconfig['reqid'])) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'reqid',
null,
'hidden',
@ -741,7 +741,7 @@ if (!empty($pconfig['reqid'])) {
));
}
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'uniqid',
null,
'hidden',

View File

@ -973,7 +973,7 @@ if ($act=="new" || $act=="edit"):
'5: Output R and W characters to the console for each packet read and write. Uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets.%1$s' .
'6-11: Debug info range', '<br />');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'act',
null,
'hidden',
@ -981,7 +981,7 @@ if ($act=="new" || $act=="edit"):
));
if (isset($id) && $a_client[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -602,7 +602,7 @@ if ($act == "new" || $act == "edit"):
'<br />');
// The hidden fields
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'act',
null,
'hidden',
@ -610,7 +610,7 @@ if ($act == "new" || $act == "edit"):
));
if (isset($id) && $a_csc[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',

View File

@ -1382,7 +1382,7 @@ if ($act=="new" || $act=="edit"):
'5: Output R and W characters to the console for each packet read and write. Uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets.%1$s' .
'6-11: Debug info range', '<br />');
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'act',
null,
'hidden',
@ -1390,7 +1390,7 @@ if ($act=="new" || $act=="edit"):
));
if (isset($id) && $a_server[$id]) {
$section->addInput(new Form_Input(
$form->addGlobal(new Form_Input(
'id',
null,
'hidden',