Portal: FilterBrick: Value for placeholder and submit button can now be empty

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4588 a333f486-631f-4898-b8df-5754b55c2be0

datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php

@@ -125,6 +125,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 // Filter brick
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
     'Brick:Portal:Filter:Name' => 'Prefilter a brick~~',
-    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg: install office~~',
+    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg. connect wifi~~',
     'Brick:Portal:Filter:SearchInput:Submit' => 'Search~~',
 ));

datamodels/2.x/itop-portal-base/de.dict.itop-portal-base.php

@@ -120,6 +120,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 // Filter brick
 Dict::Add('DE DE', 'German', 'Deutsch', array(
     'Brick:Portal:Filter:Name' => 'Prefilter a brick~~',
-    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg: install office~~',
+    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg. connect wifi~~',
     'Brick:Portal:Filter:SearchInput:Submit' => 'Search~~',
 ));

datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php

@@ -121,6 +121,6 @@ Dict::Add('EN US', 'English', 'English', array(
 // Filter brick
 Dict::Add('EN US', 'English', 'English', array(
     'Brick:Portal:Filter:Name' => 'Prefilter a brick',
-    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg: install office',
+    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg. connect wifi',
     'Brick:Portal:Filter:SearchInput:Submit' => 'Search',
 ));

datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php

@@ -121,6 +121,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 // Filter brick
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
     'Brick:Portal:Filter:Name' => 'Prefilter a brick~~',
-    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg: install office~~',
+    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg. connect wifi~~',
     'Brick:Portal:Filter:SearchInput:Submit' => 'Search~~',
 ));

datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php

@@ -121,7 +121,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 // Filter brick
 Dict::Add('FR FR', 'French', 'Français', array(
     'Brick:Portal:Filter:Name' => 'Préfiltre une brique',
-    'Brick:Portal:Filter:SearchInput:Placeholder' => 'ex : installation office',
+    'Brick:Portal:Filter:SearchInput:Placeholder' => 'ex : connecter wifi',
     'Brick:Portal:Filter:SearchInput:Submit' => 'Rechercher',
 ));
 

datamodels/2.x/itop-portal-base/portal/src/entities/filterbrick.class.inc.php

@@ -154,10 +154,12 @@ class FilterBrick extends PortalBrick
 					}
 					break;
 				case 'search_placeholder_value':
-					$this->SetSearchPlaceholderValue($oBrickSubNode->GetText(static::DEFAULT_SEARCH_PLACEHOLDER_VALUE));
+				    // Note: We don't put the default value constant if the node is empty because we might actually want this to be empty
+					$this->SetSearchPlaceholderValue($oBrickSubNode->GetText(''));
 					break;
 				case 'search_submit_label':
-					$this->SetSearchSubmitLabel($oBrickSubNode->GetText(static::DEFAULT_SEARCH_SUBMIT_LABEL));
+                    // Note: We don't put the default value constant if the node is empty because we might actually want this to be empty
+                    $this->SetSearchSubmitLabel($oBrickSubNode->GetText(''));
 					break;
 				case 'search_submit_class':
 					$this->SetSearchSubmitClass($oBrickSubNode->GetText(static::DEFAULT_SEARCH_SUBMIT_CLASS));

datamodels/2.x/itop-portal-base/ru.dict.itop-portal-base.php

@@ -103,6 +103,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 // Filter brick
 Dict::Add('RU RU', 'Russian', 'Русский', array(
     'Brick:Portal:Filter:Name' => 'Prefilter a brick~~',
-    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg: install office~~',
+    'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg. connect wifi~~',
     'Brick:Portal:Filter:SearchInput:Submit' => 'Search~~',
 ));