diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-05-12 18:56:34 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-05-12 18:56:34 -0500 |
| commit | bcf7ea33106ba99aee20d672eda3d58c95251f11 (patch) | |
| tree | 3a6f4b7fba8c07f91ad8b17bf1de2f30e13522e6 /phpBB/styles/prosilver | |
| parent | f93a750f28ca4ca502a880d44a45a72c340b6e38 (diff) | |
| parent | f17e67364dca55c9ccd8416f41547fa4097cdcd4 (diff) | |
| download | forums-bcf7ea33106ba99aee20d672eda3d58c95251f11.tar forums-bcf7ea33106ba99aee20d672eda3d58c95251f11.tar.gz forums-bcf7ea33106ba99aee20d672eda3d58c95251f11.tar.bz2 forums-bcf7ea33106ba99aee20d672eda3d58c95251f11.tar.xz forums-bcf7ea33106ba99aee20d672eda3d58c95251f11.zip | |
Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11533:
[ticket/11533] Update unit tests
[ticket/11533] Fix colspan and unnecessary tables
[ticket/11533] Change list to table for notification settings
[ticket/11533] Columns counter for notification settings
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_notifications.html | 59 |
1 files changed, 25 insertions, 34 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index df59c55e40..723609e460 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -9,44 +9,35 @@ <p>{TITLE_EXPLAIN}</p> <!-- IF MODE == 'notification_options' --> - <ul class="topiclist"> - <li class="header"> - <dl> - <dt>{L_NOTIFICATION_TYPE}</dt> - <!-- BEGIN notification_methods --> - <dd class="mark">{notification_methods.NAME}</dd> - <!-- END notification_methods --> - <dd class="mark">{L_NOTIFICATIONS}</dd> - </dl> - </li> - </ul> - <ul class="topiclist cplist"> - - <!-- BEGIN notification_types --> - <!-- IF notification_types.GROUP_NAME --> - <li class="row bg3"> - <dl> - <dt> - {notification_types.GROUP_NAME} - </dt> - </dl> - </li> - <!-- ELSE --> - <li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> - <dl> - <dt> + <table class="table1" cellspacing="1"> + <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> + </thead> + <tbody> + <!-- BEGIN notification_types --> + <!-- IF notification_types.GROUP_NAME --> + <tr class="bg3"> + <td colspan="{NOTIFICATION_TYPES_COLS}">{notification_types.GROUP_NAME}</td> + </tr> + <!-- ELSE --> + <tr class="<!-- IF notification_types.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->"> + <td> {notification_types.NAME} <!-- IF notification_types.EXPLAIN --><br /> {notification_types.EXPLAIN}<!-- ENDIF --> - </dt> + </td> <!-- BEGIN notification_methods --> - <dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd> + <td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td> <!-- END notification_methods --> - <dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{L_NOTIFICATIONS}</dfn></dd> - </dl> - </li> - <!-- ENDIF --> - <!-- END notification_types --> - </ul> + <td class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td> + </tr> + <!-- ENDIF --> + <!-- END notification_types --> + </tbody> + </table> <!-- ELSE --> <!-- IF .notification_list --> <!-- IF .pagination or TOTAL_COUNT --> |