Jdlrobson has submitted this change and it was merged.
Change subject: Remove "Needs photo" text
......................................................................
Remove "Needs photo" text
New asset renders this text obsolete
Change-Id: If61aa823a581ed3cf938624e780d3d27f30003c4
---
M includes/Resources.php
M includes/specials/SpecialMobileWatchlist.php
M javascripts/specials/nearby.js
M less/specials/watchlist.less
M stylesheets/specials/images/camera.png
M stylesheets/specials/watchlist.css
M templates/articleList.html
7 files changed, 0 insertions(+), 16 deletions(-)
Approvals:
Jdlrobson: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/includes/Resources.php b/includes/Resources.php
index aa3eebc..f86c489 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -540,7 +540,6 @@
'mobile-frontend-nearby-lookup-error',
'mobile-frontend-nearby-noresults',
'mobile-frontend-nearby-link',
- 'mobile-frontend-needs-photo',
),
'scripts' => array(
'javascripts/specials/nearby.js',
diff --git a/includes/specials/SpecialMobileWatchlist.php
b/includes/specials/SpecialMobileWatchlist.php
index ab35030..2fd0158 100644
--- a/includes/specials/SpecialMobileWatchlist.php
+++ b/includes/specials/SpecialMobileWatchlist.php
@@ -496,18 +496,12 @@
$lastModified = wfMessage(
'mobile-frontend-watchlist-modified', $ts->getHumanTimestamp() )->text();
$thumb = $this->renderThumb( $row );
- if ( isset( $thumb['needsPhoto'] ) && $thumb['needsPhoto'] &&
MobileContext::singleton()->isBetaGroupMember() ) {
- $cta = Html::element( 'div', array( 'class' => 'info'
), wfMessage( 'mobile-frontend-needs-photo' )->text() );
- } else {
- $cta = '';
- }
$output->addHtml(
Html::openElement( 'li', array( 'title' => $titleText )
) .
Html::openElement( 'a', array( 'href' =>
$title->getLocalUrl(), 'class' => 'title' ) ) .
$thumb['html'] .
Html::element( 'h2', array(), $titleText ).
- $cta .
Html::element( 'div', array( 'class' => 'info' ),
$lastModified ) .
Html::closeElement( 'a' ) .
Html::closeElement( 'li' )
diff --git a/javascripts/specials/nearby.js b/javascripts/specials/nearby.js
index 53a90f2..ca15d1e 100644
--- a/javascripts/specials/nearby.js
+++ b/javascripts/specials/nearby.js
@@ -108,7 +108,6 @@
page.pageimageClass = thumb.width >
thumb.height ? 'listThumbH' : 'listThumbV';
} else {
page.pageimageClass = 'needsPhoto';
- page.cta = mw.msg(
'mobile-frontend-needs-photo' );
}
page.anchor = 'item_' + i;
page.url = M.history.getArticleUrl( page.title );
diff --git a/less/specials/watchlist.less b/less/specials/watchlist.less
index e4a85c5..234bcb9 100644
--- a/less/specials/watchlist.less
+++ b/less/specials/watchlist.less
@@ -34,7 +34,6 @@
background-position: center center;
&.needsPhoto {
background-image: url(images/camera.png);
- .background-size( 50%, auto );
}
}
diff --git a/stylesheets/specials/images/camera.png
b/stylesheets/specials/images/camera.png
index e2ddc28..bbeba03 100644
--- a/stylesheets/specials/images/camera.png
+++ b/stylesheets/specials/images/camera.png
Binary files differ
diff --git a/stylesheets/specials/watchlist.css
b/stylesheets/specials/watchlist.css
index abeb8c9..3e27574 100644
--- a/stylesheets/specials/watchlist.css
+++ b/stylesheets/specials/watchlist.css
@@ -25,12 +25,6 @@
}
.listThumb.needsPhoto {
background-image: url(images/camera.png);
- /* use -webkit prefix for older android browsers eg. nexus 1 */
-
- -moz-background-size: 50% auto;
- -o-background-size: 50% auto;
- -webkit-background-size: 50% auto;
- background-size: 50% auto;
}
.listThumbH {
/* use -webkit prefix for older android browsers eg. nexus 1 */
diff --git a/templates/articleList.html b/templates/articleList.html
index e2f8178..0546de3 100644
--- a/templates/articleList.html
+++ b/templates/articleList.html
@@ -4,7 +4,6 @@
<a href="{{url}}" class="title" name="{{anchor}}">
<div class="listThumb {{pageimageClass}}"
style="{{listThumbStyleAttribute}}"></div>
<h2>{{title}}</h2>
- {{#cta}}<div class="info">{{cta}}</div>{{/cta}}
<div class="info proximity">{{proximity}}</div>
</a>
</li>
--
To view, visit https://gerrit.wikimedia.org/r/65002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If61aa823a581ed3cf938624e780d3d27f30003c4
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[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
