tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make command forms "inline", remove missing icon

This commit is contained in:
Thomas Gelf 2014-03-08 17:01:27 +01:00
parent ac0980b111
commit eb517f0a40
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/monitoring/application/views/helpers/CommandForm.php
View File

@ -55,6 +55,7 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
public function simpleForm($commandName, array $arguments = array()) public function simpleForm($commandName, array $arguments = array())
{ {
$form = new Form(); $form = new Form();
$form->setAttrib('class', 'inline');
$form->setIgnoreChangeDiscarding(true); $form->setIgnoreChangeDiscarding(true);
$form->setRequest(Zend_Controller_Front::getInstance()->getRequest()); $form->setRequest(Zend_Controller_Front::getInstance()->getRequest());
@ -115,14 +116,14 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
* *
* @return Form * @return Form
*/ */
public function labelSubmitForm($submitLabel, $submitTitle, $cls, $commandName, array $arguments = array()) public function labelSubmitForm($submitLabel, $submitTitle, $cls = '', $commandName, array $arguments = array())
{ {
$form = $this->simpleForm($commandName, $arguments); $form = $this->simpleForm($commandName, $arguments);
$button = new Zend_Form_Element_Button( $button = new Zend_Form_Element_Button(
array( array(
'name' => 'btn_submit', 'name' => 'btn_submit',
'class' => $this->mergeClass('button btn-common', $cls), 'class' => $cls,
'escape' => false, 'escape' => false,
'value' => '1', 'value' => '1',
'type' => 'submit', 'type' => 'submit',
@ -189,7 +190,7 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
} }
if ($changed === true) { if ($changed === true) {
$out .= $this->view->icon('config_changed.png') . ' (modified)'; $out .= ' (modified)';
} }
$formCode = (string) $form; $formCode = (string) $form;

18
public/css/icinga/forms.less
View File

@ -77,6 +77,24 @@ select::-moz-focus-inner {
outline: 0; outline: 0;
} }
form.inline {
margin: 0;
padding: 0;
display: inline;
}
button.link-like {
color: @colorLinkDefault;
background: none;
border: none;
padding: 0;
font-size: 1em;
cursor: pointer;
}
button.link-like:hover {
text-decoration: underline;
}
input[type=submit]:hover, a.button:hover { input[type=submit]:hover, a.button:hover {
cursor: pointer; cursor: pointer;