diff --git a/app/assets/stylesheets/content/_user.sass b/app/assets/stylesheets/content/_user.sass index 805753f552..bac57368ea 100644 --- a/app/assets/stylesheets/content/_user.sass +++ b/app/assets/stylesheets/content/_user.sass @@ -78,5 +78,5 @@ tr user-avatar &.avatar-medium, &.avatar-mini margin-right: 5px -.user-history-rates-no-result +.user-rate-history-list margin-bottom: 25px \ No newline at end of file diff --git a/modules/costs/app/views/hourly_rates/_list_default.html.erb b/modules/costs/app/views/hourly_rates/_list_default.html.erb index 0ff635f915..d4f0ff293e 100644 --- a/modules/costs/app/views/hourly_rates/_list_default.html.erb +++ b/modules/costs/app/views/hourly_rates/_list_default.html.erb @@ -26,15 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See docs/COPYRIGHT.rdoc for more details. ++#%> - +
<%= link_to t(:button_update), edit_hourly_rate_path(@user), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>

<%= User.human_attribute_name(:default_rates) %>

<% if @rates_default.blank? %> -
<%= no_results_box %> -
<% else %>
@@ -90,3 +88,4 @@ See docs/COPYRIGHT.rdoc for more details.
<% end %> +
\ No newline at end of file diff --git a/modules/costs/app/views/hourly_rates/_list_project.html.erb b/modules/costs/app/views/hourly_rates/_list_project.html.erb index 0034c308aa..a5dfa9da32 100644 --- a/modules/costs/app/views/hourly_rates/_list_project.html.erb +++ b/modules/costs/app/views/hourly_rates/_list_project.html.erb @@ -37,7 +37,7 @@ See docs/COPYRIGHT.rdoc for more details. current_rate = @user.current_rate(project) end %> - +
<% if project && User.current.allowed_to?({:controller => '/hourly_rates', :action => 'edit'}, project) %> <%= link_to t(:button_update), {:controller => '/hourly_rates', :action => 'edit', :project_id => project, :id => @user}, :class => 'icon icon-edit', :accesskey => accesskey(:edit) %> @@ -45,9 +45,7 @@ See docs/COPYRIGHT.rdoc for more details.

<%=h project.name %><%= (" - " + number_to_currency(current_rate.rate)) if current_rate %>

<% if rates.empty? %> -
<%= no_results_box %> -
<% else %>
@@ -102,3 +100,4 @@ See docs/COPYRIGHT.rdoc for more details.
<% end %> +
\ No newline at end of file