makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
	phpBB/styles/subsilver2/theme/stylesheet.css
This commit is contained in:
Marc Alexander 2015-03-05 14:23:50 +01:00
commit 87ca5ef7e5
4 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/styles/prosilver/template/mcp_logs.html
View file

@ -22,10 +22,10 @@
<table class="table1">
<thead>
<tr>
<th>{L_USERNAME}</th>
<th style="text-align: center">{L_IP}</th>
<th style="text-align: center">{L_TIME}</th>
<th>{L_ACTION}</th>
<th class="name">{L_USERNAME}</th>
<th class="center">{L_IP}</th>
<th class="center">{L_TIME}</th>
<th class="name">{L_ACTION}</th>
<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
</tr>
</thead>
@ -34,8 +34,8 @@
<!-- BEGIN log -->
<!-- IF log.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
<td>{log.USERNAME}</td>
<td style="text-align: center">{log.IP}</td>
<td style="text-align: center">{log.DATE}</td>
<td class="center">{log.IP}</td>
<td class="center">{log.DATE}</td>
<td>{log.ACTION}<br />
{log.DATA}
</td>

12
phpBB/styles/prosilver/template/mcp_notes_user.html
View file

@ -65,9 +65,9 @@
<table class="table1">
<thead>
<tr>
<th>{L_REPORT_BY}</th>
<th style="text-align: center">{L_IP}</th>
<th style="text-align: center">{L_TIME}</th>
<th class="name reportby">{L_REPORT_BY}</th>
<th class="center">{L_IP}</th>
<th class="center">{L_TIME}</th>
<th>{L_ACTION_NOTE}</th>
<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
</tr>
@ -76,11 +76,11 @@
<!-- BEGIN usernotes -->
<!-- IF usernotes.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
<td>{usernotes.REPORT_BY}</td>
<td style="text-align: center">{usernotes.IP}</td>
<td style="text-align: center">{usernotes.REPORT_AT}</td>
<td class="center">{usernotes.IP}</td>
<td class="center">{usernotes.REPORT_AT}</td>
<td>{usernotes.ACTION}</td>
<!-- IF S_CLEAR_ALLOWED --><td style="width: 5%; text-align: center;"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
<!-- IF S_CLEAR_ALLOWED --><td class="center" style="width: 5%;"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
</tr>
<!-- BEGINELSE -->
<tr>

14
phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
View file

@ -10,19 +10,19 @@
<table class="table1">
<thead>
<tr>
<th>{L_LOGIN_KEY}</th>
<th>{L_IP}</th>
<th>{L_LOGIN_TIME}</th>
<th class="mark">{L_MARK}</th>
<th class="name">{L_LOGIN_KEY}</th>
<th class="center">{L_IP}</th>
<th class="center">{L_LOGIN_TIME}</th>
<th class="center mark">{L_MARK}</th>
</tr>
</thead>
<tbody>
<!-- BEGIN sessions -->
<!-- IF sessions.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
<td><label for="{sessions.KEY}">{sessions.KEY}</label></td>
<td style="text-align: center">{sessions.IP}</td>
<td style="text-align: center">{sessions.LOGIN_TIME}</td>
<td style="text-align: center" class="mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}" /></td>
<td class="center">{sessions.IP}</td>
<td class="center">{sessions.LOGIN_TIME}</td>
<td class="center mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}" /></td>
</tr>
<!-- BEGINELSE -->
<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr>

2
phpBB/styles/prosilver/theme/common.css
View file

@ -671,6 +671,8 @@ table.table1 tbody th {
/* Specific column styles */
table.table1 .name { text-align: left; }
table.table1 .center { text-align: center; }
table.table1 .reportby { width: 15%; }
table.table1 .posts { text-align: center; width: 7%; }
table.table1 .joined { text-align: left; width: 15%; }
table.table1 .active { text-align: left; width: 15%; }