JGonera has submitted this change and it was merged.
Change subject: Story 420: Promote last modified to stable
......................................................................
Story 420: Promote last modified to stable
Change-Id: If5b65a39b22bc81bd5bb715db45eb46a6fb074e7
---
M MobileFrontend.php
M includes/skins/SkinMobile.php
2 files changed, 13 insertions(+), 12 deletions(-)
Approvals:
JGonera: Verified; Looks good to me, approved
diff --git a/MobileFrontend.php b/MobileFrontend.php
index 62f2cd7..c046ab1 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -237,26 +237,17 @@
$wgResourceModules['mobile.beta'] = $wgMFMobileResourceBoilerplate + array(
'dependencies' => array(
'mobile.stable',
- 'mediawiki.jqueryMsg',
),
'scripts' => array(
'javascripts/common/mf-history-jquery.js',
'javascripts/modules/mf-toggle-dynamic.js',
'javascripts/modules/mf-search.js',
'javascripts/modules/mf-languages.js',
- 'javascripts/modules/mf-last-modified.js',
),
'position' => 'bottom',
'messages' => array(
'pagetitle',
'mobile-frontend-language-header',
- 'mobile-frontend-last-modified-seconds',
- 'mobile-frontend-last-modified-hours',
- 'mobile-frontend-last-modified-minutes',
- 'mobile-frontend-last-modified-hours',
- 'mobile-frontend-last-modified-days',
- 'mobile-frontend-last-modified-months',
- 'mobile-frontend-last-modified-years',
// for mf-toggle-dynamic.js
'mobile-frontend-show-button',
@@ -353,6 +344,7 @@
$wgResourceModules['mobile.stable'] = $wgMFMobileResourceBoilerplate + array(
'dependencies' => array(
+ 'mediawiki.jqueryMsg',
'mobile.startup',
'mobile.stable.dependencies',
'mediawiki.util',
@@ -372,6 +364,7 @@
'javascripts/common/mf-navigation.js',
'javascripts/common/mf-notification.js',
'javascripts/modules/mf-homepage.js',
'javascripts/modules/mf-cleanuptemplates.js',
+ 'javascripts/modules/mf-last-modified.js',
'javascripts/modules/mf-watchstar.js',
'javascripts/modules/mf-photo.js',
'javascripts/modules/mf-references.js'
@@ -381,6 +374,15 @@
'mobile-frontend-meta-data-issues',
'mobile-frontend-meta-data-issues-header',
+ // mf-last-modified.js
+ 'mobile-frontend-last-modified-seconds',
+ 'mobile-frontend-last-modified-hours',
+ 'mobile-frontend-last-modified-minutes',
+ 'mobile-frontend-last-modified-hours',
+ 'mobile-frontend-last-modified-days',
+ 'mobile-frontend-last-modified-months',
+ 'mobile-frontend-last-modified-years',
+
// mf-notification.js
'mobile-frontend-drawer-cancel',
'mobile-frontend-logged-in-toast-notification',
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index e101ed5..63e84cb 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -215,9 +215,8 @@
)->parse();
$timestamp = wfTimestamp( TS_UNIX, $timestamp );
$postBodyText = $this->buildLanguageSelection();
- if ( $inBeta ) {
- $postBodyText .= "<p id=\"mw-mf-last-modified\"
data-timestamp=\"$timestamp\">$lastModified</p>";
- }
+ // add last modified timestamp
+ $postBodyText .= "<p id=\"mw-mf-last-modified\"
data-timestamp=\"$timestamp\">$lastModified</p>";
}
$htmlHeader = $this->getHtmlHeader();
--
To view, visit https://gerrit.wikimedia.org/r/52062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5b65a39b22bc81bd5bb715db45eb46a6fb074e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
