make a whole container

pull/8355/head
bsatarnejad 5 years ago
parent c4c2b6a2f9
commit e1a11a4839
  1. 2
      app/assets/stylesheets/content/_user.sass
  2. 5
      modules/costs/app/views/hourly_rates/_list_default.html.erb
  3. 5
      modules/costs/app/views/hourly_rates/_list_project.html.erb

@ -78,5 +78,5 @@ tr user-avatar
&.avatar-medium, &.avatar-mini &.avatar-medium, &.avatar-mini
margin-right: 5px margin-right: 5px
.user-history-rates-no-result .user-rate-history-list
margin-bottom: 25px margin-bottom: 25px

@ -26,15 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See docs/COPYRIGHT.rdoc for more details. See docs/COPYRIGHT.rdoc for more details.
++#%> ++#%>
<div class="user-rate-history-list">
<div class="contextual"> <div class="contextual">
<%= link_to t(:button_update), edit_hourly_rate_path(@user), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %> <%= link_to t(:button_update), edit_hourly_rate_path(@user), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
</div> </div>
<h3><%= User.human_attribute_name(:default_rates) %></h3> <h3><%= User.human_attribute_name(:default_rates) %></h3>
<% if @rates_default.blank? %> <% if @rates_default.blank? %>
<div class="user-history-rates-no-result">
<%= no_results_box %> <%= no_results_box %>
</div>
<% else %> <% else %>
<div class="generic-table--container"> <div class="generic-table--container">
<div class="generic-table--results-container"> <div class="generic-table--results-container">
@ -90,3 +88,4 @@ See docs/COPYRIGHT.rdoc for more details.
</div> </div>
</div> </div>
<% end %> <% end %>
</div>

@ -37,7 +37,7 @@ See docs/COPYRIGHT.rdoc for more details.
current_rate = @user.current_rate(project) current_rate = @user.current_rate(project)
end end
%> %>
<div class="user-rate-history-list">
<div class="contextual"> <div class="contextual">
<% if project && User.current.allowed_to?({:controller => '/hourly_rates', :action => 'edit'}, project) %> <% 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) %> <%= 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.
</div> </div>
<h3><%=h project.name %><%= (" - " + number_to_currency(current_rate.rate)) if current_rate %></h3> <h3><%=h project.name %><%= (" - " + number_to_currency(current_rate.rate)) if current_rate %></h3>
<% if rates.empty? %> <% if rates.empty? %>
<div class="user-history-rates-no-result">
<%= no_results_box %> <%= no_results_box %>
</div>
<% else %> <% else %>
<div class="generic-table--container"> <div class="generic-table--container">
<div class="generic-table--results-container"> <div class="generic-table--results-container">
@ -102,3 +100,4 @@ See docs/COPYRIGHT.rdoc for more details.
</div> </div>
</div> </div>
<% end %> <% end %>
</div>
Loading…
Cancel
Save