From 330e0f1fa1eddcf592e50cbcb76d1e10823e63e9 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Tue, 8 Aug 2017 14:27:54 +0200 Subject: [PATCH 01/12] Add link to discourse --- app/assets/javascripts/app/views/help_view.js | 5 +++-- app/assets/templates/faq_getting_help_tpl.jst.hbs | 1 + config/locales/diaspora/en.yml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/views/help_view.js b/app/assets/javascripts/app/views/help_view.js index 48731e55c..db4f67d08 100644 --- a/app/assets/javascripts/app/views/help_view.js +++ b/app/assets/javascripts/app/views/help_view.js @@ -10,7 +10,7 @@ app.views.Help = app.views.StaticContentView.extend({ "click .faq-link-posts-and-posting" : "postsAndPosting", "click .faq-link-tags": "tags", "click .faq-link-keyboard-shortcuts" : "keyboardShortcuts", - "click .faq-link-chat" : "chat" + "click .faq-link-chat" : "chat" }, initialize : function() { @@ -21,7 +21,8 @@ app.views.Help = app.views.StaticContentView.extend({ get_support_a_wiki: { link: this.linkHtml("https://wiki.diasporafoundation.org/Special:Search", Diaspora.I18n.t( 'wiki' ))}, get_support_a_irc: { irc: this.linkHtml("https://wiki.diasporafoundation.org/How_We_Communicate#IRC", Diaspora.I18n.t( 'irc' ))}, get_support_a_faq: { faq: this.linkHtml("https://wiki.diasporafoundation.org/FAQ_for_users", Diaspora.I18n.t( 'faq' ))}, - get_support_a_hashtag: { question: this.linkHtml("/tags/question", "#question")} + get_support_a_hashtag: { question: this.linkHtml("/tags/question", "#question")}, + get_support_a_discourse: { discourse: this.linkHtml("https://discourse.diasporafoundation.org/c/support", "discussions & support")} }; this.POSTS_AND_POSTING_SUBS = { diff --git a/app/assets/templates/faq_getting_help_tpl.jst.hbs b/app/assets/templates/faq_getting_help_tpl.jst.hbs index 1457d820d..37859b7d8 100644 --- a/app/assets/templates/faq_getting_help_tpl.jst.hbs +++ b/app/assets/templates/faq_getting_help_tpl.jst.hbs @@ -17,6 +17,7 @@
  • {{{ get_support_a_irc }}}
  • {{{ get_support_a_faq }}}
  • {{{ get_support_a_hashtag }}}
    • +
  • {{{ get_support_a_discourse }}}
    • diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 10f82eb23..0fac4de06 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -330,6 +330,7 @@ en: get_support_a_irc: "Join us on %{irc} (live chat)" get_support_a_faq: "Read our %{faq} page on wiki" get_support_a_hashtag: "Ask in a public post on diaspora* using the %{question} hashtag" + get_support_a_discourse: "Search for existing discussions relating to your enquiry or open a new thread in our %{discourse} platform" account_and_data_management: title: "Account and data management" move_pods_q: "How do I move my seed (account) from one pod to another?" From c494640a51c78d2245b6708adfe0a5ea62d0a5dc Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 16:11:27 +0200 Subject: [PATCH 02/12] Update the migration section --- config/locales/diaspora/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 0fac4de06..f281614c7 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -334,7 +334,7 @@ en: account_and_data_management: title: "Account and data management" move_pods_q: "How do I move my seed (account) from one pod to another?" - move_pods_a: "In the future you will be able to export your seed from a pod and import it on another, but this is not currently possible. You could always open a new account and add your contacts to aspects on that new seed, and ask them to add your new seed to their aspects." + move_pods_a: "Version 0.7.0.0 of diaspora* provides the first stage of account migration: you can now export all your data from the “Account” section of the user settings. Keep your data safely! In a future release you will be able to migrate your whole account, including posts and contacts, to another pod." download_data_q: "Can I download a copy of all of my data contained in my seed (account)?" download_data_a: "Yes. At the bottom of the Account tab of your settings page you will find two buttons: one for downloading your data and one for downloading your photos." close_account_q: "How do I delete my seed (account)?" From bd7f50f9b6e9b684ba5a125fafd16454e405dd83 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 16:17:12 +0200 Subject: [PATCH 03/12] 'Make contacts in this aspect visible to each other' is a local feature --- config/locales/diaspora/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index f281614c7..6a2feed37 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -354,7 +354,7 @@ en: person_multiple_aspects_q: "Can I add a person to multiple aspects?" person_multiple_aspects_a: "Yes. Go to your contacts page and click on “My contacts”. For each contact you can use the menu on the right to add them to (or remove them from) as many aspects as you want. Or you can add them to a new aspect (or remove them from an aspect) by clicking the aspect selector button on their profile page. Or you can even just move the pointer over their name where you see it in the stream, and a “hovercard” will appear. You can change the aspects they are in right there." contacts_visible_q: "What does “make contacts in this aspect visible to each other” mean?" - contacts_visible_a: "If you check this option then contacts from that aspect will be able to see who else is in it, in the “Contacts” tab on your profile page. It’s best to select this option only if the contacts in that aspect all know each other, for example if the aspect is for a club or society you belong to. They still won’t be able to see what the aspect is called." + contacts_visible_a: "If you check this option then contacts from that aspect will be able to see who else is in it, in the “Contacts” tab on your profile page. (At the moment, only your contacts who are on the same pod as you will be able to see the “Contacts” tab on your profile.) It’s best to select this option only if the contacts in that aspect all know each other, for example if the aspect is for a club or society you belong to. They still won’t be able to see what the aspect is called." remove_notification_q: "If I remove someone from an aspect, or all of my aspects, are they notified of this?" remove_notification_a: "No. They are also not notified if you add them to more aspects, when you are already sharing with them." change_aspect_of_post_q: "Once I have posted something, can I change the aspect(s) that can see it?" From a14a0e34c6fbd312ea811c589dd5ea74429f6fcb Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 19:18:51 +0200 Subject: [PATCH 04/12] Mention in comments --- config/locales/diaspora/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 6a2feed37..c5ca3a61d 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -379,7 +379,7 @@ en: how_to_mention_q: "How do I mention someone when making a post?" how_to_mention_a: "Type the “@” sign and start typing their name. A drop-down menu should appear to let you select them more easily. Note that it is only possible to mention people you have added to an aspect." mention_in_comment_q: "Can I mention someone in a comment?" - mention_in_comment_a: "No, not currently." + mention_in_comment_a: "Since version 0.7.0.0, yes! You can mention someone in a comment the same way you would do it in a post, by typing “@” and then start typing their name. Please note that when you comment on a post which is not public, you can only mention users who have already interacted with the post." see_mentions_q: "Is there a way to see the posts in which I have been mentioned?" see_mentions_a: "Yes, click “@Mentions” in the left-hand column on your home page." pods: From 8b63eabcbe1ba1b24a8c3e94e025fbe612178578 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 19:23:07 +0200 Subject: [PATCH 05/12] Search approximation --- config/locales/diaspora/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index c5ca3a61d..ff6d00120 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -389,7 +389,7 @@ en: find_people_q: "I just joined a pod, how can I find people to share with?" find_people_a: "If you want to invite your friends to join diaspora*, use the invitation link or the email link in the side-bar. Follow #tags to discover others who share your interests, and add those who post things that interest you to an aspect. Shout out that you’re #newhere in a public post." use_search_box_q: "How do I use the search box to find particular individuals?" - use_search_box_a: "If you know their full diaspora* ID (e.g. username@podname.org), you can find them by searching for it. If you are on the same pod you can search for just their username. Alternatively you can search for them by their profile name (the name you see on screen). If a search does not work the first time, try it again." + use_search_box_a: "You can search for people by entering their username or their diaspora* name (the name that is shown on their profile). If neither of these methods work, enter their full diaspora* ID (username@podname.org). If your search doesn’t work the first time, it could be due to network latency. Try it again." posts_and_posting: title: "Posts and posting" stream_full_of_posts_q: "Why is my stream full of posts from people I don’t know and don’t share with?" From 1e591b041f3a4deeda28c812ca852f30c3116375 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 19:32:07 +0200 Subject: [PATCH 06/12] Report only spam or illegal content --- app/assets/javascripts/app/views/help_view.js | 1 + app/assets/templates/faq_posts_and_posting_tpl.jst.hbs | 2 +- config/locales/diaspora/en.yml | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/views/help_view.js b/app/assets/javascripts/app/views/help_view.js index db4f67d08..bfa51a450 100644 --- a/app/assets/javascripts/app/views/help_view.js +++ b/app/assets/javascripts/app/views/help_view.js @@ -26,6 +26,7 @@ app.views.Help = app.views.StaticContentView.extend({ }; this.POSTS_AND_POSTING_SUBS = { + post_report_a: {community_guidelines: this.linkHtml("https://diasporafoundation.org/community_guidelines", Diaspora.I18n.t("community_guidelines"))}, format_text_a: { markdown: this.linkHtml("http://diasporafoundation.org/formatting", Diaspora.I18n.t( 'markdown' )), here: this.linkHtml("http://daringfireball.net/projects/markdown/syntax", Diaspora.I18n.t( 'here' )) diff --git a/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs b/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs index 10af52769..0d268d5af 100644 --- a/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs +++ b/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs @@ -28,7 +28,7 @@

    {{ post_report_q }}

     -
    {{ post_report_a }}
    +
    {{{ post_report_a }}}
    diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index ff6d00120..fd3397844 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -319,6 +319,7 @@ en: foundation_website: "diaspora* foundation website" third_party_tools: "Third-party tools" getting_started_tutorial: "”Getting started” tutorial series" + community_guidelines: "community guidelines" getting_help: title: "Getting help" getting_started_q: "Help! I need some basic help to get me started!" @@ -402,7 +403,7 @@ en: post_notification_q: "How do I get notifications, or stop getting notifications, about a post?" post_notification_a: "You will find a bell icon next to the X at the top right of a post. Click this to enable or disable notifications for that post." post_report_q: "How do I report an offensive post?" - post_report_a: "Click the alert triangle icon at the top right of the post to report it to your podmin. Enter a reason for reporting this post in the dialog box." + post_report_a: "Click the alert triangle icon at the top right of the post to report it to your podmin. Enter a reason for reporting this post in the dialog box. Please only report posts that break our %{community_guidelines} or your pod’s terms of service, for example posts containing illegal content, or which are abusive or spam." character_limit_q: "What is the character limit for posts?" character_limit_a: "65,535 characters. That’s 65,395 more characters than you get on Twitter! ;)" char_limit_services_q: "What if I'm sharing my post with a connected service with a smaller character count?" From 8158a3a3b5962a7dc839205fe65f4016006d9e2e Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 21:46:42 +0200 Subject: [PATCH 07/12] Markdown indications --- config/locales/diaspora/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index fd3397844..ee2ae4f1c 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -409,7 +409,7 @@ en: char_limit_services_q: "What if I'm sharing my post with a connected service with a smaller character count?" char_limit_services_a: "In that case you should restrict your post to the smaller character count (140 in the case of Twitter; 1000 in the case of Tumblr), and the number of characters you have left to use is displayed when that service’s icon is highlighted. You can still post to these services if your post is longer than their limit, but the text will be truncated on those services with a link to the post on diaspora*." format_text_q: "How can I format the text in my posts (bold, italics, etc.)?" - format_text_a: "By using a simplified system called %{markdown}. You can find the full Markdown syntax %{here}. The preview button is really helpful here, as you can see how your message will look before you share it." + format_text_a: "diaspora* uses a simplified system called %{markdown}. The publisher has buttons to make it easy to format your text. If you want to format your post manually, you can find the full Markdown syntax %{here}. The preview tab means you can see how your message will look before you share it. Remember that you can’t edit it once posted, so use the preview to make sure it’s perfect before pressing Share!" insert_images_q: "How do I insert images into posts?" insert_images_a: "Click the little camera icon to insert an image into a post. Press the camera icon again to add another photo, or you can select multiple photos to upload in one go." insert_images_comments_q: "Can I insert images into comments?" From b968732941649f2803b23087d8c26819487ba3c2 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 21:47:05 +0200 Subject: [PATCH 08/12] Make pronto happy (double quote, spacing...) --- app/assets/javascripts/app/views/help_view.js | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/app/views/help_view.js b/app/assets/javascripts/app/views/help_view.js index bfa51a450..6410ec179 100644 --- a/app/assets/javascripts/app/views/help_view.js +++ b/app/assets/javascripts/app/views/help_view.js @@ -4,25 +4,25 @@ app.views.Help = app.views.StaticContentView.extend({ templateName : "help", events : { - "click .faq-link" : "sectionClicked", - "click .faq-link-getting-help" : "gettingHelp", - "click .faq-link-sharing" : "sharing", - "click .faq-link-posts-and-posting" : "postsAndPosting", + "click .faq-link": "sectionClicked", + "click .faq-link-getting-help": "gettingHelp", + "click .faq-link-sharing": "sharing", + "click .faq-link-posts-and-posting": "postsAndPosting", "click .faq-link-tags": "tags", - "click .faq-link-keyboard-shortcuts" : "keyboardShortcuts", - "click .faq-link-chat" : "chat" + "click .faq-link-keyboard-shortcuts": "keyboardShortcuts", + "click .faq-link-chat": "chat" }, initialize : function() { this.GETTING_HELP_SUBS = { - getting_started_a: { tutorial_series: this.linkHtml("http://diasporafoundation.org/getting_started/sign_up", Diaspora.I18n.t( 'getting_started_tutorial' )) }, - get_support_a_website: { link: this.linkHtml("https://diasporafoundation.org/", Diaspora.I18n.t( 'foundation_website' ))}, - get_support_a_tutorials: { tutorials: this.linkHtml("https://diasporafoundation.org/tutorials", Diaspora.I18n.t( 'tutorials' ))}, - get_support_a_wiki: { link: this.linkHtml("https://wiki.diasporafoundation.org/Special:Search", Diaspora.I18n.t( 'wiki' ))}, - get_support_a_irc: { irc: this.linkHtml("https://wiki.diasporafoundation.org/How_We_Communicate#IRC", Diaspora.I18n.t( 'irc' ))}, - get_support_a_faq: { faq: this.linkHtml("https://wiki.diasporafoundation.org/FAQ_for_users", Diaspora.I18n.t( 'faq' ))}, - get_support_a_hashtag: { question: this.linkHtml("/tags/question", "#question")}, - get_support_a_discourse: { discourse: this.linkHtml("https://discourse.diasporafoundation.org/c/support", "discussions & support")} + getting_started_a: {tutorial_series: this.linkHtml("http://diasporafoundation.org/getting_started/sign_up", Diaspora.I18n.t("getting_started_tutorial"))}, + get_support_a_website: {link: this.linkHtml("https://diasporafoundation.org/", Diaspora.I18n.t("foundation_website"))}, + get_support_a_tutorials: {tutorials: this.linkHtml("https://diasporafoundation.org/tutorials", Diaspora.I18n.t("tutorials"))}, + get_support_a_wiki: {link: this.linkHtml("https://wiki.diasporafoundation.org/Special:Search", Diaspora.I18n.t("wiki"))}, + get_support_a_irc: {irc: this.linkHtml("https://wiki.diasporafoundation.org/How_We_Communicate#IRC", Diaspora.I18n.t("irc"))}, + get_support_a_faq: {faq: this.linkHtml("https://wiki.diasporafoundation.org/FAQ_for_users", Diaspora.I18n.t("faq"))}, + get_support_a_hashtag: {question: this.linkHtml("/tags/question", "#question")}, + get_support_a_discourse: {discourse: this.linkHtml("https://discourse.diasporafoundation.org/c/support", "discussions & support")} }; this.POSTS_AND_POSTING_SUBS = { From 0671a3a60c669d412d62b952e7a8282d6e292c19 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 22:07:43 +0200 Subject: [PATCH 09/12] Insert an image --- app/assets/templates/faq_posts_and_posting_tpl.jst.hbs | 4 +--- config/locales/diaspora/en.yml | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs b/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs index 0d268d5af..6fd047cc4 100644 --- a/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs +++ b/app/assets/templates/faq_posts_and_posting_tpl.jst.hbs @@ -59,9 +59,7 @@

    {{ insert_images_comments_q }}
    - {{ insert_images_comments_a1 }} - 
    ![{{ image_text }}]( {{ image_url }})
    - {{ insert_images_comments_a2 }} + {{ insert_images_comments_a }}
    diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index ee2ae4f1c..fa727ed68 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -411,12 +411,9 @@ en: format_text_q: "How can I format the text in my posts (bold, italics, etc.)?" format_text_a: "diaspora* uses a simplified system called %{markdown}. The publisher has buttons to make it easy to format your text. If you want to format your post manually, you can find the full Markdown syntax %{here}. The preview tab means you can see how your message will look before you share it. Remember that you can’t edit it once posted, so use the preview to make sure it’s perfect before pressing Share!" insert_images_q: "How do I insert images into posts?" - insert_images_a: "Click the little camera icon to insert an image into a post. Press the camera icon again to add another photo, or you can select multiple photos to upload in one go." + insert_images_a: "If you want to include an image stored on your computer in your post, click the little camera icon at the bottom of the publisher. You can also drag and drop an image, or multiple images, from your computer onto that icon. If you want to insert an image from the web into your post, click the image button on the top of the publisher, which will create the Markdown code for you." insert_images_comments_q: "Can I insert images into comments?" - insert_images_comments_a1: "You cannot upload images into comments, but the following Markdown code" - image_text: "image text" - image_url: "image url" - insert_images_comments_a2: "can be used to insert images from the web into comments as well as posts." + insert_images_comments_a: "You can use Markdown to insert an image from the web into a comment, just like in posts. However, you cannot upload images from your computer directly into comments. Upload them to an image-hosting service and then insert them using the image button above the publisher." size_of_images_q: "Can I customize the size of images in posts or comments?" size_of_images_a: "No. Images are resized automatically to fit the stream or single-post view. Markdown does not have a code for specifying the size of an image." embed_multimedia_q: "How do I embed a video, audio, or other multimedia content into a post?" From 21cdc6041d945d90b82f72ef6304065ec83ae670 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 22:57:47 +0200 Subject: [PATCH 10/12] Private profile --- app/assets/javascripts/app/views/help_view.js | 3 +-- app/assets/templates/help_tpl.jst.hbs | 12 +++------ config/locales/diaspora/en.yml | 26 ++++++------------- spec/javascripts/app/views/help_view_spec.js | 15 ++++------- 4 files changed, 18 insertions(+), 38 deletions(-) diff --git a/app/assets/javascripts/app/views/help_view.js b/app/assets/javascripts/app/views/help_view.js index 6410ec179..24052f09f 100644 --- a/app/assets/javascripts/app/views/help_view.js +++ b/app/assets/javascripts/app/views/help_view.js @@ -55,10 +55,9 @@ app.views.Help = app.views.StaticContentView.extend({ title_pods: Diaspora.I18n.t( 'pods.title' ), title_posts_and_posting: Diaspora.I18n.t( 'posts_and_posting.title' ), title_private_posts: Diaspora.I18n.t( 'private_posts.title' ), - title_private_profiles: Diaspora.I18n.t( 'private_profiles.title' ), title_public_posts: Diaspora.I18n.t( 'public_posts.title' ), - title_public_profiles: Diaspora.I18n.t( 'public_profiles.title' ), title_resharing_posts: Diaspora.I18n.t( 'resharing_posts.title' ), + title_profile: Diaspora.I18n.t("profile.title"), title_sharing: Diaspora.I18n.t( 'sharing.title' ), title_tags: Diaspora.I18n.t( 'tags.title' ), title_keyboard_shortcuts: Diaspora.I18n.t( 'keyboard_shortcuts.title' ), diff --git a/app/assets/templates/help_tpl.jst.hbs b/app/assets/templates/help_tpl.jst.hbs index 9a1579b7e..7281a958d 100644 --- a/app/assets/templates/help_tpl.jst.hbs +++ b/app/assets/templates/help_tpl.jst.hbs @@ -36,22 +36,18 @@ {{ title_private_posts }} {{ title_private_posts }} -
  • - {{ title_private_profiles }} - {{ title_private_profiles }} -
  • {{ title_public_posts }} {{ title_public_posts }}
    • -
  • - {{ title_public_profiles }} - {{ title_public_profiles }} -
  • {{ title_resharing_posts }} {{ title_resharing_posts }}
    • +
  • + {{ title_profile }} + {{ title_profile }} +
  • {{ title_sharing }} {{ title_sharing }} diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index fa727ed68..d5bc0dbed 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -432,14 +432,6 @@ en: can_reshare_a: "Nobody. Private posts are not resharable. Logged-in diaspora* users in that aspect can potentially copy and paste it, however. It’s up to you whether you trust those people!" see_comment_q: "When I comment on or like a private post, who can see it?" see_comment_a: "Only the people that the post was shared with (the people who are in the aspects selected by the original poster) can see its comments and likes. " - private_profiles: - title: "Private profiles" - who_sees_profile_q: "Who sees my private profile?" - who_sees_profile_a: "Any logged-in user that you are sharing with (meaning, you have added them to one of your aspects). However, people following you, but whom you do not follow, will see only your public information." - whats_in_profile_q: "What’s in my private profile?" - whats_in_profile_a: "Your private profile contains your biography, location, gender, and birthday, if you have completed these sections. All this information is optional – it’s up to you whether you provide it. Logged-in users who you have added to your aspects are the only people who can see your private profile. When they visit your profile page they will also see the private posts that made to the aspect(s) they are in, mixed in with your public posts." - who_sees_updates_q: "Who sees updates to my private profile?" - who_sees_updates_a: "Anyone in your aspects sees changes to your private profile. " public_posts: title: "Public posts" who_sees_post_q: "When I post something publicly, who can see it?" @@ -452,16 +444,14 @@ en: see_comment_reshare_like_a: "Comments, likes, and reshares of public posts are also public. Any logged-in diaspora* user and anyone else on the internet can see your interactions with a public post." deselect_aspect_posting_q: "What happens when I deselect one or more aspects when making a public post?" deselect_aspect_posting_a: "Deselecting aspects does not affect a public post. It will still be public and will appear in the streams of all of your contacts. To make a post visible only to specific aspects, you need to select those aspects from the aspect selector under the publisher." - public_profiles: - title: "Public profiles" - who_sees_profile_q: "Who sees my public profile?" - who_sees_profile_a: "Any logged-in diaspora* user, as well as the wider internet, can see it. Each profile has a direct URL, so it may be linked to directly from outside sites. It may be indexed by search engines." - whats_in_profile_q: "What’s in my public profile?" - whats_in_profile_a: "Your public profile contains your name, the five tags you chose to describe yourself, and your photo, if you have completed these sections. All this information is optional – it’s up to you whether you provide it. You can make this profile information as identifiable or anonymous as you like. Your profile page also shows any public posts you have made." - who_sees_updates_q: "Who sees updates to my public profile?" - who_sees_updates_a: "Anyone can see changes if they visit your profile page." - what_do_tags_do_q: "What do the tags on my public profile do?" - what_do_tags_do_a: "They help people get to know you. Your profile picture will also appear on the left-hand side of those particular tag pages, along with anyone else who has them in their public profile." + profile: + title: "Profile" + whats_in_profile_q: "What’s in my profile?" + whats_in_profile_a: "Your profile is in two parts: your basic profile and your extended profile. Your basic profile contains your name, the five tags you chose to describe yourself, and your photo. Your extended profile contains your biography, location, gender, and birthday. All this information is optional – it’s up to you whether you provide it, and you can make this profile information as identifiable or anonymous as you like. Your extended profile is displayed in the left-hand column of your profile page, under your profile picture." + who_sees_profile_q: "Who sees my profile?" + who_sees_profile_a: "Your basic profile (name, profile image and #tags) is public. Your extended profile is private by default, but you can make it all publicly accessible if you want. Only people you are sharing with (meaning, you have added them to one of your aspects) can see your extended profile if you keep it private. Other people will see only your public information. Any profile information you make public can be viewed by anyone using the web, and can be indexed by search engines" + what_do_tags_do_q: "What do the tags in my basic profile do?" + what_do_tags_do_a: "They help people get to know you. Your profile picture will also appear on the left-hand side of the stream pages of those tags, along with anyone else who has them in their basic profile." resharing_posts: title: "Resharing posts" reshare_public_post_aspects_q: "Can I reshare a public post to selected aspects?" diff --git a/spec/javascripts/app/views/help_view_spec.js b/spec/javascripts/app/views/help_view_spec.js index 38717a620..e73830267 100644 --- a/spec/javascripts/app/views/help_view_spec.js +++ b/spec/javascripts/app/views/help_view_spec.js @@ -52,26 +52,21 @@ describe("app.views.Help", function(){ expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_private_posts')).toBeTruthy(); }); - it('should show private profiles section', function(){ - this.view.$el.find('a[data-section=private_profiles]').trigger('click'); - expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_private_profiles')).toBeTruthy(); - }); - it('should show public posts section', function(){ this.view.$el.find('a[data-section=public_posts]').trigger('click'); expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_public_posts')).toBeTruthy(); }); - it('should show public profiles section', function(){ - this.view.$el.find('a[data-section=public_profiles]').trigger('click'); - expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_public_profiles')).toBeTruthy(); - }); - it('should show resharing posts section', function(){ this.view.$el.find('a[data-section=resharing_posts]').trigger('click'); expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_resharing_posts')).toBeTruthy(); }); + it("should show profile section", function() { + this.view.$el.find("a[data-section=profile]").trigger("click"); + expect(this.view.$el.find("#faq").children().first().hasClass("faq_question_profile")).toBeTruthy(); + }); + it('should show sharing section', function(){ this.view.$el.find('a[data-section=sharing]').trigger('click'); expect(this.view.$el.find('#faq').children().first().data('template')).toBe('faq_sharing'); From 770e7ddc2bdcb179e94b7f1bbc4dc9f573a3e60d Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 23:09:56 +0200 Subject: [PATCH 11/12] Public post --- config/locales/diaspora/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index d5bc0dbed..485aa2b69 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -439,10 +439,10 @@ en: find_public_post_q: "How can other people find my public post?" find_public_post_a: "Your public posts will appear in the streams of anyone following you. If you included #tags in your public post, anyone following those tags will find your post in their streams. Every public post also has a specific URL that anyone can view, even if they’re not logged in – thus public posts may be linked to directly from Twitter, blogs, etc. Public posts may also be indexed by search engines." can_comment_reshare_like_q: "Who can comment on, reshare, or like my public post?" - can_comment_reshare_like_a: "Any logged-in diaspora* user can comment on, reshare, or like your public post." + can_comment_reshare_like_a: "Any logged-in diaspora* user can comment on, reshare, or like your public post. The exception to this is people you have ignored, who won’t be able to like or comment on your posts." see_comment_reshare_like_q: "When I comment on, reshare, or like a public post, who can see it?" see_comment_reshare_like_a: "Comments, likes, and reshares of public posts are also public. Any logged-in diaspora* user and anyone else on the internet can see your interactions with a public post." - deselect_aspect_posting_q: "What happens when I deselect one or more aspects when making a public post?" + deselect_aspect_posting_q: "What happens when I deselect one or more aspects in the left-hand column when making a public post?" deselect_aspect_posting_a: "Deselecting aspects does not affect a public post. It will still be public and will appear in the streams of all of your contacts. To make a post visible only to specific aspects, you need to select those aspects from the aspect selector under the publisher." profile: title: "Profile" From d14908ed0d01133a241ae0e5a57c7e5e0fbcc2e9 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 12 Aug 2017 23:15:22 +0200 Subject: [PATCH 12/12] Sharing and tags --- config/locales/diaspora/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 485aa2b69..cb98753f8 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -476,7 +476,7 @@ en: only_sharing_q: "Who are the people listed under “Only sharing with me” on my contacts page?" only_sharing_a: "These are people that have added you to one of their aspects, but who are not (yet) in any of your aspects. In other words, they are sharing with you, but you are not sharing with them: you can think of this as them “following” you. If you add them to an aspect, they will then appear under that aspect and not under “Only sharing with me”. See above." list_not_sharing_q: "Is there a list of people whom I have added to one of my aspects, but who have not added me to one of theirs?" - list_not_sharing_a: "No, but you can see whether or not someone is sharing with you by visiting their profile page. If they are, the button showing the aspect(s) in which you have placed them will be green; if not, it’ll be gray." + list_not_sharing_a: "No, but you can see whether or not someone is sharing with you by visiting their profile page. If they are, there will be a green tick next to their diaspora* ID. If they are not, there will be a gray circle." see_old_posts_q: "When I add someone to an aspect, can they see older posts that I have already posted to that aspect?" see_old_posts_a: "No. They will only be able to see new posts to that aspect. They (and everyone else) can see your older public posts on your profile page, and they may also see them in their stream." tags: @@ -486,7 +486,7 @@ en: tags_in_comments_q: "Can I put tags in comments or just in posts?" tags_in_comments_a: "A tag added to a comment will still appear as a link to that tag’s page, but it will not make that post (or comment) appear on that tag page. This only works for tags in posts." followed_tags_q: "What are “#Followed Tags” and how do I follow a tag?" - followed_tags_a: "After searching for a tag you can click the button at the top of the tag’s page to “follow” that tag. It will then appear in your list of followed tags in the left-hand menu. Clicking one of your followed tags takes you to that tag’s page so you can see recent posts containing that tag. Click on #Followed Tags to see a stream of posts that include any one of your followed tags." + followed_tags_a: "After searching for a tag you can click the button at the top of the tag’s page to “follow” that tag. It will then appear in your list of followed tags in the left-hand menu. Clicking one of your followed tags takes you to that tag’s page so you can see recent posts containing that tag. Click on #Followed Tags to see a stream of posts that include any one of your followed tags. Posts containing that tag will also be included in your main stream." people_tag_page_q: "Who are the people listed on the left-hand side of a tag page?" people_tag_page_a: "They are people who have listed that tag to describe themselves in their public profile." filter_tags_q: "How can I filter/exclude some tags from my stream?"