[TASK] Pull BeUser>online sessions icons to right 97/34797/2
authorFelix Kopp <felix-source@phorax.com>
Sun, 30 Nov 2014 01:13:51 +0000 (02:13 +0100)
committerFrank Nägler <typo3@naegler.net>
Sun, 30 Nov 2014 15:02:27 +0000 (16:02 +0100)
Resolves: #63250
Releases: master
Change-Id: Ibe91e92f138adf25a880bbb10e37a3aefb18383a
Reviewed-on: http://review.typo3.org/34797
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Frank Nägler <typo3@naegler.net>
Tested-by: Frank Nägler <typo3@naegler.net>
typo3/sysext/beuser/Resources/Private/Partials/BackendUser/OnlineListRow.html
typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Online.html

index b0e22ff..1b8f24f 100644 (file)
@@ -8,38 +8,35 @@
                                        <b>{onlineUser.backendUser.userName}</b><br />
                                        {onlineUser.backendUser.realName}
                                </td>
-                               <td class="col-control">
-                                       <div class="btn-group" role="group">
-                                               <a class="btn" href="#" onclick="top.launchView('be_users', '{onlineUser.backendUser.uid}',''); return false;">
-                                                       <bu:SpriteManagerIcon iconName="actions-document-info" />
-                                               </a>
-                                       </div>
-                               </td>
                        </f:then>
                        <f:else>
-                               <td colspan="2"></td>
+                               <td></td>
                        </f:else>
                </f:if>
-
                <td>
                        <f:format.date format="{dateFormat} {timeFormat}" date="{session.timestamp}" />
                </td>
                <td>{session.ip}</td>
-               <td>
-                       <f:if condition="{currentSessionId} == {session.id}">
-                               <f:else>
-                                       <f:link.action
-                                               class="btn"
-                                               action="terminateBackendUserSession"
-                                               controller="BackendUser"
-                                               arguments="{backendUser: onlineUser.backendUser, sessionId: session.id}"
-                                               onclick="javascript:return confirm('{f:translate(key: \'reallyLogout\')} {onlineUser.backendUser.userName}?');"
-                                       >
-                                               <bu:spriteManagerIcon iconName="actions-document-close" />
-                                               <f:translate key="endSession" />
-                                       </f:link.action>
-                               </f:else>
-                       </f:if>
+               <td class="col-control">
+                       <div class="btn-group" role="group">
+                               <f:if condition="{currentSessionId} == {session.id}">
+                                       <f:else>
+                                               <f:link.action
+                                                       class="btn"
+                                                       action="terminateBackendUserSession"
+                                                       controller="BackendUser"
+                                                       arguments="{backendUser: onlineUser.backendUser, sessionId: session.id}"
+                                                       onclick="javascript:return confirm('{f:translate(key: \'reallyLogout\')} {onlineUser.backendUser.userName}?');"
+                                               >
+                                                       <bu:spriteManagerIcon iconName="actions-document-close" />
+                                                       <f:translate key="endSession" />
+                                               </f:link.action>
+                                       </f:else>
+                               </f:if>
+                               <a class="btn" href="#" onclick="top.launchView('be_users', '{onlineUser.backendUser.uid}',''); return false;">
+                                       <bu:SpriteManagerIcon iconName="actions-document-info" />
+                               </a>
+                       </div>
                </td>
        </tr>
 </f:for>
index 9adbe77..7a6c3a8 100644 (file)
@@ -14,7 +14,6 @@
                <thead>
                        <tr>
                                <th><f:translate key="userName" /> / <f:translate key="realName" /></th>
-                               <th>&nbsp;</th>
                                <th><f:translate key="lastAccess" /></th>
                                <th><f:translate key="ipAddress" /></th>
                                <th>&nbsp;</th>