bookyt_salary 0.16.5 → 0.16.6

data/app/views/employees/_show_salaries.html.haml

@@ -1,6 +1,6 @@
 .contextual
   = link_to t_action('new', Salary), select_employee_salaries_path(:salary => {:employee_id => @employee.id}), :class => "icon icon-add"
-%h2= t_model SalaryTemplate
+= boot_page_title t_model SalaryTemplate
 
 - @salary_template = @employee.salary_templates.first
 = render 'salary_templates/form' if @salary_template

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

@@ -4,7 +4,7 @@
   - content_for :sidebar do
     .sub-tabs
       %h3 Filter
-      %ul
+      %ul.pager
         %li= link_to t('bookyt.all'), url_for(params.merge(:by_state => 'all', :overdue => nil))
         - for state in Salary::STATES
           %li= link_to t(state, :scope => 'invoice.state'), url_for(params.merge(:by_state => state, :overdue => nil))

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

@@ -1,7 +1,7 @@
 .contextual
   = icon_link_to :new, {:action => :select_employee}
 
-%h2= t_title
+= boot_page_title
 
 = paginated_section collection do
   - if collection.any?

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

@@ -1,4 +1,4 @@
-%h2= t_title
+= boot_page_title
 
 = semantic_form_for @salary, :url => new_salary_path, :method => :get do |f|
   = f.semantic_errors

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

@@ -1,26 +1,25 @@
 = contextual_links
 
-.page-header
-  %h1= t_title
+= boot_page_title
 
-  %table.zebra-striped.collection
-    %thead
+%table.zebra-striped.collection
+  %thead
+    %tr
+      %th= t_attr :code
+      %th= t_attr :title
+      %th.right= t_attr :amount
+  %tbody
+    - for template in @salary_booking_templates
+      - amount = template.line_items.where(:date => @duration).sum(&:accounted_amount)
+      - next if amount == 0
       %tr
-        %th= t_attr :code
-        %th= t_attr :title
-        %th.right= t_attr :amount
-    %tbody
-      - for template in @salary_booking_templates
-        - amount = template.line_items.where(:date => @duration).sum(&:accounted_amount)
-        - next if amount == 0
-        %tr
-          %td= template.code
-          %td= template.title
-          %td.currency= currency_fmt(amount)
+        %td= template.code
+        %td= template.title
+        %td.currency= currency_fmt(amount)
 
 - content_for :sidebar do
   .sub-tabs
-    %ul
+    %ul.pager
       - for month in 1..12
         - date = Date.new(Date.today.year, month, 1)
         %li= link_to t('date.month_names')[date.month], url_for(:date => date.to_s(:db))

data/app/views/salary_reports/yearly_ahv_statement.html.haml

@@ -1,4 +1,4 @@
-%h3= t('salary_certificate')
+= boot_page_title
 
 %table.zebra-striped.collection
   %thead

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

@@ -2,7 +2,6 @@
   = contextual_link_to :copy
   = contextual_links_for
 
-.page-header
-  %h1= resource
+= boot_page_title
 
 = render 'form'

data/config/locales/bookyt_salary.de.yml

@@ -43,3 +43,12 @@ de:
   salary_items:
     list:
       title: Lohnarten
+  salary_reports:
+    yearly_ahv_statement:
+      title: AHV Lohnbescheinigung
+
+  overview:
+    bookyt:
+      overview:
+        title:
+          title: Übersicht

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.16.5'
+  VERSION = '0.16.6'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 83
   prerelease: 
   segments: 
   - 0
   - 16
-  - 5
-  version: 0.16.5
+  - 6
+  version: 0.16.6
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -185,10 +185,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt
 test_files: []
 
-has_rdoc: