Bug: Minor HTML change to keep HTML 4.01 Strict level (category_cats.inc.php)

New: Label over quick search (and different display solutions in themes: center, left, italic, hidden, pre-filling hidden).


git-svn-id: http://piwigo.org/svn/trunk@1869 68402e56-0260-453c-a942-63ccdbb3a9ee

8 files changed, 12 insertions, 4 deletions

diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index ccdfa5949..9c0327362 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -215,7 +215,7 @@ if (count($categories) > 0)
                                     $category['count_images'],
                                     $category['count_categories'],
                                     true,
-                                    '<BR>'
+                                    '<br />'
                                   ),
           'DESCRIPTION' => @$comment,
           'NAME'  => $name,
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 9541758bb..95b4467ff 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -614,4 +614,5 @@ $lang['useful when password forgotten'] = 'useful when password forgotten';
 $lang['w_month'] = 'Month';
 $lang['yes'] = 'Yes';
 $lang['page_end'] = 'Page bottom';
+$lang['qsearch'] = 'Quick search';
 ?>
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index 51822c58e..1abe96485 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -614,4 +614,5 @@ $lang['useful when password forgotten'] = 'utile en cas d\'oubli de mot de passe
 $lang['w_month'] = 'Mois';
 $lang['yes'] = 'Oui';
 $lang['page_end'] = 'Bas de page';
+$lang['qsearch'] = 'Recherche rapide';
 ?>
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index 9dde24af7..feb8bf8fe 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -76,7 +76,7 @@
       <!-- BEGIN summary -->
       <!-- BEGIN quick_search -->
       <form action="{pwg_root}qsearch.php" method="get" id="quicksearch">
-      <p>
+      <p><span class="qsearch">{lang:qsearch}<br /></span>
       <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" />
       </p>
       </form>
diff --git a/template/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index 32b0cabe2..0f29d1fb2 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
@@ -99,3 +99,7 @@ TD.calDayCellEmpty { color: silver; }
 .calBackDate { color: #000; }
 .calForeDate { color: #fff; }
 .virtual_cat { background: #fff !important; }
+.qsearch { font-size: 80%; font-style: normal; }
+#mbMenu #quicksearch > p { text-align: left; }
+#qsearchInput { color: #d3d3d3; }
+#qsearchInput:focus { color: #005e89; }
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index b6559b59c..5626e55e1 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -142,3 +142,5 @@ TD.calDayCellEmpty { color: silver; }
 #content ul.thumbnailCategories li div.thumbnailCategory .description p + p {
   display: inline;
 }
+.qsearch { font-size: 80%; font-style: normal; }
+#mbMenu #quicksearch > p { text-align: left; }
diff --git a/template/yoga/theme/p0w0/theme.css b/template/yoga/theme/p0w0/theme.css
index d8bd41e47..91d43b879 100644
--- a/template/yoga/theme/p0w0/theme.css
+++ b/template/yoga/theme/p0w0/theme.css
@@ -280,4 +280,5 @@ input.submit:active {
   font-size: 80%;
   font-style: normal;
 }
+.qsearch { font-size: 80%; font-style: italic; }
 * { outline: none; }
diff --git a/template/yoga/theme/wipi/theme.css b/template/yoga/theme/wipi/theme.css
index 00cd16c26..9755b89a1 100644
--- a/template/yoga/theme/wipi/theme.css
+++ b/template/yoga/theme/wipi/theme.css
@@ -326,7 +326,6 @@ a.PWG:hover .G { color : #f92; }
 #imageToolBar .randomButtons a:hover,

 #imageToolBar .navButtons a:hover { background-color: #111; }

 #menubar .menuInfoCat,

-#menubar .menuInfoCatByChild,

+#menubar .menuInfoCatByChild, .qsearch,

 h2.showtitle, #theImage p.showlegend { display: none }

-

 * { outline-width: 0px; }