bookyt_salary 0.16.6 → 0.16.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. data/app/views/salaries/_form.html.haml +5 -5
  2. data/app/views/salaries/_list.html.haml +1 -1
  3. data/app/views/salaries/select_employee.html.haml +2 -2
  4. data/app/views/salaries/show.html.haml +2 -3
  5. data/app/views/salary_booking_templates/_form.html.haml +9 -9
  6. data/app/views/salary_booking_templates/_list.html.haml +1 -1
  7. data/app/views/salary_booking_templates/statistics.html.haml +1 -1
  8. data/app/views/salary_items/_list_form.html.haml +1 -1
  9. data/app/views/salary_reports/yearly_ahv_statement.html.haml +1 -1
  10. data/app/views/salary_templates/_form.html.haml +3 -3
  11. data/app/views/salary_templates/_list.html.haml +1 -1
  12. data/lib/bookyt_salary/navigation.rb +1 -1
  13. data/lib/bookyt_salary/version.rb +1 -1
  14. metadata +4 -4
data/app/views/salaries/_form.html.haml CHANGED
@@ -5,13 +5,13 @@
5
5
  = f.input :employer_id, :as => :hidden
6
6
  = f.input :state, :as => :hidden
7
7
  .row
8
- .span16= f.input :title, :input_html => {:class => 'span12'}
8
+ .span12= f.input :title, :input_html => {:class => 'span12'}
9
9
  .row
10
- .span8= f.input :duration_from, :as => :date_field
11
- .span8= f.input :duration_to, :as => :date_field
10
+ .span6= f.input :duration_from, :as => :date_field
11
+ .span6= f.input :duration_to, :as => :date_field
12
12
  .row
13
- .span16= f.input :text, :input_html => {:rows => 4, :class => 'span12'}
14
- .span16= f.input :remarks, :input_html => {:rows => 4, :class => 'span12'}
13
+ .span12= f.input :text, :input_html => {:rows => 4, :class => 'span12'}
14
+ .span12= f.input :remarks, :input_html => {:rows => 4, :class => 'span12'}
15
15
 
16
16
  = render 'line_items/list_form', :f => f, :invoice => resource
17
17
 
data/app/views/salaries/_list.html.haml CHANGED
@@ -1,6 +1,6 @@
1
1
  = render 'salaries/sidebar'
2
2
 
3
- %table.zebra-striped.salaries.collection
3
+ %table.table.table-striped.salaries.collection
4
4
  %thead
5
5
  %tr
6
6
  %th= t_attr :value_date, Invoice
data/app/views/salaries/select_employee.html.haml CHANGED
@@ -5,9 +5,9 @@
5
5
 
6
6
  = f.inputs do
7
7
  .row
8
- .span8= f.input :employee, :as => :combobox
8
+ .span6= f.input :employee, :as => :combobox
9
9
  .row
10
- .span8= f.input :duration_from, :as => :date_field
10
+ .span6= f.input :duration_from, :as => :date_field
11
11
 
12
12
  = f.buttons do
13
13
  = f.commit_button
data/app/views/salaries/show.html.haml CHANGED
@@ -2,8 +2,7 @@
2
2
  = icon_link_to(:payslip, {:action => :payslip, :format => :pdf}, :target => '_blank')
3
3
  = contextual_links_for
4
4
 
5
- .page-header
6
- %h1= resource.title
5
+ =boot_page_title
7
6
 
8
7
  - bookings = Booking.by_reference(resource)
9
8
  - credit_accounts = bookings.select('credit_account_id').group('credit_account_id').map{|account| account.credit_account}
@@ -18,4 +17,4 @@
18
17
  .tab-content
19
18
  #tab-main.active= render "form"
20
19
  - accounts.each do |account|
21
- %div{:id => "tab-account-#{account.id}"}= render 'direct_bookings/show', :reference => resource, :direct_account => account
20
+ %div.tab-pane{:id => "tab-account-#{account.id}"}= render 'direct_bookings/show', :reference => resource, :direct_account => account
data/app/views/salary_booking_templates/_form.html.haml CHANGED
@@ -2,22 +2,22 @@
2
2
  = f.semantic_errors
3
3
  = f.inputs do
4
4
  .row
5
- .span8= f.input :title, :input_html => {"data-autofocus" => true}
6
- .span8= f.input :code
5
+ .span6= f.input :title, :input_html => {"data-autofocus" => true}
6
+ .span6= f.input :code
7
7
  .row
8
- .span8= f.input :credit_account, :as => :combobox, :collection => accounts_as_collection
9
- .span8= f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
8
+ .span6= f.input :credit_account, :as => :combobox, :collection => accounts_as_collection
9
+ .span6= f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
10
10
  .row
11
- .span8= f.input :amount
12
- .span8= f.input :amount_relates_to, :collection => amount_relates_to_collection
11
+ .span6= f.input :amount
12
+ .span6= f.input :amount_relates_to, :collection => amount_relates_to_collection
13
13
  .row
14
- .span16= f.input :comments, :input_html => {:rows => 2, :class => 'span12'}
14
+ .span12= f.input :comments, :input_html => {:rows => 2, :class => 'span12'}
15
15
 
16
16
  .row
17
- .span16= f.input :include_in_saldo_list, :input_html => {:class => 'span12'}
17
+ .span12= f.input :include_in_saldo_list, :input_html => {:class => 'span12'}
18
18
 
19
19
  .row
20
- .span8= f.input :salary_declaration_code
20
+ .span6= f.input :salary_declaration_code
21
21
 
22
22
  = f.buttons do
23
23
  = f.commit_button
data/app/views/salary_booking_templates/_list.html.haml CHANGED
@@ -1,4 +1,4 @@
1
- %table.zebra-striped.salary_booking_templates.collection
1
+ %table.table.table-striped.salary_booking_templates.collection
2
2
  %thead
3
3
  %tr
4
4
  %th= t_attr :code, SalaryBookingTemplate
data/app/views/salary_booking_templates/statistics.html.haml CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  = boot_page_title
4
4
 
5
- %table.zebra-striped.collection
5
+ %table.table.table-striped.collection
6
6
  %thead
7
7
  %tr
8
8
  %th= t_attr :code
data/app/views/salary_items/_list_form.html.haml CHANGED
@@ -1,5 +1,5 @@
1
1
  = f.inputs t_title(:list, SalaryItem) do
2
- %table.zebra-striped.salary_items.collection.nested-form-container
2
+ %table.table.table-striped.salary_items.collection.nested-form-container
3
3
  %thead
4
4
  = render 'salary_items/list_header', :template => f.object
5
5
  %tbody.sortable
data/app/views/salary_reports/yearly_ahv_statement.html.haml CHANGED
@@ -1,6 +1,6 @@
1
1
  = boot_page_title
2
2
 
3
- %table.zebra-striped.collection
3
+ %table.table.table-striped.collection
4
4
  %thead
5
5
  %tr
6
6
  %th= t_attr :ssn, Employee
data/app/views/salary_templates/_form.html.haml CHANGED
@@ -2,10 +2,10 @@
2
2
  = f.semantic_errors
3
3
  = f.inputs do
4
4
  .row
5
- .span8= f.input :title, :input_html => {"data-autofocus" => true}
6
- .span8= f.input :person, :as => :combobox, :collection => Employee.all
5
+ .span6= f.input :title, :input_html => {"data-autofocus" => true}
6
+ .span6= f.input :person, :as => :combobox, :collection => Employee.all
7
7
  .row
8
- .span16= f.input :remarks, :input_html => {:rows => 2, :class => 'span12'}
8
+ .span12= f.input :remarks, :input_html => {:rows => 2, :class => 'span12'}
9
9
 
10
10
  = render 'salary_items/list_form', :f => f
11
11
 
data/app/views/salary_templates/_list.html.haml CHANGED
@@ -1,4 +1,4 @@
1
- %table.zebra-striped.salary_templates.collection
1
+ %table.table.table-striped.salary_templates.collection
2
2
  %thead
3
3
  %tr
4
4
  %th= t_attr :title, SalaryTemplate
data/lib/bookyt_salary/navigation.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module BookytSalary
2
2
  module Navigation
3
3
  def setup_bookyt_salary(navigation)
4
- navigation.item :salaries, t_title(:index, Salary), salaries_path,
4
+ navigation.item :salaries, t_title(:index, Salary), "#",
5
5
  :if => Proc.new { user_signed_in? } do |salaries|
6
6
  salaries.item :salary_list, t_title(:index, Salary), salaries_path, :highlights_on => /\/salaries($|\/[0-9]*($|\/.*))/
7
7
  salaries.item :new_salary, t_title(:new, Salary), select_employee_salaries_path
data/lib/bookyt_salary/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module BookytSalary
2
- VERSION = '0.16.6'
2
+ VERSION = '0.16.7'
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bookyt_salary
3
3
  version: !ruby/object:Gem::Version
4
- hash: 83
4
+ hash: 81
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 16
9
- - 6
10
- version: 0.16.6
9
+ - 7
10
+ version: 0.16.7
11
11
  platform: ruby
12
12
  authors:
13
13
  - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-03-20 00:00:00 Z
18
+ date: 2012-03-26 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: rails