jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Split the SearchOverlay template into two
......................................................................
Hygiene: Split the SearchOverlay template into two
SearchOverlay should use partials. Create 'header' and
'content' templates so that we can override either or both easily.
Change-Id: I6371f34743a6d28b9ff39fd33ef238b579f64928
---
M extension.json
D resources/mobile.search/SearchOverlay.hogan
M resources/mobile.search/SearchOverlay.js
A resources/mobile.search/content.hogan
A resources/mobile.search/header.hogan
5 files changed, 35 insertions(+), 40 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 281dd7d..926273c 100644
--- a/extension.json
+++ b/extension.json
@@ -842,7 +842,8 @@
"resources/mobile.search/MobileWebSearchLogger.js"
],
"templates": {
- "SearchOverlay.hogan":
"resources/mobile.search/SearchOverlay.hogan"
+ "header.hogan":
"resources/mobile.search/header.hogan",
+ "content.hogan":
"resources/mobile.search/content.hogan"
},
"messages": {
"0": "mobile-frontend-clear-search",
diff --git a/resources/mobile.search/SearchOverlay.hogan
b/resources/mobile.search/SearchOverlay.hogan
deleted file mode 100644
index afb2b8d..0000000
--- a/resources/mobile.search/SearchOverlay.hogan
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="overlay-header-container position-fixed">
- <div class="overlay-header">
- <ul>
- <li>{{{cancelButton}}}</li>
- </ul>
- <div class="overlay-search">
- <form method="get" action="{{action}}" class="search-box">
- <input class="search" type="search" name="search"
autocomplete="off" placeholder="{{placeholderMsg}}" value="{{searchTerm}}">
- </form>
- </div>
- <ul>
- <li>{{#clearIcon}}{{>icon}}{{/clearIcon}}</li>
- </ul>
- </div>
-</div>
-<div class="overlay-content">
- <div class="search-content overlay-header">
- <ul>
-
<li>{{#searchContentIcon}}{{>icon}}{{/searchContentIcon}}</li>
- </ul>
- <div class="caption">
- <p
class="with-results">{{#searchContentIcon}}{{label}}{{/searchContentIcon}}</p>
- <p class="without-results">{{noResultsMsg}}</p>
- <p
class="without-results">{{{searchContentNoResultsMsg}}}</p>
- </div>
- </div>
- {{{spinner}}}
- <div class="results"></div>
- {{#feedback}}
- <div class="search-feedback">
- {{prompt}}
- {{#feedback}}
- {{>anchor}}
- {{/feedback}}
- </div>
- {{/feedback}}
-</div>
diff --git a/resources/mobile.search/SearchOverlay.js
b/resources/mobile.search/SearchOverlay.js
index 4d9553c..8b4a50b 100644
--- a/resources/mobile.search/SearchOverlay.js
+++ b/resources/mobile.search/SearchOverlay.js
@@ -32,11 +32,11 @@
OO.mfExtend( SearchOverlay, Overlay, {
templatePartials: $.extend( {},
Overlay.prototype.templatePartials, {
- anchor: Anchor.prototype.template,
+ header: mw.template.get( 'mobile.search',
'header.hogan' ),
+ content: mw.template.get( 'mobile.search',
'content.hogan' ),
icon: Icon.prototype.template
} ),
className: 'overlay search-overlay',
- template: mw.template.get( 'mobile.search',
'SearchOverlay.hogan' ),
/**
* @inheritdoc
* @cfg {Object} defaults Default options hash.
diff --git a/resources/mobile.search/content.hogan
b/resources/mobile.search/content.hogan
new file mode 100644
index 0000000..7dd3332
--- /dev/null
+++ b/resources/mobile.search/content.hogan
@@ -0,0 +1,20 @@
+<div class="search-content overlay-header">
+ <ul>
+ <li>{{#searchContentIcon}}{{>icon}}{{/searchContentIcon}}</li>
+ </ul>
+ <div class="caption">
+ <p
class="with-results">{{#searchContentIcon}}{{label}}{{/searchContentIcon}}</p>
+ <p class="without-results">{{noResultsMsg}}</p>
+ <p class="without-results">{{{searchContentNoResultsMsg}}}</p>
+ </div>
+</div>
+{{{spinner}}}
+<div class="results"></div>
+{{#feedback}}
+ <div class="search-feedback">
+ {{prompt}}
+ {{#feedback}}
+ {{>anchor}}
+ {{/feedback}}
+ </div>
+{{/feedback}}
diff --git a/resources/mobile.search/header.hogan
b/resources/mobile.search/header.hogan
new file mode 100644
index 0000000..065586d
--- /dev/null
+++ b/resources/mobile.search/header.hogan
@@ -0,0 +1,11 @@
+<ul>
+ <li>{{{cancelButton}}}</li>
+</ul>
+<div class="overlay-search">
+ <form method="get" action="{{action}}" class="search-box">
+ <input class="search" type="search" name="search"
autocomplete="off" placeholder="{{placeholderMsg}}" value="{{searchTerm}}">
+ </form>
+</div>
+<ul>
+ <li>{{#clearIcon}}{{>icon}}{{/clearIcon}}</li>
+</ul>
--
To view, visit https://gerrit.wikimedia.org/r/288108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6371f34743a6d28b9ff39fd33ef238b579f64928
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
