mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-18 06:21:19 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeus

Browse Source 
* vsephpbb/ticket/11098:
  [ticket/11098] Fix error reporting on the autologin key pages
  [ticket/11098] Update subsilver2 to also include mark/unmark all buttons
  [ticket/11098] HTML Validity fix to Notifications in UCP
  [ticket/11098] Add mark/unmark all options to remember me keys
This commit is contained in:
Joas Schilling
2014-04-10 12:08:01 +02:00
parent 15dfa9bba2 80bc30214f
commit 377fb770fb
4 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/styles/prosilver/template/ucp_notifications.html
View File

@@ -11,11 +11,13 @@
<!-- IF MODE == 'notification_options' -->
<table class="table1">
<thead>
<th>{L_NOTIFICATION_TYPE}</th>
<!-- BEGIN notification_methods -->
<th class="mark">{notification_methods.NAME}</th>
<!-- END notification_methods -->
<th class="mark">{L_NOTIFICATIONS}</th>
<tr>
<th>{L_NOTIFICATION_TYPE}</th>
<!-- BEGIN notification_methods -->
<th class="mark">{notification_methods.NAME}</th>
<!-- END notification_methods -->
<th class="mark">{L_NOTIFICATIONS}</th>
</tr>
</thead>
<tbody>
<!-- BEGIN notification_types -->

62
phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
View File

@@ -5,47 +5,41 @@
<h2>{L_TITLE}</h2>
<div class="panel">
<div class="inner">
<!-- IF .errors -->
<p class="error">
<!-- BEGIN errors -->
{errors} <br />
<!-- END errors -->
</p>
<!-- ENDIF -->
<p>{L_PROFILE_AUTOLOGIN_KEYS}</p><br />
<table class="table1">
<thead>
<tr>
<th>{L_MARK}</th>
<th>{L_LOGIN_KEY}</th>
<th>{L_IP}</th>
<th>{L_LOGIN_TIME}</th>
</tr>
</thead>
<tbody>
<!-- BEGIN sessions -->
<!-- IF sessions.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
<td style="text-align: center"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}"/></td>
<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>
</tr>
<!-- BEGINELSE -->
<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr>
<!-- END sessions -->
</tbody>
</table>
<p>{L_PROFILE_AUTOLOGIN_KEYS}</p>
<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
<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>
</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>
</tr>
<!-- BEGINELSE -->
<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr>
<!-- END sessions -->
</tbody>
</table>
</div>
</div>
<!-- IF .sessions -->
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE}" class="button1" />
<fieldset class="display-actions">
{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE_MARKED}" class="button2" />
<div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div>
{S_FORM_TOKEN}
</fieldset>
<!-- ENDIF -->
</form>
<!-- INCLUDE ucp_footer.html -->