Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From 305a6aeaf9a947ae2272fcdf1e7e87e5c9b31dc7 Mon Sep 17 00:00:00 2001
- From: Jose Luis Cambero Contador <cambero@macbook-de-jose-luis-cambero-contador.local>
- Date: Fri, 27 Mar 2009 13:17:26 +0100
- Subject: [PATCH] commit for merge
- ---
- app/views/admin/employment_techs/index.html.haml | 2 +-
- app/views/admin/work_units/_form_tech.html.haml | 40 ----------------------
- config/locales/es.yml | 4 ++-
- public/stylesheets/all.css | 2 +-
- 4 files changed, 5 insertions(+), 43 deletions(-)
- delete mode 100644 app/views/admin/work_units/_form_tech.html.haml
- diff --git a/app/views/admin/employment_techs/index.html.haml b/app/views/admin/employment_techs/index.html.haml
- index 05d1f6a..6e7d7e2 100644
- --- a/app/views/admin/employment_techs/index.html.haml
- +++ b/app/views/admin/employment_techs/index.html.haml
- @@ -1,5 +1,5 @@
- .content.third
- - %h1= t('Index-Employment-Tech')
- + %h1= t('ad.employment_techs_of_proyect')
- .scroll-admin-webs
- %table.table-admin-webs{:cellspacing => "0", :border => "0", :cellpadding => "0"}
- %tr
- diff --git a/app/views/admin/work_units/_form_tech.html.haml b/app/views/admin/work_units/_form_tech.html.haml
- deleted file mode 100644
- index 7b18606..0000000
- --- a/app/views/admin/work_units/_form_tech.html.haml
- +++ /dev/null
- @@ -1,40 +0,0 @@
- -.project-data
- - %h2 Técnico de empleo para esta unidad:
- - - fields_for :profile do |p|
- - .box.label= p.label :name, t('common.name') +':'
- - .box.input= p.text_field :name, :disabled => disabled
- - = error_message_on :profile, :name
- -
- - .box.label= p.label :name, t('common.first_surname') + ':'
- - .box.input= p.text_field :first_surname, :disabled => disabled
- - = error_message_on :profile, :first_surname
- -
- - .box.label= p.label :name, t('common.second_surname') + ':'
- - .box.input= p.text_field :second_surname, :disabled => disabled
- - = error_message_on :profile, :second_surname
- -
- - .box.label= p.label :name, t('common.nif') + ':' #"NIF:"
- - .box.input= p.text_field :nif, :disabled => disabled
- - = error_message_on :profile, :nif
- -
- - .box.label= p.label :name, t('common.mobile_phone') + ':' #"Movil:"
- - .box.input= p.text_field :mobile, :disabled => disabled
- - = error_message_on :profile, :mobile
- -
- - - fields_for :user do |u|
- - .box.label= u.label :email, t('common.email') + ':' #"Email:"
- - .box.input= u.text_field :email, :disabled => disabled
- - = error_message_on :user, :email
- -
- - /.box.label= u.label :login, t('common.user') + ':' #"USER:"
- - /.box.input= u.text_field :login, :disabled => disabled
- - /= error_message_on :user, :login
- -
- - .box.label.last= u.label :password, t('common.password') + ':' #"PASSWORD:"
- - .box.input.last= text_field :user, :password, :disabled => disabled, :value => random_password(9) unless @user
- - = error_message_on :user, :password
- -
- - .clear
- - #password_info.highlight
- -
- - = f.submit t('et.upload_web'), :class => 'button'
- \ No newline at end of file
- diff --git a/config/locales/es.yml b/config/locales/es.yml
- index 47410a7..65a8731 100755
- --- a/config/locales/es.yml
- +++ b/config/locales/es.yml
- @@ -126,7 +126,7 @@ es: !map
- new: Nuevo
- create: Crear
- change_languaje: Cambiar Idioma
- - create_unit_tec_work: Crear Unidad de trabajo y técnico
- + create_unit_tec_work: Crear Unidad de trabajo
- procedure_title: "Procedimiento {{titulo}}"
- procedure_body: Cuerpo del Procedimiento
- @@ -650,3 +650,5 @@ es: !map
- deleted_procedure_ok: Procedimiento eliminado correctamente
- deleted_procedure_error: Error al borrar el procedimiento
- procedure_proyect: "Procedimientos del proyecto: {{name}}"
- + employment_techs_of_proyect: Unidades de trabajo del proyecto
- +
- \ No newline at end of file
- diff --git a/public/stylesheets/all.css b/public/stylesheets/all.css
- index fafe52f..e11003e 100644
- --- a/public/stylesheets/all.css
- +++ b/public/stylesheets/all.css
- @@ -1584,7 +1584,7 @@ div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span
- .project-data {
- margin-left:30px;
- - width:400px;
- + width:600px;
- clear:both;
- }
- --
- 1.6.1+GitX
Add Comment
Please, Sign In to add comment