adherent 0.0.9 → 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cee13aa5dde08ef3ed35cd0bbc7987d1219d8d08
4
- data.tar.gz: 3793075659dedf24f933d4ef85419fd8e66d86b4
3
+ metadata.gz: 4886004175e5dadc3cb3a6afefcc1c3e174007b3
4
+ data.tar.gz: ca7a080613104ec7a0a31fc8a54402b58e913fcf
5
5
  SHA512:
6
- metadata.gz: a3e621c71ea7d4f2c86802c1afed6a35709f250fda6fb1a3f2bfe7cca3cfc4feff542e21cf570f45b597d6ef03ccbf5c5ac041cf21edb796659e71eb16d2049a
7
- data.tar.gz: 59610e13e2b477d073c0ccf0398d2932cdd8828b52e4e37429d73f601cc58f61ed3079d24a9a5c26ceb7f471ceec1274469c2ad55bf060d882ad3c985c86efa2
6
+ metadata.gz: 8ebe1f4885984dfbf6db5bb28db12ea75cb47137682fdbd251fcd3782948ad5049e7bf2939d7b9906896db78e0e3f9bce0cc6edbb5836d1783e9b23fe254f8ed
7
+ data.tar.gz: 4e7c161d5bf8737d8c47b1a85aeb7efd29d3c3264924912776ad2fe6128df51aa4bbfc0920147e47b7de0c4968f1796fc486afccb2964bcad9193efe42c0e604
@@ -63,8 +63,7 @@ html, body {
63
63
  .container-fluid {
64
64
  min-height: 100%;
65
65
  height: auto !important;
66
- height: 100%;
67
- margin: 0 auto -1.5em; /* the bottom margin is the negative value of the footer's height */
66
+ margin: 0 auto -1.5em; /* the bottom margin is the negative value of the footer's height */
68
67
 
69
68
  // position:relative;
70
69
  }
@@ -2,6 +2,8 @@ module Adherent
2
2
  class Member < ActiveRecord::Base
3
3
  attr_accessible :birthdate, :forname, :name, :number
4
4
 
5
+ pick_date_for :birthdate
6
+
5
7
  belongs_to :organism, class_name: 'Organism'
6
8
  has_one :coord
7
9
  has_many :adhesions
@@ -9,7 +9,7 @@
9
9
  <%= f.input :name, input_html: {class: "span3"} %>
10
10
  <%= f.input :forname, input_html: {class: "span3"} %>
11
11
  <%= f.input :birthdate,
12
- input_html: {class: "span2", date_min:Date.today.years_ago(100), date_max:Date.today, 'data-with-month-year'=>'avec'},
12
+ input_html: {class: "span2", value:@member.birthdate, date_min:Date.today.years_ago(100), date_max:Date.today, 'data-with-month-year'=>'avec'},
13
13
  :as=>:date_picker %>
14
14
  </div>
15
15
  </div>
@@ -18,3 +18,4 @@
18
18
  <%= f.button :submit, class: "btn-primary span2" %>
19
19
  </div>
20
20
  <% end %>
21
+ </div>
@@ -7,10 +7,10 @@
7
7
 
8
8
  <div class="champ">
9
9
  <h3>Modification <%= I18n.t('member') %></h3>
10
- </div>
10
+
11
11
  <div class="inner-champ">
12
12
  <%= render 'form' %>
13
13
  </div>
14
-
14
+ </div>
15
15
 
16
16
 
@@ -33,7 +33,7 @@
33
33
  <td><%= member.number %></td>
34
34
  <td><%= member.name %></td>
35
35
  <td><%= member.forname %></td>
36
- <td><%= l member.birthdate %></td>
36
+ <td><%= member.birthdate %></td>
37
37
  <td><%= member.coord ? member.coord.mail : '' %>
38
38
  <td><%= member.coord ? member.coord.tel : '' %>
39
39
  <td><%= icon_to 'detail.png', member_coord_path(member), title:'Coordonnées' %>
@@ -5,8 +5,9 @@
5
5
 
6
6
  <div class="champ">
7
7
  <h3>Nouveau <%= I18n::t('member') %></h3>
8
- </div>
8
+
9
9
  <div class="row-fluid inner-champ">
10
10
 
11
11
  <%= render 'form' %>
12
- </div>
12
+ </div>
13
+ </div>
@@ -13,7 +13,7 @@
13
13
 
14
14
 
15
15
  <p>
16
- <b> <%= I18n::t('number') %> :</b>
16
+ <b>Numéro :</b>
17
17
  <%= @member.number %>
18
18
  </p>
19
19
 
@@ -29,7 +29,7 @@
29
29
 
30
30
  <p>
31
31
  <b> <%= I18n::t('birthdate') %> :</b>
32
- <%= l @member.birthdate %>
32
+ <%= @member.birthdate %>
33
33
  </p>
34
34
 
35
35
  </div>
@@ -10,7 +10,7 @@
10
10
 
11
11
  <div class="container-fluid">
12
12
 
13
- <%= render 'layouts/adherent/header' %>
13
+ <%= render 'layouts/adherent/header' %>
14
14
 
15
15
 
16
16
  <div class="row-fluid">
@@ -18,25 +18,26 @@
18
18
  <div>
19
19
 
20
20
  <ul class="nav nav-tabs" id="menu_general">
21
- <!-- pas très bien nommé, la suite affiche les icones -->
22
- <li class="horizontal_icons">
23
- <%= yield :menu %>
24
- </li>
21
+ <!-- pas très bien nommé, la suite affiche les icones -->
22
+ <li class="horizontal_icons">
23
+ <%= yield :menu %>
24
+ </li>
25
25
  </ul>
26
26
  </div>
27
27
  <div id="main-zone">
28
28
 
29
- <%= render 'layouts/adherent/flash_partial' %>
29
+ <%= render 'layouts/adherent/flash_partial' %>
30
30
 
31
31
 
32
32
  <%= yield %>
33
33
  </div>
34
34
  </div>
35
+
36
+ <div class ="push"></div>
37
+
38
+ </div>
35
39
 
36
- <div class ="push"></div>
37
- </div>
40
+ <%= render 'layouts/adherent/footer' %>
38
41
 
39
- <%= render 'layouts/adherent/footer' %>
40
-
41
- </body>
42
+ </body>
42
43
  </html>
@@ -32,7 +32,6 @@ class DatePickerInput < SimpleForm::Inputs::Base
32
32
  end
33
33
 
34
34
  def date_max(option)
35
- puts "Dans date_max l option vaut #{option}"
36
35
  option ||= Date.today.years_since(5)
37
36
  option.to_formatted_s(:date_picker)
38
37
  end
@@ -1,3 +1,3 @@
1
1
  module Adherent
2
- VERSION = "0.0.9"
2
+ VERSION = "0.1.0"
3
3
  end