Explorar el Código

Update form.forkbb.php template

Visman hace 2 años
padre
commit
d4c426739d
Se han modificado 2 ficheros con 7 adiciones y 9 borrados
  1. 6 8
      app/Models/Pages/Search.php
  2. 1 1
      app/templates/layouts/form.forkbb.php

+ 6 - 8
app/Models/Pages/Search.php

@@ -166,8 +166,7 @@ class Search extends Page
                     'fields' => [
                         [
                             'type'  => 'info',
-                            'value' => __(['<a href="%s">Advanced search</a>', $this->c->Router->link('SearchAdvanced')]),
-                            'html'  => true,
+                            'value' => ['<a href="%s">Advanced search</a>', $this->c->Router->link('SearchAdvanced')],
                         ],
                         'keywords' => [
                             'class'     => ['w0'],
@@ -205,8 +204,7 @@ class Search extends Page
                     'fields' => [
                         [
                             'type'  => 'info',
-                            'value' => __(['<a href="%s">Simple search</a>', $this->c->Router->link('Search')]),
-                            'html'  => true,
+                            'value' => ['<a href="%s">Simple search</a>', $this->c->Router->link('Search')],
                         ],
                         'keywords' => [
                             'class'     => ['w2'],
@@ -227,7 +225,7 @@ class Search extends Page
                         ],
                         [
                             'type'  => 'info',
-                            'value' => __('Search info'),
+                            'value' => 'Search info',
                         ],
                     ],
                 ],
@@ -255,11 +253,11 @@ class Search extends Page
                         ],
                         [
                             'type'  => 'info',
-                            'value' => __('Search in info'),
+                            'value' => 'Search in info',
                         ],
                         [
                             'type'  => 'info',
-                            'value' => __('Search multiple forums info'),
+                            'value' => 'Search multiple forums info',
                         ],
 
                     ],
@@ -301,7 +299,7 @@ class Search extends Page
                         ],
                         [
                             'type'  => 'info',
-                            'value' => __('Search results info'),
+                            'value' => 'Search results info',
                         ],
                     ],
 

+ 1 - 1
app/templates/layouts/form.forkbb.php

@@ -13,7 +13,7 @@
         @endif
         @foreach ($setVal['fields'] as $key => $cur)
             @if ('info' === $cur['type'])
-            <p id="id-{{ $cur['id'] or $setKey.$key }}" class="f-yinfo"> @if ($cur['html']){!! $cur['value'] !!} @else{{ $cur['value'] }} @endif</p>
+            <p id="id-{{ $cur['id'] or $setKey.$key }}" class="f-yinfo">{!! __($cur['value']) !!}</p>
             @elseif ('wrap' === $cur['type'])
             <div id="id-{{ $cur['id'] or $setKey.$key }}" @if ($cur['class']) class="f-wrap-{{ \implode(' f-wrap-', $cur['class']) }}" @endif>
             @elseif ('endwrap' === $cur['type'])