diff options
| -rw-r--r-- | admin/popuphelp.php | 13 | ||||
| -rw-r--r-- | admin/themes/default/theme.css | 26 | ||||
| -rw-r--r-- | admin/themes/roma/theme.css | 4 | ||||
| -rw-r--r-- | language/en_UK/help/quick_search.html | 36 |
4 files changed, 50 insertions, 29 deletions
diff --git a/admin/popuphelp.php b/admin/popuphelp.php index 8c431c88b..7d0a0cf8b 100644 --- a/admin/popuphelp.php +++ b/admin/popuphelp.php @@ -47,16 +47,21 @@ if and preg_match('/^[a-z_]*$/', $_GET['page']) ) { - $help_content = - load_language('help/'.$_GET['page'].'.html', '', array('return'=>true) ); + $help_content = load_language( + 'help/'.$_GET['page'].'.html', + '', + array( + 'force_fallback' => 'en_UK', + 'return' => true, + ) + ); if ($help_content == false) { $help_content = ''; } - $help_content = trigger_change( - 'get_popup_help_content', $help_content, $_GET['page']); + $help_content = trigger_change('get_popup_help_content', $help_content, $_GET['page']); } else { diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 1e644f585..a483a0485 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -1242,4 +1242,28 @@ a.group_perm { } .preview-box.icon-search:hover img { opacity:0.5; -}
\ No newline at end of file +} + +/* table in help/quick_search.html */ +table.qsearch_help_table { + border-collapse:collapse; + text-align:left; + margin:1em; +} +table.qsearch_help_table q { + font-family: Courier, Fixed; + font-weight: bold; +} +table.qsearch_help_table q:before { + content: '\''; + color: green; +} +table.qsearch_help_table q:after { + content: '\''; + color: green; +} +table.qsearch_help_table td { + border: 1px solid #ccc; + padding:5px; + vertical-align:top; +} diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index c543981f4..088d18912 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -353,3 +353,7 @@ table.dataTable thead th { .userPropertiesContainer {border-color:#333;} .userPrefs {border-color:#333;} + +table.qsearch_help_table td { + border-color: #444; +}
\ No newline at end of file diff --git a/language/en_UK/help/quick_search.html b/language/en_UK/help/quick_search.html index 283cb6a1e..717c09ae9 100644 --- a/language/en_UK/help/quick_search.html +++ b/language/en_UK/help/quick_search.html @@ -1,26 +1,8 @@ <h2>Search</h2> -<style> -q { - font-family: Courier, Fixed; - font-weight: bold; -} -q:before { - content: '\''; - color: green; -} -q:after { - content: '\''; - color: green; -} -TD { - border: 1px solid -} -</style> - - -<p>By default all searched terms must match. Searches are case-insesitive.</p> - -<table style="border-collapse:collapse;text-align:left"> + +<p>By default all searched terms must match. Searches are case-insensitive.</p> + +<table class="qsearch_help_table"> <tr> <td>quoted phrase<br> <q>"search"</q> @@ -60,7 +42,7 @@ TD { <br> -<table style="border-collapse:collapse;text-align:left"> +<table class="qsearch_help_table"> <tr> <td><q>tag:</q><br> @@ -142,5 +124,11 @@ TD { <td>Searches photos by file size<br> <q>filesize:1m..10m</q> finds files between 1MB and 10MB.</td> </tr> +<tr> +<td><q>id:</q> +</td> +<td>Searches photos by its numeric identifier in Piwigo<br> +<q>id:123..126</q> finds photo 123 to 126 (it may find between 0 and 4 photos, because photos can be deleted).</td> +</tr> -</table>
\ No newline at end of file +</table> |