Merge branch '22' into 'master'

#22 labels improved for ssh connection in OLT form

See merge request interlink-sa/flowdat3/modules/ftth!133

src/FTTHBundle/Admin/OLTAdmin.php

@@ -34,8 +34,8 @@ class OLTAdmin extends WorkflowBaseAdmin
             ->add('sshUser')
             ->add('sshPass')
             ->add('enablePass')
-            ->add('sshPort')
             ->add('sshConnect')
+            ->add('sshPort')
             ->add('backups')
         ;
     }
@@ -53,11 +53,10 @@ class OLTAdmin extends WorkflowBaseAdmin
             ->add('sshUser')
             ->add('sshPass')
             ->add('enablePass')
-            ->add('sshPort')
             ->add('sshConnect')
+            ->add('sshPort')
             ->add('enable')
             ->add('backups')
-//            ->add('workflow')
             ->add('currentState','string', array('template' => 'WorkflowBundle:Workflow:base_list_field_current_state.html.twig'))
             ->add('_action', 'with-workflow-action', array(
                 'actions' => array(
@@ -95,9 +94,10 @@ class OLTAdmin extends WorkflowBaseAdmin
                         ->add('sshUser')
                         ->add('sshPass')
                         ->add('enablePass')
+                        ->add('sshConnect', null, [
+                            'help' => 'form.help_ssh_connect',
+                        ])
                         ->add('sshPort')
-                        ->add('sshConnect')
-                        //->add('enable')
                     ->end()
                 ->end()
                 ->tab('autodiscovery')
@@ -143,8 +143,8 @@ class OLTAdmin extends WorkflowBaseAdmin
                     ->add('sshUser')
                     ->add('sshPass')
                     ->add('enablePass')
-                    ->add('sshPort')
                     ->add('sshConnect')
+                    ->add('sshPort')
                     ->add('enable')
                 ->end()
             ->end()

src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

@@ -33,8 +33,8 @@ filter:
     label_name: Nombre
     label_mark: Marca
     label_snmp_community: Comunidad SNMP
-    label_ssh_user: SSH USER
-    label_ssh_pass: SSH PASS
+    label_ssh_user: CONNECTION USER
+    label_ssh_pass: CONNECTION PASS
     label_firmware: Firmware
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
@@ -113,8 +113,8 @@ form:
     label_name: Nombre
     label_mark: Marca
     label_snmp_community: Comunidad SNMP
-    label_ssh_user: SSH USER
-    label_ssh_pass: SSH PASS
+    label_ssh_user: CONNECTION USER
+    label_ssh_pass: CONNECTION PASS
     label_firmware: Firmware
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
@@ -174,8 +174,9 @@ form:
     label_onu_profile: ONU Profile
     label_onu_template: Plantilla ONU
     label_enable_pass: Enable Password
-    label_ssh_port: SSH Port
-    label_ssh_connect: Conexión por SSH
+    label_ssh_port: Puerto para conexión SSH | Telnet
+    label_ssh_connect: Habilitar conexión por SSH ?
+    help_ssh_connect: Telnet es la conexión por defecto para configurar la OLT
     label_time_discovery: Tiempo de escaneo
     label_discovery_profile: Perfíl
     label_date: Fecha
@@ -199,8 +200,8 @@ list:
     label_name: Nombre
     label_mark: Marca
     label_snmp_community: Comunidad SNMP
-    label_ssh_user: SSH USER
-    label_ssh_pass: SSH PASS
+    label_ssh_user: CONNECTION USER
+    label_ssh_pass: CONNECTION PASS
     label_firmware: Firmware
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP
@@ -269,8 +270,8 @@ show:
     label_name: Nombre
     label_mark: Marca
     label_snmp_community: Comunidad SNMP
-    label_ssh_user: SSH USER
-    label_ssh_pass: SSH PASS
+    label_ssh_user: CONNECTION USER
+    label_ssh_pass: CONNECTION PASS
     label_firmware: Firmware
     label_library_version: Versión Librería
     label_execute_snmp: Consultar SNMP