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

Commit b222f24

Browse files
jjeffryesjjeffryes
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into shipicon
# Conflicts: # css/obBase.css
2 parents bff4c34 + ffe0065 commit b222f24

File tree

12 files changed

+377
-168
lines changed

12 files changed

+377
-168
lines changed

‎css/obBase.css‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3415,6 +3415,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
34153415
.popMenu-navBar {
34163416
top: 50px;
34173417
right: 10px;
3418+
width: 100%;
34183419
transform: none;
34193420
transition: none;
34203421
}
@@ -3434,10 +3435,15 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
34343435
color: #fff;
34353436
font-size: 13px;
34363437
padding: 10px 0;
3437-
width: 230px;
3438+
width: auto;
3439+
min-width: 230px;
34383440
overflow: hidden;
34393441
transform: translateY(-110%);
3440-
transition: transform 200ms;
3442+
transition: transform 200ms;
3443+
}
3444+
3445+
.popMenu-navBarSubMenu-servers {
3446+
width: 230px;
34413447
}
34423448

34433449
.popMenu-opened .popMenu-navBarSubMenu-pageNav,
@@ -4060,7 +4066,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
40604066
border-style: solid;
40614067
border-width: 10px 10px 0 10px;
40624068
border-color: rgba(37,37,37,.95) transparent transparent transparent;
4063-
position: absolute;
4069+
position: absolute;
40644070
bottom: -10px;
40654071
right: 48px;
40664072
}

‎js/languages/en-US.json‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"SearchForItemsPlaceholder": "Type #games, #shoes or any #tag...",
8888
"SearchForPagesPlaceholder": "Search by name or keyword",
8989
"SearchFeedPlaceholder": "Type a keyword...",
90-
"SearchForFollowersPlaceholder": "Type a name...",
90+
"SearchForFollowersPlaceholder": "Search for a name in your currently loaded followers (scroll to load more).",
9191
"SearchForUsersPlaceholder": "Type a name...",
9292
"SearchOnUserStorePlaceholder": "Type a title...",
9393
"EstDeliveryDomesticPlaceholder": "3-5 Business Days",
@@ -177,6 +177,16 @@
177177
"SSLIsOn": "SSL is on",
178178
"SSLIsOff": "SSL is off",
179179
"LibbitcoinServerAddress": "Libbitcoin Server Address",
180+
"SMTPNotificationsWarning": "Turn email notifications on/off",
181+
"SMTPNotifications": "SMTP Notifications",
182+
"SMTPPassword": "SMTP Password",
183+
"SMTPUsername": "SMTP Username",
184+
"SMTPServer": "SMTP Server Address",
185+
"SMTPServerExample": "hostname:port",
186+
"SMTPRecipientExample": "[email protected]",
187+
"SMTPRecipient": "Recipient Email Address",
188+
"SMTPSenderExample": "[email protected]",
189+
"SMTPSender": "Sender Email Address",
180190
"ServerIPPort": "Server IP:Port",
181191
"All": "All",
182192
"Name": "Name",
@@ -306,9 +316,9 @@
306316
"Off": "Off",
307317
"ClickToChange": "Click to change",
308318
"NotProvided": "not provided",
309-
"NotFollowingAnyone": "Not following anyone",
310-
"NoFollowers": "No followers",
311-
"NoReviews": "No reviews",
319+
"NotFollowingAnyone": "No nodes being followed were loaded",
320+
"NoFollowers": "No followers were loaded",
321+
"NoReviews": "No reviews were loaded",
312322
"NoDetailsSpecified": "No details specified",
313323
"Moderator": "Moderator",
314324
"Moderator2": "Moderator:",
@@ -635,6 +645,7 @@
635645
},
636646
"buyFlow": {
637647
"PayForOrder": "Pay for Order",
648+
"BuyOwnProductMsg": "You can't buy your own listing",
638649
"NeedTempAddress": "I need a temporary Bitcoin address",
639650
"NeedTempAddressHelper": "Please bookmark the url to your temporary bitcoin address",
640651
"CantFindAddress": "I can't find my bitcoin address",

‎js/models/userMd.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@ module.exports = Backbone.Model.extend({
4040

4141
moderators: [],
4242
moderator_guids: [], //list of moderator guids, created in the parse function
43-
nsfw: '' //show nsfw work content, yes or no
43+
nsfw: '', //show nsfw work content, yes or no
44+
smtp_notifications: false, // turn on smtp notifications
45+
smtp_server: '', // smtp server for notifications (e.g. smtp.gmail.com:587)
46+
smtp_sender: '', // email address FROM:
47+
smtp_recipient: '', // email address TO:
48+
smtp_username: '', // smtp server username
49+
smtp_password: '' // smtp server password or app password
4450
},
4551

4652
parse: function(response) {

‎js/router.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ module.exports = Backbone.Router.extend({
107107
guidFetch;
108108

109109
if (handle) {
110-
guidFetch = app.getGuid(handle, this.userModel.get('resolver') + '/v2/users/')
110+
guidFetch = app.getGuid(handle, this.userModel.get('resolver').replace(/\/+$/, "") + '/v2/users/')
111111
.done((guid) => {
112112
deferred.resolve(guid);
113113
}).fail(() => {

‎js/templates/buyWizard.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,10 +529,16 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
529529
<span class="ion-chevron-left fontSize10 marginRight2 textOpacity75"></span>
530530
<%= polyglot.t('Back') %>
531531
</a>
532+
<% if(ob.ownPage){ %>
533+
<div class="btn btn-bar btn-half custCol-secondary custCol-border-primary borderBottomRightRaidus3 disabled">
534+
<%= polyglot.t('buyFlow.BuyOwnProductMsg') %>
535+
</div>
536+
<% } else { %>
532537
<a class="btn btn-bar btn-half js-buyWizardSendPurchase custCol-secondary custCol-border-primary borderBottomRightRaidus3">
533538
<%= polyglot.t('buyFlow.PayForOrder') %>
534539
<span class="ion-chevron-right fontSize10 marginLeft2 textOpacity75"></span>
535540
</a>
541+
<% } %>
536542
<span class="btn btn-bar btn-half disabled js-buyWizardPendingMsg hide custCol-secondary custCol-border-primary borderBottomRightRaidus3"><%= polyglot.t('PaymentPending') %></span>
537543
<a class="btn btn-bar btn-wide js-buyWizardCloseSummary custCol-secondary borderBottomLeftRaidus3 borderBottomRightRaidus3 hide"><%= polyglot.t('Close') %></a>
538544
</div>

‎js/templates/pageNav.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,18 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
7676
<a href="#userPage">
7777
<span class="ion-document-text fontSize12 marginRight2 textOpacity1"></span>
7878
<%= polyglot.t('nav.myPage') %>
79-
<span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.myPage.toUpperCase() %></span>
79+
<span class="pull-right txt-muted marginLeft10"><%= config.keyShortcutPrefix + config.keyShortcuts.myPage.toUpperCase() %></span>
8080
</a>
8181
<a href="#userPage/<%= ob.guid %>/customize">
8282
<span class="ion-paintbucket fontSize10 textOpacity1"></span>
8383
<%= polyglot.t('nav.customizePage') %>
84-
<span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.customizePage.toUpperCase() %></span>
84+
<span class="pull-right txt-muted marginLeft10"><%= config.keyShortcutPrefix + config.keyShortcuts.customizePage.toUpperCase() %></span>
8585
</a>
8686
<% if(ob.vendor) { %>
8787
<a href="#userPage/<%= ob.guid %>/listingNew" >
8888
<span class="ion-ios-pricetag fontSize10 marginRight2 textOpacity1"></span>
8989
<%= polyglot.t('nav.createListing') %>
90-
<span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.create.toUpperCase() %></span>
90+
<span class="pull-right txt-muted marginLeft10"><%= config.keyShortcutPrefix + config.keyShortcuts.create.toUpperCase() %></span>
9191
</a>
9292
<% }else{ %>
9393
<a href="#userPage/<%= ob.guid %>/createStore">
@@ -107,27 +107,27 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
107107
<a href="#transactions/purchases">
108108
<span class="ion-log-out fontSize11 marginRight2 textOpacity1"></span>
109109
<%= polyglot.t('nav.purchases') %>
110-
<span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.purchases.toUpperCase() %></span>
110+
<span class="pull-right txt-muted marginLeft10"><%= config.keyShortcutPrefix + config.keyShortcuts.purchases.toUpperCase() %></span>
111111
</a>
112112
<% if(ob.vendor) { %>
113113
<a href="#transactions/sales">
114114
<span class="ion-log-in fontSize11 marginRight2 textOpacity1"></span>
115115
<%= polyglot.t('nav.sales') %>
116-
<span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.sales.toUpperCase() %></span>
116+
<span class="pull-right txt-muted marginLeft10"><%= config.keyShortcutPrefix + config.keyShortcuts.sales.toUpperCase() %></span>
117117
</a>
118118
<% } %>
119119
<% if(ob.moderator) { %>
120120
<a href="#transactions/cases">
121121
<span class="ion-briefcase fontSize11 marginRight2 textOpacity1"></span>
122122
<%= polyglot.t('nav.cases') %>
123-
<span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.cases.toUpperCase() %></span>
123+
<span class="pull-right txt-muted marginLeft10"><%= config.keyShortcutPrefix + config.keyShortcuts.cases.toUpperCase() %></span>
124124
</a>
125125
<% } %>
126126
<hr/>
127127
<a href="#settings">
128128
<span class="ion-toggle-filled fontSize11 marginRight2 textOpacity1"></span>
129129
<%= polyglot.t('nav.settings') %>
130-
<span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.settings.toUpperCase() %></span>
130+
<span class="pull-right txt-muted marginLeft10"><%= config.keyShortcutPrefix + config.keyShortcuts.settings.toUpperCase() %></span>
131131
</a>
132132
<hr/>
133133
<a class="js-showAboutModal">
@@ -140,7 +140,7 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
140140
</a>
141141
</div>
142142

143-
<div class="js-serverSubmenu popMenu-navBarSubMenu popMenu-navBarSubMenu-servers" style="right: 222px"></div>
143+
<div class="js-serverSubmenu popMenu-navBarSubMenu popMenu-navBarSubMenu-servers"></div>
144144
</div>
145145

146146
<div class="popMenu popMenu-notifications js-navNotificationsMenu" data-onclose="onNotifMenuClose" data-onopen="onNotifMenuOpen">

‎js/templates/settings.html‎

Lines changed: 142 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
11601160
<% if(config.testnet) { %>
11611161
<div class="positionTopRight padding10">
11621162
<span class="btn btn-txt custCol-secondary">
1163-
<%= polyglot.t('MustTestnetAddress') %> <!--remove this in production-->
1163+
<%= polyglot.t('MustTestnetAddress') %>
11641164
</span>
11651165
</div>
11661166
<% } %>
@@ -1181,8 +1181,10 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
11811181
<div class="fieldItem flexRow">
11821182
<div class="flexRow">
11831183
<div class="flexCol-4">
1184-
<input type="radio" class="fieldItem" id="fancyStylesYes" name="notFancy" value="true" /><label for="fancyStylesYes" class="radioLabel"><%= polyglot.t('Yes') %></label>
1185-
<input type="radio" class="fieldItem" id="fancyStylesNo" name="notFancy" value="false" checked/><label for="fancyStylesNo" class="radioLabel"><%= polyglot.t('No') %></label>
1184+
<input type="radio" class="fieldItem" id="fancyStylesYes" name="notFancy" value="true" />
1185+
<label for="fancyStylesYes" class="radioLabel"><%= polyglot.t('Yes') %></label>
1186+
<input type="radio" class="fieldItem" id="fancyStylesNo" name="notFancy" value="false" checked/>
1187+
<label for="fancyStylesNo" class="radioLabel"><%= polyglot.t('No') %></label>
11861188
</div>
11871189
<div class="flexCol-8">
11881190
<div class="marginLeft10 textSize11px txt-fade"><%= polyglot.t('NoFancyStylesWarning') %></div>
@@ -1194,7 +1196,6 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
11941196
</div>
11951197

11961198
<div class="flexRow">
1197-
11981199
<div class="flexCol-3 borderRight custCol-border">
11991200
<div class="fieldItem">
12001201
<label>
@@ -1208,29 +1209,32 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
12081209
<div class="fieldItem flexRow">
12091210
<div class="flexRow">
12101211
<div class="flexCol-4">
1211-
<input type="radio" class="fieldItem" id="useTestnetYes" name="useTestnet" value="true" <% if(window.config.testnet){ %>checked<% } %> /><label for="useTestnetYes" class="radioLabel"><%= polyglot.t('Yes') %></label>
1212-
<input type="radio" class="fieldItem" id="useTestnetNo" name="useTestnet" value="false" <% if(!window.config.testnet){ %>checked<% } %> /><label for="useTestnetNo" class="radioLabel"><%= polyglot.t('No') %></label>
1212+
<input type="radio" class="fieldItem" id="useTestnetYes" name="useTestnet" value="true" <% if(window.config.testnet){ %>checked<% } %> />
1213+
<label for="useTestnetYes" class="radioLabel"><%= polyglot.t('Yes') %></label>
1214+
<input type="radio" class="fieldItem" id="useTestnetNo" name="useTestnet" value="false" <% if(!window.config.testnet){ %>checked<% } %> />
1215+
<label for="useTestnetNo" class="radioLabel"><%= polyglot.t('No') %></label>
12131216
</div>
12141217
</div>
12151218
</div>
12161219
</div>
1217-
12181220
</div>
12191221

12201222
<div class="flexRow">
12211223
<div class="flexCol-3 borderRight custCol-border">
12221224
<div class="fieldItem">
12231225
<label>
12241226
<%= polyglot.t('AdditionalPaymentData') %>
1225-
<i class="ion-help-circled tooltip tooltip-box" data-tooltip="<%= polyglot.t('AdditionalPaymentDataInfo') %>"></i>
12261227
</label>
1228+
<i class="ion-help-circled tooltip tooltip-box" data-tooltip="<%= polyglot.t('AdditionalPaymentDataInfo') %>"></i>
12271229
</div>
12281230
</div>
12291231

12301232
<div class="flexCol-9 borderRight0 custCol-border">
12311233
<div class="fieldItem">
1232-
<input type="radio" class="fieldItem" id="additional_payment_data_yes" name="additionalPaymentData" value="true" checked /><label for="additional_payment_data_yes" class="radioLabel"><%= polyglot.t('Yes') %></label>
1233-
<input type="radio" class="fieldItem" id="additional_payment_data_no" name="additionalPaymentData" value="false" /><label for="additional_payment_data_no" class="radioLabel"><%= polyglot.t('No') %></label>
1234+
<input type="radio" class="fieldItem" id="additional_payment_data_yes" name="additionalPaymentData" value="true" checked />
1235+
<label for="additional_payment_data_yes" class="radioLabel"><%= polyglot.t('Yes') %></label>
1236+
<input type="radio" class="fieldItem" id="additional_payment_data_no" name="additionalPaymentData" value="false" />
1237+
<label for="additional_payment_data_no" class="radioLabel"><%= polyglot.t('No') %></label>
12341238
</div>
12351239
</div>
12361240
</div>
@@ -1271,6 +1275,134 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
12711275

12721276
</div>
12731277

1278+
<div class="flexRow borderBottom custCol-border marginTop20">
1279+
<h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('SMTPNotifications') %></h3>
1280+
</div>
1281+
1282+
<div class="flexRow">
1283+
1284+
<div class="flexCol-3 borderRight custCol-border">
1285+
<div class="fieldItem">
1286+
<label>
1287+
<%= polyglot.t('SMTPNotifications') %>
1288+
</label>
1289+
</div>
1290+
</div>
1291+
1292+
<div class="flexCol-9 borderRight0 custCol-border">
1293+
<div class="fieldItem flexRow">
1294+
<div class="flexRow">
1295+
<div class="flexCol-4">
1296+
<input type="radio" class="fieldItem" id="smtpNotificationsYes" name="smtp_notifications" value="true" /><label for="smtpNotificationsYes" class="radioLabel"><%= polyglot.t('Yes') %></label>
1297+
<input type="radio" class="fieldItem" id="smtpNotificationsNo" name="smtp_notifications" value="false" checked/><label for="smtpNotificationsNo" class="radioLabel"><%= polyglot.t('No') %></label>
1298+
</div>
1299+
<div class="flexCol-8">
1300+
<div class="marginLeft10 textSize11px txt-fade"><%= polyglot.t('SMTPNotificationsWarning') %></div>
1301+
</div>
1302+
</div>
1303+
</div>
1304+
</div>
1305+
1306+
</div>
1307+
1308+
<div class="flexRow">
1309+
1310+
<div class="flexCol-3 borderRight custCol-border">
1311+
<div class="fieldItem">
1312+
<label for="resolver">
1313+
<%= polyglot.t('SMTPServer') %>
1314+
</label>
1315+
</div>
1316+
</div>
1317+
1318+
<div class="flexCol-9 borderRight0 custCol-border">
1319+
<input name="smtp_server"
1320+
id="smtpServer"
1321+
type="text"
1322+
placeholder="<%= polyglot.t('SMTPServerExample') %>"
1323+
class="fieldItem"
1324+
value="<%= ob.user.smtp_server %>">
1325+
</div>
1326+
</div>
1327+
1328+
<div class="flexRow">
1329+
1330+
<div class="flexCol-3 borderRight custCol-border">
1331+
<div class="fieldItem">
1332+
<label for="resolver">
1333+
<%= polyglot.t('SMTPUsername') %>
1334+
</label>
1335+
</div>
1336+
</div>
1337+
1338+
<div class="flexCol-9 borderRight0 custCol-border">
1339+
<input name="smtp_username"
1340+
id="smtpUsername"
1341+
type="text"
1342+
class="fieldItem"
1343+
value="<%= ob.user.smtp_username %>">
1344+
</div>
1345+
</div>
1346+
1347+
<div class="flexRow">
1348+
1349+
<div class="flexCol-3 borderRight custCol-border">
1350+
<div class="fieldItem">
1351+
<label for="resolver">
1352+
<%= polyglot.t('SMTPPassword') %>
1353+
</label>
1354+
</div>
1355+
</div>
1356+
1357+
<div class="flexCol-9 borderRight0 custCol-border">
1358+
<input name="smtp_password"
1359+
id="smtpPassword"
1360+
type="text"
1361+
class="fieldItem"
1362+
value="<%= ob.user.smtp_password %>">
1363+
</div>
1364+
</div>
1365+
1366+
<div class="flexRow">
1367+
1368+
<div class="flexCol-3 borderRight custCol-border">
1369+
<div class="fieldItem">
1370+
<label for="resolver">
1371+
<%= polyglot.t('SMTPSender') %>
1372+
</label>
1373+
</div>
1374+
</div>
1375+
1376+
<div class="flexCol-9 borderRight0 custCol-border">
1377+
<input name="smtp_sender"
1378+
id="smtpSender"
1379+
type="text"
1380+
placeholder="<%= polyglot.t('SMTPSenderExample') %>"
1381+
class="fieldItem"
1382+
value="<%= ob.user.smtp_sender %>">
1383+
</div>
1384+
</div>
1385+
1386+
<div class="flexRow">
1387+
1388+
<div class="flexCol-3 borderRight custCol-border">
1389+
<div class="fieldItem">
1390+
<label for="resolver">
1391+
<%= polyglot.t('SMTPRecipient') %>
1392+
</label>
1393+
</div>
1394+
</div>
1395+
1396+
<div class="flexCol-9 borderRight0 custCol-border">
1397+
<input name="smtp_recipient"
1398+
id="smtpRecipient"
1399+
type="text"
1400+
placeholder="<%= polyglot.t('SMTPRecipientExample') %>"
1401+
class="fieldItem"
1402+
value="<%= ob.user.smtp_recipient %>">
1403+
</div>
1404+
</div>
1405+
12741406
<a class="btn btn-large js-saveAdvanced custCol-secondary pull-right marginRight15 marginTop15 marginBottom50 btn-secondary">
12751407
<span class="ion-checkmark fontSize11 marginRight2 textOpacity1"></span>
12761408
<%= polyglot.t('SaveChanges') %> (<%= config.keyShortcutPrefix + config.keyShortcuts.save.toUpperCase() %>)

0 commit comments

Comments
 (0)