diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 244d18944..dba2b58b6 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -466,7 +466,7 @@ abstract class cmdbAbstractObject extends CMDBObject { if (!$bSingleSelectMode) { - $aAttribs['form::select'] = array('label' => "", 'description' => Dict::S('UI:SelectAllToggle+')); + $aAttribs['form::select'] = array('label' => "", 'description' => Dict::S('UI:SelectAllToggle+')); } else { @@ -907,7 +907,7 @@ EOF $sClassesCombo = MetaModel::GetName($sClassName); } $oUnlimitedFilter = new DBObjectSearch($sClassName); - $sHtml .= "
\n"; + $sHtml .= "\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php) $sHtml .= "

".Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo)."

\n"; $index = 0; $sHtml .= "

\n"; diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php index b9d210074..2df051dc1 100644 --- a/application/ui.linkswidget.class.inc.php +++ b/application/ui.linkswidget.class.inc.php @@ -60,7 +60,7 @@ class UILinksWidget $this->m_aEditableFields = array(); $this->m_aTableConfig = array(); - $this->m_aTableConfig['form::checkbox'] = array( 'label' => "m_sAttCode}{$this->m_sNameSuffix} .selection').each( function() { this.checked = value; } ); oWidget".self::$iWidgetIndex.".OnSelectChange();\">", 'description' => Dict::S('UI:SelectAllToggle+')); + $this->m_aTableConfig['form::checkbox'] = array( 'label' => "m_sAttCode}{$this->m_sNameSuffix} .selection', this.checked); oWidget".self::$iWidgetIndex.".OnSelectChange();\">", 'description' => Dict::S('UI:SelectAllToggle+')); foreach(MetaModel::ListAttributeDefs($this->m_sLinkedClass) as $sAttCode=>$oAttDef) { diff --git a/css/light-grey.css b/css/light-grey.css index 089a4b059..4f22f52b8 100644 --- a/css/light-grey.css +++ b/css/light-grey.css @@ -794,7 +794,7 @@ div#inner_menu { } div#logo { height: 70px; - width: 100%; + nowidth: 100%; text-align: center; } div#logo div { @@ -810,7 +810,7 @@ div#logo div { #global-search { height: 55px; float: right; - background: url(../images/banner-search.png) no-repeat left; + background: url(../images/banner-search.png) no-repeat; nopadding-top: 15px; text-align: right; overflow-y: hidden; @@ -830,7 +830,7 @@ div#logo div { #global-search > form input[type="text"] { border: 0; height: 18px; - width: 180px;E8FFD3 + width: 180px; padding-top: 4; background: transparent; } diff --git a/js/utils.js b/js/utils.js index ca7661a4c..299df49dc 100644 --- a/js/utils.js +++ b/js/utils.js @@ -104,12 +104,16 @@ function ReloadSearchForm(divId, sClassName, sBaseClass, sContext) var oDiv = $('#'+divId); oDiv.block(); var oFormEvents = $('#'+divId+' form').data('events'); + var aSubmit = new Array(); // Save the submit handlers - aSubmit = new Array(); + aSubmit = new Array(); if ( (oFormEvents != null) && (oFormEvents.submit != undefined)) { - aSubmit = oFormEvents.submit; + for(index = 0; index < oFormEvents.submit.length; index++) + { + aSubmit [index ] = { data:oFormEvents.submit[index].data, namespace:oFormEvents.submit[index].namespace, handler: oFormEvents.submit[index].handler}; + } } $.post('ajax.render.php?'+sContext, @@ -177,3 +181,14 @@ function GetUserPreference(sPreferenceCode, sDefaultValue) } return value; } + +/** + * Check/uncheck a whole list of checkboxes + */ +function CheckAll(sSelector, bValue) +{ + var value = bValue; + $(sSelector).each( function() { + this.checked = value; + }); +} \ No newline at end of file