浏览代码

#22 labels improved for ssh connection in OLT form

Espinoza Guillermo 6 年之前
父节点
当前提交
d8bcbd2d33
共有 2 个文件被更改,包括 9 次插入8 次删除
  1. 6 6
      src/FTTHBundle/Admin/OLTAdmin.php
  2. 3 2
      src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

+ 6 - 6
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()

+ 3 - 2
src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

@@ -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