diff --git a/app/assets/javascripts/admin/sheets.coffee b/app/assets/javascripts/admin/sheets.coffee index 7e59026..8a34e43 100644 --- a/app/assets/javascripts/admin/sheets.coffee +++ b/app/assets/javascripts/admin/sheets.coffee @@ -19,7 +19,7 @@ $(document).ready -> data: $('#sheets_chart').data('values') xkey: 'y' ykeys: ['foyers', 'familles', 'associations',"individuel", "bienfaiteurs", "pouvoirs"] - labels: ['Foyers', 'Familles', 'Associations',"Individuel", "Bienfaiteurs", "Pouvoirs"] + labels: ['Foyers', 'Familles', 'Associations',"Individuelle", "Bienfaiteurs", "Pouvoirs"] lineColors: ["#FF9900", "#4942CC", "#008000", "#FF45A3", "#DC3912", "#4684EE"] parseTime:false diff --git a/app/views/public/renews/select_sheet.html.haml b/app/views/public/renews/select_sheet.html.haml index b96234b..46363b7 100644 --- a/app/views/public/renews/select_sheet.html.haml +++ b/app/views/public/renews/select_sheet.html.haml @@ -18,7 +18,7 @@ =f.input :email, :label => "Email :" - =f.input :join_type, :collection => {"Individuel" => 1, "Familial" => 2}, :include_blank => false, :label => "Type d'adhésion :", :as => :radio + =f.input :join_type, :collection => {"Individuelle" => 1, "Familiale" => 2}, :include_blank => false, :label => "Type d'adhésion :", :as => :radio diff --git a/app/views/public/shared/_top.html.haml b/app/views/public/shared/_top.html.haml index 9e680e7..4a3d988 100644 --- a/app/views/public/shared/_top.html.haml +++ b/app/views/public/shared/_top.html.haml @@ -3,7 +3,7 @@ =link_to image_tag("/logo_pic_vert_w.png", :id => "logo"), "/" #personnal_menu - =link_to "Rennouveler mon adhésion »", select_sheet_public_renews_index_path + =link_to "Renouveller mon adhésion »", select_sheet_public_renews_index_path =link_to "Adhérer »", select_sheet_public_joins_path =link_to "Accès au forum »", "/forum" #menu