#170 title improvement
Closed 5 years ago by jflory7. Opened 5 years ago by saidat.
fedora-commops/ saidat/fedora-happiness-packets master  into  master

@@ -1,17 +1,18 @@ 

- {% extends 'base.html' %}

- 

- {% block content %}

- 

-     <div class="page-header">

-         <h2>Happiness Archive</h2>

-     </div>

- 

-     <p>

-         When you send a Happiness Packet, you can agree to display your message publicly on

-         this website. If both sender and recipient select this option, the message is published

-         on this page as a part of our Happiness Archive.

-     </p>

- 

-     {% include 'messaging/_message_list.html' %}

- 

- {% endblock content %}

+ {% extends 'base.html' %}

+ {% block title %}Happiness Archive{% endblock %}

+ 

+ {% block content %}

+ 

+     <div class="page-header">

+         <h2>Happiness Archive</h2>

+     </div>

+ 

+     <p>

+         When you send a Happiness Packet, you can agree to display your message publicly on

+         this website. If both sender and recipient select this option, the message is published

+         on this page as a part of our Happiness Archive.

+     </p>

+ 

+     {% include 'messaging/_message_list.html' %}

+ 

+ {% endblock content %}

file modified
+93 -91
@@ -1,91 +1,93 @@ 

- {% extends 'base.html' %}

- 

- {% block content %}

- <div id="faq">

-     <div class="page-header">

-         <h2>Frequently Asked Questions</h2>

-     </div>

- 

-     <h3>Who made this and why?</h3>

-     <p>

-         The Open-Source Happiness Packets project was created by <a href="https://twitter.com/mxsash">Sasha Romijn</a> and

-         <a href="https://twitter.com/thatdocslady">Mikey Ariel</a> in March 2016.

-         The idea came about while we were building our

-         <a href="https://2016.djangocon.eu/speakers/13">Healthy Minds in a Healthy Community</a> presentation

-         for Djangocon Europe 2016. One of the issues we wanted to address in the presentation was that many

-         people are unaware of how loved, appreciated, or admired they are by their peers, since our culture seems

-         to discourage positive feedback and amplify negative feedback. With this project, we wanted to provide a platform

-         for people to send positive feedback, thanks, or just a kind word to their peers, with hope to make it

-         easier and more acceptable for people to spread happiness, gratitude and appreciation in open-source communities.

-     </p>

- 

-     <h3>Isn't it weird to send these notes to other people?</h3>

-     <p>

-         Many of us come from a culture where it's sometimes more acceptable to complain about the negative than to

-         acknowledge the positive things. Therefore, it might feel a little awkward to communicate positive feedback

-         directly to others. However, in our personal experience, once you take that first step, any awkwardness

-         is quickly replaced by feeling good about helping someone else feel good.

-     </p>

- 

-     <h3>Can I send anything I want?</h3>

-     <p>

-         We don't screen the content of messages. However, all messages must meet the

-         <a href="https://www.djangoproject.com/conduct/">Django Project Code of Conduct</a>.

-         Notably, harassment, insults and other exclusionary behavior are never acceptable.

-     </p>

-     <p>

-         Violations of this can result in blocking you from using the service. Your message might also be shared with

-         the Django Code of Conduct committee, who reserve the right to take further action of their own. If you're a member

-         of another open-source community, your message might be shared with any code of conduct committee or similar group

-         from that community.

-     </p>

- 

-     <h3>Should I reply when I get a Happiness Packet from someone?</h3>

-     <p>

-         You are under no obligation to respond to the sender of the Happiness Packet. But if you are inspired by what

-         you received, you are welcome to respond or send your own Happiness Packet. We always encourage sending more

-         messages, but only if they are sincere.

-     </p>

-     <p>

-         Note: if the sender selected to remain anonymous, you cannot reply to their message.

-     </p>

- 

-     <h3>Are my Happiness Packets private?</h3>

-     <p>

-         By default, we only send your message with the recipient. They will get an e-mail with your message

-         and can view it online. We only share your name and email address with the recipient if you choose this option.

-         We may analyse messages and their metadata for statistical analysis.

-     </p>

-     <p>

-         In case of suspected abuse or Code of Conduct violations, the service administrators might view and read

-         your message to determine further processing.

-     </p>

- 

-     <h3>What happens if I choose to display my message publicly?</h3>

-     <p>

-         If both the sender and the recipient of the message agree to publish the message on the website,

-         the message will be displayed in the <a href="{% url 'messaging:archive' %}">Happiness Archive</a>.

-         We encourage you to share your messages with the community,

-         but the choice is yours and you are not obligated to choose this option if you do not feel comfortable with it.

-         You can also choose to publish the message but keep the sender and recipient names private.

-     </p>

-     <p>

-         Note: we cannot modify the content of the message after it is sent, so if the message includes personally-identifying

-         information or references to third parties, they will be published even if you choose to hide the sender and

-         recipient names.

-     </p>

- 

-     <h3>I received an abusive message, what should I do?</h3>

-     <p>

-         Please report this to <a href="mailto:info@happinesspackets.io">info@happinesspackets.io</a>, preferably by

-         forwarding the original email that contains the message.

-     </p>

- 

-     <h3>I don't want to receive any email from you</h3>

-     <p>

-         Every email we sent includes a link to stop receiving all future e-mail messages. If you follow the link

-         and confirm, your email address will not be able to be used anywhere on the site.

-         Note: if you select to block your email address, you will not be able to send Happiness Packets yourself.

-     </p>

- </div>

- {% endblock content %}

+ {% extends 'base.html' %}

+ 

+ {% block title %}Faq{% endblock %}

This is using a different name than the page title. For consistency, could you please use the same title as the page title?

+ 

+ {% block content %}

+ <div id="faq">

+     <div class="page-header">

+         <h2>Frequently Asked Questions</h2>

+     </div>

+ 

+     <h3>Who made this and why?</h3>

+     <p>

+         The Open-Source Happiness Packets project was created by <a href="https://twitter.com/mxsash">Sasha Romijn</a> and

+         <a href="https://twitter.com/thatdocslady">Mikey Ariel</a> in March 2016.

+         The idea came about while we were building our

+         <a href="https://2016.djangocon.eu/speakers/13">Healthy Minds in a Healthy Community</a> presentation

+         for Djangocon Europe 2016. One of the issues we wanted to address in the presentation was that many

+         people are unaware of how loved, appreciated, or admired they are by their peers, since our culture seems

+         to discourage positive feedback and amplify negative feedback. With this project, we wanted to provide a platform

+         for people to send positive feedback, thanks, or just a kind word to their peers, with hope to make it

+         easier and more acceptable for people to spread happiness, gratitude and appreciation in open-source communities.

+     </p>

+ 

+     <h3>Isn't it weird to send these notes to other people?</h3>

+     <p>

+         Many of us come from a culture where it's sometimes more acceptable to complain about the negative than to

+         acknowledge the positive things. Therefore, it might feel a little awkward to communicate positive feedback

+         directly to others. However, in our personal experience, once you take that first step, any awkwardness

+         is quickly replaced by feeling good about helping someone else feel good.

+     </p>

+ 

+     <h3>Can I send anything I want?</h3>

+     <p>

+         We don't screen the content of messages. However, all messages must meet the

+         <a href="https://www.djangoproject.com/conduct/">Django Project Code of Conduct</a>.

+         Notably, harassment, insults and other exclusionary behavior are never acceptable.

+     </p>

+     <p>

+         Violations of this can result in blocking you from using the service. Your message might also be shared with

+         the Django Code of Conduct committee, who reserve the right to take further action of their own. If you're a member

+         of another open-source community, your message might be shared with any code of conduct committee or similar group

+         from that community.

+     </p>

+ 

+     <h3>Should I reply when I get a Happiness Packet from someone?</h3>

+     <p>

+         You are under no obligation to respond to the sender of the Happiness Packet. But if you are inspired by what

+         you received, you are welcome to respond or send your own Happiness Packet. We always encourage sending more

+         messages, but only if they are sincere.

+     </p>

+     <p>

+         Note: if the sender selected to remain anonymous, you cannot reply to their message.

+     </p>

+ 

+     <h3>Are my Happiness Packets private?</h3>

+     <p>

+         By default, we only send your message with the recipient. They will get an e-mail with your message

+         and can view it online. We only share your name and email address with the recipient if you choose this option.

+         We may analyse messages and their metadata for statistical analysis.

+     </p>

+     <p>

+         In case of suspected abuse or Code of Conduct violations, the service administrators might view and read

+         your message to determine further processing.

+     </p>

+ 

+     <h3>What happens if I choose to display my message publicly?</h3>

+     <p>

+         If both the sender and the recipient of the message agree to publish the message on the website,

+         the message will be displayed in the <a href="{% url 'messaging:archive' %}">Happiness Archive</a>.

+         We encourage you to share your messages with the community,

+         but the choice is yours and you are not obligated to choose this option if you do not feel comfortable with it.

+         You can also choose to publish the message but keep the sender and recipient names private.

+     </p>

+     <p>

+         Note: we cannot modify the content of the message after it is sent, so if the message includes personally-identifying

+         information or references to third parties, they will be published even if you choose to hide the sender and

+         recipient names.

+     </p>

+ 

+     <h3>I received an abusive message, what should I do?</h3>

+     <p>

+         Please report this to <a href="mailto:info@happinesspackets.io">info@happinesspackets.io</a>, preferably by

+         forwarding the original email that contains the message.

+     </p>

+ 

+     <h3>I don't want to receive any email from you</h3>

+     <p>

+         Every email we sent includes a link to stop receiving all future e-mail messages. If you follow the link

+         and confirm, your email address will not be able to be used anywhere on the site.

+         Note: if you select to block your email address, you will not be able to send Happiness Packets yourself.

+     </p>

+ </div>

+ {% endblock content %}

file modified
+55 -54
@@ -1,54 +1,55 @@ 

- {% extends 'base.html' %}

- 

- {% block content %}

- 

-     <div class="page-header">

-         <h2>What are Fedora Happiness Packets?</h2>

-     </div>

- 

-     <p class="lead">

-         People are generally much more loved than they think they are. Especially when things don't go according to

-         plan, other people almost never think as harshly of you as you might think of yourself. It's easy for us to

-         complain when bad things happen, and yet we're often fairly silent when things are good. Open-source communities

-         are no different, especially when our main communication channels are textual and virtual.

-     </p>

- 

-     <p>

-         The feeling that you made a difference, that your work matters and has value, and that the people

-         you work with are happy to work with you, is an awesome feeling. With Fedora Happiness Packets, we're

-         trying to spread that feeling.

-     </p>

- 

-     <p class="text-center">

-         <a class="btn btn-primary btn-lg btn-responsive" href="{% url 'messaging:send' %}" role="button">Send some happiness now! <img class="emoji" src="static/images/emoji/loveletter.png" alt="💌" title="Love letter" aria-label="Emoji: Love letter"></a>

-     </p>

- 

-     <h2>How does it work?</h2>

-     <p>

-         Openly expressing appreciation, gratitude, or happiness to other people can be difficult. This is especially

-         true when you don't know them very well. Many of us come from cultures in which people are not open by default

-         about such feelings, and naturally feel uncomfortable or even creepy to share them.

-     </p>

-     <p>

-         Fedora Happiness Packets is a very simple platform to anonymously reach out to the people that you

-         appreciate or to whom you are thankful in your open-source community. Your message can be sent anonymously

-         if you feel uncomfortable to share your name with the recipient. Of course, we encourage you to share your name,

-         but it's completely optional!

-     </p>

- 

-     <h3>Happiness Archive</h3>

-     <p>

-         If both the sender and the recipient agree, we can

-         <a href="{% url 'messaging:archive' %}">publish the Happiness Packet</a> on the website.

-         We hope to build an archive of open-source happiness that communities can draw inspiration from.

-     </p><p>

-         As an example, here are two random messages from our archive:

-     </p>

- 

-     {% include 'messaging/_message_list.html' %}

- 

-     <p class="text-center">

-         <a class="btn btn-primary btn-lg btn-responsive" href="{% url 'messaging:send' %}" role="button">Send some happiness now! <img class="emoji" src="static/images/emoji/loveletter.png" alt="💌" title="Love letter" aria-label="Emoji: Love letter"></a>

-     </p>

- 

- {% endblock content %}

+ {% extends 'base.html' %}

+ {% block title %} Happiness Packets{% endblock %}

There is some hanging whitespace here if you could please remove this too.

+ 

+ {% block content %}

+ 

+     <div class="page-header">

+         <h2>What are Fedora Happiness Packets?</h2>

+     </div>

+ 

+     <p class="lead">

+         People are generally much more loved than they think they are. Especially when things don't go according to

+         plan, other people almost never think as harshly of you as you might think of yourself. It's easy for us to

+         complain when bad things happen, and yet we're often fairly silent when things are good. Open-source communities

+         are no different, especially when our main communication channels are textual and virtual.

+     </p>

+ 

+     <p>

+         The feeling that you made a difference, that your work matters and has value, and that the people

+         you work with are happy to work with you, is an awesome feeling. With Fedora Happiness Packets, we're

+         trying to spread that feeling.

+     </p>

+ 

+     <p class="text-center">

+         <a class="btn btn-primary btn-lg btn-responsive" href="{% url 'messaging:send' %}" role="button">Send some happiness now! <img class="emoji" src="static/images/emoji/loveletter.png" alt="💌" title="Love letter" aria-label="Emoji: Love letter"></a>

+     </p>

+ 

+     <h2>How does it work?</h2>

+     <p>

+         Openly expressing appreciation, gratitude, or happiness to other people can be difficult. This is especially

+         true when you don't know them very well. Many of us come from cultures in which people are not open by default

+         about such feelings, and naturally feel uncomfortable or even creepy to share them.

+     </p>

+     <p>

+         Fedora Happiness Packets is a very simple platform to anonymously reach out to the people that you

+         appreciate or to whom you are thankful in your open-source community. Your message can be sent anonymously

+         if you feel uncomfortable to share your name with the recipient. Of course, we encourage you to share your name,

+         but it's completely optional!

+     </p>

+ 

+     <h3>Happiness Archive</h3>

+     <p>

+         If both the sender and the recipient agree, we can

+         <a href="{% url 'messaging:archive' %}">publish the Happiness Packet</a> on the website.

+         We hope to build an archive of open-source happiness that communities can draw inspiration from.

+     </p><p>

+         As an example, here are two random messages from our archive:

+     </p>

+ 

+     {% include 'messaging/_message_list.html' %}

+ 

+     <p class="text-center">

+         <a class="btn btn-primary btn-lg btn-responsive" href="{% url 'messaging:send' %}" role="button">Send some happiness now! <img class="emoji" src="static/images/emoji/loveletter.png" alt="💌" title="Love letter" aria-label="Emoji: Love letter"></a>

+     </p>

+ 

+ {% endblock content %}

i have added different title names to be displayed in the title bar of different pages for easy readability and neatness, consistency of the title name and the header displayed . Before the faq, archive, and the start pages were displaying the same name "open-source Happiness packets" in the title bar

rebased onto bae40a2f4040137f5f57f6f512fb5a65466b8c41

5 years ago

This is using a different name than the page title. For consistency, could you please use the same title as the page title?

There is some hanging whitespace here if you could please remove this too.

Metadata Update from @jflory7:
- Pull-request tagged with: improvement, needs changes, type - frontend, type - summer coding
- Request assigned

5 years ago

Thanks for opening this @saidat. I left some feedback in-line for you to address.

rebased onto 7b67ae4

5 years ago

Canceling this PR as a duplicate of #185.

Pull-Request has been closed by jflory7

5 years ago