[BUGFIX] Module Permissions: wrong un-/lock icon state 62/44562/5
authorJosef Glatz <jousch@gmail.com>
Thu, 5 Nov 2015 22:16:31 +0000 (23:16 +0100)
committerFrank Nägler <frank.naegler@typo3.org>
Fri, 6 Nov 2015 19:28:10 +0000 (20:28 +0100)
Fix icon state by replacing unlock with locked icon.
Add better explaining tooltip text for locked pages.

Releases: master
Resolves: #71357
Change-Id: If2a0c587b4f3e9b2c4f64486a0b6464ca2e47477
Reviewed-on: https://review.typo3.org/44562
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
typo3/sysext/beuser/Classes/Controller/PermissionAjaxController.php
typo3/sysext/beuser/Resources/Private/Language/locallang_mod_permission.xlf
typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html

index 4d0196b..a746465 100644 (file)
@@ -302,9 +302,9 @@ class PermissionAjaxController
     {
         $page = (int)$page;
         if ($editLockState === 1) {
-            $ret = '<span id="el_' . $page . '"><a class="editlock btn btn-default" data-page="' . $page . '" data-lockstate="1" title="The page and all content is locked for editing by all non-Admin users.">' . $this->iconFactory->getIcon('actions-unlock', Icon::SIZE_SMALL)->render() . '</a></span>';
+            $ret = '<span id="el_' . $page . '"><a class="editlock btn btn-default" data-page="' . $page . '" data-lockstate="1" title="The page and all content is locked for editing by all non-Admin users.">' . $this->iconFactory->getIcon('actions-lock', Icon::SIZE_SMALL)->render() . '</a></span>';
         } else {
-            $ret = '<span id="el_' . $page . '"><a class="editlock btn btn-default" data-page="' . $page . '" data-lockstate="0" title="Enable the &raquo;Admin-only&laquo; edit lock for this page">' . $this->iconFactory->getIcon('actions-lock', Icon::SIZE_SMALL)->render() . '</a></span>';
+            $ret = '<span id="el_' . $page . '"><a class="editlock btn btn-default" data-page="' . $page . '" data-lockstate="0" title="Enable the &raquo;Admin-only&laquo; edit lock for this page">' . $this->iconFactory->getIcon('actions-unlock', Icon::SIZE_SMALL)->render() . '</a></span>';
         }
         return $ret;
     }
index 2deb753..faaa2c4 100644 (file)
@@ -25,7 +25,7 @@
                                <source>Lock</source>
                        </trans-unit>
                        <trans-unit id="EditLock_descr">
-                               <source>The page and all content is locked for editing by all non-Admin users.</source>
+                               <source>Disable the »Admin-only« edit lock for this page. Currently this page and all content is locked for editing by all non-Admin users.</source>
                        </trans-unit>
                        <trans-unit id="EditLock_descr2">
                                <source>Enable the »Admin-only« edit lock for this page</source>
index 6585dc4..ad7501e 100644 (file)
                                                                                                        data-lockstate="1"
                                                                                                        title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr')}"
                                                                                                >
-                                                                                                       <core:icon identifier="actions-unlock" />
+                                                                                                       <core:icon identifier="actions-lock" />
                                                                                                </a>
                                                                                        </f:then>
                                                                                        <f:else>
                                                                                                        data-lockstate="0"
                                                                                                        title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr2')}"
                                                                                                >
-                                                                                                       <core:icon identifier="actions-lock" />
+                                                                                                       <core:icon identifier="actions-unlock" />
                                                                                                </a>
                                                                                        </f:else>
                                                                                </f:if>