fedora-commops / fedora-happiness-packets

Clone
Source Code
GIT

#185 Title improvement
Merged 5 years ago by jflory7. Opened 5 years ago by saidat.
fedora-commops/ saidat/fedora-happiness-packets correction1  into  master

file modified
+1 -2 
@@ -2,8 +2,7 @@ 
 

  <!DOCTYPE html>
 

  <html lang="en">
 

  <head>
 

-     <title>Open-source Happiness Packets</title>
 

-     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 

+          <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 

  

      <meta name="viewport" content="width=device-width, initial-scale=1.0">
 

      <link href="https://fonts.googleapis.com/css?family=Montserrat|Open+Sans" rel="stylesheet">

file modified
+2 
@@ -1,5 +1,7 @@ 
 

  {% extends 'base.html' %}
 

  

+ {% block extra_head %}<title>Happiness Archive</title>{% endblock %}
 

+ 

  {% block content %}
 

  

      <div class="page-header">

file modified
+2 
@@ -1,5 +1,7 @@ 
 

  {% extends 'base.html' %}
 

  

+ {% block extra_head %}<title>Block e-mail address</title>{% endblock %}
 

+ 

  {% block content %}
 

  

      <div class="page-header">

file modified
+3 -1 
@@ -1,9 +1,11 @@ 
 

  {% extends 'base.html' %}
 

  

+ {% block extra_head %}<title>FAQ-(Frequently Asked Questions)</title>{% endblock %}
 

+ 

  {% block content %}
 

  <div id="faq">
 

      <div class="page-header">
 

-         <h2>Frequently Asked Questions</h2>
 

+         <h2>FAQ-(Frequently Asked Questions)</h2>
 

      </div>
 

  

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

file modified
+2 
@@ -1,5 +1,7 @@ 
 

  {% extends 'base.html' %}
 

  

+ {% block extra_head %}<title>Get inspired</title>{% endblock %}
 

+ 

  {% block content %}
 

  

      <div class="page-header">

file modified
+3 
@@ -1,4 +1,7 @@ 
 

  {% extends 'base.html' %}
 

+ 

+ {% block extra_head %}<title>Send happiness packet</title>{% endblock %}
 

+ 

  {% load crispy_forms_tags %}
 

  

  {% block content %}

file modified
+2 
@@ -1,5 +1,7 @@ 
 

  {% extends 'base.html' %}
 

  

+ {% block extra_head %}<title>Check your email</title>{% endblock %}
 

+ 

  {% block content %}
 

  

      <div class="page-header">

file modified
+1 
@@ -1,4 +1,5 @@ 
 

  {% extends 'base.html' %}
 

+ {% block extra_head %}<title>Received Happiness Packets</title>{% endblock %}
 

  

  {% block content %}

file modified
+1 -1 
@@ -1,5 +1,5 @@ 
 

  {% extends 'base.html' %}
 

- 

+ {% block extra_head %}<title>Sent Happiness Packets</title>{% endblock %}
 

  {% block content %}
 

  

      <div class="page-header">

file modified
+2 
@@ -1,5 +1,7 @@ 
 

  {% extends 'base.html' %}
 

  

+ {% block extra_head %}<title>Fedora Happiness Packets</title>{% endblock %}
 

+ 

  {% block content %}
 

  

      <div class="page-header">

file modified
+3 
@@ -1,5 +1,8 @@ 
 

  {% extends 'base.html' %}
 

  

+ {% block extra_head %}<title>Search</title>{% endblock %}
 

+ 

+ 

  {% block content %}
 

  <h2>Search</h2>
 

  <form method="get"  class="form-inline">

here is the correction required @jflory. Thank you so much

@saidat Thanks for the PR. However, this PR is difficult to review because it appears your changes altered all parts of the file. Do you use an editor with automatic formatting rules? They might be affecting the changes you submit.

Before we merge, could you also please rebase and squash your commits into one commit? This helps keep the git changelog tidy. If you have never rebased before, see these two articles for help:

If you need additional guidance, don't hesitate to ask for help.

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

hello @jflory7, i rebased my commits but i think i have rebased master to another branch of mine called correction1. i dont know if what i have done is right since am new to rebasing but it has given me this
[[First, rewinding head to replay your work on top of it...
Fast-forwarded master to correction1.]]]
and i wanted to upload the picture for clear information but i have failed, how do i go about this.Thanks

rebased onto aac4462
5 years ago

Hello @jflory7 , please take a look at my pull request when you get time, i have corrected what you told me . Thanks

I left a comment here in #91 with more details.

1 new commit added

  • improvements on the titles to be displayed in the address bar
5 years ago

Hello @jflory7 , please take a look at my pull request when you get time, i have corrected what you told me . Thanks

This is invalid HTML. </title>title> => </title>.

This is invalid HTML. </title>title> => </title>.

There is a hanging whitespace, could you please write it like this? <h2>FAQ (Frequently Asked Questions)</h2>

This is invalid HTML. </title>title> => </title>.

I don't understand why this line is added. I think line 4 cancels the need for line 7 since they both do the same thing?

rebased onto 164e20ef028ade37f72b8735f7e007ff4f7675df
5 years ago

Hi @saidat, thanks for the changes. There are still a few changes needed before merging. Let me know if you have any specific questions or doubts.

Hi @jflory7, am not getting you what specific changes are you meaning?

@jflory7, am really sorry maybe my text editor and when i built it i didnt recognize it let me rectify it . Thanks

The editor auto corrects itself

rebased onto aac4462
5 years ago

Hi @saidat, thanks for making the changes. I tested this PR but the changes didn't work. There are two things remaining for this to merge:

  1. The <title> line needs to be removed from the base.html
  2. All HTML page templates need to have a custom header set, such as the Search page (the title returns as localhost:8000/search on that page for example)

hello@jflory7, i would like to show you a working sample of the faq and archive when i run them on my pc without deleting the title html tag from the base.html. Buthello@jflory7, here is the sample of the faq and archive when i run them on my pc without deleting the title html tag from the base.html i have failed to upload the pictures here unless i upload them on the issue #91. please help me out

@saidat Are you using the latest version of the code from this repo? You may be missing newer commits in the repo. Knowing which commit is the last commit not made by you in git log might help. Seeing a screenshot would help.

yes i think am using the lastest version because i pulled some codes few days back

3 new commits added

  • title improvement
  • improvements on the titles to be displayed in the address bar
  • title improvement
5 years ago

hello @jflory7 , can you please have a look at what i have changed .

rebased onto 33cfb7a
5 years ago

Metadata Update from @jflory7:
- Pull-request untagged with: needs changes
5 years ago

Hi @saidat, thank you for making these changes. :smile: I tested this and it worked as expected. I'm going to merge this one now! :clapper: Thank you for your patience and persistence working on this.

Pull-Request has been merged by jflory7
5 years ago

Thank you too @Justin W. Flory jflory7@gmail.com for patience and
guidance. And i would like to be assigned more tickets now=F0=9F=98=80=F0=
=9F=98=80

On Wed, 27 Mar 2019 at 04:15, Justin W. Flory pagure@pagure.io wrote:

jflory7 merged a pull-request against the project:
fedora-happiness-packets that you are following.

Merged pull-request:

Title improvement

https://pagure.io/fedora-commops/fedora-happiness-packets/pull-request/18=
5
Changes Summary 11
+1 -2
file changed
templates/base.html
+2 -0
file changed
templates/messaging/archive.html
+2 -0
file changed
templates/messaging/blacklist_email.html
+3 -1
file changed
templates/messaging/faq.html
+2 -0
file changed
templates/messaging/inspiration.html
+3 -0
file changed
templates/messaging/message_send_form.html
+2 -0
file changed
templates/messaging/message_sender_confirmation_sent.html
+1 -0
file changed
templates/messaging/received_messages.html
+1 -1
file changed
templates/messaging/sent_messages.html
+2 -0
file changed
templates/messaging/start.html
+3 -0
file changed
templates/search/search.html
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.