#262 redesigned search page (Google Code-In Task for evanH2002)
Merged 4 years ago by jflory7. Opened 4 years ago by evanhearne.
fedora-commops/ evanhearne/fedora-happiness-packets search-redesign  into  master

@@ -6,15 +6,14 @@ 

  

      <div class="page-header">

          <h2>Happiness Archive</h2>

-     </div>

- 

-     {% url 'messaging:search' as url %}

-     <form method="get" class="form-inline" action="{{url}}">

+         {% url 'messaging:search' as url %}

+         <form method="get" class="form-inline" action="{{url}}" style="position: absolute; top: 50px; right: 0px;">

              <div class="form-group" style="font-size: 1.7em;">

                  <input type="search" name="q" id="id_q">

                  <input type="submit" value="Search" class="search">

              </div>  

-     </form>

+         </form>

+     </div>

  

      <p>

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

file modified
+7 -5
@@ -3,18 +3,20 @@ 

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

  

  {% block content %}

- <h2>Search</h2>

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

+ 

+ {% if query %}

+ <div class="page-header">

+     <h3>Results</h3>

+     <form method="get"  class="form-inline" style="position: absolute; top: 40px; right: 0px;">

      {% for field in form %}

      <div class="form-group" style="font-size: 1.7em;">

          {{ field.errors }}

-         {{ field.label_tag }} {{ field }}

+         {{ field }}

      </div>

      {% endfor %}

      <input type="submit" value="Search" class="search">

  </form>

- {% if query %}

- <h3>Results</h3>

+ </div>

  

  {% for result in object_list %}

  <h4>

Description:

Happiness Archive's page has been redesigned, putting the search bar just below the heading. This change affects both before and after the search.

Changes have been made to two files:

1.  fedora-happiness-packets/templates/search/search.html
2.  fedora-happiness-packets/templates/messaging/archive.html

@alishapapun please take a look at this PR when you have the chance :)

1 new commit added

  • reposition search to top right
4 years ago

rebased onto 3609dfa

4 years ago

@alishapapun I have made changes like you asked, will comment on code in for consistency. Feel free to review :smile:

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

4 years ago

Hey @evanhearne, these changes look good to me. I'm going to merge them now. :clapper: Thanks!

rebased onto 4632cf5

4 years ago

Pull-Request has been merged by jflory7

4 years ago