diff options
| -rw-r--r-- | static/styles.css | 6 | ||||
| -rw-r--r-- | templates/search.html | 106 |
2 files changed, 69 insertions, 43 deletions
diff --git a/static/styles.css b/static/styles.css index 66b3200fd612..b2a16b7a6473 100644 --- a/static/styles.css +++ b/static/styles.css @@ -131,3 +131,9 @@ html, body { .converse .reply-box { padding-top: 10px; } +.search-result { + margin: 8px; +} +.search-result .mdl-button { + margin: 3px; +} diff --git a/templates/search.html b/templates/search.html index 35193fb61cd2..0ff49e508d52 100644 --- a/templates/search.html +++ b/templates/search.html @@ -1,47 +1,67 @@ <!doctype html> <html lang="en"> - <head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> - <meta http-equiv="Content-Security-Policy" content="script-src 'self';"> - <!-- Bootstrap CSS --> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> - <title>Converse Index</title> - </head> - <body> - <header> - <nav class="navbar navbar-light bg-light justify-content-between mb-3"> - <a class="navbar-brand" href="/"> - <h2>Converse</h2> - </a> - <form class="form-inline" method="get" action="/search"> - <input class="form-control mr-sm-2" type="search" placeholder="Search" name="query" aria-label="Search"> - <button class="btn btn-outline-success my-2 my-sm-0 mr-1" type="submit">Search</button> - <a class="btn btn-outline-secondary my-2" href="/thread/new">New thread</a> - <a class="btn btn-outline-secondary my-2" href="/">Back to index</a> - </form> - </nav> - </header> - <div class="container"> - <div class="row"> - <div class="col-4"> - <h2>Search results for '{{ query }}':</h2> + <head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0"> + <title>Converse: Search results</title> + + <!-- TODO --> + <meta http-equiv="Content-Security-Policy" content="script-src https://code.getmdl.io 'self';"> + <!-- <link rel="shortcut icon" href="images/favicon.png"> --> + + <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu"> + <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> + <link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.blue_grey-orange.min.css" /> + <link rel="stylesheet" href="/static/styles.css"> + </head> + <body class="converse mdl-base mdl-color-text--grey-700 mdl-color--grey-100"> + <div class="mdl-layout mdl-layout--fixed-header mdl-js-layout mdl-color--grey-100"> + <header class="mdl-layout__header mdl-layout__header--scroll mdl-color--primary-dark"> + <div class="mdl-layout__header-row"> + <a href="/" class="mdl-layout-title mdl-color-text--blue-grey-50 cvs-title">Converse</a> + <div class="mdl-layout-spacer"></div> + <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label mdl-color-text--blue-grey-50 search-field"> + <form method="get" action="/search"> + <input class="mdl-textfield__input" type="search" id="search-query" aria-label="Search" name="query"> + <label class="mdl-textfield__label mdl-color-text--blue-grey-100" for="search-query">Search query...</label> + <input type="submit" hidden /> + </form> + </div> + + <a href="/"> + <button class="mdl-button mdl-js-button mdl-button--raised mdl-button--accent mdl-js-ripple-effect"> + Back to index + </button> + </a> + </div> + </header> + <main class="mdl-layout__content"> + <section class="section--center mdl-grid"> + <div class="mdl-cell--12-col"> + <h4>Search results for '{{ query }}':</h4> + </div> + {% for result in results %} + <div class="mdl-card mdl-cell--6-col search-result mdl-shadow--2dp"> + <div class="mdl-card__supporting-text"> + <p>Posted in '{{ result.title }}' by {{ result.author }}:</p> + <p>{{ result.headline | safe }}</p> + </div> + <div class="mdl-card__actions mdl-card--border post-actions"> + <div class="mdl-layout-spacer"></div> + <a class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-button--colored" href="/thread/{{ result.thread_id }}#post-{{ result.post_id }}"> + <i class="material-icons">arrow_forward</i> + </a> + </div> + </div> + {% endfor %} + </section> + </main> + <footer class="mdl-mini-footer"> + <div class="mdl-mini-footer--right-section"> + <p>Powered by <a href="https://github.com/tazjin/converse">Converse</a></p> + </div> + </footer> </div> - </div> - <div class="row"> - <div class="col-12"> - <div class="list-group"> - {% for result in results -%} - <a href="/thread/{{ result.thread_id }}#post-{{ result.post_id }}" class="list-group-item list-group-item-action flex-column align-items-start"> - <div class="d-flex w-100 justify-content-between"> - <p class="mb-1">{{ result.headline | safe }}</p> - <small class="float-right text-muted"><i>(Posted in '{{ result.title }}' by {{ result.author }})</i></small> - </div> - </a> - {%- endfor %} - </div> - </div> - </div> - </div> - </body> + <script src="https://code.getmdl.io/1.3.0/material.min.js"></script> + </body> </html> |