voluntary 0.2.2 → 0.2.3

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

@@ -0,0 +1,12 @@
+<% body ||= nil %>
+<% footer ||= nil %>
+<div class="modal-header">
+  <button type="button" id="close_bootstrap_modal_button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+  <h3><%= title %></h3>
+</div>
+<div class="modal-body" style="overflow-y:none;">
+  <%= body || yield(:modal_body) %>
+</div>
+<div class="modal-footer">
+  <%= footer || yield(:modal_footer) %>
+</div>

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

@@ -0,0 +1,17 @@
+<% name ||= id %>
+<% 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">
+    <label class="radio">
+      <input type="radio" value="true" name="<%= name %>" id="<%= id %>_true"<%= value ? ' checked="checked"' : '' %> class="radio_buttons <%= required_class %>"/>
+      Yes
+    </label>
+    <label class="radio">
+      <input type="radio" value="false" name="<%= name %>" id="<%= id %>_false"<%= value ? '' : ' checked="checked"' %>  class="radio_buttons <%= required_class %>"/>
+      No
+    </label>
+  </div>
+</div>

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

@@ -1,3 +1,4 @@
+<% 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?
@@ -8,8 +9,9 @@
   <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
   <% if can? :destroy, resource %>    
     <li>
+      <% working_resource = namespace.present? ? [namespace, resource] : resource %>
       <%= link_to(
-        t('general.destroy'), polymorphic_or_resource_path(resource), id: "#{resource.class.name.tableize.singularize}_#{resource.id}", method: :delete, 
+        t('general.destroy'), polymorphic_or_resource_path(working_resource), id: "#{resource.class.name.tableize.singularize}_#{resource.id}", method: :delete, 
         data: { confirm: t('general.questions.are_you_sure') },
         onclick: "delete_link('#{resource.class.name.tableize.singularize}_#{resource.id}'); return false;"
       ) 
@@ -17,7 +19,7 @@
     </li>
   <% end %>
   <% if can? :edit, resource %>    
-    <li><%= link_to t('general.edit'), eval("edit_#{type.gsub('/', '_').singularize}_path(resource)") %></li>
+    <li><%= link_to t('general.edit'), eval("edit_#{(namespace.present? ? namespace.to_s + '_' : '')}#{type.gsub('/', '_').singularize}_path(resource)") %></li>
   <% end %>
   <% if resource.respond_to? :state_events %>
   <li class="divider"></li>

data/config/locales/general/en.yml

@@ -3,6 +3,7 @@ en:
     index:
       title: Home
     search: Search
+    submit: Submit
     new: New
     denied: Denied
     accepted: Accepted
@@ -16,6 +17,11 @@ en:
     list_action: Back to the overview
     details: Details
     export: Export
+    join: Join
+    leave: Leave
+    join_or_leave: Join or Leave
+    publish: publish
+    group: Group
     form:
       errors_count: '%{count} prohibited this object from being saved:'
       successfully_created: Creation successful
@@ -31,8 +37,12 @@ en:
       access_denied: Access denied
       not_found: Resource not found.
     notifications:
-      event_successful: "%{event} successful."  
-   
+      event_successful: "%{event} successful."
+    plugins:
+      competitive_list:
+        sort: Sort through round robin tournament
+        save_match_results: Save match results
+    
   attributes:  
     name: Name 
     text: Text
@@ -43,6 +53,8 @@ en:
     vacancy_id: Vacancy  
     roles: Roles
     position: Position
+    date: Date
+    trend: Trend
     
   activerecord:
     models:

data/config/routes/api.rb

@@ -0,0 +1,6 @@
+scope :voluntary do
+  namespace :api, defaults: {format: 'json'} do
+    namespace :v1 do
+    end
+  end
+end

data/config/routes.rb

@@ -14,7 +14,7 @@ Rails.application.routes.draw do
 
   resources :areas do
     resources :users, only: :index
-    resources :projects, only: :index
+    resources :projects, only: [:index, :new]
     
     collection do
       put :update_multiple
@@ -159,4 +159,6 @@ Rails.application.routes.draw do
   post 'like/:target_type/:target_id' => 'likes#create'
   post 'dislike/:target_type/:target_id' => 'likes#create'
   post 'unlike/:target_type/:target_id' => 'likes#destroy'
+  
+  draw :api
 end

data/lib/generators/voluntary/install/templates/app/views/layouts/application.html.erb

@@ -13,6 +13,10 @@
   
   <%= render 'layouts/shared/navigation' %>
   
+  <% if voluntary_application_repository_path.present? %>
+  <a href="https://github.com/<%= voluntary_application_repository_path %>"><img style="position: absolute; top: 41px; right: 0; border: 0; z-index: 100;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>
+  <% end %>
+  
   <section id="dialog">
     <img alt="Ajax-loader-small" class="hide " id="dialog_body_spinner" src="<%=image_path('voluntary/spinner.gif')%>"/>
     <div id="dialog_body"/>
@@ -27,7 +31,7 @@
     </div>
 <% end %>    
     <div class="row-fluid">
-<% if sidenav(@sidenav_links_count).present? || content_for?(:search) %>
+<% if sidenav(@sidenav_links_count).present? || content_for?(:search) || content_for?(:sidebar) %>
       <div class="span9">
         <% if content_for?(:breadcrumbs) %>
           <div class="nav">
@@ -43,6 +47,8 @@
         <%= yield :search %>
         
         <%= sidenav(@sidenav_links_count) %>
+        
+        <%= yield :sidebar %>
       </div>
 <% else %>
       <div class="span12">

data/lib/generators/voluntary/product_dummy/product_dummy_generator.rb

@@ -33,7 +33,6 @@ gemspec path: File.expand_path(File.dirname(__FILE__) + "/../")
         
         # view 
         gem 'acts_as_markup', git: 'git://github.com/vigetlabs/acts_as_markup.git'
-        gem 'auto_html', git: 'git://github.com/Applicat/auto_html'
         gem 'recaptcha', require: 'recaptcha/rails'
         gem "will_paginate", github: "mislav/will_paginate"
         

data/lib/generators/voluntary/product_dummy/templates/app/views/layouts/application.html.erb

@@ -13,6 +13,10 @@
   
   <%= render 'layouts/shared/navigation' %>
   
+  <% if voluntary_application_repository_path.present? %>
+  <a href="https://github.com/<%= voluntary_application_repository_path %>"><img style="position: absolute; top: 41px; right: 0; border: 0; z-index: 100;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>
+  <% end %>
+  
   <section id="dialog">
     <img alt="Ajax-loader-small" class="hide " id="dialog_body_spinner" src="<%=image_path('voluntary/spinner.gif')%>"/>
     <div id="dialog_body"/>
@@ -27,7 +31,7 @@
     </div>
 <% end %>    
     <div class="row-fluid">
-<% if sidenav(@sidenav_links_count).present? || content_for?(:search) %>
+<% if sidenav(@sidenav_links_count).present? || content_for?(:search) || content_for?(:sidebar) %>
       <div class="span9">
         <% if content_for?(:breadcrumbs) %>
           <div class="nav">
@@ -43,6 +47,8 @@
         <%= yield :search %>
         
         <%= sidenav(@sidenav_links_count) %>
+        
+        <%= yield :sidebar %>
       </div>
 <% else %>
       <div class="span12">

data/lib/voluntary/version.rb

@@ -1,3 +1,3 @@
 module Voluntary
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/voluntary.rb

@@ -23,7 +23,7 @@ require 'koala'
 require 'ransack' 
 require 'faker'
 require 'paper_trail'
-require 'mongoid-history'
+require 'mongoid/history'
 require 'mongoid_slug'
 require 'has_scope'
 require 'friendly_id'
@@ -50,6 +50,7 @@ require 'typhoeus'
 require 'capistrano'
 require 'jquery-rails'
 require 'bootstrap-sass-rails'
+require 'bootstrap-datetimepicker-rails'
 require 'jquery-ui-bootstrap-rails-asset'
 require 'auto_html'
 #require 'twitter-bootstrap-rails'
@@ -64,6 +65,7 @@ require 'uglifier'
 require 'coffee-script'
 require 'font-awesome-rails'
 require 'thor'
+require 'selectize-rails'
 
 require 'voluntary/navigation'