restyling

This commit is contained in:
Roland Gruber 2021-12-09 19:53:33 +01:00
parent ed1e1af6cf
commit 95222cce71
6 changed files with 27 additions and 8 deletions

View file

@ -161,7 +161,9 @@ printHeaderContents(_("Import and export configuration"), '../..');
$pwdInput->setCSSClasses(array('lam-initial-focus')); $pwdInput->setCSSClasses(array('lam-initial-focus'));
$loginContent->add($pwdInput, 12); $loginContent->add($pwdInput, 12);
$loginContent->addLabel(new htmlOutputText(' ', false)); $loginContent->addLabel(new htmlOutputText(' ', false));
$loginContent->addField(new htmlButton('submitLogin', _("Ok"))); $loginButton = new htmlButton('submitLogin', _("Ok"));
$loginButton->setCSSClasses(array('lam-primary'));
$loginContent->addField($loginButton);
$content->add($loginContent, 12); $content->add($loginContent, 12);
@ -176,7 +178,7 @@ printHeaderContents(_("Import and export configuration"), '../..');
$tabindex = 0; $tabindex = 0;
$content = new htmlResponsiveRow(); $content = new htmlResponsiveRow();
$content->addVerticalSpacer('2rem'); $content->addVerticalSpacer('2rem');
$content->add(new htmlLink(_('Back to login'), '../login.php', '../../graphics/undo.png'), 12); $content->add(new htmlLink(_('Back to login'), '../login.php'), 12);
$content->addVerticalSpacer('1rem'); $content->addVerticalSpacer('1rem');
parseHtml(null, $content, array(), false, $tabindex, null); parseHtml(null, $content, array(), false, $tabindex, null);
} }
@ -205,7 +207,9 @@ printHeaderContents(_("Import and export configuration"), '../..');
$content = new htmlResponsiveRow(); $content = new htmlResponsiveRow();
$content->add(new htmlSubTitle(_('Export')), 12); $content->add(new htmlSubTitle(_('Export')), 12);
$content->add(new htmlButton('exportConfig', _('Export')), 12); $exportButton = new htmlButton('exportConfig', _('Export'));
$exportButton->setCSSClasses(array('lam-primary'));
$content->add($exportButton);
$content->add(new htmlSubTitle(_('Import')), 12); $content->add(new htmlSubTitle(_('Import')), 12);
renderImportPart($content); renderImportPart($content);
@ -261,7 +265,9 @@ printHeaderContents(_("Import and export configuration"), '../..');
} }
if (!isset($_POST['importConfigConfirm']) && !$validUpload) { if (!isset($_POST['importConfigConfirm']) && !$validUpload) {
$content->add(new htmlInputFileUpload('import-file'), 12); $content->add(new htmlInputFileUpload('import-file'), 12);
$content->add(new htmlButton('importConfig', _('Submit')), 12); $submitButton = new htmlButton('importConfig', _('Submit'));
$submitButton->setCSSClasses(array('lam-secondary'));
$content->add($submitButton);
} }
elseif (isset($_POST['importConfig'])) { elseif (isset($_POST['importConfig'])) {
$content->add(new htmlOutputText(_('Import steps')), 12); $content->add(new htmlOutputText(_('Import steps')), 12);
@ -284,7 +290,9 @@ printHeaderContents(_("Import and export configuration"), '../..');
$content->addVerticalSpacer('1rem'); $content->addVerticalSpacer('1rem');
} }
$buttonGroup = new htmlGroup(); $buttonGroup = new htmlGroup();
$buttonGroup->addElement(new htmlButton('importConfigConfirm', _('Import'))); $importButton = new htmlButton('importConfigConfirm', _('Import'));
$importButton->setCSSClasses(array('lam-secondary'));
$buttonGroup->addElement($importButton);
$buttonGroup->addElement(new htmlButton('importCancel', _('Cancel'))); $buttonGroup->addElement(new htmlButton('importCancel', _('Cancel')));
$content->add($buttonGroup, 12); $content->add($buttonGroup, 12);
} }

View file

@ -150,6 +150,7 @@ $tabindex = 1;
$box->add($passwordInput, 12); $box->add($passwordInput, 12);
$box->addVerticalSpacer('1rem'); $box->addVerticalSpacer('1rem');
$button = new htmlButton('submit', _("Ok")); $button = new htmlButton('submit', _("Ok"));
$button->setCSSClasses(array('lam-primary'));
$box->addLabel($button); $box->addLabel($button);
$box->add(new htmlOutputText(''), 0, 6); $box->add(new htmlOutputText(''), 0, 6);
$box->addVerticalSpacer('1.5rem'); $box->addVerticalSpacer('1.5rem');

View file

@ -159,6 +159,7 @@ printHeaderContents(_("Login"), '../..');
// button // button
$group->addElement($spacer); $group->addElement($spacer);
$okButton = new htmlButton('submit', _("Ok")); $okButton = new htmlButton('submit', _("Ok"));
$okButton->setCSSClasses(array('lam-primary'));
$row = new htmlResponsiveRow(); $row = new htmlResponsiveRow();
$row->add($okButton, 12); $row->add($okButton, 12);
$row->setCSSClasses(array('')); $row->setCSSClasses(array(''));

View file

@ -638,8 +638,10 @@ printHeaderContents(_("Edit general settings"), '../..');
// buttons // buttons
if ($cfg->isWritable()) { if ($cfg->isWritable()) {
$buttonTable = new htmlTable(); $buttonTable = new htmlTable();
$buttonTable->addElement(new htmlButton('submit', _("Ok"))); $saveButton = new htmlButton('submit', _("Save"));
$buttonTable->addElement(new htmlSpacer('1rem', null)); $saveButton->setCSSClasses(array('lam-primary'));
$buttonTable->addElement($saveButton);
$buttonTable->addElement(new htmlSpacer('0.5rem', null));
$buttonTable->addElement(new htmlButton('cancel', _("Cancel"))); $buttonTable->addElement(new htmlButton('cancel', _("Cancel")));
$row->add($buttonTable, 12); $row->add($buttonTable, 12);
$row->add(new htmlHiddenInput('submitFormData', '1'), 12); $row->add(new htmlHiddenInput('submitFormData', '1'), 12);

View file

@ -252,6 +252,7 @@ $addTemplateSelect->setHasDescriptiveElements(true);
$box->add($addTemplateSelect, 12); $box->add($addTemplateSelect, 12);
$box->addVerticalSpacer('0.5rem'); $box->addVerticalSpacer('0.5rem');
$newProfileButton = new htmlButton('btnAddProfile', _('Add')); $newProfileButton = new htmlButton('btnAddProfile', _('Add'));
$newProfileButton->setCSSClasses(array('lam-primary'));
$newProfileButton->setOnClick("jQuery('#action').val('add');showConfirmationDialog('" . _("Add profile") . "', '" . $newProfileButton->setOnClick("jQuery('#action').val('add');showConfirmationDialog('" . _("Add profile") . "', '" .
_('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();"); _('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();");
$box->addLabel($newProfileButton); $box->addLabel($newProfileButton);
@ -264,6 +265,7 @@ $oldProfileInput = new htmlResponsiveInputField(_('New profile name'), 'renfilen
$box->add($oldProfileInput, 12); $box->add($oldProfileInput, 12);
$box->addVerticalSpacer('0.5rem'); $box->addVerticalSpacer('0.5rem');
$renameProfileButton = new htmlButton('btnRenameProfile', _('Rename')); $renameProfileButton = new htmlButton('btnRenameProfile', _('Rename'));
$renameProfileButton->setCSSClasses(array('lam-secondary'));
$renameProfileButton->setOnClick("jQuery('#action').val('rename');showConfirmationDialog('" . _("Rename profile") . "', '" . $renameProfileButton->setOnClick("jQuery('#action').val('rename');showConfirmationDialog('" . _("Rename profile") . "', '" .
_('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();"); _('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();");
$box->addLabel($renameProfileButton); $box->addLabel($renameProfileButton);
@ -274,6 +276,7 @@ $box->add(new htmlSubTitle(_("Delete profile")), 12);
$box->add(new htmlResponsiveSelect('delfilename', $files, array(), _('Profile name'), '232'), 12); $box->add(new htmlResponsiveSelect('delfilename', $files, array(), _('Profile name'), '232'), 12);
$box->addVerticalSpacer('0.5rem'); $box->addVerticalSpacer('0.5rem');
$deleteProfileButton = new htmlButton('btnDeleteProfile', _('Delete')); $deleteProfileButton = new htmlButton('btnDeleteProfile', _('Delete'));
$deleteProfileButton->setCSSClasses(array('lam-danger'));
$deleteProfileButton->setOnClick("jQuery('#action').val('delete');showConfirmationDialog('" . _("Delete profile") . "', '" . $deleteProfileButton->setOnClick("jQuery('#action').val('delete');showConfirmationDialog('" . _("Delete profile") . "', '" .
_('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();"); _('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();");
$box->addLabel($deleteProfileButton); $box->addLabel($deleteProfileButton);
@ -291,6 +294,7 @@ $profileSetPwd2->setSameValueFieldID('setpassword');
$box->add($profileSetPwd2, 12); $box->add($profileSetPwd2, 12);
$box->addVerticalSpacer('0.5rem'); $box->addVerticalSpacer('0.5rem');
$setPasswordProfileButton = new htmlButton('btnSetPasswordProfile', _('Set profile password')); $setPasswordProfileButton = new htmlButton('btnSetPasswordProfile', _('Set profile password'));
$setPasswordProfileButton->setCSSClasses(array('lam-secondary'));
$setPasswordProfileButton->setOnClick("jQuery('#action').val('setpass');showConfirmationDialog('" . _("Set profile password") . "', '" . $setPasswordProfileButton->setOnClick("jQuery('#action').val('setpass');showConfirmationDialog('" . _("Set profile password") . "', '" .
_('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();"); _('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();");
$box->addLabel($setPasswordProfileButton, 12); $box->addLabel($setPasswordProfileButton, 12);
@ -304,6 +308,7 @@ $box->add(new htmlSubTitle(_("Change default profile")), 12);
$box->add(new htmlResponsiveSelect('defaultfilename', $files, array($defaultprofile), _('Profile name'), '234'), 12); $box->add(new htmlResponsiveSelect('defaultfilename', $files, array($defaultprofile), _('Profile name'), '234'), 12);
$box->addVerticalSpacer('0.5rem'); $box->addVerticalSpacer('0.5rem');
$defaultProfileButton = new htmlButton('btnDefaultProfile', _('Ok')); $defaultProfileButton = new htmlButton('btnDefaultProfile', _('Ok'));
$defaultProfileButton->setCSSClasses(array('lam-secondary'));
$defaultProfileButton->setOnClick("jQuery('#action').val('setdefault');showConfirmationDialog('" . _("Change default profile") . "', '" . $defaultProfileButton->setOnClick("jQuery('#action').val('setdefault');showConfirmationDialog('" . _("Change default profile") . "', '" .
_('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();"); _('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();");
$box->addLabel($defaultProfileButton); $box->addLabel($defaultProfileButton);

View file

@ -380,7 +380,9 @@ function display_LoginPage($licenseValidator, $error_message, $errorDetails = nu
} }
// login button // login button
$row->add(new htmlSpacer(null, '20px'), 12); $row->add(new htmlSpacer(null, '20px'), 12);
$row->add(new htmlButton('checklogin', _("Login")), 12); $loginButton = new htmlButton('checklogin', _("Login"));
$loginButton->setCSSClasses(array('lam-primary'));
$row->add($loginButton);
parseHtml(null, $row, array(), false, $tabindex, 'user'); parseHtml(null, $row, array(), false, $tabindex, 'user');
?> ?>