Made fixes to es languge files and users page

Fixed PHP formatting error in ES lang file and added tests to cover.
Made user edit page more responsive on smaller devices.
Fixed 'cancel' button on profile screen when the user does not have
permission to manage users.

diff --git a/resources/lang/es/activities.php b/resources/lang/es/activities.php
index 1556f453000744db202c8bcb2b80159088829fae..649b8c7d2b37c9890221471b4d8cdef0b6902cd3 100644 (file)
--- a/resources/lang/es/activities.php
+++ b/resources/lang/es/activities.php
@@ -13,7 +13,7 @@ return [
     'page_update'                 => 'página actualizada',
     'page_update_notification'    => 'Página actualizada exitosamente',
     'page_delete'                 => 'página borrada',
     'page_update'                 => 'página actualizada',
     'page_update_notification'    => 'Página actualizada exitosamente',
     'page_delete'                 => 'página borrada',

-    'page_delete_notification'    => 'Página borrada exitosamente,
+    'page_delete_notification'    => 'Página borrada exitosamente',

     'page_restore'                => 'página restaurada',
     'page_restore_notification'   => 'Página restaurada exitosamente',
     'page_move'                   => 'página movida',
     'page_restore'                => 'página restaurada',
     'page_restore_notification'   => 'Página restaurada exitosamente',
     'page_move'                   => 'página movida',

diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index de3a3151fab189d612d59742a8a9c62092eb0dfa..e0019e618f460a5c478578b1d55d17d1ffa19413 100644 (file)
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -21,6 +21,10 @@
         <form action="{{ baseUrl("/settings/users/create") }}" method="post">
             {!! csrf_field() !!}
             @include('users/forms/' . $authMethod)
         <form action="{{ baseUrl("/settings/users/create") }}" method="post">
             {!! csrf_field() !!}
             @include('users/forms/' . $authMethod)

+            <div class="form-group">
+                <a href="{{  baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button muted">{{ trans('common.cancel') }}</a>
+                <button class="button pos" type="submit">{{ trans('common.save') }}</button>
+            </div>

         </form>
     </div>
 
         </form>
     </div>
 

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index bf10b829d0620de193e43711833fa6787d548db5..ff3475194bdfacd7705d74cf17e8d81061a8048b 100644 (file)
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -19,38 +19,42 @@
                 </div>
             </div>
             <div class="row">
                 </div>
             </div>
             <div class="row">

-            <div class="col-md-6" ng-non-bindable>
-                {!! csrf_field() !!}
-                <input type="hidden" name="_method" value="put">
-                @include('users.forms.' . $authMethod, ['model' => $user])
+                <div class="col-sm-6" ng-non-bindable>
+                    {!! csrf_field() !!}
+                    <input type="hidden" name="_method" value="put">
+                    @include('users.forms.' . $authMethod, ['model' => $user])

 
 

-            </div>
-            <div class="col-md-6">
-                <div class="form-group" id="logo-control">
-                    <label for="user-avatar">{{ trans('settings.users_avatar') }}</label>
-                    <p class="small">{{ trans('settings.users_avatar_desc') }}</p>
-
-                    @include('components.image-picker', [
-                          'resizeHeight' => '512',
-                          'resizeWidth' => '512',
-                          'showRemove' => false,
-                          'defaultImage' => baseUrl('/user_avatar.png'),
-                          'currentImage' => $user->getAvatar(80),
-                          'currentId' => $user->image_id,
-                          'name' => 'image_id',
-                          'imageClass' => 'avatar large'
-                      ])

                 </div>
                 </div>

-                <div class="form-group">
-                    <label for="user-language">{{ trans('settings.users_preferred_language') }}</label>
-                    <select name="setting[language]" id="user-language">
-                        @foreach(trans('settings.language_select') as $lang => $label)
-                            <option @if(setting()->getUser($user, 'language') === $lang) selected @endif value="{{ $lang }}">{{ $label }}</option>
-                        @endforeach
-                    </select>
+                <div class="col-sm-6">
+                    <div class="form-group" id="logo-control">
+                        <label for="user-avatar">{{ trans('settings.users_avatar') }}</label>
+                        <p class="small">{{ trans('settings.users_avatar_desc') }}</p>
+
+                        @include('components.image-picker', [
+                              'resizeHeight' => '512',
+                              'resizeWidth' => '512',
+                              'showRemove' => false,
+                              'defaultImage' => baseUrl('/user_avatar.png'),
+                              'currentImage' => $user->getAvatar(80),
+                              'currentId' => $user->image_id,
+                              'name' => 'image_id',
+                              'imageClass' => 'avatar large'
+                          ])
+                    </div>
+                    <div class="form-group">
+                        <label for="user-language">{{ trans('settings.users_preferred_language') }}</label>
+                        <select name="setting[language]" id="user-language">
+                            @foreach(trans('settings.language_select') as $lang => $label)
+                                <option @if(setting()->getUser($user, 'language') === $lang) selected @endif value="{{ $lang }}">{{ $label }}</option>
+                            @endforeach
+                        </select>
+                    </div>

                 </div>
             </div>
                 </div>
             </div>

-        </div>
+            <div class="form-group">
+                <a href="{{  baseUrl($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button muted">{{ trans('common.cancel') }}</a>
+                <button class="button pos" type="submit">{{ trans('common.save') }}</button>
+            </div>

         </form>
 
         <hr class="margin-top large">
         </form>
 
         <hr class="margin-top large">


@@ -60,7 +64,7 @@
             <p class="text-muted">{{ trans('settings.users_social_accounts_info') }}</p>
             <div class="row">
                 @foreach($activeSocialDrivers as $driver => $enabled)
             <p class="text-muted">{{ trans('settings.users_social_accounts_info') }}</p>
             <div class="row">
                 @foreach($activeSocialDrivers as $driver => $enabled)

-                    <div class="col-md-3 text-center">
+                    <div class="col-sm-3 col-xs-6 text-center">

                         <div>@icon($driver, ['width' => 56])</div>
                         <div>
                             @if($user->hasSocialAccount($driver))
                         <div>@icon($driver, ['width' => 56])</div>
                         <div>
                             @if($user->hasSocialAccount($driver))

diff --git a/resources/views/users/forms/ldap.blade.php b/resources/views/users/forms/ldap.blade.php
index 0a6cf79ae1d26163283a480f550daa255cb58142..f6e8b4c806a436111a32ee8976aab0b5cbfc516a 100644 (file)
--- a/resources/views/users/forms/ldap.blade.php
+++ b/resources/views/users/forms/ldap.blade.php
@@ -22,9 +22,4 @@
         <label for="external_auth_id">{{ trans('settings.users_external_auth_id') }}</label>
         @include('form.text', ['name' => 'external_auth_id'])
     </div>
         <label for="external_auth_id">{{ trans('settings.users_external_auth_id') }}</label>
         @include('form.text', ['name' => 'external_auth_id'])
     </div>

-@endif
-
-<div class="form-group">
-    <a href="{{ baseUrl("/settings/users") }}" class="button muted">{{ trans('common.cancel') }}</a>
-    <button class="button pos" type="submit">{{ trans('common.save') }}</button>
-</div>
\ No newline at end of file
+@endif
\ No newline at end of file

diff --git a/resources/views/users/forms/standard.blade.php b/resources/views/users/forms/standard.blade.php
index 39ae4c7703d923e7300688a41616e107067525d8..fa712368b7fdf04707bf8f85ced397d1ef5f8a93 100644 (file)
--- a/resources/views/users/forms/standard.blade.php
+++ b/resources/views/users/forms/standard.blade.php
@@ -31,10 +31,4 @@
 <div class="form-group">
     <label for="password-confirm">{{ trans('auth.password_confirm') }}</label>
     @include('form.password', ['name' => 'password-confirm'])
 <div class="form-group">
     <label for="password-confirm">{{ trans('auth.password_confirm') }}</label>
     @include('form.password', ['name' => 'password-confirm'])

-</div>
-
-<div class="form-group">
-    <a href="{{ baseUrl("/settings/users") }}" class="button muted">{{ trans('common.cancel') }}</a>
-    <button class="button pos" type="submit">{{ trans('common.save') }}</button>
-</div>
-
+</div>
\ No newline at end of file

diff --git a/resources/views/users/forms/system.blade.php b/resources/views/users/forms/system.blade.php
index 868dad854061b6c73e7db7927f82121e5a69cc83..6243010a4177aa5957160e40a37c5ecd6aaeb4c9 100644 (file)
--- a/resources/views/users/forms/system.blade.php
+++ b/resources/views/users/forms/system.blade.php
@@ -19,8 +19,3 @@
     </div>
 @endif
 
     </div>
 @endif
 

-<div class="form-group">
-    <a href="{{ baseUrl("/settings/users") }}" class="button muted">{{ trans('common.cancel') }}</a>
-    <button class="button pos" type="submit">{{ trans('common.save') }}</button>
-</div>
-

diff --git a/tests/LanguageTest.php b/tests/LanguageTest.php
index ed5ee7dee14ec621b38801694da9c44b8523c337..911ac3e81588306c700ba9ee27500fe4d92084f3 100644 (file)
--- a/tests/LanguageTest.php
+++ b/tests/LanguageTest.php
@@ -3,13 +3,24 @@
 class LanguageTest extends TestCase
 {
 
 class LanguageTest extends TestCase
 {
 

-    public function test_js_endpoint_for_each_language() {
+    protected $langs;
+
+    /**
+     * LanguageTest constructor.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->langs = array_diff(scandir(resource_path('lang')), ['..', '.']);
+    }
+
+    public function test_js_endpoint_for_each_language()
+    {

 
 

-        $langs = array_diff(scandir(resource_path('lang')), ['..', '.']);

         $visibleKeys = ['common', 'components', 'entities', 'errors'];
 
         $this->asEditor();
         $visibleKeys = ['common', 'components', 'entities', 'errors'];
 
         $this->asEditor();

-        foreach ($langs as $lang) {
+        foreach ($this->langs as $lang) {

             setting()->putUser($this->getEditor(), 'language', $lang);
             $transResp = $this->get('/translations');
             foreach ($visibleKeys as $key) {
             setting()->putUser($this->getEditor(), 'language', $lang);
             $transResp = $this->get('/translations');
             foreach ($visibleKeys as $key) {


@@ -18,4 +29,20 @@ class LanguageTest extends TestCase
         }
     }
 
         }
     }
 

+    public function test_all_lang_files_loadable()
+    {
+        $files = array_diff(scandir(resource_path('lang/en')), ['..', '.']);
+        foreach ($this->langs as $lang) {
+            foreach ($files as $file) {
+                $loadError = false;
+                try {
+                    $translations = trans(str_replace('.php', '', $file), [], $lang);
+                } catch (\Exception $e) {
+                    $loadError = true;
+                }
+                $this->assertFalse($loadError, "Translation file {$lang}/{$file} failed to load");
+            }
+        }
+    }
+

 }
\ No newline at end of file
 }
\ No newline at end of file