customer_vault 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b62fcc51965a154997c43c8d6c026e2e0da40c
-  data.tar.gz: e934b8a36a209b05a31903f8065a4b74ce8a2b2b
+  metadata.gz: 4ff457a0825294de50e44e6db98a58416080bce5
+  data.tar.gz: 8ec2452865e5059fffe8562986e2d889d6a9b8cf
 SHA512:
-  metadata.gz: c742380521d01c89d4ea3a53960d528bcf0385c4564f95a1dcfef1f1f0575a0a8299bcbe16e318fbf438574d65380b4def72f48d4268f02effa64f09f870e792
-  data.tar.gz: 149971a98042c888c5aedf2813e7e64ac5df6a9a2bafcdcb58578bebae6e1f1e776f69036e0b714a1594e9580c0fd436b52e3534251656fa8bc0c6e5df7e99a0
+  metadata.gz: 62caa832a2fe4f89bd4bd9fe411cdbf32c144ecf7c59c7bb0f8bb00ee97a0f434cc86726a49b296897f0147f66728de38cf6d192f1da002dc42eee9839d3cc3b
+  data.tar.gz: 01936a7af059267ffb588e10c5bb24ee2532e7ada2791d47432de8094a558173610ed131a1da453251ee95c8bf7738acdf948775c2dc8eb4542d82212c271468

data/app/assets/stylesheets/customer_vault/individuals.css.scss

@@ -3,7 +3,7 @@
   They will automatically be included in application.css.
 */
 
-aside.individual, aside.corporation, aside .action, ul li.person{
+aside.individual, aside.corporation, aside .action, ul li.person, .cadre{
     background-color:#F5F5F5;
     margin-bottom:1%;
     border:1px solid #D8D8D8;

data/app/models/customer_vault/corporation.rb

@@ -1,9 +1,7 @@
 module CustomerVault
   class Corporation < Person
     self.table_name = 'customer_vault_corporations'
-    
     validates_presence_of :name
-    has_one :address, class_name: 'Dorsale::Address', as: :addressable
-    accepts_nested_attributes_for :address, allow_destroy: true
+    
   end
 end

data/app/models/customer_vault/individual.rb

@@ -8,8 +8,5 @@ module CustomerVault
     
     validates_presence_of :first_name
     validates_presence_of :last_name
-
-    has_one :address, class_name: 'Dorsale::Address', as: :addressable
-    accepts_nested_attributes_for :address, allow_destroy: true
   end
 end

data/app/models/customer_vault/person.rb

@@ -1,7 +1,10 @@
 module CustomerVault
   class Person < ActiveRecord::Base
     self.abstract_class = true
-    
+ 
+    has_one :address, class_name: 'Dorsale::Address', as: :addressable
+    accepts_nested_attributes_for :address, allow_destroy: true
+
     def self.list 
       individuals = Individual.all
       corporations = Corporation.all

data/app/views/customer_vault/corporations/_form.html.slim

@@ -1,28 +1,15 @@
-= form_for [customer_vault, @corporation], html: { class: "form-horizontal"} do |f|
-	.form-group
-		=f.label "Name" , class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :name, class:"form-control"
-		
-	.form-group
-		=f.label "Email", class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :email, class:"form-control"
-		
-	.form-group
-		=f.label "Phone", class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :phone, class:"form-control"
-		
-	.form-group
-		=f.label "Fax", class:"control-label col-lg-2"
-		div class="col-lg-10"	
-			=f.text_field :fax, class:"form-control"
-	
-	= f.fields_for :address do |address_form|
-	  = render partial: 'dorsale/addresses/nested_form', :locals => {:f => address_form}
-	
-	.actions 
-	  div class= "cdiv mega-top-buffer"
-	    = f.submit 'Valider', :class=>"btn btn-success btn-sm", id: 'submit-corporation'
-	    = link_to 'Retour', customer_vault.people_path, :class=>"btn btn-primary btn-sm"
+= horizontal_form_for [customer_vault, @corporation] do |f|
+  = f.input :name
+  = f.input :email
+  = f.input :phone
+  = f.input :fax
+  
+  / Temporaire - A refactoriser
+  = f.simple_fields_for :address do |af|
+    = af.input :street
+    = af.input :street_bis
+    = af.input :zip
+    = af.input :city
+    = af.input :country, as: :string
+  
+  = form_buttons

data/app/views/customer_vault/corporations/_show_details.html.slim

@@ -1,36 +1,9 @@
-aside.col-lg-12.corporation
-  .row
-    .col-lg-12.cdiv
-      =image_tag ('customer_vault/icons/group-64.png')
-    .col-lg-12.cdiv
-      span class= "text-muted titre bold" #{corporation.name}
-  .row
-    .col-lg-12.top-buffer
-      - if corporation.name?
-        .col-lg-12.cdiv
-          .bold.text-muted.cdiv Name
-          span #{corporation.name}  
-    .col-lg-12.cdiv
-      - if corporation.email?
-          .bold.text-muted.cdiv Email
-          span #{corporation.email}
-    .col-lg-12.cdiv
-      - if corporation.phone?
-          .bold.text-muted.cdiv Phone
-          span #{corporation.phone}
-    .col-lg-12.cdiv
-      - if corporation.fax?
-          .bold.text-muted.cdiv Fax
-          span #{corporation.fax}
-    .col-lg-12.cdiv
-      - if corporation.address && !corporation.address.one_line.blank?
-          .bold.text-muted.cdiv Address
-          span.address #{corporation.address.one_line}
-    
-  .row.mega-top-buffer.bottom-buffer
-    .col-lg-4.cdiv
-      =link_to 'Editer', customer_vault.edit_corporation_path(corporation), :class=>"btn btn-success btn-sm"
-    .col-lg-4.cdiv
-      =link_to 'Effacer', [customer_vault, corporation], data: {:confirm => 'Are you sure?'}, :method => :delete, :class=>"btn btn-danger btn-sm"
-    .col-lg-4.cdiv
-      = link_to 'Retour', customer_vault.people_path, :class=>"btn btn-primary btn-sm"                
+.corporation-context: .context
+  = context_icon :users
+  = context_title corporation.name
+  = actions_for corporation, url: customer_vault.corporation_path(corporation)
+  
+  = context_info "E-mail",  corporation.email
+  = context_info "Phone",   corporation.phone
+  = context_info "Fax",     corporation.fax
+  = context_info "Address", corporation.address.one_line if corporation.address.present?

data/app/views/customer_vault/corporations/edit.html.slim

@@ -1,23 +1,19 @@
-.container-fluid
-  .div class = "col-lg-12"
-    ol.breadcrumb
-      li 
-        = link_to 'Home', '/'
-      li
-        = link_to 'People', customer_vault.people_path
-      li.active= "Edit #{@corporation.name}"
-  .col-lg-12
-    .col-lg-4
-      aside.col-lg-12
-        .row
-          .col-lg-12.cdiv
-            =image_tag ('customer_vault/icons/group-64.png')		
-        .row
-          .col-lg-12.cdiv
-            h3.text-muted= "Edit {@corporation.name}"
-      - if @corporation.errors.any?
-        = render partial: 'customer_vault/layout/form_error', :locals => {:p => @corporation}
-    .col-lg-8
-      .col-lg-12
-        == render 'form'
+- content_for :sub_header do
+  ol.breadcrumb
+    li
+      = link_to 'Home', '/'
+    li
+      = link_to 'People', customer_vault.people_path
+    li.active
+      = "Edit #{@corporation.name}"
 
+- content_for :context do
+  .corporation-context: .context
+    = context_icon :users
+    = context_title "Edit #{@corporation.name}"
+
+- content_for :main do
+  .cadre
+    = render "form"
+
+= render "agilidee_commons/contextual"

data/app/views/customer_vault/corporations/new.html.slim

@@ -1,22 +1,19 @@
-.container-fluid
-  .col-lg-12
-    ol.breadcrumb
-      li 
-        = link_to 'Home', '/'
-      li
-        = link_to 'People', customer_vault.people_path
-      li.active New Corporation
-  .col-lg-12
-    .col-lg-4
-      .aside.col-lg-12
-        .row
-          .col-lg-12.cdiv
-            =image_tag ('customer_vault/icons/group-64.png')		
-        .row
-          .col-lg-12.cdiv
-            h3.text-muted New Corporation
-      - if @corporation.errors.any?
-        = render partial: 'customer_vault/layout/form_error', :locals => {:p => @corporation}
-    .col-lg-8
-      .col-lg-12
-        == render 'form'
+- content_for :sub_header do
+  ol.breadcrumb
+    li
+      = link_to 'Home', '/'
+    li
+      = link_to 'People', customer_vault.people_path
+    li.active
+      = "New corporation"
+
+- content_for :context do
+  .corporation-context: .context
+    = context_icon :users
+    = context_title "New corporation"
+
+- content_for :main do
+  .cadre
+    = render "form"
+
+= render "agilidee_commons/contextual"

data/app/views/customer_vault/corporations/show.html.slim

@@ -1,43 +1,41 @@
-.container-fluid
-	.col-lg-12
-		ol class="breadcrumb"
-			li 
-				= link_to 'Home', '/'
-			li
-				= link_to 'People', customer_vault.people_path
-			li.active #{@corporation.name}
-	.col-lg-12
-		.col-lg-4
-			= render partial: 'show_details', locals: {corporation: @corporation}						
+- content_for :sub_header do
+  ol.breadcrumb
+    li
+      = link_to 'Home', '/'
+    li
+      = link_to 'People', customer_vault.people_path
+    li.active
+      = @corporation.name
 
-		.col-lg-8
-			.col-lg-12
-				ul.nav.nav-tabs role="tablist"
-				    li.active
-				    	a data-toggle="tab" href="#linkable" role="tab" Links 
-				    li
-				    	a data-toggle="tab" href="#history" role="tab" History
-				    li
-				    	a data-toggle="tab" href="#todos" role="tab" Todos
-
-				.tab-content
-					#linkable.tab-pane.active
-						ul.linkable
-							- @corporation.links.each do |link|
-								li.person
-									- target = link[:person]
-									-	if target.instance_of? CustomerVault::Individual						
-											= render partial: 'customer_vault/individuals/list_details', :locals => {:i => target, person: @corporation, link: link[:origin]}
-									-	if target.instance_of? CustomerVault::Corporation
-										  = render partial: 'customer_vault/corporations/list_details', :locals => {:c => target, person: @corporation, link: link[:origin]}
-						
-						= link_to 'New link', customer_vault.new_corporation_link_path(@corporation.id), :class=>"btn btn-success", id: 'new-link'
-					#history.tab-pane
-						p 
-							' History is soon to come
-					#todos.tab-pane
-						p 
-							' Todos are soon to come
+- content_for :context do
+  = render partial: 'show_details', locals: {corporation: @corporation}
 
+- content_for :main do
+  ul.nav.nav-tabs role="tablist"
+      li.active
+        a data-toggle="tab" href="#linkable" role="tab" Links 
+      li
+        a data-toggle="tab" href="#history" role="tab" History
+      li
+        a data-toggle="tab" href="#todos" role="tab" Todos
 
+  .tab-content
+    #linkable.tab-pane.active
+      ul.linkable
+        - @corporation.links.each do |link|
+          li.person
+            - target = link[:person]
+            - if target.instance_of? CustomerVault::Individual
+                = render partial: 'customer_vault/individuals/list_details', :locals => {:i => target, person: @corporation, link: link[:origin]}
+            - if target.instance_of? CustomerVault::Corporation
+                = render partial: 'customer_vault/corporations/list_details', :locals => {:c => target, person: @corporation, link: link[:origin]}
+      
+      = link_to 'New link', customer_vault.new_corporation_link_path(@corporation.id), class: "btn btn-success", id: 'new-link'
+    
+    #history.tab-pane
+      p = "History is soon to come"
+    
+    #todos.tab-pane
+      p = "Todos are soon to come"
 
+= render "agilidee_commons/contextual"

data/app/views/customer_vault/individuals/_form.html.slim

@@ -1,58 +1,21 @@
-= form_for [customer_vault, @individual], html: { class: "form-horizontal"} do |f|
-	.form-group
-		=f.label "First name" , class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :first_name, class:"form-control"
-		
-	.form-group
-		=f.label "Last name", class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :last_name, class:"form-control"
-		
-	.form-group
-		=f.label "Email", class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :email, class:"form-control"
-		
-	.form-group
-		=f.label "Title", class:"control-label col-lg-2"
-		div class="col-lg-10"	
-			=f.text_field :title, class:"form-control"
-		
-	.form-group
-		=f.label "Twitter",class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :twitter, class:"form-control"
-		
-	.form-group
-		=f.label "Context", class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_area :context, class:"form-control"
-	
-	.form-group
-		=f.label "Phone", class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :phone, class:"form-control"
-			
-	.form-group
-		=f.label "Fax", class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :fax, class:"form-control"
-			
-	.form-group
-		=f.label "Mobile", class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :mobile, class:"form-control"
-			
-	.form-group
-		=f.label "Web Site", class:"control-label col-lg-2"
-		div class="col-lg-10"
-			=f.text_field :www, class:"form-control"
-	 
-	= f.fields_for :address do |address_form|
-     = render partial: 'dorsale/addresses/nested_form', :locals => {:f => address_form}
- 	
-	.actions 
-		div class= "cdiv"
-			= f.submit 'Valider', :class=>"btn btn-success btn-sm", id: 'submit-individual'
-			= link_to 'Retour', customer_vault.people_path, :class=>"btn btn-primary btn-sm"
+= horizontal_form_for [customer_vault, @individual] do |f|
+  = f.input :first_name
+  = f.input :last_name
+  = f.input :email
+  = f.input :title
+  = f.input :twitter
+  = f.input :context, as: :text
+  = f.input :phone
+  = f.input :fax
+  = f.input :mobile
+  = f.input :www
+  
+  / Temporaire - A refactoriser
+  = f.simple_fields_for :address do |af|
+    = af.input :street
+    = af.input :street_bis
+    = af.input :zip
+    = af.input :city
+    = af.input :country, as: :string
+  
+  = form_buttons

data/app/views/customer_vault/individuals/_show_details.html.slim

@@ -1,52 +1,18 @@
-aside.col-lg-12.individual
-  .row
-    header
-      .col-lg-12.cdiv
-        =image_tag ('customer_vault/icons/individual-64.png')
-      .col-lg-12.cdiv
-        span class= "text-muted titre bold" #{individual.first_name} #{individual.last_name}
-  .row
-    .col-lg-12.top-buffer
-      - if individual.email?
-        .col-lg-12.cdiv
-          .bold.text-muted.cdiv Email
-          span #{individual.email} 
-    .col-lg-12.cdiv
-      - if individual.twitter?
-          .bold.text-muted.cdiv Twitter
-          span #{individual.twitter}
-    .col-lg-12.cdiv
-      - if individual.phone?
-          .bold.text-muted.cdiv Phone
-          span #{individual.phone}
-    .col-lg-12.cdiv
-      - if individual.mobile?
-          .bold.text-muted.cdiv Mobile
-          span #{individual.mobile}
-    .col-lg-12.cdiv
-      - if individual.fax?
-          .bold.text-muted.cdiv Fax
-          span #{individual.fax}
-    .col-lg-12.cdiv
-      - if individual.context?
-          .bold.text-muted.cdiv Context
-          span #{individual.context}
-    .col-lg-12.cdiv
-      - if individual.www?
-          .bold.text-muted.cdiv Internet Site
-          - if individual.www.include?("http://")
-            =link_to individual.www , individual.www
-          - else 
-            =link_to "http://#{individual.www}" , "http://#{individual.www}"
-    .col-lg-12.cdiv
-      - if individual.address && !individual.address.one_line.blank?
-          .bold.text-muted.cdiv Address
-          span.address #{individual.address.one_line}
-    
-  .row.mega-top-buffer.bottom-buffer
-    .col-lg-4.cdiv
-      =link_to 'Editer', customer_vault.edit_individual_path(individual), :class=>"btn btn-success btn-sm"
-    .col-lg-4.cdiv
-      =link_to 'Effacer', [customer_vault, individual], data: {:confirm => 'Are you sure?'}, :method => :delete, :class=>"btn btn-danger btn-sm"
-    .col-lg-4.cdiv
-      = link_to 'Retour', customer_vault.people_path, :class=>"btn btn-primary btn-sm"  
+.individual-context: .context
+  = context_icon :user
+  = context_title individual.name
+  = actions_for individual, url: customer_vault.individual_path(individual)
+  
+  = context_info "E-mail",  individual.email
+  = context_info "Twitter", individual.twitter
+  = context_info "Phone",   individual.phone
+  = context_info "Mobile",  individual.mobile
+  = context_info "Fax",     individual.fax
+  = context_info "Context", individual.context
+  
+  - if individual.www.to_s.include?("://")
+    = context_info "Website", link_to(individual.www, individual.www)
+  - else
+    = context_info "Website", link_to("http://#{individual.www}", individual.www)
+  
+  = context_info "Address", individual.address.one_line if individual.address.present?