Merge pull request #60 from Midburn/feat/labels

Use field name in labels
Midburn · Jan 10, 2017 · caa93fb · caa93fb
2 parents f7dd526 + 0146587
commit caa93fb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 44 deletions.
diff --git a/app/views/camps/_edit_person.html.erb b/app/views/camps/_edit_person.html.erb
diff --git a/app/views/camps/_form.haml b/app/views/camps/_form.haml
@@ -40,9 +40,6 @@
       alert( "עריכת שדות תיק הבטיחות סגור כעת\r\nSafety file is currrently disabled" );
     })});
 
-%div{id:'edit-person-modal', class:'modal', 'data-keyboard' => 'true', 'tabindex' =>"-1"}
-  = render 'edit_person'
-
 = simple_form_for @camp, :html => {:dir => I18n.t(:html_direction), :id => 'camp-form' } do |form|
 
   .header-heading

diff --git a/app/views/camps/_person_fields.haml b/app/views/camps/_person_fields.haml
@@ -1,14 +1,14 @@
 .nested-fields.panel.panel-default.col-md-7
   .panel-body
-    = t("activerecord.attributes.person.name")
+    = f.label :name
     = f.text_field :name, class: 'form-control'
-    = t("activerecord.attributes.person.email")
+    = f.label :email
     = f.text_field :email, class: 'form-control'
-    = t("activerecord.attributes.person.phone")
+    = f.label :phone_number
     = f.text_field :phone_number, class: 'form-control'
-    = t("activerecord.attributes.person.background")
+    = f.label :background
     = f.text_field :background, class: 'form-control'
-    = t("activerecord.attributes.person.roles")
+    = f.label :roles
     = f.collection_check_boxes(:role_ids, Role.all, :id, :identifier) do |b|
       = b.label { b.check_box + ' ' + t("project_roles." + b.text) }
     %br

diff --git a/config/locales/he.yml b/config/locales/he.yml
@@ -598,7 +598,7 @@ he:
       person: &person
         name: 'שם'
         email: "אימייל"
-        phone: "טלפון"
+        phone_number: "טלפון"
         background: "רקע"
         roles: "תפקידים"
       responsibles/person: