From b274be78aa008b3df8c11b4e65807b5470d21515 Mon Sep 17 00:00:00 2001 From: Jonas Eberle Date: Thu, 25 Mar 2021 10:34:27 +0100 Subject: [PATCH 1/7] [BUGFIX] do not send autocompleted value by default Fixes #116 --- js/theme.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/theme.js b/js/theme.js index 360b589..b33b68d 100644 --- a/js/theme.js +++ b/js/theme.js @@ -80,7 +80,8 @@ document.addEventListener('DOMContentLoaded', function () { 'use strict'; onSelect: function (item) { searchinput.value = item.label; searchform.submit(); - } + }, + disableAutoSelect: true }); } }); From b87912dc1d8a6305f9f5cada255579fe421631c2 Mon Sep 17 00:00:00 2001 From: Jonas Eberle Date: Thu, 25 Mar 2021 10:47:09 +0100 Subject: [PATCH 2/7] [BUGFIX] do not send autocompleted value by default Fixes #116 --- sphinx_typo3_theme/static/js/theme.min.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx_typo3_theme/static/js/theme.min.js b/sphinx_typo3_theme/static/js/theme.min.js index ed9808b..a36c10e 100644 --- a/sphinx_typo3_theme/static/js/theme.min.js +++ b/sphinx_typo3_theme/static/js/theme.min.js @@ -1 +1 @@ -function toggleCurrent(e){"use strict";e.preventDefault();for(var t=e.currentTarget.parentElement.parentElement,n=t.parentElement.parentElement.querySelectorAll("li.current"),o=0;oNo data available.

"),document.getElementById("toc-version-options").dataset.ready=!0}})}}),jQuery("li.toctree-l1.current").filter(":contains('TYPO3 Exceptions')").removeClass("current"),jQuery("#btnEditOnGitHub").mouseenter(function(){jQuery("#btnHowToEdit").show()}),jQuery("#btnHowToEdit").parent().mouseleave(function(){jQuery("#btnHowToEdit").hide()})}); \ No newline at end of file +function toggleCurrent(e){"use strict";e.preventDefault();for(var t=e.currentTarget.parentElement.parentElement,n=t.parentElement.parentElement.querySelectorAll("li.current"),o=0;oNo data available.

"),document.getElementById("toc-version-options").dataset.ready=!0}})}}),jQuery("li.toctree-l1.current").filter(":contains('TYPO3 Exceptions')").removeClass("current"),jQuery("#btnEditOnGitHub").mouseenter(function(){jQuery("#btnHowToEdit").show()}),jQuery("#btnHowToEdit").parent().mouseleave(function(){jQuery("#btnHowToEdit").hide()})}); \ No newline at end of file From 028403e6f78138f5ff5794abb0e10b422fc97904 Mon Sep 17 00:00:00 2001 From: Martin Bless Date: Fri, 26 Mar 2021 11:02:14 +0100 Subject: [PATCH 3/7] Add package.json.main-with-grunt.json --- package.json.main-with-grunt.json | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package.json.main-with-grunt.json diff --git a/package.json.main-with-grunt.json b/package.json.main-with-grunt.json new file mode 100644 index 0000000..4a5353d --- /dev/null +++ b/package.json.main-with-grunt.json @@ -0,0 +1,40 @@ +{ + "name": "sphinx-typo3-theme", + "version": "1.0.0", + "private": true, + "dependencies": {}, + "devDependencies": { + "@fortawesome/fontawesome-free": "^5.13.0", + "TYPO3CMS-Guide-HowToDocument": "github:TYPO3-Documentation/TYPO3CMS-Guide-HowToDocument", + "autocompleter": "^6.0.3", + "bootstrap": "^4.4.1", + "connect-livereload": "^0.6.1", + "grunt": "^1.1.0", + "grunt-cli": "^1.3.2", + "grunt-contrib-clean": "2.0.0", + "grunt-contrib-copy": "1.0.0", + "grunt-contrib-uglify": "^4.0.1", + "grunt-contrib-watch": "^1.1.0", + "grunt-exec": "^3.0.0", + "grunt-sass": "^3.1.0", + "grunt-stylelint": "^0.15.0", + "http-server": "^0.12.3", + "jquery": "^3.5.0", + "modernizr": "^3.11.0", + "node-sass": "^4.14.0", + "popper.js": "^1.16.1", + "stylelint": "^13.3.3", + "underscore": "^1.10.2" + }, + "scripts": { + "watch": "grunt watch", + "frontend": "grunt frontend", + "build": "grunt build", + "render": "grunt render", + "serve": "http-server ./build/Result/project/0.0.0/" + }, + "engines": { + "node": ">=10.16", + "yarn": ">= 1.0.0" + } +} From 2a589e2a8445524929366e56be7c77ba457168df Mon Sep 17 00:00:00 2001 From: Martin Bless Date: Fri, 26 Mar 2021 11:13:02 +0100 Subject: [PATCH 4/7] [BUGFIX] Remove flex property from a.logo tag Resolves #119 --- sphinx_typo3_theme/layout.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sphinx_typo3_theme/layout.html b/sphinx_typo3_theme/layout.html index 8ca33b5..ff3d098 100644 --- a/sphinx_typo3_theme/layout.html +++ b/sphinx_typo3_theme/layout.html @@ -114,8 +114,9 @@ {%- block pageheader %} {%- if logo and logo != 'None' %} + {%- endif %} {%- endblock %} From 71d3c7a61cc4bd75a5f431c16a9dbc55b953ef54 Mon Sep 17 00:00:00 2001 From: Martin Bless Date: Fri, 26 Mar 2021 13:38:44 +0100 Subject: [PATCH 5/7] Use msg 'Not found in word stems' --- js/theme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/theme.js b/js/theme.js index b33b68d..225320a 100644 --- a/js/theme.js +++ b/js/theme.js @@ -71,7 +71,7 @@ document.addEventListener('DOMContentLoaded', function () { 'use strict'; update(suggestions); }, minLength: 4, - emptyMsg: 'No elements found', + emptyMsg: 'Not found in word stems', render: function (item) { var div = document.createElement("div"); div.textContent = item.label; From 83183d4fb934af416915151762be3d7b3f2aa359 Mon Sep 17 00:00:00 2001 From: Martin Bless Date: Fri, 26 Mar 2021 13:39:47 +0100 Subject: [PATCH 6/7] Add "How to edit" button without hover --- js/theme.js | 2 -- sphinx_typo3_theme/breadcrumbs.html | 9 +++++++-- sphinx_typo3_theme/static/js/theme.min.js | 2 +- sphinx_typo3_theme/theme.conf | 2 ++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/js/theme.js b/js/theme.js index 225320a..c097cf4 100644 --- a/js/theme.js +++ b/js/theme.js @@ -124,7 +124,5 @@ jQuery(document).ready(function () { 'use strict'; // start with collapsed menu on a TYPO3 Exceptions page jQuery('li.toctree-l1.current').filter(":contains('TYPO3 Exceptions')").removeClass('current'); - jQuery('#btnEditOnGitHub').mouseenter(function () { jQuery('#btnHowToEdit').show();}); - jQuery('#btnHowToEdit').parent().mouseleave(function () {jQuery('#btnHowToEdit').hide();}); }); diff --git a/sphinx_typo3_theme/breadcrumbs.html b/sphinx_typo3_theme/breadcrumbs.html index 7e31512..747f9bf 100644 --- a/sphinx_typo3_theme/breadcrumbs.html +++ b/sphinx_typo3_theme/breadcrumbs.html @@ -8,12 +8,17 @@ {%- if pagename != "search" %}
- + {%- endif %} {%- if theme_github_repository and theme_github_branch %} {%- if theme_github_sphinx_locale %} {%- set localizationprefix = "Localization." + theme_github_sphinx_locale + "/" %} diff --git a/sphinx_typo3_theme/static/js/theme.min.js b/sphinx_typo3_theme/static/js/theme.min.js index a36c10e..df698c6 100644 --- a/sphinx_typo3_theme/static/js/theme.min.js +++ b/sphinx_typo3_theme/static/js/theme.min.js @@ -1 +1 @@ -function toggleCurrent(e){"use strict";e.preventDefault();for(var t=e.currentTarget.parentElement.parentElement,n=t.parentElement.parentElement.querySelectorAll("li.current"),o=0;oNo data available.

"),document.getElementById("toc-version-options").dataset.ready=!0}})}}),jQuery("li.toctree-l1.current").filter(":contains('TYPO3 Exceptions')").removeClass("current"),jQuery("#btnEditOnGitHub").mouseenter(function(){jQuery("#btnHowToEdit").show()}),jQuery("#btnHowToEdit").parent().mouseleave(function(){jQuery("#btnHowToEdit").hide()})}); \ No newline at end of file +function toggleCurrent(e){"use strict";e.preventDefault();for(var t=e.currentTarget.parentElement.parentElement,n=t.parentElement.parentElement.querySelectorAll("li.current"),o=0;oNo data available.

"),document.getElementById("toc-version-options").dataset.ready=!0}})}}),jQuery("li.toctree-l1.current").filter(":contains('TYPO3 Exceptions')").removeClass("current")}); \ No newline at end of file diff --git a/sphinx_typo3_theme/theme.conf b/sphinx_typo3_theme/theme.conf index 47a4899..58948ba 100644 --- a/sphinx_typo3_theme/theme.conf +++ b/sphinx_typo3_theme/theme.conf @@ -39,3 +39,5 @@ logo_height = 130 logo_title = TYPO3 Documentation logo_url = https://docs.typo3.org/ logo_width = 484 +# +h2edit_url = https://docs.typo3.org/m/typo3/docs-how-to-document/master/en-us/WritingDocsOfficial/GithubMethod.html From 10896ac8feca1152089b307fdd1ed572ca248118 Mon Sep 17 00:00:00 2001 From: Martin Bless Date: Fri, 26 Mar 2021 13:48:30 +0100 Subject: [PATCH 7/7] Update HISTORY.rst --- HISTORY.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index c884185..1ddde70 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,22 @@ History ======= + +4.5.2 (2021-03-26) +================== + +* Have 'How to edit' button point to `GithubMethod.html + `__ + +* Always show the 'How to edit' button when the 'Edit on ...' button is shown + +* Built in offline Sphinx search autocompletion: Turn autoSelect off, use text + 'Not found in word stems' + +* Remove flex property from logo link, so that it doesn't extend the clickable + area past the image + + 4.5.1 (2021-03-13) ==================