[MediaWiki-commits] [Gerrit] WikidataPageBanner hide icon placeholder if empty - change (mediawiki...WikidataPageBanner)

2015-07-08 Thread Sumit (Code Review) 
Sumit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223558

Change subject: WikidataPageBanner hide icon placeholder if empty
..

WikidataPageBanner hide icon placeholder if empty

Bug: T105163
Change-Id: I1ac2edc605bb262e751bdbebb3d1109f9c30b6ab
---
M includes/WikidataPageBanner.functions.php
M templates/banner.mustache
2 files changed, 6 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner 
refs/changes/58/223558/1

diff --git a/includes/WikidataPageBanner.functions.php 
b/includes/WikidataPageBanner.functions.php
index 7a3d83d..503d025 100644
--- a/includes/WikidataPageBanner.functions.php
+++ b/includes/WikidataPageBanner.functions.php
@@ -33,7 +33,8 @@
) );
$iconsToAdd[] = array( 'icon' = $icon );
}
+   $paramsForBannerTemplate['icons'] = true;
+   $paramsForBannerTemplate['iconSet'] = $iconsToAdd;
}
-   $paramsForBannerTemplate['icons'] = $iconsToAdd;
}
 }
diff --git a/templates/banner.mustache b/templates/banner.mustache
index a6e6ed7..e2c7564 100644
--- a/templates/banner.mustache
+++ b/templates/banner.mustache
@@ -3,11 +3,13 @@
div class=topbanner
div class=name{{title}}/div
a title={{tooltip}} href={{bannerfile}}img 
src={{banner}} srcset={{srcset}} class=wpb-banner-image/a
+   {{#icons}}
div class=iconbox
-   {{#icons}}
+   {{#iconSet}}
{{{icon}}}
-   {{/icons}}
+   {{/iconSet}}
/div
+   {{/icons}}
div class=topbanner-toc/div
/div
/div

-- 
To view, visit https://gerrit.wikimedia.org/r/223558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ac2edc605bb262e751bdbebb3d1109f9c30b6ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Sumit asthana.sumi...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WikidataPageBanner hide icon placeholder if empty - change (mediawiki...WikidataPageBanner)

2015-07-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: WikidataPageBanner hide icon placeholder if empty
..


WikidataPageBanner hide icon placeholder if empty

Bug: T105163
Change-Id: I1ac2edc605bb262e751bdbebb3d1109f9c30b6ab
---
M includes/WikidataPageBanner.functions.php
M templates/banner.mustache
2 files changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Jdlrobson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/WikidataPageBanner.functions.php 
b/includes/WikidataPageBanner.functions.php
index 7a3d83d..f8d9cb7 100644
--- a/includes/WikidataPageBanner.functions.php
+++ b/includes/WikidataPageBanner.functions.php
@@ -33,7 +33,8 @@
) );
$iconsToAdd[] = array( 'icon' = $icon );
}
+   $paramsForBannerTemplate['hasIcons'] = true;
+   $paramsForBannerTemplate['icons'] = $iconsToAdd;
}
-   $paramsForBannerTemplate['icons'] = $iconsToAdd;
}
 }
diff --git a/templates/banner.mustache b/templates/banner.mustache
index a6e6ed7..f1cc539 100644
--- a/templates/banner.mustache
+++ b/templates/banner.mustache
@@ -3,11 +3,13 @@
div class=topbanner
div class=name{{title}}/div
a title={{tooltip}} href={{bannerfile}}img 
src={{banner}} srcset={{srcset}} class=wpb-banner-image/a
+   {{#hasIcons}}
div class=iconbox
{{#icons}}
{{{icon}}}
{{/icons}}
/div
+   {{/hasIcons}}
div class=topbanner-toc/div
/div
/div

-- 
To view, visit https://gerrit.wikimedia.org/r/223558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ac2edc605bb262e751bdbebb3d1109f9c30b6ab
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Sumit asthana.sumi...@gmail.com
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits