diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 12:08:01 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 12:08:01 +0200 |
| commit | 377fb770fb37f4fb797ab234e44c4d387d4f8a64 (patch) | |
| tree | 45ca821cdeb819cb5cb7347fc122f78cc91d0e61 /phpBB/styles/prosilver/template | |
| parent | 15dfa9bba2556e93c899e7266168bfe4fea9ed3b (diff) | |
| parent | 80bc30214f0d27813b04580a9ddd8243ddb3cfb0 (diff) | |
| download | forums-377fb770fb37f4fb797ab234e44c4d387d4f8a64.tar forums-377fb770fb37f4fb797ab234e44c4d387d4f8a64.tar.gz forums-377fb770fb37f4fb797ab234e44c4d387d4f8a64.tar.bz2 forums-377fb770fb37f4fb797ab234e44c4d387d4f8a64.tar.xz forums-377fb770fb37f4fb797ab234e44c4d387d4f8a64.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeus
* 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
Diffstat (limited to 'phpBB/styles/prosilver/template')
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_notifications.html | 12 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html | 62 |
2 files changed, 35 insertions, 39 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 2712e53034..b400a3c8b1 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -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 --> diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html index bf97434bac..6fec0b8aed 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html +++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html @@ -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> • <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 --> |