adherent 0.1.10 → 0.2.0

data/app/views/adherent/adhesions/index.html.haml

@@ -3,7 +3,7 @@
   = icon_to 'nouveau.png', new_member_adhesion_path(@member), title:'Nouvelle adhésion ou renouvellement'
 
 
-.champ
+.champ.col-lg-12
   %h3 Historique des adhésions pour #{@member.to_s} 
   
   %table.table.table-striped.table-bordered.table-condensed(cellpadding="0" cellspacing="0" border="0")
@@ -20,8 +20,8 @@
           %td= adhesion.from_date
           %td= adhesion.to_date
           %td= number_to_currency(adhesion.amount, locale: :fr)
-          %td= number_to_currency(adhesion.due, locale: :fr)
+          %td= adhesion.due
           %td
             = icon_to 'modifier.png', edit_member_adhesion_path(@member, adhesion)
-            = icon_to 'supprimer.png', [@member,adhesion], method: :delete, confirm: 'Etes vous sûr ?'
-            = icon_to('money-plus.png', new_member_payment_path(@member), title:'Ajouter un paiement') unless adhesion.is_paid?
+            = icon_to 'supprimer.png', [@member,adhesion], method: :delete, data: {confirm: 'Etes vous sûr ?'}
+            = icon_to('money-plus.png', new_member_payment_path(@member), title:'Ajouter un paiement') unless adhesion.is_paid?

data/app/views/adherent/adhesions/new.html.erb

@@ -3,11 +3,11 @@
 <%= icon_to_users %>
 <% end -%>
 
-<div class="champ">
+<div class="champ col-lg-12">
   <h3>Renouvellement ou nouvelle adhésion pour <%=  @member.to_s %></h3>
-</div>
-<div class="row-fluid inner-champ">
+
+<div class="inner-champ">
 
 <%= render 'form' %>
 </div>
-
+</div>

data/app/views/adherent/coords/_form.html.erb

@@ -1,22 +1,24 @@
-<div class="inputs row-fluid" id="form_coord" > 
+<div class="panel-body" id="form_coord" > 
 
-<%= simple_form_for([@member, @coord], :url=>member_coord_path(@member),  :html=> {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for([@member, @coord], :url=>member_coord_path(@member),
+  :html=> {class: 'form-horizontal'}, wrapper: :horizontal_form) do |f| %>
   <%= f.error_notification %>
 
- <div class="row-fluid">
-      <div class="span12">
-    <%= f.input :mail, input_html: {class: "span3"} %>
-    <%= f.input :tel, input_html: {class: "span3"} %>
-    <%= f.input :gsm, input_html: {class: "span3"} %>
-    <%= f.input :office, input_html: {class: "span3"} %>
-    <%= f.input :address, input_html: {rows: 4, class: "span3"} %>
-    <%= f.input :zip, input_html: {class: "span3"} %>
-    <%= f.input :city, input_html: {class: "span3"} %>
+ <div class="form-inputs">
+     
+    <%= f.input :mail, my_wrapper_html: {class: "col-lg-3"} %>
+    <%= f.input :tel, my_wrapper_html: {class: "col-lg-3"} %>
+    <%= f.input :gsm, my_wrapper_html: {class: "col-lg-3"} %>
+    <%= f.input :office, my_wrapper_html: {class: "col-lg-3"} %>
+    <%= f.input :address, my_wrapper_html: {rows: 4, class: "col-lg-3"} %>
+    <%= f.input :zip, my_wrapper_html: {class: "col-lg-3"} %>
+    <%= f.input :city, my_wrapper_html: {class: "col-lg-3"} %>
    
-  </div>
+
  </div>
 
   <div class="form-actions">
-    <%= f.button :submit, class: "btn-primary span2"  %>
+    <%= f.button :submit, class: "btn-primary col-md-2 col-md-offset-2"  %>
   </div>
 <% end %>
+</div>

data/app/views/adherent/coords/edit.html.erb

@@ -3,12 +3,12 @@
 
 <% end -%>
 
-<div class="champ">
+<div class="champ col-lg-12">
   <h3>Modification <%=  I18n.t('coord').pluralize %></h3>
-</div>
+
   <div class="inner-champ">
     <%= render 'form' %>
   </div>
-
+</div>
 
 

data/app/views/adherent/coords/new.html.erb

@@ -3,10 +3,11 @@
 <%= icon_to_users %>
 <% end -%>
 
-<div class="champ">
+<div class="champ col-lg-12">
   <h3>Saisie des coordonnées de <%= @member.to_s %></h3>
-</div>
-<div class="row-fluid inner-champ">
+
+<div class="inner-champ">
 
 <%= render 'form' %>
+</div>
 </div>

data/app/views/adherent/coords/show.html.erb

@@ -5,10 +5,10 @@
 
 <% end -%>
 
-<div class="champ">
+<div class="champ col-lg-12">
   <h3>Fiche <%=  I18n::t('coord').pluralize %> <%= "#{@member.to_s}" %></h3>
-</div>
-<div class="row-fluid inner-champ">
+
+<div class="inner-champ">
 
 
 <p>
@@ -47,4 +47,4 @@
 </p>
 
 </div>
-
+</div>

data/app/views/adherent/members/_form.html.erb

@@ -1,21 +1,19 @@
-<div class="inputs row-fluid" id="form_member" > 
+<div class="panel-body" id="form_member" > 
 
-<%= simple_form_for(@member,  :html=> {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(@member,  :html=> {class: 'form-horizontal'},
+    wrapper: :horizontal_form) do |f| %>
   <%= f.error_notification %>
-
- <div class="row-fluid">
-      <div class="span12">
-    <%= f.input :number, input_html: {class: "span3"} %>
-    <%= f.input :name, input_html: {class: "span3"} %>
-    <%= f.input :forname, input_html: {class: "span3"} %>
-    <%= f.input :birthdate, 
-      input_html: {class: "span2", value:@member.birthdate, date_min:Date.today.years_ago(100), date_max:Date.today, 'data-with-month-year'=>'avec'},
+    <div class="form-inputs"> 
+    <%= f.input :number, placeholder:'Numéro', my_wrapper_html:{class:'col-sm-2'} %>
+    <%= f.input :name, my_wrapper_html:{class:'col-sm-4'} %>
+    <%= f.input :forname, my_wrapper_html:{class:'col-sm-4'} %>
+    <%= f.input :birthdate, my_wrapper_html:{class:'col-sm-2'},
+      input_html: {value:@member.birthdate, date_min:Date.today.years_ago(100), date_max:Date.today, 'data-with-month-year'=>'avec'},
         :as=>:date_picker %>
- </div>
- </div>
+  </div>
 
   <div class="form-actions">
-    <%= f.button :submit, class: "btn-primary span2"  %>
+    <%= f.button :submit, class: "btn-primary col-md-2 col-md-offset-2"  %>
   </div>
 <% end %>
 </div>

data/app/views/adherent/members/edit.html.erb

@@ -4,7 +4,7 @@
 
 <% end -%>
 
-<div class="champ">
+<div class="champ col-lg-12">
   <h3>Modification <%=  I18n.t('member') %></h3>
 
   <div class="inner-champ">

data/app/views/adherent/members/index.html.erb

@@ -5,11 +5,12 @@
 <% end -%>
 
 
-<div class="champ">
+<div class="champ col-lg-12">
 
 
   <h3>Liste des <%= I18n::t('members') %></h3>
-<table class="table display table-striped table-bordered table-condensed" id='members' cellpadding="0" cellspacing="0" border="0">
+<table class="table display table-striped table-bordered table-condensed"
+       id='members' cellpadding="0" cellspacing="0" border="0">
 <thead>
   <tr>
   
@@ -42,7 +43,7 @@
     
     <%= icon_to 'payment.png', member_payments_path(member), title: 'Liste des paiements' , id:"payment_member_#{member.id}"%>
       <%= icon_to 'modifier.png', edit_member_path(member) , id:"edit_member_#{member.id}" %>
-    <%= icon_to 'supprimer.png', member, id:"delete_member_#{member.id}", :confirm => 'Etes vous sur ?', :method => :delete %></td>
+    <%= icon_to 'supprimer.png', member, id:"delete_member_#{member.id}", data:{:confirm => 'Etes vous sûr ?'}, :method => :delete %></td>
   </tr>
 <% end %>
 </tbody>

data/app/views/adherent/members/new.html.erb

@@ -3,10 +3,12 @@
 <%= icon_to 'users.png', members_path %>
 <% end -%>
 
-<div class="champ">
-  <h3>Nouveau <%= I18n::t('member') %></h3>
+<div class="champ col-lg-12">
+  <h3>
+    Nouveau <%= I18n::t('member') %>
+  </h3>
 
-<div class="row-fluid inner-champ">
+<div class="inner-champ">
 
 <%= render 'form' %>
 </div>

data/app/views/adherent/members/show.html.erb

@@ -7,11 +7,10 @@
 
 <% end -%>
 
-<div class="champ">
+<div class="champ col-lg-12">
   <h3>Fiche <%=  I18n::t('member') %></h3>
-</div>
-<div class="row-fluid inner-champ">
 
+  <div class='inner-champ'>
 
 <p>
   <b>Numéro :</b>
@@ -34,4 +33,4 @@
 </p>
 
 </div>
-
+</div>

data/app/views/adherent/payments/_form.html.haml

@@ -1,17 +1,14 @@
-.inputs.row-fluid#transfer
+.panel-body#transfer
   = simple_form_for([@member, @payment], :html=>{class:'form-inline'})  do |f|
     =f.error_notification
-    .row-fluid
-      .span12
-        = f.input :date, wrapper_html:{class:'span2'},
-          label_html:{class: 'span4'},
-          input_html:{class:'span8', value:@payment.date, 
-            date_min:min_date,
-            date_max:max_date},
-          :as=>:date_picker
-        = f.input :amount, wrapper_html:{class:'span2'}, label_html:{class: 'span6'}, input_html:{class:'span6', value:two_decimals(@payment.amount)}, :as=>:french_decimal
-        = f.input :mode, wrapper_html:{class:'span3'}, :collection=>Adherent::MODES, prompt:'Choisissez', label_html:{class: 'span6'}, input_html:{class:'span6'}
-    .row-fluid
-      .span12
-        .form-actions
-          = f.button :submit, id: 'new_payement', class: "btn-primary span2"
+    .form-inputs
+      = f.input :date, wrapper_html:{class:'span2'},
+        label_html:{class: 'span4'},
+        input_html:{class:'span8', value:@payment.date, 
+          date_min:min_date,
+          date_max:max_date},
+        :as=>:date_picker
+      = f.input :amount, wrapper_html:{class:'span2'}, label_html:{class: 'span6'}, input_html:{class:'span6', value:two_decimals(@payment.amount)}, :as=>:french_decimal
+      = f.input :mode, wrapper_html:{class:'span3'}, :collection=>Adherent::MODES, prompt:'Choisissez', label_html:{class: 'span6'}, input_html:{class:'span6'}
+    .form-actions
+      = f.button :submit, id: 'new_payement', class: "btn-primary span2"

data/app/views/adherent/payments/edit.html.erb

@@ -3,11 +3,11 @@
 <%= icon_to 'payment.png', member_payments_path(@member) %>
 <% end -%>
 
-<div class="champ">
+<div class="champ col-lg-12">
   <h3>Enregistrement d'un paiement de <%=  @member.to_s %></h3>
-</div>
-<div class="row-fluid inner-champ">
+
+<div class="inner-champ">
 
 <%= render 'form' %>
 </div>
-
+</div>

data/app/views/adherent/payments/index.html.haml

@@ -3,7 +3,7 @@
   = icon_to 'money-plus.png', new_member_payment_path(@member), title:'Nouveau paiement'
 
 
-.champ
+.champ.col-lg-12
   %h3 Historique des paiements reçus de #{@member.to_s} 
   
   %table.table.table-striped.table-bordered.table-condensed(cellpadding="0" cellspacing="0" border="0")

data/app/views/adherent/payments/new.html.haml

@@ -1,8 +1,8 @@
 =content_for :menu do
   = icon_to 'payment.png', member_payments_path(@member) 
-.champ
+.champ.col-lg-12
   %h3 Enregistrement d'un paiement de #{@member.to_s}
-.row-fluid.inner-champ
-  = render 'form'
+  .inner-champ
+    = render 'form'
 
 

data/app/views/adherent/payments/show.html.haml

@@ -7,31 +7,31 @@
       "javascript:print()",
        class:'icon_menu', title:'Imprimer un reçu')  
   = icon_to 'modifier.png', edit_member_payment_path(@payment.member, @payment)
-  = icon_to 'supprimer.png', [@member,@payment], method: :delete, confirm: 'Etes vous sûr ?'
+  = icon_to 'supprimer.png', [@member,@payment], method: :delete, data: {confirm: 'Etes vous sûr ?'}
   
 
 .champ
   %h3 Détail d'un paiement
 
-.inner-champ
-  %p
-    %b Effectué par :
-    = @member.to_s
-  %p
-    %b Le :
-    = @payment.date
-  %p
-    %b Montant :
-    = number_to_currency(@payment.amount, locale: :fr)
-  %p
-    %b Par :
-    = @payment.mode
-  %p
-    %b Imputé sur :
-    = list_imputations(@payment)
-  %p
-    %b Reste à imputer :
-    = number_to_currency @payment.non_impute, locale: :fr
+  .inner-champ
+    %p
+      %b Effectué par :
+      = @member.to_s
+    %p
+      %b Le :
+      = @payment.date
+    %p
+      %b Montant :
+      = number_to_currency(@payment.amount, locale: :fr)
+    %p
+      %b Par :
+      = @payment.mode
+    %p
+      %b Imputé sur :
+      = list_imputations(@payment)
+    %p
+      %b Reste à imputer :
+      = number_to_currency @payment.non_impute, locale: :fr
   
 
 = render 'receipt'

data/app/views/adherent/reglements/_form.html.haml

@@ -1,12 +1,8 @@
-.inputs.row-fluid#transfer
+.panel-body#transfer
   = simple_form_for([@payment, @reglement], :html=>{class:'form-inline'})  do |f|
     =f.error_notification
-    .row-fluid
-      .span12
-        = f.input :amount, wrapper_html:{class:'span2'}, label_html:{class: 'span6'}, input_html:{class:'span6', value:number_to_currency(@reglement.amount)}, :as=>:french_decimal, :disabled=>true
-        = f.association :adhesion, :collection=>@unpaid_adhesions, :label_method=>:to_s_for_select, :prompt=>'Choisissez une adhésion', wrapper_html:{class:'span4'}, label_html:{class: 'span3'}, input_html:{class:'span9'} 
-           
-    .row-fluid
-      .span12
-        .form-actions
-          = f.button :submit, id: 'new_reglement', class: "btn-primary span2"
+    .form-action
+      = f.input :amount, wrapper_html:{class:'span2'}, label_html:{class: 'span6'}, input_html:{class:'span6', value:number_to_currency(@reglement.amount)}, :as=>:french_decimal, :disabled=>true
+      = f.association :adhesion, :collection=>@unpaid_adhesions, :label_method=>:to_s_for_select, :prompt=>'Choisissez une adhésion', wrapper_html:{class:'span4'}, label_html:{class: 'span3'}, input_html:{class:'span9'} 
+    .form-actions
+      = f.button :submit, id: 'new_reglement', class: "btn-primary span2"

data/app/views/adherent/reglements/new.html.erb

@@ -3,11 +3,11 @@
 <%= icon_to_users %>
 <% end -%>
 
-<div class="champ">
+<div class="champ col-lg-12">
   <h3>Imputation du montant restant (<%=  @payment.non_impute %>) payé par <%=  @member.to_s %></h3>
-</div>
-<div class="row-fluid inner-champ">
+
+<div class="inner-champ">
 
 <%= render 'form' %>
 </div>
-
+</div>

data/app/views/adherent/reglements/show.html.haml

@@ -1,5 +1,5 @@
 = content_for :menu do
-  = icon_to 'supprimer.png', [@payment, @reglement], method: :delete, confirm: 'Etes vous sûr ?'
+  = icon_to 'supprimer.png', [@payment, @reglement], method: :delete, data:{confirm: 'Etes vous sûr ?'}
   = icon_to 'retour.png', :back
   
 
@@ -7,25 +7,25 @@
 .champ
   %h3 Détail d'un réglement
 
-.inner-champ
-  %p
-    %b Imputé sur un payment effectué par :
-    = @payment.member.to_s
-  %p
-    %b Le :
-    = @payment.date
-  %p
-    %b d'un montant total de :
-    = number_to_currency(@payment.amount, locale: :fr)
-  %p
-    %b dont sur ce réglement :
-    = number_to_currency(@reglement.amount, locale: :fr)
-  %p
-    %b enregistré le :
-    = l @reglement.created_at
-  - if @reglement.created_at != @reglement.updated_at
+  .inner-champ
     %p
-      %b modifié le :
-      = l @reglement.updated_at
+      %b Imputé sur un payment effectué par :
+      = @payment.member.to_s
+    %p
+      %b Le :
+      = @payment.date
+    %p
+      %b d'un montant total de :
+      = number_to_currency(@payment.amount, locale: :fr)
+    %p
+      %b dont sur ce réglement :
+      = number_to_currency(@reglement.amount, locale: :fr)
+    %p
+      %b enregistré le :
+      = l @reglement.created_at
+    - if @reglement.created_at != @reglement.updated_at
+      %p
+        %b modifié le :
+        = l @reglement.updated_at
   
             

data/app/views/layouts/adherent/_flash_partial.html.haml

@@ -1,4 +1,4 @@
-.row-fluid
+.col-lg-12
   - if flash[:notice]
     .alert.notice
       %a.close(data-dismiss ="alert") ×

data/app/views/layouts/adherent/application.html.erb

@@ -13,7 +13,7 @@
       <%= render 'layouts/adherent/header' %>
 
 
-      <div class="row-fluid">
+      <div class="row">
 
         <div>
 
@@ -24,13 +24,15 @@
             </li>
           </ul>
         </div>
-        <div id="main-zone">
+        </div>
+      <div class='row' id="main-zone">
+        
 
           <%= render 'layouts/adherent/flash_partial' %>
 
 
           <%= yield %>
-        </div>
+        
       </div>
     
     <div class ="push"></div>

data/config/initializers/date_picker_input.rb

@@ -14,10 +14,10 @@ Date::DATE_FORMATS[:date_picker] = "%d/%m/%Y"
 
 class DatePickerInput < SimpleForm::Inputs::Base
 
- def input
+ def input(wrapper_options)
    input_html_options['data-jcmin'] = date_min(input_html_options[:date_min])
    input_html_options['data-jcmax'] = date_max(input_html_options[:date_max])
-   input_html_classes.unshift('input_date_picker')
+   input_html_classes.unshift('input_date_picker form-control')
    
    input_html_options.delete :date_min
    input_html_options.delete :date_max

data/config/initializers/french_decimal_input.rb

@@ -5,10 +5,10 @@
 #
 class FrenchDecimalInput < SimpleForm::Inputs::Base
 
- def input
+ def input(wrapper_options)
    input_html_options['type'] = 'text' # probablement inutile
    input_html_options['pattern'] = '\-?\d+(\.\d{0,2})?'
-   
+   input_html_classes.unshift('form-control')
 
    @builder.text_field(attribute_name, input_html_options)
   end