From 95222cce71d2456c4f42f5c8acb1d170ec74934f Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 9 Dec 2021 19:53:33 +0100 Subject: [PATCH] restyling --- lam/templates/config/confImportExport.php | 18 +++++++++++++----- lam/templates/config/conflogin.php | 1 + lam/templates/config/mainlogin.php | 1 + lam/templates/config/mainmanage.php | 6 ++++-- lam/templates/config/profmanage.php | 5 +++++ lam/templates/login.php | 4 +++- 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/lam/templates/config/confImportExport.php b/lam/templates/config/confImportExport.php index 114ee8640..7cd35e6ae 100644 --- a/lam/templates/config/confImportExport.php +++ b/lam/templates/config/confImportExport.php @@ -161,7 +161,9 @@ printHeaderContents(_("Import and export configuration"), '../..'); $pwdInput->setCSSClasses(array('lam-initial-focus')); $loginContent->add($pwdInput, 12); $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); @@ -176,7 +178,7 @@ printHeaderContents(_("Import and export configuration"), '../..'); $tabindex = 0; $content = new htmlResponsiveRow(); $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'); parseHtml(null, $content, array(), false, $tabindex, null); } @@ -205,7 +207,9 @@ printHeaderContents(_("Import and export configuration"), '../..'); $content = new htmlResponsiveRow(); $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); renderImportPart($content); @@ -261,7 +265,9 @@ printHeaderContents(_("Import and export configuration"), '../..'); } if (!isset($_POST['importConfigConfirm']) && !$validUpload) { $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'])) { $content->add(new htmlOutputText(_('Import steps')), 12); @@ -284,7 +290,9 @@ printHeaderContents(_("Import and export configuration"), '../..'); $content->addVerticalSpacer('1rem'); } $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'))); $content->add($buttonGroup, 12); } diff --git a/lam/templates/config/conflogin.php b/lam/templates/config/conflogin.php index 5c58fabdd..737233e33 100644 --- a/lam/templates/config/conflogin.php +++ b/lam/templates/config/conflogin.php @@ -150,6 +150,7 @@ $tabindex = 1; $box->add($passwordInput, 12); $box->addVerticalSpacer('1rem'); $button = new htmlButton('submit', _("Ok")); + $button->setCSSClasses(array('lam-primary')); $box->addLabel($button); $box->add(new htmlOutputText(''), 0, 6); $box->addVerticalSpacer('1.5rem'); diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php index 6b1d9d4a0..a610cb6bd 100644 --- a/lam/templates/config/mainlogin.php +++ b/lam/templates/config/mainlogin.php @@ -159,6 +159,7 @@ printHeaderContents(_("Login"), '../..'); // button $group->addElement($spacer); $okButton = new htmlButton('submit', _("Ok")); + $okButton->setCSSClasses(array('lam-primary')); $row = new htmlResponsiveRow(); $row->add($okButton, 12); $row->setCSSClasses(array('')); diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php index 21700e3f6..7100e8ce8 100644 --- a/lam/templates/config/mainmanage.php +++ b/lam/templates/config/mainmanage.php @@ -638,8 +638,10 @@ printHeaderContents(_("Edit general settings"), '../..'); // buttons if ($cfg->isWritable()) { $buttonTable = new htmlTable(); - $buttonTable->addElement(new htmlButton('submit', _("Ok"))); - $buttonTable->addElement(new htmlSpacer('1rem', null)); + $saveButton = new htmlButton('submit', _("Save")); + $saveButton->setCSSClasses(array('lam-primary')); + $buttonTable->addElement($saveButton); + $buttonTable->addElement(new htmlSpacer('0.5rem', null)); $buttonTable->addElement(new htmlButton('cancel', _("Cancel"))); $row->add($buttonTable, 12); $row->add(new htmlHiddenInput('submitFormData', '1'), 12); diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php index feae7708a..9cd01d018 100644 --- a/lam/templates/config/profmanage.php +++ b/lam/templates/config/profmanage.php @@ -252,6 +252,7 @@ $addTemplateSelect->setHasDescriptiveElements(true); $box->add($addTemplateSelect, 12); $box->addVerticalSpacer('0.5rem'); $newProfileButton = new htmlButton('btnAddProfile', _('Add')); +$newProfileButton->setCSSClasses(array('lam-primary')); $newProfileButton->setOnClick("jQuery('#action').val('add');showConfirmationDialog('" . _("Add profile") . "', '" . _('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();"); $box->addLabel($newProfileButton); @@ -264,6 +265,7 @@ $oldProfileInput = new htmlResponsiveInputField(_('New profile name'), 'renfilen $box->add($oldProfileInput, 12); $box->addVerticalSpacer('0.5rem'); $renameProfileButton = new htmlButton('btnRenameProfile', _('Rename')); +$renameProfileButton->setCSSClasses(array('lam-secondary')); $renameProfileButton->setOnClick("jQuery('#action').val('rename');showConfirmationDialog('" . _("Rename profile") . "', '" . _('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();"); $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->addVerticalSpacer('0.5rem'); $deleteProfileButton = new htmlButton('btnDeleteProfile', _('Delete')); +$deleteProfileButton->setCSSClasses(array('lam-danger')); $deleteProfileButton->setOnClick("jQuery('#action').val('delete');showConfirmationDialog('" . _("Delete profile") . "', '" . _('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();"); $box->addLabel($deleteProfileButton); @@ -291,6 +294,7 @@ $profileSetPwd2->setSameValueFieldID('setpassword'); $box->add($profileSetPwd2, 12); $box->addVerticalSpacer('0.5rem'); $setPasswordProfileButton = new htmlButton('btnSetPasswordProfile', _('Set profile password')); +$setPasswordProfileButton->setCSSClasses(array('lam-secondary')); $setPasswordProfileButton->setOnClick("jQuery('#action').val('setpass');showConfirmationDialog('" . _("Set profile password") . "', '" . _('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();"); $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->addVerticalSpacer('0.5rem'); $defaultProfileButton = new htmlButton('btnDefaultProfile', _('Ok')); +$defaultProfileButton->setCSSClasses(array('lam-secondary')); $defaultProfileButton->setOnClick("jQuery('#action').val('setdefault');showConfirmationDialog('" . _("Change default profile") . "', '" . _('Ok') . "', '" . _('Cancel') . "', 'passwordDialogDiv', 'profileForm', null); document.getElementById('passwd').focus();"); $box->addLabel($defaultProfileButton); diff --git a/lam/templates/login.php b/lam/templates/login.php index af42aa726..58355ea1e 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -380,7 +380,9 @@ function display_LoginPage($licenseValidator, $error_message, $errorDetails = nu } // login button $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'); ?>