T4473: Unify label/placeholder for folders search input

This commit is contained in:
Aleksander Machniak 2018-11-16 12:57:54 +01:00
parent 8a72ceb940
commit 7c6b305b2f
7 changed files with 12 additions and 8 deletions

View file

@ -43,7 +43,7 @@ $labels['globalfirst'] = 'Global address book(s) first';
$labels['personalonly'] = 'Personal address book(s) only';
$labels['globalonly'] = 'Global address book(s) only';
$labels['findaddressbooks'] = 'Find address books';
$labels['findaddressbooks'] = 'Find address books...';
$labels['searchterms'] = 'Search terms';
$labels['listsearchresults'] = 'Additional address books';
$labels['foldersearchform'] = 'Address book search form';

View file

@ -27,7 +27,7 @@ $labels['folderrename'] = 'Rename folder';
$labels['foldermount'] = 'Add storage';
$labels['folderdelete'] = 'Delete folder';
$labels['folderoptions'] = 'Folder options';
$labels['findfolders'] = 'Find folders';
$labels['findfolders'] = 'Find folders...';
$labels['findfiles'] = 'Find files';
$labels['share'] = 'Share';

View file

@ -12,13 +12,13 @@
<h3 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h3>
<h3 id="folderslist-header" class="boxtitle">
<roundcube:label name="folders" />
<a href="#folders" class="iconbutton search" title="<roundcube:label name='findfolders' />" tabindex="0"><roundcube:label name='findfolders' /></a>
<a href="#folders" class="iconbutton search" title="<roundcube:label name='kolab_files.findfolders' />" tabindex="0"><roundcube:label name='findfolders' /></a>
</h3>
<div class="listsearchbox">
<div class="searchbox" role="search" aria-labelledby="aria-label-foldersearchform">
<h4 id="aria-label-foldersearchform" class="voice"><roundcube:label name="arialabelfoldersearchform" /></h4>
<label for="foldersearch" class="voice"><roundcube:label name="arialabelsearchterms" /></label>
<input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='findfolders' />" />
<input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='kolab_files.findfolders' />" />
<a class="iconbutton searchicon"></a>
<roundcube:button type="link" command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
</div>

View file

@ -38,13 +38,13 @@
<h2 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h2>
<h2 id="folderslist-header" class="boxtitle">
<roundcube:label name="folders" />
<a href="#folders" class="iconbutton search" title="<roundcube:label name='findfolders' />" tabindex="0"><roundcube:label name='findfolders' /></a>
<a href="#folders" class="iconbutton search" title="<roundcube:label name='kolab_files.findfolders' />" tabindex="0"><roundcube:label name='findfolders' /></a>
</h2>
<div class="listsearchbox">
<div class="searchbox" role="search" aria-labelledby="aria-label-foldersearchform">
<h3 id="aria-label-foldersearchform" class="voice"><roundcube:label name="arialabelfoldersearchform" /></h3>
<label for="foldersearch" class="voice"><roundcube:label name="arialabelsearchterms" /></label>
<input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='findfolders' />" />
<input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='kolab_files.findfolders' />" />
<a class="iconbutton searchicon"></a>
<roundcube:button type="link" command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
</div>

View file

@ -4,7 +4,7 @@
<div class="searchbox" role="search" aria-labelledby="aria-label-foldersearchform">
<h4 id="aria-label-foldersearchform" class="voice"><roundcube:label name="arialabelfoldersearchform" /></h4>
<label for="foldersearch" class="voice"><roundcube:label name="arialabelsearchterms" /></label>
<input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='findfolders' />" />
<input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='kolab_files.findfolders' />" />
<a class="iconbutton searchicon"></a>
<roundcube:button type="link" command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
</div>

View file

@ -37,7 +37,7 @@ $labels['appendnote'] = 'Add a Note';
$labels['editnote'] = 'Edit Note';
$labels['savein'] = 'Save in';
$labels['foldersubscribe'] = 'List permanently';
$labels['findnotebooks'] = 'Find notebooks';
$labels['findnotebooks'] = 'Find notebooks...';
$labels['findnotes'] = 'Find notes';
$labels['listsearchresults'] = 'Additional notebooks';
$labels['nrnotebooksfound'] = '$nr notebooks found';

View file

@ -366,6 +366,10 @@ class libkolab extends rcube_plugin
$attrib['buttontitle'] = $attrib['label-domain'] . '.' . $attrib['buttontitle'];
}
if ($attrib['buttontitle']) {
$attrib['placeholder'] = $rcmail->gettext($attrib['buttontitle']);
}
return $rcmail->output->search_form($attrib);
}
}