From 014658711f6b2d10c7c3c211de8bddc4076a2d78 Mon Sep 17 00:00:00 2001
From: Elisha <elisha@skycure.com>
Date: Wed, 11 Jan 2017 00:02:34 +0200
Subject: [PATCH] Use field name in labels

---
 app/views/camps/_edit_person.html.erb | 35 ---------------------------
 app/views/camps/_form.haml            |  3 ---
 app/views/camps/_person_fields.haml   | 10 ++++----
 config/locales/he.yml                 |  2 +-
 4 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 app/views/camps/_edit_person.html.erb

diff --git a/app/views/camps/_edit_person.html.erb b/app/views/camps/_edit_person.html.erb
deleted file mode 100644
index 2647462e..00000000
--- a/app/views/camps/_edit_person.html.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="modal-dialog">
-  <form class="edit-person">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only"><%= t 'general.buttons.cancel' %></span></button>
-        <h4 id="add-user-dialog-header" class="modal-title"><%= t('edit_person') %></h4>
-      </div>
-      <div class="modal-body">
-        <table class="form-layout form-input">
-          <tr>
-            <td><%= t 'activerecord.attributes.person.name' %></td>
-            <td><input id="edit-person-name" class="form-control" type="text"/></td>
-          </tr>
-          <tr>
-            <td><%= t 'activerecord.attributes.person.email' %></td>
-            <td><input id="edit-person-email" class="form-control" type="email"/></td>
-          </tr>
-          <tr>
-            <td><%= t 'activerecord.attributes.person.phone' %></td>
-            <td><input id="edit-person-phone" class="form-control required"/></td>
-          </tr>
-          <tr>
-            <td><%= t 'activerecord.attributes.person.background' %></td>
-            <td><input id="edit-person-background" class="form-control required"/></td>
-          </tr>
-        </table>
-        <span class="notification"></span>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" id="add-user-cancel-btn" data-dismiss="modal"><%= t 'general.buttons.cancel' %></button>
-        <button type="submit" class="btn btn-primary" id="save-person"><%= t 'general.buttons.save' %></button>
-      </div>
-    </div>
-  </form>
-</div>
diff --git a/app/views/camps/_form.haml b/app/views/camps/_form.haml
index c75d5e7d..8477804b 100755
--- 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
index a1e8092d..63732501 100644
--- 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
index af0c5f03..981cbe69 100755
--- 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: