sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-22 21:57:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix text problems in Community Guidelines and broken email links; also add press kit link (#8623)

Browse source
This commit is contained in:
Alys 2017-04-01 02:07:18 +10:00 committed by Matteo Pagliazzi
parent 4fed13afdd
commit ec98541df6
5 changed files with 117 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
website/common/locales/en/communityGuidelines.json
View file

@ -70,7 +70,7 @@
"commGuidePara039": "The Back Corner Guild is a free public space to discuss sensitive subjects, and it is carefully moderated. It is not a place for general discussions or conversations. <strong>The Public Space Guidelines still apply, as do all of the Terms and Conditions.</strong> Just because we are wearing long cloaks and clustering in a corner doesn't mean that anything goes! Now pass me that smoldering candle, will you?",
"commGuideHeadingTrello": "Trello Boards",
"commGuidePara040": "<strong>Trello serves as an open forum for suggestions and discussion of site features.</strong> Habitica is ruled by the people in the form of valiant contributors -- we all build the site together. Trello lends structure to our system. Out of consideration for this, <strong>try your best to contain all your thoughts into one comment, instead of commenting many times in a row on the same card. If you think of something new, feel free to edit your original comments.</strong> Please, take pity on those of us who receive a notification for every new comment. Our inboxes can only withstand so much.",
"commGuidePara041": "Habitica uses five different Trello boards:",
"commGuidePara041": "Habitica uses four different Trello boards:",
"commGuideList03A": "The <strong>Main Board</strong> is a place to request and vote on site features.",
"commGuideList03B": "The <strong>Mobile Board</strong> is a place to request and vote on mobile app features.",
"commGuideList03C": "The <strong>Pixel Art Board</strong> is a place to discuss and submit pixel art.",

110
website/views/options/profile/profile.jade
View file

@ -1,55 +1,55 @@
script(id='partials/options.profile.profile.html', type='text/ng-template')
.container-fluid
.row
.col-md-12(ng-show='!_editing.profile')
button.btn.btn-default(ng-click='_editing.profile = true', ng-show='!_editing.profile')= env.t('edit')
h4=env.t('displayName')
span(ng-show='profile.profile.name') {{profile.profile.name}}
p
small.muted=env.t('displayNameDescription1')
|&nbsp;
a(href='/#/options/settings/settings')=env.t('displayNameDescription2')
|&nbsp;
=env.t('displayNameDescription3')
span.muted(ng-hide='profile.profile.name') -&nbsp;
=env.t('none')
| &nbsp;-
h4=env.t('displayPhoto')
img.img-rendering-auto(ng-show='profile.profile.imageUrl', ng-src='{{profile.profile.imageUrl}}')
span.muted(ng-hide='profile.profile.imageUrl') -&nbsp;
=env.t('none')
| &nbsp;-
h4=env.t('displayBlurb')
markdown(ng-show='profile.profile.blurb', text='profile.profile.blurb')
span.muted(ng-hide='profile.profile.blurb') -&nbsp;
=env.t('none')
| &nbsp;-
//{{profile.profile.blurb | linky:'_blank'}}
.row
.col-md-6
h4=env.t('totalCheckinsTitle')
span {{env.t('totalCheckins', {count: user.loginIncentives})}}
.col-md-6
h4
| {{::getProgressDisplay()}}
.progress
.progress-bar(role='progressbar', aria-valuenow='{{::incentivesProgress()}}', aria-valuemin='0', aria-valuemax='100', style='width: {{::incentivesProgress()}}%;')
span.sr-only {{::incentivesProgress()}}% Complete
form.col-md-4(ng-show='_editing.profile', ng-submit='save()')
.alert.alert-info.alert-sm
!=env.t("communityGuidelinesWarning")
input.btn.btn-primary(type='submit', value=env.t('save'))
// TODO use photo-upload instead: https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/xMmADvxBOak
.form-group
label=env.t('displayName')
input.form-control(type='text', placeholder=env.t('fullName'), ng-model='editingProfile.name')
.form-group
label=env.t('photoUrl')
input.form-control(type='url', ng-model='editingProfile.imageUrl', placeholder=env.t('imageUrl'))
.form-group
label=env.t('displayBlurb')
textarea.form-control(rows=5, placeholder=env.t('displayBlurbPlaceholder'), ng-model='editingProfile.blurb')
include ../../shared/formatting-help
script(id='partials/options.profile.profile.html', type='text/ng-template')
.container-fluid
.row
.col-md-12(ng-show='!_editing.profile')
button.btn.btn-default(ng-click='_editing.profile = true', ng-show='!_editing.profile')= env.t('edit')
h4=env.t('displayName')
span(ng-show='profile.profile.name') {{profile.profile.name}}
p
small.muted=env.t('displayNameDescription1')
|&nbsp;
a(href='/#/options/settings/settings')=env.t('displayNameDescription2')
|&nbsp;
=env.t('displayNameDescription3')
span.muted(ng-hide='profile.profile.name') -&nbsp;
=env.t('none')
| &nbsp;-
h4=env.t('displayPhoto')
img.img-rendering-auto(ng-show='profile.profile.imageUrl', ng-src='{{profile.profile.imageUrl}}')
span.muted(ng-hide='profile.profile.imageUrl') -&nbsp;
=env.t('none')
| &nbsp;-
h4=env.t('displayBlurb')
markdown(ng-show='profile.profile.blurb', text='profile.profile.blurb')
span.muted(ng-hide='profile.profile.blurb') -&nbsp;
=env.t('none')
| &nbsp;-
//{{profile.profile.blurb | linky:'_blank'}}
.row
.col-md-6
h4=env.t('totalCheckinsTitle')
span {{env.t('totalCheckins', {count: user.loginIncentives})}}
.col-md-6
h4
| {{::getProgressDisplay()}}
.progress
.progress-bar(role='progressbar', aria-valuenow='{{::incentivesProgress()}}', aria-valuemin='0', aria-valuemax='100', style='width: {{::incentivesProgress()}}%;')
span.sr-only {{::incentivesProgress()}}% Complete
form.col-md-4(ng-show='_editing.profile', ng-submit='save()')
.alert.alert-info.alert-sm
!=env.t("communityGuidelinesWarning", { hrefBlankCommunityManagerEmail : '<a href="mailto:' + env.EMAILS.COMMUNITY_MANAGER_EMAIL + '">' + env.EMAILS.COMMUNITY_MANAGER_EMAIL + '</a>'})
input.btn.btn-primary(type='submit', value=env.t('save'))
// TODO use photo-upload instead: https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/xMmADvxBOak
.form-group
label=env.t('displayName')
input.form-control(type='text', placeholder=env.t('fullName'), ng-model='editingProfile.name')
.form-group
label=env.t('photoUrl')
input.form-control(type='url', ng-model='editingProfile.imageUrl', placeholder=env.t('imageUrl'))
.form-group
label=env.t('displayBlurb')
textarea.form-control(rows=5, placeholder=env.t('displayBlurbPlaceholder'), ng-model='editingProfile.blurb')
include ../../shared/formatting-help

114
website/views/options/settings/api.jade
View file

@ -1,57 +1,57 @@
script(type='text/ng-template', id='partials/options.settings.api.html')
.container-fluid
.row
.col-md-6
h2=env.t('API')
small=env.t('APIText')
h6=env.t('userId')
pre.prettyprint {{user.id}}
h6=env.t('APIToken')
pre.prettyprint {{User.settings.auth.apiToken}}
small!=env.t("APITokenWarning")
br
h3=env.t('thirdPartyApps')
ul
li
a(target='_blank' href='https://www.beeminder.com/habitica')=env.t('beeminder')
br
=env.t('beeminderDesc')
li
a(target='_blank' href='https://chrome.google.com/webstore/detail/habitrpg-chat-client/hidkdfgonpoaiannijofifhjidbnilbb')=env.t('chromeChatExtension')
br
=env.t('chromeChatExtensionDesc')
li
a(target='_blank' ng-href='http://data.habitrpg.com?uuid={{user._id}}')=env.t('dataTool')
br
=env.t('dataToolDesc')
li
!=env.t('otherExtensions')
br
=env.t('otherDesc')
hr
h2=env.t('webhooks')
table.table.table-striped
thead(ng-if='user.webhooks.length')
tr
th=env.t('enabled')
th=env.t('webhookURL')
th
tbody
tr(ng-repeat="webhook in user.webhooks track by $index")
td
input(type='checkbox', ng-model='webhook.enabled', ng-change='saveWebhook(webhook, $index)')
td
input.form-control(type='url', ng-model='webhook.url', ng-change='webhook._editing=true', ui-keyup="{13:'saveWebhook(webhook, $index)'}")
td
span.pull-left(ng-show='webhook._editing') *
a.checklist-icons(ng-click='deleteWebhook(webhook, $index)')
span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))
tr
td(colspan=2)
form.form-horizontal(ng-submit='addWebhook(_newWebhook.url)')
.form-group.col-sm-10
input.form-control(type='url', ng-model='_newWebhook.url', placeholder=env.t('webhookURL'))
.col-sm-2
button.btn.btn-sm.btn-primary(type='submit')=env.t('add')
script(type='text/ng-template', id='partials/options.settings.api.html')
.container-fluid
.row
.col-md-6
h2=env.t('API')
small=env.t('APIText')
h6=env.t('userId')
pre.prettyprint {{user.id}}
h6=env.t('APIToken')
pre.prettyprint {{User.settings.auth.apiToken}}
small!=env.t("APITokenWarning", { hrefTechAssistanceEmail : '<a href="mailto:' + env.EMAILS.TECH_ASSISTANCE_EMAIL + '">' + env.EMAILS.TECH_ASSISTANCE_EMAIL + '</a>' })
br
h3=env.t('thirdPartyApps')
ul
li
a(target='_blank' href='https://www.beeminder.com/habitica')=env.t('beeminder')
br
=env.t('beeminderDesc')
li
a(target='_blank' href='https://chrome.google.com/webstore/detail/habitrpg-chat-client/hidkdfgonpoaiannijofifhjidbnilbb')=env.t('chromeChatExtension')
br
=env.t('chromeChatExtensionDesc')
li
a(target='_blank' ng-href='http://data.habitrpg.com?uuid={{user._id}}')=env.t('dataTool')
br
=env.t('dataToolDesc')
li
!=env.t('otherExtensions')
br
=env.t('otherDesc')
hr
h2=env.t('webhooks')
table.table.table-striped
thead(ng-if='user.webhooks.length')
tr
th=env.t('enabled')
th=env.t('webhookURL')
th
tbody
tr(ng-repeat="webhook in user.webhooks track by $index")
td
input(type='checkbox', ng-model='webhook.enabled', ng-change='saveWebhook(webhook, $index)')
td
input.form-control(type='url', ng-model='webhook.url', ng-change='webhook._editing=true', ui-keyup="{13:'saveWebhook(webhook, $index)'}")
td
span.pull-left(ng-show='webhook._editing') *
a.checklist-icons(ng-click='deleteWebhook(webhook, $index)')
span.glyphicon.glyphicon-trash(tooltip=env.t('delete'))
tr
td(colspan=2)
form.form-horizontal(ng-submit='addWebhook(_newWebhook.url)')
.form-group.col-sm-10
input.form-control(type='url', ng-model='_newWebhook.url', placeholder=env.t('webhookURL'))
.col-sm-2
button.btn.btn-sm.btn-primary(type='submit')=env.t('add')

2
website/views/shared/footer.jade
View file

@ -36,6 +36,8 @@ footer.footer(ng-controller='FooterCtrl')
a(href='/static/privacy')=env.t('companyPrivacy')
li
a(href='/static/terms')=env.t('companyTerms')
li
a(href='/static/press-kit')=env.t('presskit')
li
a(href='/static/contact')=env.t('contactUs')
li

4
website/views/static/community-guidelines.jade
View file

@ -28,8 +28,8 @@ block content
p.pagemeta
=env.t('lastUpdated')
|&nbsp;
=env.t('February')
|&nbsp;28&comma; 2016
=env.t('March')
|&nbsp;30&comma; 2017
h2#welcome=env.t('commGuideHeadingWelcome')
.clearfix
img.pull-left(src='/community-guidelines-images/intro.png', alt='')