voluntary 0.4.0 → 0.5.0

data/app/views/products/_form.html.erb

@@ -1,28 +1,27 @@
-<%= simple_form_for(@product, html: {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(@product, url: @product.new_record? ? products_path : product_path(@product), html: {class: 'form-horizontal'}, wrapper: :horizontal_form) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @product } %>
+
+  <%= f.input :name %>  
+  <%= f.input :text, as: :text, input_html: {style: 'width: 500px; height:300px;'} %>
   
-  <div class="form-inputs">
-    <%= f.input :name %>  
-    <%= f.input :text, as: :text, input_html: {style: 'width: 500px; height:300px;'} %>
-    
-    <div class="control-group check_boxes required">
-      <label class="check_boxes required control-label">
-        <abbr title="required">*</abbr> 
-        <%= t('areas.index.title') %>
-      </label>
-      <div class="controls">
+  <div class="form-group string required">
+    <label class="string required control-label col-sm-3 control-label">
+      <abbr title="required">*</abbr> <%= t('areas.index.title') %>
+    </label>
+    <div class="col-sm-9">
   <% Area.all.each do |area| %>
-        <label class="checkbox">
-          <input class="check_boxes required" id="product_area_ids_<%=area.id%>" name="product[area_ids][]" 
-          type="checkbox" value="<%=area.id%>"<%= @product.area_ids.include?(area.id) ? ' checked="checked"' : '' %>/>
-          <%= link_to area.name, area %>
-        </label>
+      <label class="checkbox">
+        <input class="check_boxes required" id="product_area_ids_<%=area.id%>" name="product[area_ids][]" 
+        type="checkbox" value="<%=area.id%>"<%= @product.area_ids.include?(area.id) ? ' checked="checked"' : '' %>/>
+        <%= link_to area.name, area %>
+      </label>
   <% end %>
-      </div>
     </div>
-  </div>
+  </div>  
   
-  <div class="form-actions">
-    <%= f.button :submit %>
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
+    </div>
   </div>
 <% end %>

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

@@ -1,17 +1,17 @@
-<%= simple_form_for(@project, html: {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(@project, html: {class: 'form-horizontal'}, wrapper: :horizontal_form) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @project } %>
+
+	<%= f.input :organization_id, collection: current_user.organizations %>
+  <%= f.input :product_id, collection: Product.all %>
+  <%= f.input :name %>  
+  <%= f.input :text, input_html: {style: 'width: 500px; height:300px;'} %>
+  <%= f.input :url %>
   
-  <div class="form-inputs">
-  	<%= f.input :organization_id, collection: current_user.organizations %>
-    <%= f.input :product_id, collection: Product.all %>
-    <%= f.input :name %>  
-    <%= f.input :text, input_html: {style: 'width: 500px; height:300px;'} %>
-    <%= f.input :url %>
-    
-    <%= f.association :areas, as: :check_boxes %>
-  </div>
+  <%= f.association :areas, as: :check_boxes %>
   
-  <div class="form-actions">
-    <%= f.button :submit %>
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
+    </div>
   </div>
 <% end %>

data/app/views/shared/form/_error_messages.html.erb

@@ -1,5 +1,5 @@
 <% if resource && resource.errors.any? %>
-<div class="alert alert-error">
+<div class="alert alert-danger">
   <h2><%= t('general.form.errors_count', count: pluralize(resource.errors.count, t('general.error'))) %></h2>
   <ul>
   <% resource.errors.full_messages.each do |msg| %>

data/app/views/shared/layouts/twitter_bootstrap/_control_group.html.erb

@@ -1,11 +1,11 @@
 <% id ||= field.match(/id="([^"]*)"/)[1] %>
 <% required ||= false %>
-<% required_class = required ? ' required' : ' optional' %>
-<div class="control-group string<%= required_class %> <%= id %>">
-  <label for="<%= id %>" class="string<%= required_class %> control-label">
+<% required_class = required ? 'required' : 'optional' %>
+<div class="form-group string <%= required_class %> <%= id %>">
+  <label class="string <%= required_class %> control-label col-sm-3 control-label" for="<%= id %>">
     <% if required %><abbr title="required">*</abbr><% end %> <%= label %>
   </label>
-  <div class="controls">
+  <div class="col-sm-9">
     <%= field %>
   </div>
-</div>
+</div>

data/app/views/shared/layouts/twitter_bootstrap/control_group/_boolean.html.erb

@@ -2,9 +2,9 @@
 <% required ||= false %>
 <% required_class = required ? ' required' : ' optional' %>
 <% value ||= true %>
-<div class="control-group radio_buttons <%= required_class %> <%= id %>">
-  <label class="radio_buttons <%= required_class %> control-label"><%= label %></label>
-  <div class="controls">
+<div class="form-group string <%= required_class %> <%= id %>">
+  <label class="string <%= required_class %> control-label col-sm-3 control-label"><%= label %></label>
+  <div class="col-sm-9">
     <label class="radio">
       <input type="radio" value="true" name="<%= name %>" id="<%= id %>_true"<%= value ? ' checked="checked"' : '' %> class="radio_buttons <%= required_class %>"/>
       Yes
@@ -14,4 +14,4 @@
       No
     </label>
   </div>
-</div>
+</div>

data/app/views/shared/resource/_actions.html.erb

@@ -1,4 +1,5 @@
 <% namespace ||= nil %>
+<% after_namespace ||= nil %>
 <% if !resource.is_a?(Column) && (
 	can?(:destroy, resource) || can?(:edit, resource) || (
       resource.respond_to?(:state_events) && resource.state_events.select{|event| can? event, resource }.any?
@@ -19,7 +20,7 @@
     </li>
   <% end %>
   <% if can? :edit, resource %>    
-    <li><%= link_to t('general.edit'), eval("edit_#{(namespace.present? ? namespace.to_s + '_' : '')}#{type.gsub('/', '_').singularize}_path(resource)") %></li>
+    <li><%= link_to t('general.edit'), eval("edit_#{(namespace.present? ? namespace.to_s + '_' : '')}#{type.gsub('/', '_').singularize}#{after_namespace.present? ? '_' + after_namespace : ''}_path(resource)") %></li>
   <% end %>
   <% links = event_links_for_resource(resource, type) %>
   <% if links.any? %>

data/app/views/stories/_form.html.erb

@@ -1,19 +1,9 @@
 <%= simple_form_for(@story, url: @story.new_record? ? stories_path : story_path(@story), as: :story, html: {class: 'form-vertical'}) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @story } %>
   
-  <% unless @story.new_record? %>
-  <div class="form-actions">
-    <%= f.button :submit %>
-  </div>
-  <% end %>
+  <%= @story.project ? f.hidden_field(:project_id) : f.input(:project_id, collection: Project.all) %> 
+  <%= f.input :name %>  
+  <%= f.input :text, as: :text, input_html: {style: 'width:500px; height:100px;'} %>
   
-  <div class="form-inputs">
-    <%= @story.project ? f.hidden_field(:project_id) : f.input(:project_id, collection: Project.all) %> 
-    <%= f.input :name %>  
-    <%= f.input :text, as: :text, input_html: {style: 'width:500px; height:100px;'} %>
-  </div>
-  
-  <div class="form-actions">
-    <%= f.button :submit %>
-  </div>
+  <%= f.button :submit %>
 <% end %>

data/app/views/stories/show.html.erb

@@ -4,6 +4,7 @@
 </h3>
 
 <dl class="dl-horizontal">
+  <%= show_attribute :id %>
   <%= show_associations :project %>
   <%= show_actions %>
 </dl>

data/app/views/stories/steps/_activate.html.erb

@@ -3,15 +3,12 @@
   <% if step == :activate %>
   <input type="hidden" name="next_step" value="1"/>
   <% end %>
-  <div class="form-inputs">
-    <%= render partial: 'tasks/collection', locals: { 
-      collection: @story.tasks.select{|t| !t.new_record? }, 
-      options: { current_parent: @story, columns: @step_presenter.task_columns } 
-    } 
-    %>
-  </div>
-    
-  <div class="form-actions">
+  <%= render partial: 'tasks/collection', locals: { 
+    collection: @story.tasks.select{|t| !t.new_record? }, 
+    options: { current_parent: @story, columns: @step_presenter.task_columns, append_new_link: false } 
+  } 
+  %>
+  <div class="form-group">
     <%= f.button :submit, t('general.events.activate') %>
   </div>
 <% end %>

data/app/views/stories/steps/_setup_tasks.html.erb

@@ -1,23 +1,28 @@
+<%= simple_form_for(@story, @step_presenter.form_options) do |f| %>
+  <%= f.input :tasks_file, as: :file, label: t('activerecord.attributes.story.tasks_file') %>
+  <% if step == :setup_tasks %>
+  <input type="hidden" name="next_step" value="1"/>
+  <% end %>
+  <div class="form-group">
+    <button type="submit" class="btn btn-default"><%= t('stories.steps.setup_tasks.import') %></button>
+  </div>
+<% end %>
+
 <%= simple_form_for(@story, @step_presenter.form_options) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @story } %>
   <% if step == :setup_tasks %>
   <input type="hidden" name="next_step" value="1"/>
   <% end %>
   
-  <div class="form-actions">
-    <div class="control-group string required" style="display: block">
-      <div class="controls">
-        <%= f.button :submit, t('stories.steps.setup_tasks.update') %>
-        
-        &nbsp;&nbsp;&nbsp;&nbsp;
-        <%= link_to_add_fields(
-          t('stories.steps.setup_tasks.add_task'), f, :tasks, target: 'setup_tasks_input'
-        ) %>
-      </div>
-    </div>
+  <div class="form-group">
+    <button type="submit" class="btn btn-default"><%= t('stories.steps.setup_tasks.update') %></button>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <%= link_to_add_fields(
+      t('stories.steps.setup_tasks.add_task'), f, :tasks, target: 'setup_tasks_input'
+    ) %>
   </div>
   
-  <div id="setup_tasks_input" class="form-inputs">
+  <div id="setup_tasks_input">
     <%= f.simple_fields_for :tasks do |task_form| %>
       <%= render_product_specific_partial_if_available(
         task_form.object, 'stories/task_fields', f: task_form
@@ -25,11 +30,7 @@
     <% end %>
   </div>
   
-  <div class="form-actions">
-    <div class="control-group string required" style="display: block">
-      <div class="controls">
-        <%= f.button :submit, t('stories.steps.setup_tasks.update') %>
-      </div>
-    </div>
+  <div class="form-group">
+    <button type="submit" class="btn btn-default"><%= t('stories.steps.setup_tasks.update') %></button>
   </div>
 <% end %>

data/app/views/tasks/show.html.erb

@@ -0,0 +1,20 @@
+<h3><%= resource.name %></h3>
+
+<dl class="dl-horizontal">
+  <%= show_attribute :state %>
+  <%= show_actions after_namespace: 'workflow_project_owner_index' %>
+</dl>
+
+<h4><%= t('tasks.show.story_text') %></h4>
+
+<%= resource.story.text %>
+
+<% if resource.text.present? %>
+<h4><%= t('tasks.show.text') %></h4>
+
+<%= resource.text %>
+<% end %>
+
+<h4><%= t('activerecord.models.result') %></h4>
+
+<%= resource.result.text if resource.result_id.present? %>

data/app/views/users/_form.html.erb

@@ -3,11 +3,10 @@
   method: resource.new_record? ? :post : :put,
   html: { 
     class: 'form-horizontal block-form', autocomplete: 'off'
-  }
+  }, wrapper: :horizontal_form
  ) do |f| %>
   <%= devise_error_messages! %>
     
-<div class="form-inputs">
   <% @presenter.attributes.each do |attribute| %>
     <%= case attribute
     when :name
@@ -29,15 +28,12 @@
       f.input attribute
     end %>
   <% end %>
-
-  <% 
-  #TODO: language selection
-  %>
   
   <%= recaptcha_tags if resource.new_record? && Rails.env == 'production' %>
-</div>
 
-<div class="form-actions">
-  <%= f.button :submit %>
-</div>
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
+    </div>
+  </div>
 <% end %>

data/app/views/users/preferences.html.erb

@@ -1,11 +1,9 @@
 <h3><%= t('users.preferences.title') %></h3>
 
-<%= simple_form_for(current_user, url: preferences_user_path(current_user), html: { class: 'form-horizontal block-form' }) do |f| %>
-  <div class="form-inputs">
-    <%= f.input :main_role_id, collection: Role.is_public %>
+<%= simple_form_for(current_user, url: preferences_user_path(current_user), html: { class: 'form-horizontal block-form' }, wrapper: :horizontal_form) do |f| %>
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
+    </div>
   </div>
-  
-  <div class="form-actions">
-    <%= f.button :submit %>
-  </div>
-<% end %>
+<% end %>

data/app/views/users/show.html.erb

@@ -1,6 +1,7 @@
 <h3><%= @user.name %></h3>
 
 <dl class="dl-horizontal">
+  <%= show_attribute :api_key if current_user.try(:id) == @user.id %>
   <%= show_associations :areas %>
   <%= show_actions %>
 </dl>

data/app/views/workflow/project_owner/index.html.erb

@@ -1,5 +1,5 @@
-<div class="container-fluid">
-  <div class="row-fluid">
+<div class="container-fluid" style="padding-top:0px;">
+  <div class="row">
     <div class="tabs">
       <ul>
         <li><a href="#stories"><%= I18n.t('stories.index.title') %></a></li>

data/app/views/workflow/tasks/_work_form.html.erb

@@ -1,8 +1,6 @@
 <%= render 'shared/form/error_messages', resource: resource %>
-<div class="form-inputs">
-  <%= render 'shared/form/error_messages', resource: @result %>
-  <fieldset>
-    <input type="hidden" name="task[result_attributes][task_id]" id="task_result_attributes_task_id" value="<%= resource.id %>"/> 
-    <%= text_area_tag 'task[result_attributes][text]', @result.text, style: 'width: 98%; height:200px;' %>
-  </fieldset>
-</div>
+<%= render 'shared/form/error_messages', resource: @result %>
+<fieldset>
+  <input type="hidden" name="task[result_attributes][task_id]" id="task_result_attributes_task_id" value="<%= resource.id %>"/> 
+  <%= text_area_tag 'task[result_attributes][text]', @result.text, style: 'width: 98%; height:200px;' %>
+</fieldset>

data/app/views/workflow/tasks/steps/_complete.html.erb

@@ -2,14 +2,18 @@
   resource, 'workflow/tasks/work_head' 
 ) %>
 
-<%= simple_form_for(resource, url: update_task_workflow_user_index_path(resource), html: {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(
+  resource, url: update_task_workflow_user_index_path(resource), 
+  html: {class: 'form-horizontal'}, wrapper: :horizontal_form
+) do |f| %>
   <%= render_product_specific_partial_if_available(
     resource, 'workflow/tasks/work_form', f: f, resource: resource 
   ) %>
   
-  <div class="form-actions">
-    <%= f.button :submit %>
-    
-    <%= f.button :submit, t('tasks.general.events.follow_up'), name: 'event[follow_up]' %>
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
+      <%= f.button :submit, t('tasks.general.events.follow_up'), name: 'event[follow_up]' %>
+    </div>
   </div>
 <% end %>

data/app/views/workflow/tasks/steps/_review.html.erb

@@ -2,16 +2,21 @@
   resource, 'workflow/tasks/work_head' 
 ) %>
 
-<%= simple_form_for(resource, url: update_task_workflow_user_index_path(resource), html: {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(
+  resource, url: update_task_workflow_user_index_path(resource), 
+  html: {class: 'form-horizontal'}, wrapper: :horizontal_form
+) do |f| %>
   <%= render_product_specific_partial_if_available( 
     resource, 'workflow/tasks/work_form', f: f, resource: resource
   ) %>
   
-  <div class="form-actions">
-    <%= f.button :submit %>
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
     
-    <%= f.button :submit, t('tasks.general.events.follow_up'), name: 'event[follow_up]' %>
-   
-    <%= f.button :submit, t('tasks.general.events.complete'), name: 'event[complete]' %>
+      <%= f.button :submit, t('tasks.general.events.follow_up'), name: 'event[follow_up]' %>
+     
+      <%= f.button :submit, t('tasks.general.events.complete'), name: 'event[complete]' %>
+    </div>
   </div>
 <% end %>

data/app/views/workflow/tasks/steps/_work.html.erb

@@ -2,20 +2,25 @@
   resource, 'workflow/tasks/work_head'
 ) %>
 
-<%= simple_form_for(resource, as: :task, url: update_task_workflow_user_index_path(resource), html: {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(
+  resource, as: :task, url: update_task_workflow_user_index_path(resource), 
+  html: {class: 'form-horizontal'}, wrapper_form: :horizontal_form
+) do |f| %>
   <%= render_product_specific_partial_if_available(
     resource, 'workflow/tasks/work_form', f: f, resource: resource
   ) %>
   
-  <div class="form-actions">
-    <%= f.button :submit %>
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
    
-    <%= f.button :submit, t('workflow.user.general.steps.general.cancel'), name: 'event[cancel]' %>
-   
-    <%= f.button :submit, t('workflow.user.general.steps.general.skip'), name: 'event[skip]' %>
-    
-    <%= f.button :submit, t('users.general.events.review'), name: 'event[review]' %>
-    
-    <%= f.button :submit, t('workflow.user.general.steps.general.next'), name: 'event[next]' %>
+      <%= f.button :submit, t('workflow.user.general.steps.general.cancel'), name: 'event[cancel]' %>
+     
+      <%= f.button :submit, t('workflow.user.general.steps.general.skip'), name: 'event[skip]' %>
+      
+      <%= f.button :submit, t('users.general.events.review'), name: 'event[review]' %>
+      
+      <%= f.button :submit, t('workflow.user.general.steps.general.next'), name: 'event[next]' %>
+    </div>
   </div>
 <% end %>

data/app/views/workflow/user/index.html.erb

@@ -1,11 +1,11 @@
-<div class="container-fluid">
-  <div class="row-fluid">
-    <div class="span6">
+<div class="container-fluid" style="padding-top:0px;">
+  <div class="row">
+    <div class="col-md-6">
       <h3><%= I18n.t('workflow.index.assigned_tasks') %></h3>
       
       <%= render 'tasks', collection: @assigned_tasks, columns: ['name', 'story_id'] %>
     </div>
-    <div class="span6">
+    <div class="col-md-6">
       <h3><%= I18n.t('workflow.index.completed_tasks') %></h3>
       
       <%= render 'tasks', collection: @completed_tasks, columns: ['name', 'story_id'] %>

data/config/initializers/simple_form.rb

@@ -45,40 +45,40 @@ SimpleForm.setup do |config|
     b.use :error, :wrap_with => { :tag => :span, :class => :error }
   end
 
-  config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
+  config.wrappers :bootstrap, :tag => 'div', :class => 'form-group', :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |ba|
+    b.wrapper :tag => 'div' do |ba|
       ba.use :input
-      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-block' }
       ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
     end
   end
 
-  config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :prepend, :tag => 'div', :class => "form-group", :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
+    b.wrapper :tag => 'div' do |input|
       input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend|
         prepend.use :input
       end
       input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-block' }
     end
   end
 
-  config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :append, :tag => 'div', :class => "form-group", :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-append' do |append|
+    b.wrapper :tag => 'div' do |input|
+      input.wrapper :tag => 'div', :class => 'input-group' do |append|
         append.use :input
       end
       input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-block' }
     end
   end