bookyt_salary 0.16.8 → 0.17.0

data/app/views/salaries/_form.html.haml

@@ -1,19 +1,16 @@
-= semantic_form_for @salary do |f|
-  = f.semantic_errors
-  = f.inputs do
-    = f.input :employee_id, :as => :hidden
-    = f.input :employer_id, :as => :hidden
-    = f.input :state, :as => :hidden
-    .row-fluid
-      .span10= f.input :title, :input_html => {:class => 'span10'}
-    .row-fluid
-      .span5= f.input :duration_from, :as => :date_field
-      .span5= f.input :duration_to, :as => :date_field
-    .row-fluid
-      .span10= f.input :text, :input_html => {:rows => 4, :class => 'span10'}
-      .span10= f.input :remarks, :input_html => {:rows => 4, :class => 'span10'}
+= simple_form_for @salary do |f|
+  = f.input :employee_id, :as => :hidden
+  = f.input :employer_id, :as => :hidden
+  = f.input :state, :as => :hidden
+  .row-fluid
+    .span12= f.input :title
+  .row-fluid
+    .span6= f.input :duration_from, :as => :date_field
+    .span6= f.input :duration_to, :as => :date_field
+  .row-fluid
+    .span12= f.input :text, :input_html => {:rows => 4}
+    .span12= f.input :remarks, :input_html => {:rows => 4}
 
   = render 'line_items/list_form', :f => f, :invoice => resource
 
-  = f.buttons do
-    = f.commit_button
+  = f.button :submit

data/app/views/salaries/select_employee.html.haml

@@ -1,13 +1,9 @@
 = boot_page_title
 
-= semantic_form_for @salary, :url => new_salary_path, :method => :get do |f|
-  = f.semantic_errors
+= simple_form_for @salary, :url => new_salary_path, :method => :get do |f|
+  .row-fluid
+    .span6= f.input :employee, :as => :combobox
+  .row-fluid
+    .span6= f.input :duration_from, :as => :date_field
 
-  = f.inputs do
-    .row-fluid
-      .span5= f.input :employee, :as => :combobox
-    .row-fluid
-      .span5= f.input :duration_from, :as => :date_field
-
-  = f.buttons do
-    = f.commit_button
+  = f.button :submit

data/app/views/salary_booking_templates/_form.html.haml

@@ -1,23 +1,20 @@
-= semantic_form_for @salary_booking_template do |f|
-  = f.semantic_errors
-  = f.inputs do
-    .row-fluid
-      .span5= f.input :title, :input_html => {"data-autofocus" => true}
-      .span5= f.input :code
-    .row-fluid
-      .span5= f.input :credit_account, :as => :combobox, :collection => accounts_as_collection
-      .span5= f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
-    .row-fluid
-      .span5= f.input :amount
-      .span5= f.input :amount_relates_to, :collection => amount_relates_to_collection
-    .row-fluid
-      .span10= f.input :comments, :input_html => {:rows => 2, :class => 'span10'}
+= simple_form_for @salary_booking_template do |f|
+  .row-fluid
+    .span6= f.input :title, :input_html => {"data-autofocus" => true}
+    .span6= f.input :code
+  .row-fluid
+    .span6= f.input :credit_account, :as => :combobox, :collection => accounts_as_collection
+    .span6= f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
+  .row-fluid
+    .span6= f.input :amount
+    .span6= f.input :amount_relates_to, :collection => amount_relates_to_collection
+  .row-fluid
+    .span12= f.input :comments, :input_html => {:rows => 2}
 
-    .row-fluid
-      .span10= f.input :include_in_saldo_list, :input_html => {:class => 'span10'}
+  .row-fluid
+    .span12= f.input :include_in_saldo_list
 
-    .row-fluid
-      .span5= f.input :salary_declaration_code
+  .row-fluid
+    .span6= f.input :salary_declaration_code
 
-  = f.buttons do
-    = f.commit_button
+  = f.button :submit

data/app/views/salary_items/_list_form.html.haml

@@ -1,7 +1,7 @@
-= f.inputs t_title(:list, SalaryItem) do
-  %table.table.table-striped.salary_items.collection.nested-form-container
-    %thead
-      = render 'salary_items/list_header', :template => f.object
-    %tbody.sortable
-      = f.fields_for :salary_items do |salary_item|
-        = render 'salary_items/form', :salary_item => salary_item, :template => f.object
+%h3= t_title(:list, SalaryItem)
+%table.table.table-striped.salary_items.collection.nested-form-container
+  %thead
+    = render 'salary_items/list_header', :template => f.object
+  %tbody.sortable
+    = f.fields_for :salary_items do |salary_item|
+      = render 'salary_items/form', :salary_item => salary_item, :template => f.object

data/app/views/salary_templates/_form.html.haml

@@ -1,13 +1,10 @@
-= semantic_form_for @salary_template do |f|
-  = f.semantic_errors
-  = f.inputs do
-    .row-fluid
-      .span5= f.input :title, :input_html => {"data-autofocus" => true}
-      .span5= f.input :person, :as => :combobox, :collection => Employee.all
-    .row-fluid
-      .span10= f.input :remarks, :input_html => {:rows => 2, :class => 'span10'}
+= simple_form_for @salary_template do |f|
+  .row-fluid
+    .span6= f.input :title, :input_html => {"data-autofocus" => true}
+    .span6= f.input :person, :as => :combobox, :collection => Employee.all
+  .row-fluid
+    .span12= f.input :remarks, :input_html => {:rows => 2}
 
   = render 'salary_items/list_form', :f => f
 
-  = f.buttons do
-    = f.commit_button
+  = f.button :submit

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.16.8'
+  VERSION = '0.17.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 91
   prerelease: 
   segments: 
   - 0
-  - 16
-  - 8
-  version: 0.16.8
+  - 17
+  - 0
+  version: 0.17.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"