diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php index 55fb1ff44..722a238d2 100644 --- a/application/helpers/table_helper.php +++ b/application/helpers/table_helper.php @@ -166,7 +166,6 @@ function get_person_data_row($person,$controller) { $CI =& get_instance(); $controller_name=strtolower(get_class($CI)); - $modal_class = $controller_name == 'employees' ? 'modal-dlg-wide' : ''; $table_data_row=''; $table_data_row.=""; @@ -174,7 +173,7 @@ function get_person_data_row($person,$controller) $table_data_row.=''.character_limiter($person->first_name,13).''; $table_data_row.=''.mailto($person->email,character_limiter($person->email,22)).''; $table_data_row.=''.character_limiter($person->phone_number,13).''; - $table_data_row.=''.anchor($controller_name."/view/$person->person_id", $CI->lang->line('common_edit'),array('class'=>"modal-dlg modal-btn-submit $modal_class",'title'=>$CI->lang->line($controller_name.'_update'))).''; + $table_data_row.=''.anchor($controller_name."/view/$person->person_id", $CI->lang->line('common_edit'), array('class'=>"modal-dlg modal-btn-submit", 'title'=>$CI->lang->line($controller_name.'_update'))).''; $table_data_row.=''; return $table_data_row; diff --git a/application/language/en/employees_lang.php b/application/language/en/employees_lang.php index 60e32060a..e4a15d9fd 100644 --- a/application/language/en/employees_lang.php +++ b/application/language/en/employees_lang.php @@ -1,13 +1,13 @@ person_id, array('id'=>'employee_form', 'class'=> 'form-horizontal')); ?>
lang->line('common_fields_required_message'); ?>
-
- lang->line("employees_basic_information"); ?> - load->view("people/form_basic_info"); ?> -
-
- lang->line("employees_login_info"); ?> -
- lang->line('employees_username'), 'username', array('class'=>'required control-label col-xs-3')); ?> -
-
- - 'username', - 'id'=>'username', - 'class'=>'form-control input-sm', - 'value'=>$person_info->username) - );?> -
-
+ + +
+
+
+ load->view("people/form_basic_info"); ?> +
- person_id == "" ? array('class'=>'required') : array(); ?> - -
- lang->line('employees_password'), 'password',array_merge($password_label_attributes, array('class' => 'col-xs-3 control-label'))); ?> -
-
- - 'password', - 'id'=>'password', - 'class'=>'form-control input-sm') - );?> +
+
+
+ lang->line('employees_username'), 'username', array('class'=>'required control-label col-xs-3')); ?> +
+
+ + 'username', + 'id'=>'username', + 'class'=>'form-control input-sm', + 'value'=>$person_info->username) + );?> +
+
-
+ + person_id == "" ? array('class'=>'required') : array(); ?> + +
+ lang->line('employees_password'), 'password', array_merge($password_label_attributes, array('class'=>'col-xs-3 control-label'))); ?> +
+
+ + 'password', + 'id'=>'password', + 'class'=>'form-control input-sm') + );?> +
+
+
+ +
+ lang->line('employees_repeat_password'), 'repeat_password', array_merge($password_label_attributes, array('class'=>'col-xs-3 control-label'))); ?> +
+
+ + 'repeat_password', + 'id'=>'repeat_password', + 'class'=>'form-control input-sm') + );?> +
+
+
+
-
- lang->line('employees_repeat_password'), 'repeat_password',array_merge($password_label_attributes, array('class' => 'col-xs-3 control-label'))); ?> -
-
- - 'repeat_password', - 'id'=>'repeat_password', - 'class'=>'form-control input-sm') - );?> -
-
-
- +
+
+

lang->line("employees_permission_desc"); ?>

-
- lang->line("employees_permission_info"); ?> -

lang->line("employees_permission_desc"); ?>

- -
    - result() as $module) - { - ?> -
  • - module_id,$this->Employee->has_grant($module->module_id,$person_info->person_id),"class='module'"); ?> - lang->line('module_'.$module->module_id);?>: - lang->line('module_'.$module->module_id.'_desc');?> +
      result() as $permission) - { - $exploded_permission = explode('_', $permission->permission_id); - if ($permission->module_id == $module->module_id) - { - $lang_key = $module->module_id.'_'.$exploded_permission[1]; - $lang_line = $this->lang->line($lang_key); - $lang_line = ($this->lang->line_tbd($lang_key) == $lang_line) ? $exploded_permission[1] : $lang_line; - if (empty($lang_line)) + foreach($all_modules->result() as $module) + { + ?> +
    • + module_id,$this->Employee->has_grant($module->module_id,$person_info->person_id),"class='module'"); ?> + lang->line('module_'.$module->module_id);?>: + lang->line('module_'.$module->module_id.'_desc');?> + result() as $permission) { - continue; - } + $exploded_permission = explode('_', $permission->permission_id); + if ($permission->module_id == $module->module_id) + { + $lang_key = $module->module_id.'_'.$exploded_permission[1]; + $lang_line = $this->lang->line($lang_key); + $lang_line = ($this->lang->line_tbd($lang_key) == $lang_line) ? $exploded_permission[1] : $lang_line; + if (empty($lang_line)) + { + continue; + } + ?> +
        +
      • + permission_id, $this->Employee->has_grant($permission->permission_id,$person_info->person_id)); ?> + +
        • +
      + +
      • + -
        -
      • - permission_id,$this->Employee->has_grant($permission->permission_id,$person_info->person_id)); ?> - -
        • -
      - - - -
    -
+ +
+
+ \ No newline at end of file diff --git a/application/views/people/manage.php b/application/views/people/manage.php index 41705fa74..e7cf7f274 100644 --- a/application/views/people/manage.php +++ b/application/views/people/manage.php @@ -63,16 +63,16 @@ function post_person_form_submit(response) { ?> " . $this->lang->line('common_import_excel') . "", - array('class'=>"modal-dlg modal-btn-submit", 'title'=>$this->lang->line('items_import_items_excel'))); + "
" . $this->lang->line('common_import_excel') . "
", + array('class'=>'modal-dlg modal-btn-submit', 'title'=>$this->lang->line('items_import_items_excel'))); ?> - " . $this->lang->line($controller_name . '_new') . "", - array('class'=>"modal-dlg modal-btn-submit $dlog_class", 'title'=>$this->lang->line($controller_name . '_new'))); + " . $this->lang->line($controller_name . '_new') . "", + array('class'=>'modal-dlg modal-btn-submit', 'title'=>$this->lang->line($controller_name . '_new'))); ?> diff --git a/translations/employees_lang.csv b/translations/employees_lang.csv index 8b85e8de4..83516f2ad 100644 --- a/translations/employees_lang.csv +++ b/translations/employees_lang.csv @@ -1,12 +1,12 @@ label,de-CH,nl-BE,es,en,fr,zh,ru,th,tr,id -employees_basic_information,Mitarbeiter-Information,Employee Basic Information,Información Básica de Empleados,Employee Basic Information,Fiche Employé,員工基本資料,Сотрудник Базовая Информация,ข้อมูลพื้นฐานของพนักงาน,Personel Temel Bilgileri,Informasi Karyawan +employees_basic_information,Mitarbeiter-Information,Information,Información Básica de Empleados,Information,Fiche Employé,員工基本資料,Сотрудник Базовая Информация,ข้อมูลพื้นฐานของพนักงาน,Personel Temel Bilgileri,Informasi Karyawan employees_cannot_be_deleted,"Konnte gewählten Mitarbeiter nicht löschen, einer oder mehrere weisen Verkäufe aus.","Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)",No se pudieron borrar empleados. Uno o más empleados tiene ventas procesadas o estás tratando de borrarte a tí mismo(a).,"Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)","Impossible de supprimer. Un ou plusieurs des employés à éffectué une vente, ou alors vous essayez de vous supprimer vous-meme :)",無法刪除選定的僱員，選定的員工中已有銷售紀錄或你正在試圖刪除自己 :),"Не возможно удалить выбранный сотрудников, одного или более работников обработал продаж или вы пытаетесь удалить себя",ไม่สามารถลบข้อมูลพนักงานที่กำลังปฏิบัติงานอยู่ได้,"Seçili personel silinemedi, personellerin satışları var yada kendinizi silmeye çalışıyorsunuz",Karyawan terpilih tidak bisa dihapus; satu atau lebih dari para pekerja telah memproses penjualan atau Anda mencoba untuk menghapus diri Anda sendiri:) employees_confirm_delete,Wollen Sie diesen Mitarbeiter wirklich löschen?,Bent u zeker dat u de geselecteerde werknemers wil verwijderen?,¿Seguro(a) que quieres borrar los empleados seleccionados?,Are you sure you want to delete the selected employees?,Voulez-vous supprimer ces employés?,你確定要刪除所選的員工嗎？,"Вы уверены, что хотите удалить выбранную сотрудников?",ยืนยันการลบข้อมูลพนักงาน,Seçili personelleri silmek istediğinize emin misiniz?,Apakah Anda yakin ingin menghapus karyawan yang dipilih? employees_employee,Mitarbeiter,Werknemer,Empleado,Employee,Employé,員工,Сотрудник,พนักงาน,Personel,Karyawan employees_error_adding_updating,Fehler beim Hinzufügen/Ändern,Error adding/updating employee,Error al agregar/actualizar empleado,Error adding/updating employee,Erreur d\'ajout/édition d\'employé,添加/更新員工錯誤,Ошибка при добавлении/обновлении сотрудника,การปรับปรุงข้อมูลผิดพลาด,Personel ekleme/güncelleme hatası,Kesalahan menambah / memperbarui karyawan employees_error_deleting_demo_admin,Sie können den Admin nicht löschen,You can not delete the demo admin user,No puedes borrar el usuario admin del demo,You can not delete the demo admin user,Vous ne pouvez pas effacer l\'utilisateur de démonstration admin,您不能刪除admin用戶,Вы не можете удалить пользователь демонстрация аккаунт,You can not delete the demo admin user,Admin güncellenemez,Anda tidak dapat menghapus Demo admin user employees_error_updating_demo_admin,Sie können den Admin nicht ändern,You can not change the demo admin user,No puedes cambiar el usuario admin del demo,You can not change the demo admin user,Vous ne pouvez pas modifier l\'utilisateur de démonstration admin,您不能更改admin用戶,Вы не можете изменить пользователь демонстрация аккаунт,You can not change the demo admin user,Admin silinemez,Anda tidak dapat merubah Demo admin user -employees_login_info,Mitarbeiter Login,Employee Login Info,Información de Ingreso del Empleado,Employee Login Info,Détails de Connexion Employé,員工登錄資料,Информация для сотрудников Входа,Employee Login Info,Personel Giriş Bilgileri,Info Login Karyawan +employees_login_info,Mitarbeiter Login,Login,Información de Ingreso del Empleado,Login,Détails de Connexion Employé,員工登錄資料,Информация для сотрудников Входа,Login,Personel Giriş Bilgileri,Info Login Karyawan employees_new,Neuer Mitarbeiter,N. Werknemer,Nuevo Empleado,New Employee,Nouvel Employé,新員工,Новый Сотрудник,เพิ่มพนักงาน,Yeni Personel,Karyawan Baru employees_none_selected,Sie haben keinen Mitarbeiter zum Löschen gewählt,U hebt geen werknemers geselecteerd,No has seleccionado empleados para borrar,You have not selected any employees to delete,Aucun employé sélectionné pour la suppression,您還沒有選擇任何員工進行刪除,Вы не выбрали ни сотрудников для удаления,โปรดเลือกพนักงาน,Silmek için çalışan seçmediniz,Anda belum memilih karyawan untuk menghapus employees_one_or_multiple,Mitarbeiter,werknemer(s) verwijderd,empleado(s),employee(s),employé(s),員工,сотрудник(ов),พนักงาน,personel,Karyawan @@ -15,7 +15,7 @@ employees_password_minlength,Passwort muss mindestens 8 Zeichen lang sein,Paswoo employees_password_must_match,Passwörter passen nicht überein,Paswoorden komen niet overeen,Las Contraseñas no coinciden,Passwords do not match,Mots de passe non corcordants,密碼與確認密碼不一致,Пароли не совпадают,รหัสผ่านไม่ตรงกัน,Şifreler uyuşmuyor,Kata Sandi tidak cocok employees_password_required,Passwort ist erforderlich,Paswoord moet ingevuld worden,La Contraseña es requerida,Password is required,Le Mot de passe est requis,請輸入密碼,Пароль обязательно,ต้องกรอกรหัสผ่าน,Şifre zorunlu alandır,Kata Sandi wajib diisi employees_permission_desc,"Klicken Sie unten, um die jeweiligen Zugangsrechte zu aktivieren",Check the boxes below to grant access to modules,Activa las cajas debajo para permitir el acceso a los módulos,Check the boxes below to grant access to modules,Cochez les cases cis-dessous pour autoriser l\'accès aux modules,勾選後授予使用該模組功能,"Отметьте флажками ниже, чтобы предоставить доступ к модулям",Check the boxes below to grant access to modules,Modül yetkisi vermek için kutuları işaretleyin,Tandai kotak di bawah ini untuk memberikan akses ke Modul -employees_permission_info,Mitarbeiter Zugangsrechte,Employee Permissions and Access,Permisos y Acceso del Empleado,Employee Permissions and Access,Droits d\'Accès Employé,員工權限,Сотрудник разрешениями и правами доступа,Employee Permissions and Access,Personel İzin ve Yetkileri,Hak Akses Karyawan +employees_permission_info,Mitarbeiter Zugangsrechte,Permissions,Permisos y Acceso del Empleado,Permissions,Droits d\'Accès Employé,員工權限,Сотрудник разрешениями и правами доступа,Permissions,Personel İzin ve Yetkileri,Hak Akses Karyawan employees_repeat_password,Wiederhole Passwort,Herhaal Paswoord,Repita Contraseña,Password Again,Re-saisissez le mot de passe,確認密碼,Повторяете пароль,Password Again,Şifre (Tekrar),Ulang Kata Sandi employees_successful_adding,Hinzufügen erfolgreich,You have successfully added employee,Has agregado el empleado satisfactoriamente,You have successfully added employee,Employé ajouté,新增員工資料成功,Вы успешно добавили сотрудника,เพิ่มข้อมูลพนักงานเรียบร้อยแล้ว,Personel eklendi,Anda telah berhasil menambahkan karyawan employees_successful_deleted,Löschung erfolgreich,Er werd(en),Has borrado satisfactoriamente a,You have successfully deleted,Suppréssion d\'employé réussie,成功刪除員工資料,Вы успешно удалили,ลบข้อมูลสำเร็จ,Silme başarılı,Anda telah berhasil menghapus