Merge 3.2 into master

This commit is contained in:
Sabina Talipova 2022-12-16 11:58:33 +13:00
commit 88fe457a90
2 changed files with 2 additions and 15 deletions

View File

@ -1,6 +1,6 @@
# Using the Simple theme
* Copy the theme into the `themes/` directory of your SilverStripe project. If you've named it correctly, there should be a directory called `themes/simple/templates`.
* Copy the theme into the `themes/` directory of your Silverstripe project. If you've named it correctly, there should be a directory called `themes/simple/templates`.
* Add the following to your `mysite/_config.php` file. Remove any existing `SSViewer::set_theme` lines.

View File

@ -2,21 +2,8 @@ jQuery.noConflict();
(function($) {
$(document).ready(function() {
/* removes text from search form on focus and replaces it on unfocus - if text is entered then it does not get replaced with default on unfocus */
// L is a magnifying glass icon in the font
$('#SearchForm_SearchForm_action_results').val('L');
var searchField = $('#SearchForm_SearchForm_Search');
var default_value = searchField.val();
searchField.focus(function() {
$(this).addClass('active');
if(searchField.val() == default_value) {
searchField.val('');
}
});
searchField.blur(function() {
if(searchField.val() == '') {
searchField.val(default_value);
}
});
if (!$.browser.msie || ($.browser.msie && (parseInt($.browser.version, 10) > 8))) {
var searchBarButton = $("button.search-dropdown-icon");