Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/171866
Change subject: Hygiene: Address template FIXME, introduce overlay header
partial
......................................................................
Hygiene: Address template FIXME, introduce overlay header partial
Change-Id: I4a78200100c58fcda049155776944d1a60b994d9
---
M includes/Resources.php
M javascripts/Overlay.js
M javascripts/modules/talk/TalkSectionOverlay.js
M templates/Overlay.hogan
A templates/OverlayHeader.hogan
5 files changed, 19 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/66/171866/1
diff --git a/includes/Resources.php b/includes/Resources.php
index f377e3e..0867a0f 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -520,7 +520,7 @@
'SectionAddOverlay/header.hogan' =>
'templates/modules/talk/talkSectionAddHeader.hogan',
'SectionAddOverlay.hogan' =>
'templates/modules/talk/talkSectionAdd.hogan',
'Section/header.hogan' =>
'templates/modules/talk/talkSectionHeader.hogan',
- 'SectionOverlay.hogan' =>
'templates/modules/talk/talkSection.hogan',
+ 'Section/content.hogan' =>
'templates/modules/talk/talkSection.hogan',
),
'messages' => array(
'mobile-frontend-talk-fullpage',
@@ -605,6 +605,7 @@
'mobile-frontend-overlay-continue',
),
'templates' => array(
+ 'header.hogan' => 'templates/OverlayHeader.hogan',
'Overlay.hogan' => 'templates/Overlay.hogan',
'LoadingOverlay.hogan' =>
'templates/LoadingOverlay.hogan',
'OverlayFooterLink.hogan' =>
'templates/OverlayFooterLink.hogan',
diff --git a/javascripts/Overlay.js b/javascripts/Overlay.js
index 69ba0d7..a857be0 100644
--- a/javascripts/Overlay.js
+++ b/javascripts/Overlay.js
@@ -42,6 +42,7 @@
*/
className: 'overlay',
templatePartials: {
+ header: mw.template.get( 'mobile.overlays',
'header.hogan' ),
spinner: mw.template.get( 'mobile.ajax',
'spinner.hogan' )
},
template: mw.template.get( 'mobile.overlays', 'Overlay.hogan' ),
diff --git a/javascripts/modules/talk/TalkSectionOverlay.js
b/javascripts/modules/talk/TalkSectionOverlay.js
index f62f60c..dcdb18b 100644
--- a/javascripts/modules/talk/TalkSectionOverlay.js
+++ b/javascripts/modules/talk/TalkSectionOverlay.js
@@ -12,10 +12,9 @@
* @extends Overlay
*/
TalkSectionOverlay = Overlay.extend( {
- // FIXME: This should use templatePartials
- template: mw.template.get( 'mobile.talk.overlays',
'SectionOverlay.hogan' ),
templatePartials: {
- header: mw.template.get( 'mobile.talk.overlays',
'Section/header.hogan' )
+ header: mw.template.get( 'mobile.talk.overlays',
'Section/header.hogan' ),
+ content: mw.template.get( 'mobile.talk.overlays',
'Section/content.hogan' )
},
defaults: {
reply: mw.msg( 'mobile-frontend-talk-reply' ),
diff --git a/templates/Overlay.hogan b/templates/Overlay.hogan
index 3059e19..ef5bd9a 100644
--- a/templates/Overlay.hogan
+++ b/templates/Overlay.hogan
@@ -1,18 +1,6 @@
<div class="overlay-header-container {{#fixedHeader}}
position-fixed{{/fixedHeader}}">
<div class="overlay-header">
- <ul>
- <li>{{{cancelButton}}}</li>
- </ul>
- <div class="overlay-title">
- <h2>{{{heading}}}</h2>
- </div>
- {{#headerButtons}}
- <div class="{{headerButtonsListClassName}}">
- {{#headerButtons}}
- <button class="{{className}}">{{msg}}</button>
- {{/headerButtons}}
- </div>
- {{/headerButtons}}
+ {{>header}}
</div>
</div>
<div class="overlay-content">
diff --git a/templates/OverlayHeader.hogan b/templates/OverlayHeader.hogan
new file mode 100644
index 0000000..2e1ea26
--- /dev/null
+++ b/templates/OverlayHeader.hogan
@@ -0,0 +1,13 @@
+<ul>
+ <li>{{{cancelButton}}}</li>
+</ul>
+<div class="overlay-title">
+ <h2>{{{heading}}}</h2>
+</div>
+{{#headerButtons}}
+<div class="{{headerButtonsListClassName}}">
+ {{#headerButtons}}
+ <button class="{{className}}">{{msg}}</button>
+ {{/headerButtons}}
+</div>
+{{/headerButtons}}
--
To view, visit https://gerrit.wikimedia.org/r/171866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a78200100c58fcda049155776944d1a60b994d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
