bookyt_projects 0.19.15 → 0.19.17

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

@@ -1,14 +1,14 @@
 = semantic_form_for @activity do |f|
   = f.inputs do
     .row
-      .span8= f.input :person, :as => :combobox
-      .span8= f.input :project, :as => :combobox
+      .span6= f.input :person, :as => :combobox
+      .span6= f.input :project, :as => :combobox
     .row
-      .span8= f.input :date, :as => :date_field
-      .span8= f.input :duration, :as => :string
+      .span6= f.input :date, :as => :date_field
+      .span6= f.input :duration, :as => :string
 
     .row
-      .span16= f.input :remarks, :input_html => {:rows => 2, :class => 'span12'}
+      .span12= f.input :remarks, :input_html => {:rows => 2, :class => 'span12'}
 
   = f.buttons do
     = f.commit_button

data/app/views/activities/_list.html.haml

@@ -1,4 +1,4 @@
-%table.zebra-striped.activities.collection
+%table.table.table-striped.activities.collection
   %thead
     %tr
       - [:person, :date, :duration].each do |attr|

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

@@ -3,7 +3,7 @@
     = f.input :date, :as => :date_field, :label => t('attributes.date'), :input_html => {:value => @date}
 
   = f.inputs do
-    %table.zebra-striped{:style => 'width: 100%'}
+    %table.table.table-striped.collection
       %thead
         %th= t_attr :person, Activity
         %th= t_attr :project, Activity

data/app/views/people/_show_timesheet.html.haml

@@ -1,8 +1,8 @@
 - WorkDay.create_or_update_upto(@employee, Date.today.end_of_month)
 
 .row
-  .span8
+  .span12
     = render 'timesheets/show', :work_days => @employee.work_days.where(:date => current_month_period(:time_sheet_period))
 
-  .span4
-    = render 'timesheets/pager'
+- content_for :sidebar do
+  = render 'timesheets/pager'

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

@@ -2,15 +2,15 @@
   = f.semantic_errors
   = f.inputs do
     .row
-      .span8
+      .span6
         = f.input :name, :input_html => {'data-autofocus' => 'true'}
         = f.input :duration_from, :as => :date_field
         = f.input :client, :as => :combobox
-      .span8
+      .span6
         = f.input :project_state
         = f.input :duration_to, :as => :date_field
     .row
-      .span16
+      .span12
         = f.input :remarks, :input_html => {:rows => 5, :class => 'span12'}
 
   = f.buttons do

data/app/views/projects/_list.html.haml

@@ -1,4 +1,4 @@
-%table.zebra-striped{:class => "#{collection.first.class.to_s.downcase.pluralize} collection"}
+%table.table.table-striped.activities.collection
   %thead
     %tr
       %th= t_attr :name

data/app/views/projects/_show.html.haml

@@ -1,7 +1,10 @@
-%ul.tabs
-  %li.active= link_to 'Details', '#details'
-  %li= link_to 'Stundenrapport', '#activities'
+.tabbable
+  %ul.nav.nav-tabs
+    %li.active= link_to 'Details', '#details', {:data => {:toggle => 'tab'}}
+    %li= link_to 'Stundenrapport', '#activities', {:data => {:toggle => 'tab'}}
 
 .tab-content
-  #details.active= render "form"
-  #activities= render 'show_activities'
+  #details.tab-pane.active
+    = render "form"
+  #activities.tab-pane
+    = render 'show_activities'

data/app/views/timesheets/_pager.html.haml

@@ -1,4 +1,4 @@
-= boot_page_title t('title.period')
+%h3 t_title('title.period')
 
 %ul.pager
   = month_pages(:time_sheet_period)

data/app/views/timesheets/_show.html.haml

@@ -1,4 +1,4 @@
-%table.zebra-striped.condensed-table.span8
+%table.table.table-striped.collection
   %thead
     %tr
       %th= t_attr :date, Activity

data/lib/bookyt_projects/navigation.rb

@@ -1,7 +1,7 @@
 module BookytProjects
   module Navigation
     def setup_bookyt_projects(navigation)
-      navigation.item :projects, t('bookyt.main_navigation.projects'), projects_path, :if => Proc.new { user_signed_in? } do |projects|
+      navigation.item :projects, t('bookyt.main_navigation.projects'), '#', :if => Proc.new { user_signed_in? } do |projects|
         projects.item :project_index, t_title(:index, Project), projects_path, :highlights_on => /\/(projects|activities)($|\/[0-9]*($|\/.*))/
         projects.item :new_project, t_title(:new, Project), new_project_path
         projects.item :divider, "", :class => 'divider'

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.19.15'
+  VERSION = '0.19.17'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 113
   prerelease: 
   segments: 
   - 0
   - 19
-  - 15
-  version: 0.19.15
+  - 17
+  version: 0.19.17
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 Z
+date: 2012-03-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails