diff options
| author | Martin Wright <martin@mysociety.org> | 2015-01-13 11:01:12 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-03-02 16:25:31 +0000 |
| commit | 18f5d3c10ae84b8500f039a838991275aee5962f (patch) | |
| tree | 92a5a4ad43f38b624a9f9ac4c133f77562a61980 | |
| parent | 2df0322adeece42404a82957a8f1bf42c9d42407 (diff) | |
made filters more semantic, styling
| -rw-r--r-- | app/assets/stylesheets/responsive/_public_body_layout.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/responsive/_public_body_style.scss | 24 | ||||
| -rw-r--r-- | app/views/request/_request_filter_form.html.erb | 8 |
3 files changed, 37 insertions, 3 deletions
diff --git a/app/assets/stylesheets/responsive/_public_body_layout.scss b/app/assets/stylesheets/responsive/_public_body_layout.scss index bed6b56c7..13be5fc82 100644 --- a/app/assets/stylesheets/responsive/_public_body_layout.scss +++ b/app/assets/stylesheets/responsive/_public_body_layout.scss @@ -57,3 +57,11 @@ font-size: 16px; margin-right: 1em; } + +.list-filter-item { + .title { + display: inline; + font-size: 1em; + font-weight: normal; + } +} diff --git a/app/assets/stylesheets/responsive/_public_body_style.scss b/app/assets/stylesheets/responsive/_public_body_style.scss index 3876ef40a..6af2d08a7 100644 --- a/app/assets/stylesheets/responsive/_public_body_style.scss +++ b/app/assets/stylesheets/responsive/_public_body_style.scss @@ -25,3 +25,27 @@ font-size: 1em; } } + + +.list-filter-item { + ul { + list-style: none outside none; + margin: 0; + padding: 0; + } + li { + display: inline-block; + &:after { + content:' | '; + display: inline-block; + color: #ccc; //Unsupported browsers will ignore the rgba declaration below + color: rgba(0,0,0,0.1); + } + &:last-child { + &:after { + content: ''; + } + } + + } +} diff --git a/app/views/request/_request_filter_form.html.erb b/app/views/request/_request_filter_form.html.erb index 0983c8c57..19961ddfc 100644 --- a/app/views/request/_request_filter_form.html.erb +++ b/app/views/request/_request_filter_form.html.erb @@ -1,21 +1,23 @@ <div class="list-filter-item"> - <h3 class="title"><%= _("Showing") %></h3> <div class="filter-request-types"> + <ul> <% statuses = [["all", _("all requests")], ["successful", _("successful requests")], ["unsuccessful", _("unsuccessful requests")], ["awaiting", _("unresolved requests")]] %> <% statuses.each do |status, label| %> + <li> <% if params[:view] != status %> <% if params[:controller] == "public_body" %> <%= link_to label, url_for(:controller => "public_body", :action => "show", :view => status, :url_name => @public_body.url_name) + "?" + request.query_string + '#results' %> <% else %> - <%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?" + request.query_string + '#results' %> + <%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?" + request.query_string + '#results' %> <% end %> <% else %> <%= label %> <% end %> - <%= "|" unless statuses.last[0] == status %> + </li> <% end %> + </ul> </div> </div> |