Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit b4fb33f

Browse files
committed
Improve layout, add explanation paragraph.
1 parent 24e64ca commit b4fb33f

File tree

4 files changed

+43
-12
lines changed

4 files changed

+43
-12
lines changed

css/obBase.css

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4876,7 +4876,8 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
48764876
bottom: -150px;
48774877
right: 0;
48784878
z-index: 1;
4879-
padding: 20px;
4879+
width: 490px;
4880+
padding: 38px;
48804881
opacity: 0;
48814882
background: #141414;
48824883
color: #fff;
@@ -4890,7 +4891,23 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
48904891
}
48914892

48924893
.socialReminder .socialTitle {
4893-
margin-right: 40px;
4894+
margin-bottom: 20px;
4895+
}
4896+
4897+
.socialReminder .socialInfoLink {
4898+
font-style: normal;
4899+
cursor: pointer;
4900+
}
4901+
4902+
.socialReminder .socialInfoLinkInner {
4903+
font-style: normal;
4904+
text-decoration: underline;
4905+
cursor: pointer;
4906+
}
4907+
4908+
.socialReminder .socialParagraph {
4909+
line-height: 1.4;
4910+
margin-bottom: 20px;
48944911
}
48954912

48964913
.socialReminder .closeBtn {

js/languages/en-US.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,8 +731,11 @@
731731
"newConfigTitle": "New Configuration",
732732
"new": "New"
733733
},
734-
"socialSharing": {
734+
"socialReminder": {
735735
"title": "OpenBazaar",
736+
"explanationLink": "(%{linkText})",
737+
"explanationLinkText": "<span class='socialInfoLinkInner'>more</span>",
738+
"explanation": "If you can take a few seconds to post a link to OpenBazaar to social media, you can help OpenBazaar grow. The more buyers and sellers that are active, the stronger the network will be, with a greater variety of better products and services available for purchase.",
736739
"blurb": "OpenBazaar%20is%20a%20decentralized%2C%20P2P%20Bitcoin%20Marketplace.",
737740
"shareTwitter": "Share on Twitter",
738741
"shareFacebook": "Share on Facebook",

js/templates/pageNav.html

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,23 @@
7272
</a>
7373
<hr/>
7474
<% var shareURL = "https%3A%2F%2Fopenbazaar.org" %>
75-
<a href="https://twitter.com/intent/tweet/?text=<%= polyglot.t('socialSharing.blurb') %>&url=<%= shareURL %>&hashtags=OpenBazaar&related=openbazaar%3AOpenBazaar,News%20about%20OpenBazaar">
75+
<a href="https://twitter.com/intent/tweet/?text=<%= polyglot.t('socialReminder.blurb') %>&url=<%= shareURL %>&hashtags=OpenBazaar&related=openbazaar%3AOpenBazaar,News%20about%20OpenBazaar">
7676
<span class="ion-social-twitter fontSize11 marginRight2 textOpacity1"></span>
7777
Twitter
7878
</a>
7979
<a href="https://www.facebook.com/sharer/sharer.php?u=<%= shareURL %>">
8080
<span class="ion-social-facebook fontSize11 marginRight2 textOpacity1"></span>
8181
Facebook
8282
</a>
83-
<a href=http://pinterest.com/pin/create/button/?url=<%= shareURL %>&description=<%= polyglot.t('socialSharing.blurb') %>">
83+
<a href=http://pinterest.com/pin/create/button/?url=<%= shareURL %>&description=<%= polyglot.t('socialReminder.blurb') %>">
8484
<span class="ion-social-pinterest fontSize11 marginRight2 textOpacity1"></span>
8585
Pinterest
8686
</a>
87-
<a href="https://www.linkedin.com/shareArticle?mini=true&url=<%= shareURL %>&title=<%= polyglot.t('socialSharing.title') %>&summary=<%= polyglot.t('socialSharing.blurb') %>&source=OpenBazaar">
87+
<a href="https://www.linkedin.com/shareArticle?mini=true&url=<%= shareURL %>&title=<%= polyglot.t('socialReminder.title') %>&summary=<%= polyglot.t('socialReminder.blurb') %>&source=OpenBazaar">
8888
<span class="ion-social-linkedin fontSize11 marginRight2 textOpacity1"></span>
8989
LinkedIn
9090
</a>
91-
<a href="http://www.tumblr.com/share/link?url=<%= shareURL %>&name=OpenBazaar&description=<%= polyglot.t('socialSharing.blurb') %>">
91+
<a href="http://www.tumblr.com/share/link?url=<%= shareURL %>&name=OpenBazaar&description=<%= polyglot.t('socialReminder.blurb') %>">
9292
<span class="ion-social-tumblr fontSize11 marginRight2 textOpacity1"></span>
9393
Tumblr
9494
</a>
@@ -173,22 +173,27 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
173173
<% if (ob.showSocial) { %>
174174
<div class="socialReminder js-socialReminder">
175175
<% var shareURL = "https%3A%2F%2Fopenbazaar.org" %>
176-
<h3 class="socialTitle"><%= polyglot.t('socialSharing.reminder') %></h3>
176+
<h3 class="socialTitle"><%= polyglot.t('socialReminder.reminder') %>&nbsp;
177+
<span class="socialInfoLink js-socialInfoLink">
178+
<%= polyglot.t('socialReminder.explanationLink', { linkText: polyglot.t('socialReminder.explanationLinkText') }) %>
179+
</span>
180+
</h3>
181+
<p class="socialParagraph hide js-socialParagraph"><%= polyglot.t('socialReminder.explanation') %></p>
177182
<div class="closeBtn js-socialCloseBtn"><i class="ion-close"></i></div>
178183
<div class="socialLinkWrapper">
179-
<a class="socialLink" href="https://twitter.com/intent/tweet/?text=<%= polyglot.t('socialSharing.blurb') %>&url=<%= shareURL %>&hashtags=OpenBazaar&related=openbazaar%3AOpenBazaar,News%20about%20OpenBazaar">
184+
<a class="socialLink" href="https://twitter.com/intent/tweet/?text=<%= polyglot.t('socialReminder.blurb') %>&url=<%= shareURL %>&hashtags=OpenBazaar&related=openbazaar%3AOpenBazaar,News%20about%20OpenBazaar">
180185
<span class="ion-social-twitter socialIcon"></span>
181186
</a>
182187
<a class="socialLink" href="https://www.facebook.com/sharer/sharer.php?u=<%= shareURL %>">
183188
<span class="ion-social-facebook socialIcon"></span>
184189
</a>
185-
<a class="socialLink" href=http://pinterest.com/pin/create/button/?url=<%= shareURL %>&description=<%= polyglot.t('socialSharing.blurb') %>">
190+
<a class="socialLink" href=http://pinterest.com/pin/create/button/?url=<%= shareURL %>&description=<%= polyglot.t('socialReminder.blurb') %>">
186191
<span class="ion-social-pinterest socialIcon"></span>
187192
</a>
188-
<a class="socialLink" href="https://www.linkedin.com/shareArticle?mini=true&url=<%= shareURL %>&title=<%= polyglot.t('socialSharing.title') %>&summary=<%= polyglot.t('socialSharing.blurb') %>&source=OpenBazaar">
193+
<a class="socialLink" href="https://www.linkedin.com/shareArticle?mini=true&url=<%= shareURL %>&title=<%= polyglot.t('socialReminder.title') %>&summary=<%= polyglot.t('socialReminder.blurb') %>&source=OpenBazaar">
189194
<span class="ion-social-linkedin socialIcon"></span>
190195
</a>
191-
<a class="socialLink" href="http://www.tumblr.com/share/link?url=<%= shareURL %>&name=OpenBazaar&description=<%= polyglot.t('socialSharing.blurb') %>">
196+
<a class="socialLink" href="http://www.tumblr.com/share/link?url=<%= shareURL %>&name=OpenBazaar&description=<%= polyglot.t('socialReminder.blurb') %>">
192197
<span class="ion-social-tumblr socialIcon"></span>
193198
</a>
194199
</div>

js/views/pageNavVw.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ module.exports = baseVw.extend({
4545
'mouseenter .js-serverSubmenu': 'mouseenterServerSubmenu',
4646
'mouseleave .js-serverSubmenu': 'mouseleaveServerSubmenu',
4747
'click .js-socialCloseBtn': 'clickSocialCloseBtn',
48+
'click .js-socialInfoLink': 'clickSocialInfoLink',
4849
},
4950

5051
initialize: function(options){
@@ -409,6 +410,7 @@ module.exports = baseVw.extend({
409410

410411
if (self.showSocial) {
411412
self.$socialReminder = self.$('.js-socialReminder');
413+
self.$socialParagraph = self.$('.js-socialParagraph');
412414
setTimeout(function() {
413415
self.$socialReminder.addClass('show');
414416
}, 10000);
@@ -423,6 +425,10 @@ module.exports = baseVw.extend({
423425
localStorage.setItem('showSocial', 'hide');
424426
},
425427

428+
clickSocialInfoLink: function() {
429+
this.$socialParagraph.toggleClass('hide');
430+
},
431+
426432
showAboutModal: function(){
427433
this.cleanNav();
428434
this.aboutModal.setTab('about')

0 commit comments

Comments
 (0)