diff options
| -rw-r--r-- | app/views/user/show.rhtml | 35 | ||||
| -rw-r--r-- | public/stylesheets/main.css | 18 |
2 files changed, 26 insertions, 27 deletions
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index a4466f5f4..8f1803442 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -81,7 +81,7 @@ <div id="user_public_banned"> <p> <strong> - <%= _('This user has been banned from {{site_name}} ', :site_name=>site_name)%> + <%= _('This user has been banned from {{site_name}} ', :site_name=>site_name)%> </strong> </p> <p> @@ -125,17 +125,16 @@ <% if @show_requests %> <div id="user_profile_search"> - <% form_tag(show_user_url, :method => "get", :id=>"search_form") do %> - <div> - <%= text_field_tag(:user_query, params[:user_query]) %> - <% if @is_you %> - <%= submit_tag(_("Search your contributions")) %> - <% else %> - <%= submit_tag(_("Search contributions by this person")) %> - <% end %> - </div> - <% end %> - + <% form_tag(show_user_url, :method => "get", :id=>"search_form") do %> + <div> + <%= text_field_tag(:user_query, params[:user_query]) %> + <% if @is_you %> + <%= submit_tag(_("Search your contributions")) %> + <% else %> + <%= submit_tag(_("Search contributions by this person")) %> + <% end %> + </div> + <% end %> <% if !@xapian_requests.nil? %> <% if @xapian_requests.results.empty? %> @@ -143,16 +142,16 @@ <h2 class="foi_results" id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> <%= @match_phrase %> </h2> <p><%= @is_you ? _('You have made no Freedom of Information requests using this site.') : _('This person has made no Freedom of Information requests using this site.') %> - <%= @page_desc %> + <%= @page_desc %> <% end %> <% else %> <h2 class="foi_results" id="foi_requests"> <%= @is_you ? n_('Your %d Freedom of Information request', 'Your %d Freedom of Information requests', @xapian_requests.matches_estimated.to_s) % @xapian_requests.matches_estimated.to_s : n_('This person\'s %d Freedom of Information request', 'This person\'s %d Freedom of Information requests', @xapian_requests.matches_estimated.to_s) % @xapian_requests.matches_estimated %> <!-- matches_estimated <%=@xapian_requests.matches_estimated%> --> <%= @match_phrase %> - <%= @page_desc %> + <%= @page_desc %> </h2> - + <% for result in @xapian_requests.results %> <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> @@ -171,9 +170,9 @@ <% if @xapian_comments.results.empty? %> <% if @page == 1 %> <h2><%= @is_you ? _('Your annotations') : _('This person\'s annotations') %> - <%= @match_phrase %> - </h2> - <p><%= _('None made.')%></p> + <%= @match_phrase %> + </h2> + <p><%= _('None made.')%></p> <% end %> <% else %> <h2 id="annotations"> diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index cd617c115..b9559ba17 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -24,9 +24,9 @@ position:absolute; left:0; z-index:150; text-align:right; --moz-opacity:0.7px; +-moz-opacity:0.7; filter:alpha(opacity= 70) !important; -opacity:0.7px; +opacity:0.7; width:auto; right:0; top:10px; @@ -1245,7 +1245,7 @@ border-radius:2px; -moz-border-radius:2px; text-shadow:1px 1px 0 #5B841D; font-size:18px; -cursor:hand; +cursor:pointer; padding:5px 6px; } @@ -1481,7 +1481,7 @@ top:2px; border:none; background:#FFF; cursor:pointer; -opacity:1px; +opacity:1; } #ui-datepicker-div .ui-datepicker-next-hover { @@ -1490,7 +1490,7 @@ top:2px; border:none; background:#FFF; cursor:pointer; -opacity:1px; +opacity:1; } #other-country-notice { @@ -1502,7 +1502,7 @@ z-index:999; display:block; position:absolute; top:0; -opacity:0.9px; +opacity:0.9; } p.public-body-name-prefix { @@ -1522,7 +1522,7 @@ text-decoration:none; display:inline-block; border-radius:2px; -moz-border-radius:2px; -cursor:hand; +cursor:pointer; background:url(/images/small-white-cross.png) no-repeat; width:15px; height:15px; @@ -1538,7 +1538,7 @@ position:absolute; text-align:left; background-color:#FFF; z-index:999; -opacity:0.9px; +opacity:0.9; border-radius:6px; -moz-border-radius:6px; border:1px solid #444; @@ -1647,7 +1647,7 @@ display:none; #ui-datepicker-div .ui-datepicker-prev,#ui-datepicker-div .ui-datepicker-next { margin-top:2px; -opacity:0.5px; +opacity:0.5; } div.controller_help dt:hover > a:hover,div.controller_help h1:hover > a:hover,div#help_unhappy h1:hover > a.hover_a:hover,h2 a:hover,.request_listing span.head a:hover,.user_listing span.head a:hover,.body_listing span.head a:hover,.request_listing .requester a,.feed_link a:hover,.act_link a:hover,#header_right > a:hover { |