[CLEANUP] Backend User and Permission Module 55/35855/2
authorBenjamin Kott <benjamin.kott@outlook.com>
Tue, 6 Jan 2015 23:12:01 +0000 (00:12 +0100)
committerGeorg Ringer <georg.ringer@gmail.com>
Wed, 7 Jan 2015 11:30:32 +0000 (12:30 +0100)
- Adapting to bootstrap markup
- Introduce advanced inline-forms
- Move leftover css to t3skin for later removal

Releases: master
Resolves: #64153
Change-Id: I590746f98b0ca7fbf45be31785906b56e423b43e
Reviewed-on: http://review.typo3.org/35855
Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
15 files changed:
typo3/sysext/beuser/Resources/Private/Layouts/Default.html
typo3/sysext/beuser/Resources/Private/Layouts/Permission.html
typo3/sysext/beuser/Resources/Private/Partials/BackendUser/OnlineListRow.html
typo3/sysext/beuser/Resources/Private/Partials/Filters/BackendUser/Index.html
typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Compare.html
typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Index.html
typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html
typo3/sysext/beuser/Resources/Private/Templates/Permission/Edit.html
typo3/sysext/beuser/Resources/Private/Templates/Permission/Index.html
typo3/sysext/beuser/Resources/Public/Css/style.css [deleted file]
typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_element_table.less
typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_main_form.less
typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_module_beuser.less [new file with mode: 0644]
typo3/sysext/t3skin/Resources/Private/Styles/t3skin.less
typo3/sysext/t3skin/Resources/Public/Css/visual/t3skin.css

index dafc771..ae428ab 100644 (file)
@@ -1,4 +1,4 @@
-<f:be.container includeCssFiles="{0: '{f:uri.resource(path:\'Css/style.css\')}'}">
+<f:be.container>
        <div class="typo3-fullDoc">
                <div id="typo3-docheader">
                        <div class="typo3-docheader-functions">
index 2530e49..604545f 100644 (file)
@@ -1,5 +1,4 @@
 <f:be.container
-       includeCssFiles="{0: '{f:uri.resource(path:\'Css/style.css\')}'}"
        includeRequireJsModules="{0: 'TYPO3/CMS/Beuser/Permissions'}"
        loadPrototype="0"
        loadExtJsTheme="0"
index 3b58777..698a071 100644 (file)
@@ -4,13 +4,19 @@
        <tr>
                <f:if condition="{it.isFirst}">
                        <f:then>
-                               <td>
+                               <td class="col-icon">
+                                       <a href="#" class="t3-js-clickmenutrigger" data-table="be_users" data-uid="{onlineUser.backendUser.uid}" data-listframe="1" title="id={onlineUser.backendUser.uid}">
+                                               <bu:spriteIconForRecord table="be_users" object="{onlineUser.backendUser}" />
+                                       </a>
+                               </td>
+                               <td class="col-title">
                                        <b>{onlineUser.backendUser.userName}</b><br />
                                        {onlineUser.backendUser.realName}
                                </td>
                        </f:then>
                        <f:else>
-                               <td></td>
+                               <td class="col-icon"></td>
+                               <td class="col-title"></td>
                        </f:else>
                </f:if>
                <td>
index e922cbf..898494d 100644 (file)
@@ -1,68 +1,52 @@
-{namespace bu = TYPO3\CMS\Beuser\ViewHelpers}
 
-<bu:section title="Filter" collapsible="TRUE">
-       <f:form action="index" objectName="demand" object="{demand}" class="form-horizontal">
-               <div class="form-group">
-                       <label for="tx_Beuser_username" class="col-sm-4 control-label"><f:translate key="userName">Username</f:translate></label>
-                       <div class="col-sm-8">
-                               <f:form.textfield
-                                       id="tx_Beuser_username"
-                                       class="form-control"
-                                       property="userName"
-                               />
-                       </div>
-               </div>
-               <div class="form-group">
-                       <label for="tx_Beuser_usertype" class="col-sm-4 control-label"><f:translate key="admin">Admin</f:translate></label>
-                       <div class="col-sm-8">
-                               <f:form.select
-                                       id="tx_Beuser_usertype"
-                                       class="form-control"
-                                       property="userType"
-                                       options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"adminOnly\")}', 2: '{f:translate(key:\"normalUserOnly\")}'}"
-                               />
-                       </div>
-               </div>
-               <div class="form-group">
-                       <label for="tx_Beuser_status" class="col-sm-4 control-label"><f:translate key="status">Status</f:translate></label>
-                       <div class="col-sm-8">
-                               <f:form.select
-                                       id="tx_Beuser_status"
-                                       class="form-control"
-                                       property="status"
-                                       options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"activeOnly\")}', 2: '{f:translate(key:\"inactiveOnly\")}'}"
-                               />
-                       </div>
-               </div>
-               <div class="form-group">
-                       <label for="tx_Beuser_logins" class="col-sm-4 control-label"><f:translate key="login">Login</f:translate></label>
-                       <div class="col-sm-8">
-                               <f:form.select
-                                       id="tx_Beuser_logins"
-                                       class="form-control"
-                                       property="logins"
-                                       options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"loginBefore\")}', 2: '{f:translate(key:\"neverLoggedIn\")}'}"
-                               />
-                       </div>
-               </div>
-               <div class="form-group">
-                       <label for="tx_beuser_backendUserGroup" class="col-sm-4 control-label"><f:translate key="backendUserGroup">User Group</f:translate></label>
-                       <div class="col-sm-8">
-                               <f:form.select
-                                       id="tx_beuser_backendUserGroup"
-                                       class="form-control"
-                                       property="backendUserGroup"
-                                       options="{backendUserGroups}"
-                                       optionLabelField="title"
-                                       optionValueField="uid"
-                               />
-                       </div>
-               </div>
-               <div class="form-group">
-                       <div class="col-sm-offset-4 col-sm-8">
-                               <f:form.submit value="{f:translate(key: 'filter')}" />
-                       </div>
-               </div>
-
-       </f:form>
-</bu:section>
\ No newline at end of file
+<f:form action="index" objectName="demand" object="{demand}" class="form-inline form-inline-spaced">
+       <div class="form-group">
+               <label for="tx_Beuser_username"><f:translate key="userName">Username</f:translate></label>
+               <f:form.textfield
+                       id="tx_Beuser_username"
+                       class="form-control input-sm"
+                       property="userName"
+               />
+       </div>
+       <div class="form-group">
+               <label for="tx_Beuser_usertype"><f:translate key="admin">Admin</f:translate></label>
+               <f:form.select
+                       id="tx_Beuser_usertype"
+                       class="form-control input-sm"
+                       property="userType"
+                       options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"adminOnly\")}', 2: '{f:translate(key:\"normalUserOnly\")}'}"
+               />
+       </div>
+       <div class="form-group">
+               <label for="tx_Beuser_status"><f:translate key="status">Status</f:translate></label>
+               <f:form.select
+                       id="tx_Beuser_status"
+                       class="form-control input-sm"
+                       property="status"
+                       options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"activeOnly\")}', 2: '{f:translate(key:\"inactiveOnly\")}'}"
+               />
+       </div>
+       <div class="form-group">
+               <label for="tx_Beuser_logins"><f:translate key="login">Login</f:translate></label>
+               <f:form.select
+                       id="tx_Beuser_logins"
+                       class="form-control input-sm"
+                       property="logins"
+                       options="{0: '{f:translate(key:\"both\")}', 1: '{f:translate(key:\"loginBefore\")}', 2: '{f:translate(key:\"neverLoggedIn\")}'}"
+               />
+       </div>
+       <div class="form-group">
+               <label for="tx_beuser_backendUserGroup"><f:translate key="backendUserGroup">User Group</f:translate></label>
+               <f:form.select
+                       id="tx_beuser_backendUserGroup"
+                       class="form-control input-sm"
+                       property="backendUserGroup"
+                       options="{backendUserGroups}"
+                       optionLabelField="title"
+                       optionValueField="uid"
+               />
+       </div>
+       <div class="form-group">
+               <f:form.submit value="{f:translate(key: 'filter')}" class="btn btn-default btn-sm" />
+       </div>
+</f:form>
index 2225e38..f8b467f 100644 (file)
 </f:section>
 
 <f:section name="content">
-       <table border="0" cellpadding="0" cellspacing="0" id="tx_beuser_compare" class="table table-striped table-hover">
-               <thead>
-                       <tr class="t3-row-header">
-                               <th>&nbsp;</th>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <th>
-                                               <a href="#" class="t3-js-clickmenutrigger" data-table="be_users" data-uid="{compareUser.uid}" data-listframe="1" title="id={compareUser.uid}">
-                                                       <bu:spriteIconForRecord table="be_users" object="{compareUser}" />
-                                               </a>
-                                               {compareUser.userName}
-                                       </th>
-                               </f:for>
-                       </tr>
-               </thead>
-               <tbody>
-                       <tr>
-                               <td><h5><f:translate key="realName" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>{compareUser.realName}</td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="email" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:if condition="{compareUser.email}">
-                                                       <f:then>
-                                                               <f:link.email email="{compareUser.email}" />
-                                                       </f:then>
-                                                       <f:else>
-                                                               -
-                                                       </f:else>
-                                               </f:if>
-                                       </td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="admin" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:if condition="{compareUser.isAdministrator}">
-                                                       <f:then><f:translate key="yes" /></f:then>
-                                                       <f:else><f:translate key="no" /></f:else>
-                                               </f:if>
-                                       </td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="disable" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:if condition="{compareUser.isDisabled} == 1">
-                                                       <f:then>
-                                                               <a href="{bu:issueCommand(parameters: 'data[be_users][{compareUser.uid}][disable]=0', redirectUrl: redirectUrl)}">
-                                                                       <bu:spriteManagerIcon iconName="actions-edit-unhide" options="{title: 'unhide'}" />
-                                                               </a>
-                                                       </f:then>
-                                                       <f:else>
-                                                               <a href="{bu:issueCommand(parameters: 'data[be_users][{compareUser.uid}][disable]=1', redirectUrl: redirectUrl)}">
-                                                                       <bu:spriteManagerIcon iconName="actions-edit-hide" options="{title: 'hide'}" />
-                                                               </a>
-                                                       </f:else>
-                                               </f:if>
-                                       </td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="startDateAndTime" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:if condition="{compareUser.startDateAndTime}">
-                                                       <f:then>
-                                                               <f:format.date format="{dateFormat} {timeFormat}">{compareUser.startDateAndTime}</f:format.date>
-                                                       </f:then>
-                                                       <f:else>
-                                                               -
-                                                       </f:else>
-                                               </f:if>
-                                       </td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="endDateAndTime" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:if condition="{compareUser.endDateAndTime}">
-                                                       <f:then>
-                                                               <f:format.date format="{dateFormat} {timeFormat}">{compareUser.endDateAndTime}</f:format.date>
-                                                       </f:then>
-                                                       <f:else>
-                                                               -
-                                                       </f:else>
-                                               </f:if>
-                                       </td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="lastLogin" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:if condition="{compareUser.lastLoginDateAndTime}">
-                                                       <f:then>
-                                                               <f:format.date format="{dateFormat} {timeFormat}">{compareUser.lastLoginDateAndTime}</f:format.date>
-                                                       </f:then>
-                                                       <f:else>
-                                                               <f:translate key="never" />
-                                                       </f:else>
-                                               </f:if>
-                                       </td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="backendUserGroups" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:for each="{compareUser.BackendUserGroups}" as="backendUserGroup">
-                                                       <a href="#" class="t3-js-clickmenutrigger" data-table="be_groups" data-uid="{backendUserGroup.uid}" data-listframe="1" title="id={backendUserGroup.uid}">
-                                                               <bu:spriteIconForRecord table="be_users" object="{backendUserGroup}" />
+       <div class="table-fit">
+               <table border="0" cellpadding="0" cellspacing="0" id="tx_beuser_compare" class="table table-striped table-bordered table-hover">
+                       <thead>
+                               <tr>
+                                       <th></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <th>
+                                                       <a href="#" class="t3-js-clickmenutrigger" data-table="be_users" data-uid="{compareUser.uid}" data-listframe="1" title="id={compareUser.uid}">
+                                                               <bu:spriteIconForRecord table="be_users" object="{compareUser}" />
                                                        </a>
-                                                       {backendUserGroup.title}<br />
-                                               </f:for>
-                                       </td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="allowedLanguages" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:if condition="{compareUser.allowedLanguages}">
-                                                       <f:then>
-                                                               <bu:display.sysLanguage uids="{compareUser.allowedLanguages}" />
-                                                       </f:then>
-                                                       <f:else>
-                                                               -
-                                                       </f:else>
-                                               </f:if>
-                                       </td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="dbMountPoints" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:if condition="{compareUser.dbMountPoints}">
-                                                       <f:then>
-                                                               <bu:display.pages uids="{compareUser.dbMountPoints}" />
-                                                       </f:then>
-                                                       <f:else>
-                                                               -
-                                                       </f:else>
-                                               </f:if>
-                                       </td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="fileMounts" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:if condition="{compareUser.fileMountPoints}">
-                                                       <f:then>
-                                                               <bu:display.sysFileMounts uids="{compareUser.fileMountPoints}" />
-                                                       </f:then>
-                                                       <f:else>
-                                                               -
-                                                       </f:else>
-                                               </f:if>
-                                       </td>
-                               </f:for>
-                       </tr>
-                       <tr>
-                               <td><h5><f:translate key="disableIpLock" /></h5></td>
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <td>
-                                               <f:if condition="{compareUser.ipLockIsDisabled} == 1">
-                                                       <f:then><f:translate key="yes" /></f:then>
-                                                       <f:else><f:translate key="no" /></f:else>
-                                               </f:if>
-                                       </td>
-                               </f:for>
-                       </tr>
-               </tbody>
-       </table>
+                                                       {compareUser.userName}
+                                               </th>
+                                       </f:for>
+                               </tr>
+                       </thead>
+                       <tbody>
+                               <tr>
+                                       <th><f:translate key="realName" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>{compareUser.realName}</td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="email" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:if condition="{compareUser.email}">
+                                                               <f:then>
+                                                                       <f:link.email email="{compareUser.email}" />
+                                                               </f:then>
+                                                               <f:else>
+                                                                       -
+                                                               </f:else>
+                                                       </f:if>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="admin" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:if condition="{compareUser.isAdministrator}">
+                                                               <f:then><f:translate key="yes" /></f:then>
+                                                               <f:else><f:translate key="no" /></f:else>
+                                                       </f:if>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="disable" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:if condition="{compareUser.isDisabled} == 1">
+                                                               <f:then>
+                                                                       <a class="btn" href="{bu:issueCommand(parameters: 'data[be_users][{compareUser.uid}][disable]=0', redirectUrl: redirectUrl)}">
+                                                                               <bu:spriteManagerIcon iconName="actions-edit-unhide" options="{title: 'unhide'}" />
+                                                                       </a>
+                                                               </f:then>
+                                                               <f:else>
+                                                                       <a class="btn" href="{bu:issueCommand(parameters: 'data[be_users][{compareUser.uid}][disable]=1', redirectUrl: redirectUrl)}">
+                                                                               <bu:spriteManagerIcon iconName="actions-edit-hide" options="{title: 'hide'}" />
+                                                                       </a>
+                                                               </f:else>
+                                                       </f:if>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="startDateAndTime" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:if condition="{compareUser.startDateAndTime}">
+                                                               <f:then>
+                                                                       <f:format.date format="{dateFormat} {timeFormat}">{compareUser.startDateAndTime}</f:format.date>
+                                                               </f:then>
+                                                               <f:else>
+                                                                       -
+                                                               </f:else>
+                                                       </f:if>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="endDateAndTime" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:if condition="{compareUser.endDateAndTime}">
+                                                               <f:then>
+                                                                       <f:format.date format="{dateFormat} {timeFormat}">{compareUser.endDateAndTime}</f:format.date>
+                                                               </f:then>
+                                                               <f:else>
+                                                                       -
+                                                               </f:else>
+                                                       </f:if>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="lastLogin" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:if condition="{compareUser.lastLoginDateAndTime}">
+                                                               <f:then>
+                                                                       <f:format.date format="{dateFormat} {timeFormat}">{compareUser.lastLoginDateAndTime}</f:format.date>
+                                                               </f:then>
+                                                               <f:else>
+                                                                       <f:translate key="never" />
+                                                               </f:else>
+                                                       </f:if>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="backendUserGroups" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:for each="{compareUser.BackendUserGroups}" as="backendUserGroup">
+                                                               <a href="#" class="t3-js-clickmenutrigger" data-table="be_groups" data-uid="{backendUserGroup.uid}" data-listframe="1" title="id={backendUserGroup.uid}">
+                                                                       <bu:spriteIconForRecord table="be_users" object="{backendUserGroup}" />
+                                                               </a>
+                                                               {backendUserGroup.title}<br />
+                                                       </f:for>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="allowedLanguages" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:if condition="{compareUser.allowedLanguages}">
+                                                               <f:then>
+                                                                       <bu:display.sysLanguage uids="{compareUser.allowedLanguages}" />
+                                                               </f:then>
+                                                               <f:else>
+                                                                       -
+                                                               </f:else>
+                                                       </f:if>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="dbMountPoints" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:if condition="{compareUser.dbMountPoints}">
+                                                               <f:then>
+                                                                       <bu:display.pages uids="{compareUser.dbMountPoints}" />
+                                                               </f:then>
+                                                               <f:else>
+                                                                       -
+                                                               </f:else>
+                                                       </f:if>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="fileMounts" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:if condition="{compareUser.fileMountPoints}">
+                                                               <f:then>
+                                                                       <bu:display.sysFileMounts uids="{compareUser.fileMountPoints}" />
+                                                               </f:then>
+                                                               <f:else>
+                                                                       -
+                                                               </f:else>
+                                                       </f:if>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                               <tr>
+                                       <th><f:translate key="disableIpLock" /></th>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <td>
+                                                       <f:if condition="{compareUser.ipLockIsDisabled} == 1">
+                                                               <f:then><f:translate key="yes" /></f:then>
+                                                               <f:else><f:translate key="no" /></f:else>
+                                                       </f:if>
+                                               </td>
+                                       </f:for>
+                               </tr>
+                       </tbody>
+               </table>
+       </div>
 </f:section>
index ffce70c..5879767 100644 (file)
 </f:section>
 
 <f:section name="content">
+
        <f:comment>
                Listing of users on compare list
        </f:comment>
-
        <f:if condition="{compareUserList}">
-               <bu:section title="{f:translate(key: 'section.compare', default: 'Compare')}" collapsible="TRUE">
-                       <ul id="compareUsers">
-                               <f:for each="{compareUserList}" as="compareUser">
-                                       <li>
-                                               <f:link.action action="removeFromCompareList"   arguments="{uid: compareUser.uid}">
-                                                       <bu:SpriteManagerIcon iconName="actions-selection-delete" />
-                                               </f:link.action>
-
-                                               <a href="#" class="t3-js-clickmenutrigger" data-table="be_users" data-uid="{compareUser.uid}" data-listframe="1" title="id={compareUser.uid}">
-                                                       <bu:spriteIconForRecord table="be_users" object="{compareUser}" />
-                                               </a>
-
-                                               {compareUser.userName}
-                                       </li>
-                               </f:for>
-                       </ul>
-
-                       <f:form action="compare">
-                               <f:form.submit value="{f:translate(key: 'compareUserList', default: 'Compare user list')}" />
-                       </f:form>
-
-               </bu:section>
+               <h3>{f:translate(key: 'section.compare', default: 'Compare')}</h3>
+               <div class="table-fit">
+                       <table class="table table-hover">
+                               <tbody>
+                                       <f:for each="{compareUserList}" as="compareUser">
+                                               <tr>
+                                                       <td class="col-icon">
+                                                               <a href="#" class="t3-js-clickmenutrigger" data-table="be_users" data-uid="{compareUser.uid}" data-listframe="1" title="id={compareUser.uid}">
+                                                                       <bu:spriteIconForRecord table="be_users" object="{compareUser}" />
+                                                               </a>
+                                                       </td>
+                                                       <td class="col-title">
+                                                               {compareUser.userName}
+                                                       </td>
+                                                       <td>
+                                                               <f:link.action action="removeFromCompareList" arguments="{uid: compareUser.uid}" class="pull-right">
+                                                                       <bu:SpriteManagerIcon iconName="actions-selection-delete" />
+                                                               </f:link.action>
+                                                       </td>
+                                               </tr>
+                                       </f:for>
+                               </tbody>
+                       </table>
+               </div>
+               <f:form action="compare">
+                       <f:form.submit value="{f:translate(key: 'compareUserList', default: 'Compare user list')}" class="btn btn-default" />
+               </f:form>
+               <hr>
        </f:if>
 
        <f:comment>
                Filter section
        </f:comment>
-
        <f:render partial="Filters/BackendUser/Index" arguments="{demand: demand, backendUserGroups: backendUserGroups}" />
 
        <f:comment>
                Listing of all users
        </f:comment>
-
-       <f:be.widget.paginate objects="{backendUsers}" as="paginatedBackendUsers" configuration="{itemsPerPage: 50, insertAbove: 1, insertBelow: 1}">
+       <f:be.widget.paginate objects="{backendUsers}" as="paginatedBackendUsers" configuration="{itemsPerPage: 50, insertBelow: 1}">
                <div class="table-fit">
                        <table class="table table-striped table-hover">
                                <thead>
@@ -77,4 +81,5 @@
                        </table>
                </div>
        </f:be.widget.paginate>
+
 </f:section>
index 5d75ee0..3ad4041 100644 (file)
 </f:section>
 
 <f:section name="content">
-       <table class="table table-striped table-hover">
-               <thead>
-                       <tr>
-                               <th><f:translate key="userName" /> / <f:translate key="realName" /></th>
-                               <th><f:translate key="lastAccess" /></th>
-                               <th><f:translate key="ipAddress" /></th>
-                               <th>&nbsp;</th>
-                       </tr>
-               </thead>
-               <tbody>
-                       <f:for each="{onlineUsersAndSessions}" as="onlineUser">
-                               <f:render partial="BackendUser/OnlineListRow" arguments="{onlineUser: onlineUser, dateFormat: dateFormat, timeFormat: timeFormat, currentSessionId: currentSessionId}" />
-                       </f:for>
-               </tbody>
-       </table>
+       <div class="table-fit">
+               <table class="table table-striped table-hover">
+                       <thead>
+                               <tr>
+                                       <th class="col-icon"></th>
+                                       <th class="col-title"><f:translate key="userName" /> / <f:translate key="realName" /></th>
+                                       <th><f:translate key="lastAccess" /></th>
+                                       <th><f:translate key="ipAddress" /></th>
+                                       <th class="col-control"></th>
+                               </tr>
+                       </thead>
+                       <tbody>
+                               <f:for each="{onlineUsersAndSessions}" as="onlineUser">
+                                       <f:render partial="BackendUser/OnlineListRow" arguments="{onlineUser: onlineUser, dateFormat: dateFormat, timeFormat: timeFormat, currentSessionId: currentSessionId}" />
+                               </f:for>
+                       </tbody>
+               </table>
+       </div>
 </f:section>
index d03f20b..6d7f7fc 100644 (file)
 
 <f:section name="content">
        <f:form action="update" name="editform">
-               <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></h3>
+
+               <div class="form-group">
+                       <label><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></label>
+                       <f:form.select name="data[pages][{id}][perms_userid]" options="{beUserData}" value="{currentBeUser}" class="form-control" />
+               </div>
+
                <div class="form-group">
-                       <f:form.select name="data[pages][{id}][perms_userid]" options="{beUserData}" value="{currentBeUser}" />
+                       <label><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></label>
+                       <f:if condition="{f:count(subject:beGroupData)} > 1">
+                               <f:then>
+                                       <f:form.select name="data[pages][{id}][perms_groupid]" options="{beGroupData}" value="{currentBeGroup}" class="form-control" />
+                               </f:then>
+                               <f:else>
+                                       <div class="alert alert-notice"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:noGroups" /></div>
+                               </f:else>
+                       </f:if>
                </div>
 
-               <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></h3>
-               <f:if condition="{f:count(subject:beGroupData)} > 1">
-                       <f:then>
-                               <div class="form-group">
-                                       <f:form.select name="data[pages][{id}][perms_groupid]" options="{beGroupData}" value="{currentBeGroup}" />
-                               </div>
-                       </f:then>
-                       <f:else>
-                               <div class="alert alert-notice"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:noGroups" /></div>
-                       </f:else>
-               </f:if>
+               <div class="panel panel-default panel-space">
+                       <div class="table-fit">
+                               <table class="table table-striped table-hover" id="typo3-permissionMatrix">
+                                       <thead>
+                                               <tr>
+                                                       <th></th>
+                                                       <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></th>
+                                                       <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></th>
+                                                       <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></th>
+                                                       <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></th>
+                                                       <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></th>
+                                               </tr>
+                                       </thead>
+                                       <tbody>
+                                               <tr>
+                                                       <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></strong></td>
+                                                       <td><input type="checkbox" name="check[perms_user][1]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_user][5]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_user][2]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_user][3]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_user][4]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
+                                               </tr>
+                                               <tr>
+                                                       <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></strong></td>
+                                                       <td><input type="checkbox" name="check[perms_group][1]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_group][5]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_group][2]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_group][3]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_group][4]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
+                                               </tr>
+                                               <tr>
+                                                       <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></strong></td>
+                                                       <td><input type="checkbox" name="check[perms_everybody][1]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_everybody][5]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_everybody][2]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_everybody][3]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
+                                                       <td><input type="checkbox" name="check[perms_everybody][4]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
+                                               </tr>
+                                       </tbody>
+                               </table>
+                       </div>
+               </div>
+
+               <div class="form-group">
+                       <f:form.select name="mirror[pages][{id}]" options="{recursiveSelectOptions}" class="form-control" />
+               </div>
 
+               <f:form.submit class="btn btn-default" name="submit" value="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Save')}" />
+               <f:link.action class="btn btn-default" action="index" arguments="{id: id}"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Abort" /></f:link.action>
 
-               <table class="table table-striped table-hover" id="typo3-permissionMatrix">
-                       <thead>
-                       <tr>
-                               <th></th>
-                               <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></th>
-                               <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:16" /></th>
-                               <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:2" /></th>
-                               <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:4" /></th>
-                               <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:8" /></th>
-                       </tr>
-                       </thead>
-                       <tbody>
-                       <tr>
-                               <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></strong></td>
-                               <td><input type="checkbox" name="check[perms_user][1]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
-                               <td><input type="checkbox" name="check[perms_user][5]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
-                               <td><input type="checkbox" name="check[perms_user][2]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
-                               <td><input type="checkbox" name="check[perms_user][3]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
-                               <td><input type="checkbox" name="check[perms_user][4]" onclick="TYPO3.Permissions.checkChange('check[perms_user]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_user]')" /></td>
-                       </tr>
-                       <tr>
-                               <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></strong></td>
-                               <td><input type="checkbox" name="check[perms_group][1]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
-                               <td><input type="checkbox" name="check[perms_group][5]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
-                               <td><input type="checkbox" name="check[perms_group][2]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
-                               <td><input type="checkbox" name="check[perms_group][3]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
-                               <td><input type="checkbox" name="check[perms_group][4]" onclick="TYPO3.Permissions.checkChange('check[perms_group]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_group]')" /></td>
-                       </tr>
-                       <tr>
-                               <td><strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></strong></td>
-                               <td><input type="checkbox" name="check[perms_everybody][1]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
-                               <td><input type="checkbox" name="check[perms_everybody][5]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
-                               <td><input type="checkbox" name="check[perms_everybody][2]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
-                               <td><input type="checkbox" name="check[perms_everybody][3]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
-                               <td><input type="checkbox" name="check[perms_everybody][4]" onclick="TYPO3.Permissions.checkChange('check[perms_everybody]', 'tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]')" /></td>
-                       </tr>
-                       </tbody>
-               </table>
                <f:form.hidden name="data[pages][{id}][perms_user]" value="{pageInfo.perms_user}" />
                <f:form.hidden name="data[pages][{id}][perms_group]" value="{pageInfo.perms_group}" />
                <f:form.hidden name="data[pages][{id}][perms_everybody]" value="{pageInfo.perms_everybody}" />
-
-               <f:form.select name="mirror[pages][{id}]" options="{recursiveSelectOptions}" />
-
-               <br/><br/>
-
                <f:form.hidden name="depth" value="{depth}" />
-               <f:form.submit name="submit" value="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Save')}" />
-               <f:link.action class="btn btn-default" action="index" arguments="{id: id}"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Abort" /></f:link.action>
-
                <f:form.hidden name="redirect" value="{f:uri.action(action: 'index', arguments: {lastEdited: id, id: returnId})}" />
+
        </f:form>
 
+       <hr>
        <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" /></h3>
        <p>
                <strong><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1" /></strong>: <f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:1_t" /> <br />
                        Permissions.setCheck("check[perms_everybody]", "tx_beuser_system_beusertxpermission[data][pages][{id}][perms_everybody]");
                });
        </script>
+
 </f:section>
index 5370bcf..0b829de 100644 (file)
 </f:section>
 
 <f:section name="content">
+
        <div class="form-group">
                <label for="depth"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Depth" />:</label>
-               <f:form.select id="depth" value="{depth}" options="{depthOptions}" additionalAttributes="{onchange: 'jumpToUrl(\'{depthBaseUrl}\'.replace(\'__DEPTH__\', this.options[this.selectedIndex].value), this);'}" />
+               <f:form.select class="form-control" id="depth" value="{depth}" options="{depthOptions}" additionalAttributes="{onchange: 'jumpToUrl(\'{depthBaseUrl}\'.replace(\'__DEPTH__\', this.options[this.selectedIndex].value), this);'}" />
        </div>
 
-       <div class="table-fit">
-               <table class="table table-striped table-hover" id="typo3-permissionList">
-                       <thead>
-                       <tr>
-                               <th colspan="2">&nbsp;</th>
-                               <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></th>
-                               <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></th>
-                               <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></th>
-                               <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock" /></th>
-                       </tr>
-                       </thead>
-                       <f:for each="{viewTree}" as="data">
+       <div class="panel panel-default panel-space">
+               <div class="table-fit">
+                       <table class="table table-striped table-hover" id="typo3-permissionList">
+                               <thead>
                                <tr>
-                                       <f:if condition="{data.cellAttrib}">
-                                               <f:then>
-                                                       <td align="left" nowrap="nowrap" {data.cellAttrib}>
-                                                               <f:format.raw>{data.html}</f:format.raw>
-                                                       </td>
-                                               </f:then>
-                                               <f:else>
-                                                       <td align="left" nowrap="nowrap" {data.groupName}>
-                                                               <f:format.raw>{data.html}</f:format.raw>
-                                                       </td>
-                                               </f:else>
-                                       </f:if>
-                                       <f:if condition="{data.editPermsAllowed}">
-                                               <f:then>
-                                                       <td>
-                                                               <f:if condition="{data.id} > 0">
-                                                                       <f:link.action action="edit" arguments="{id: data.id, depth: depth}" title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}">
-                                                                               <bu:spriteManagerIcon iconName="actions-document-open" />
-                                                                       </f:link.action>
-                                                               </f:if>
-                                                       </td>
-                                               </f:then>
-                                               <f:else>
-                                                       <td></td>
-                                               </f:else>
-                                       </f:if>
-                                       <td nowrap="nowrap"><f:format.raw>{data.userPermissions}</f:format.raw></td>
-                                       <td nowrap="nowrap"><f:format.raw>{data.groupPermissions}</f:format.raw></td>
-                                       <td nowrap="nowrap"><f:format.raw>{data.otherPermissions}</f:format.raw></td>
-                                       <td nowrap="nowrap">
-                                       <f:if condition="{data.id} > 0">
-                                               <span id="el_{data.id}">
-                                                       <f:if condition="{data.editLock}">
-                                                               <f:then>
-                                                                       <a class="editlock" data-page="{data.pageId}" data-lockstate="1" title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr')}">
-                                                                               <bu:spriteManagerIcon iconName="status-warning-lock" />
-                                                                       </a>
-                                                               </f:then>
-                                                               <f:else>
-                                                                       <a class="editlock" data-page="{data.pageId}" data-lockstate="0" title="Enable the &raquo;Admin-only&laquo; edit lock for this page">
-                                                                               [+]
-                                                                       </a>
-                                                               </f:else>
-                                                       </f:if>
-                                               </span>
-                                       </f:if>
+                                       <th colspan="2">&nbsp;</th>
+                                       <th><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Owner" /></th>
+                                       <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Group" /></th>
+                                       <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Everybody" /></th>
+                                       <th align="center"><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock" /></th>
                                </tr>
-                       </f:for>
-               </table>
+                               </thead>
+                               <f:for each="{viewTree}" as="data">
+                                       <tr>
+                                               <f:if condition="{data.cellAttrib}">
+                                                       <f:then>
+                                                               <td align="left" nowrap="nowrap" {data.cellAttrib}>
+                                                                       <f:format.raw>{data.html}</f:format.raw>
+                                                               </td>
+                                                       </f:then>
+                                                       <f:else>
+                                                               <td align="left" nowrap="nowrap" {data.groupName}>
+                                                                       <f:format.raw>{data.html}</f:format.raw>
+                                                               </td>
+                                                       </f:else>
+                                               </f:if>
+                                               <f:if condition="{data.editPermsAllowed}">
+                                                       <f:then>
+                                                               <td>
+                                                                       <f:if condition="{data.id} > 0">
+                                                                               <f:link.action action="edit" arguments="{id: data.id, depth: depth}" title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:ch_permissions')}">
+                                                                                       <bu:spriteManagerIcon iconName="actions-document-open" />
+                                                                               </f:link.action>
+                                                                       </f:if>
+                                                               </td>
+                                                       </f:then>
+                                                       <f:else>
+                                                               <td></td>
+                                                       </f:else>
+                                               </f:if>
+                                               <td nowrap="nowrap"><f:format.raw>{data.userPermissions}</f:format.raw></td>
+                                               <td nowrap="nowrap"><f:format.raw>{data.groupPermissions}</f:format.raw></td>
+                                               <td nowrap="nowrap"><f:format.raw>{data.otherPermissions}</f:format.raw></td>
+                                               <td nowrap="nowrap">
+                                               <f:if condition="{data.id} > 0">
+                                                       <span id="el_{data.id}">
+                                                               <f:if condition="{data.editLock}">
+                                                                       <f:then>
+                                                                               <a class="editlock" data-page="{data.pageId}" data-lockstate="1" title="{f:translate(key: 'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:EditLock_descr')}">
+                                                                                       <bu:spriteManagerIcon iconName="status-warning-lock" />
+                                                                               </a>
+                                                                       </f:then>
+                                                                       <f:else>
+                                                                               <a class="editlock" data-page="{data.pageId}" data-lockstate="0" title="Enable the &raquo;Admin-only&laquo; edit lock for this page">
+                                                                                       [+]
+                                                                               </a>
+                                                                       </f:else>
+                                                               </f:if>
+                                                       </span>
+                                               </f:if>
+                                       </tr>
+                               </f:for>
+                       </table>
+               </div>
        </div>
 
-       <br />
        <f:format.raw>{cshItem}</f:format.raw>
 
        <h3><f:translate key="LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:Legend" />:</h3>
-       <div class="legend">
+       <div class="beuser-legend">
                <table>
                        <tr>
                                <td nowrap="nowrap" class="edge"><span><span></span></span></td>
diff --git a/typo3/sysext/beuser/Resources/Public/Css/style.css b/typo3/sysext/beuser/Resources/Public/Css/style.css
deleted file mode 100755 (executable)
index 3f090d4..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * @group: Structure
- */
-
-#compareUsers { margin-bottom: 10px; list-style-type: none; padding-left: 0.1em; }
-
-div.collapsibleSection { background-color: #ededed; border-top: 1px solid #cdcdcd; border-bottom: 1px solid #cdcdcd; padding: 12px; margin-bottom: 24px; }
-       #typo3-docbody div.collapsibleSection form { margin-bottom: 0; }
-
-#tx_beuser_compare td { min-width: 170px; }
-
-/**
- * @end
- */
-
-/**
- * @group: Form
- */
-
-       form .field-row,
-       form .button-row { clear: both; margin-bottom: 10px; }
-       form .indent { margin-left: 100px; }
-
-/**
- * @end
- */
-.legend .pull-left {
-    margin-right: 0.5em;
-}
-
-.legend td {
-    overflow:hidden;
-}
-
-.legend span.t3-icon {
-    margin-right: 0;
-}
-
-.number {
-       border: 1px solid #000000;
-       border-radius: 2px;
-       width: 16px;
-       height: 16px;
-       display: inline-block;
-       text-align: center;
-       margin-right: 5px;
-       margin-left: 10px;
-       line-height: 14px;
-       font-weight: bold;
-}
-
-.edge span {
-       width: 1px;
-       height: 10px;
-       background: #000000;
-       display: block;
-       margin-top: 8px;
-       margin-left: 6px;
-}
-.edge span span {
-       width: 10px;
-       height: 1px;
-       background: #000000;
-       display: block;
-       margin-left: 1px;
-}
-.hr span {
-       width: 20px;
-       height: 1px;
-       background: #000000;
-       display: block;
-       margin-top: -1px;
-       margin-left: -4px;
-}
-.vr span {
-       width: 1px;
-       height: 20px;
-       background: #000000;
-       margin-top: -2px;
-       margin-left: 6px;
-       display: block;
-}
index 8580ab7..c45ed9a 100644 (file)
@@ -189,7 +189,6 @@ table {
 //
 // Fits the table in the viewport and makes overflow possible
 //
-
 .table-fit {
        width: 100%;
        margin-bottom: 1.5em;
@@ -203,13 +202,32 @@ table {
                margin-top: 0;
                margin-bottom: 0;
                border: 0;
-
-               > thead,
-               > tbody,
-               > tfoot {
-                       > tr > td {
+               tbody:first-child {
+                       tr:first-child {
+                               th,
+                               td {
+                                       border-top: 0;
+                               }
+                       }
+               }
+               tr {
+                       > td {
                                white-space: nowrap;
                        }
+                       > th:first-child,
+                       > td:first-child {
+                               border-left: 0;
+                       }
+                       > th:last-child,
+                       > td:last-child {
+                               border-right: 0;
+                       }
+                       &:last-child {
+                               th,
+                               td {
+                                       border-bottom: 0;
+                               }
+                       }
                }
        }
 }
index bcc1c29..2e1d531 100644 (file)
@@ -79,3 +79,17 @@ a.typo3-goBack {
 .t3-tceforms-input-wrapper-datetime .t3-clearable-wrapper .t3-input-clearer {
        top: 10px;
 }
+
+//
+// Form Inline adjustments
+//
+.form-inline-spaced {
+       margin: 0 -0.5em @line-height-computed;
+       .form-group {
+               margin: 0.5em;
+               margin-bottom: 0;
+               label {
+                       margin-right: 0.5em;
+               }
+       }
+}
\ No newline at end of file
diff --git a/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_module_beuser.less b/typo3/sysext/t3skin/Resources/Private/Styles/TYPO3/_module_beuser.less
new file mode 100644 (file)
index 0000000..42673c0
--- /dev/null
@@ -0,0 +1,58 @@
+//
+// Legend
+//
+.beuser-legend {
+       margin-bottom: 18px;
+       .pull-left {
+               margin-right: 0.5em;
+       }
+       td {
+               overflow:hidden;
+       }
+       .t3-icon {
+           margin-right: 0;
+       }
+       .number {
+               border: 1px solid #000000;
+               border-radius: 2px;
+               width: 16px;
+               height: 16px;
+               display: inline-block;
+               text-align: center;
+               margin-right: 5px;
+               margin-left: 10px;
+               line-height: 14px;
+               font-weight: bold;
+       }
+       .edge span {
+               width: 1px;
+               height: 10px;
+               background: #000000;
+               display: block;
+               margin-top: 8px;
+               margin-left: 6px;
+       }
+       .edge span span {
+               width: 10px;
+               height: 1px;
+               background: #000000;
+               display: block;
+               margin-left: 1px;
+       }
+       .hr span {
+               width: 20px;
+               height: 1px;
+               background: #000000;
+               display: block;
+               margin-top: -1px;
+               margin-left: -4px;
+       }
+       .vr span {
+               width: 1px;
+               height: 20px;
+               background: #000000;
+               margin-top: -2px;
+               margin-left: 6px;
+               display: block;
+       }
+}
index ea98013..765722f 100644 (file)
 @import "TYPO3/_module_web_list_sysnote.less";
 @import "TYPO3/_module_web_new_element.less";
 @import "TYPO3/_module_extensionmanager.less";
+@import "TYPO3/_module_beuser.less";
 
 @import "TYPO3/structure/_element_move_element.less";
 @import "TYPO3/structure/_element_version.less";
index 2dc2d9e..5382124 100644 (file)
@@ -8843,11 +8843,25 @@ fieldset[disabled] .table .btn-checkbox-holder input[type=checkbox]:checked + .b
   margin-bottom: 0;
   border: 0;
 }
-.table-fit > .table > thead > tr > td,
-.table-fit > .table > tbody > tr > td,
-.table-fit > .table > tfoot > tr > td {
+.table-fit > .table tbody:first-child tr:first-child th,
+.table-fit > .table tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+.table-fit > .table tr > td {
   white-space: nowrap;
 }
+.table-fit > .table tr > th:first-child,
+.table-fit > .table tr > td:first-child {
+  border-left: 0;
+}
+.table-fit > .table tr > th:last-child,
+.table-fit > .table tr > td:last-child {
+  border-right: 0;
+}
+.table-fit > .table tr:last-child th,
+.table-fit > .table tr:last-child td {
+  border-bottom: 0;
+}
 .panel {
   margin: 3em 0;
 }
@@ -10228,6 +10242,16 @@ a.typo3-goBack {
 .t3-tceforms-input-wrapper-datetime .t3-clearable-wrapper .t3-input-clearer {
   top: 10px;
 }
+.form-inline-spaced {
+  margin: 0 -0.5em 18px;
+}
+.form-inline-spaced .form-group {
+  margin: 0.5em;
+  margin-bottom: 0;
+}
+.form-inline-spaced .form-group label {
+  margin-right: 0.5em;
+}
 body#typo3-backend-php {
   margin: 0;
   padding: 0;
@@ -11462,6 +11486,61 @@ span.ter-ext-state {
   right: 3px;
   top: 4px;
 }
+.beuser-legend {
+  margin-bottom: 18px;
+}
+.beuser-legend .pull-left {
+  margin-right: 0.5em;
+}
+.beuser-legend td {
+  overflow: hidden;
+}
+.beuser-legend .t3-icon {
+  margin-right: 0;
+}
+.beuser-legend .number {
+  border: 1px solid #000000;
+  border-radius: 2px;
+  width: 16px;
+  height: 16px;
+  display: inline-block;
+  text-align: center;
+  margin-right: 5px;
+  margin-left: 10px;
+  line-height: 14px;
+  font-weight: bold;
+}
+.beuser-legend .edge span {
+  width: 1px;
+  height: 10px;
+  background: #000000;
+  display: block;
+  margin-top: 8px;
+  margin-left: 6px;
+}
+.beuser-legend .edge span span {
+  width: 10px;
+  height: 1px;
+  background: #000000;
+  display: block;
+  margin-left: 1px;
+}
+.beuser-legend .hr span {
+  width: 20px;
+  height: 1px;
+  background: #000000;
+  display: block;
+  margin-top: -1px;
+  margin-left: -4px;
+}
+.beuser-legend .vr span {
+  width: 1px;
+  height: 20px;
+  background: #000000;
+  margin-top: -2px;
+  margin-left: 6px;
+  display: block;
+}
 table#typo3-ttContentList {
   border: 1px solid #a2aab8;
   background-color: #fff;