diff options
| author | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-27 00:03:48 +0000 |
|---|---|---|
| committer | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-27 00:03:48 +0000 |
| commit | 714368c049f8749ed22c6d1d07bb3adc783dc349 (patch) | |
| tree | 8952248ebf3f85b141ef0d18ecf6a1becdc8b89b /views | |
| parent | 8beb37ed67b5f2fa0f9aa85499a8f11b39c9d067 (diff) | |
| parent | b65166302f5296165da115ed96ce112433157a2d (diff) | |
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
Diffstat (limited to 'views')
| -rw-r--r-- | views/error.hbs | 5 | ||||
| -rw-r--r-- | views/index.hbs | 33 | ||||
| -rw-r--r-- | views/user_search.hbs | 3 | ||||
| -rw-r--r-- | views/user_solutions.hbs | 4 |
4 files changed, 42 insertions, 3 deletions
diff --git a/views/error.hbs b/views/error.hbs new file mode 100644 index 0000000..062b947 --- /dev/null +++ b/views/error.hbs @@ -0,0 +1,5 @@ +<main id = 'solutions-main'> + <div class = 'search container' id = 'solutions-div'> + <h4>Sorry, we could not find {{ url }}</h4> + </div> +</main> diff --git a/views/index.hbs b/views/index.hbs index c3cbeab..214695b 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -1,4 +1,6 @@ <header> + + <div class="header-content"> <form action="/search/courses" method="get" id="search-field"> @@ -7,7 +9,36 @@ <hr> <!-- Divider --> <div class="search col-md-8 col-lg-8 col-md-offset-2"> <!-- Search-bar, Drop-down and Prompt --> - <div class="input-group"> + {{# if messages.error }} + <section class="alert alert-danger custom-Alert"> + <h4>{{ messages.error }}</h4> + </section> + {{/if}} + + {{# if success }} + <section class="alert alert-success"> + <!-- Change those to banners later --> + <h2>Signup Successful!</h2> + </section> + {{ else }} + {{# if errors }} + <section class="alert alert-danger"> + <ul> + {{# each errors }} + <li>{{ this.msg }}</li> + {{/each}} + </ul> + </section> + {{/if}} + {{/if}} + {{#if flashMsg}} + <section class="alert alert-danger"> + {{flashMsg}} + </section> + {{/if}} + + + <div class="input-group"> <!-- Search Category Drop-Down --> <div class="input-group-btn"> <button type="button" diff --git a/views/user_search.hbs b/views/user_search.hbs index 59c9435..f342d26 100644 --- a/views/user_search.hbs +++ b/views/user_search.hbs @@ -11,6 +11,9 @@ <h4 class='search-head'>Search results for "{{query}}"</h4> {{# if users }} + <h4 class='search-head'> + Found <span id="search-count"> {{ resultCount }}</span> result(s) + </h4> {{# each users}} <a href="/public_profile/{{this.user_name}}"> <section class = 'solutions-card'> diff --git a/views/user_solutions.hbs b/views/user_solutions.hbs index fac0301..f50499f 100644 --- a/views/user_solutions.hbs +++ b/views/user_solutions.hbs @@ -26,9 +26,9 @@ </a> <!-- Replace p below with breadcrumbs later --> - <p class="col-xs-12 col-sm-12 col-md-6 show-path"> + <!--<p class="col-xs-12 col-sm-12 col-md-6 show-path"> CSC148 > Winter 2015 > Question 1 - </p> + </p> --> </div> <!-- Solution 1 Example --> |