diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-13 20:02:38 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-13 20:02:38 -0500 |
| commit | cb937841269017d13058208378e4c9ad79718c6e (patch) | |
| tree | a06976422960e53a5e5f76a95583780349ce57f1 /phpBB/styles | |
| parent | 441e389123e4701c7166765cca617f3bc305e0ba (diff) | |
| download | forums-cb937841269017d13058208378e4c9ad79718c6e.tar forums-cb937841269017d13058208378e4c9ad79718c6e.tar.gz forums-cb937841269017d13058208378e4c9ad79718c6e.tar.bz2 forums-cb937841269017d13058208378e4c9ad79718c6e.tar.xz forums-cb937841269017d13058208378e4c9ad79718c6e.zip | |
[ticket/11103] UCP Notification List
PHPBB3-11103
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_notifications.html | 122 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 4 |
3 files changed, 94 insertions, 34 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 2f789f3f2c..e00ad555ff 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -133,7 +133,7 @@ <!-- IF S_NOTIFICATIONS_DISPLAY --> <li> [ <a href="#" id="notification_list_button" title="{NOTIFICATIONS_COUNT}">{NOTIFICATIONS_COUNT}</a> ] • - <div id="notification_list"> + <div id="notification_list" class="notification_list"> <ul class="topiclist forums"> <!-- BEGIN notifications --> <li class="row<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->"> diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 531ffd3e6a..3ee58a278e 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -2,45 +2,105 @@ <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}> -<h2>{L_UCP_NOTIFICATION_OPTIONS}</h2> +<h2>{TITLE}</h2> <div class="panel"> <div class="inner"> - <p>{L_UCP_NOTIFICATION_OPTIONS_EXPLAIN}</p> - - <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 --> - <li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> - <dl> - <dt> - {notification_types.NAME} - </dt> - <!-- 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> - <!-- END notification_methods --> - <dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd> - </dl> - </li> - <!-- END notification_types --> - - </ul> + <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 --> + <li class="row<!-- IF notification_types.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->"> + <dl> + <dt> + {notification_types.NAME} + </dt> + <!-- 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> + <!-- END notification_methods --> + <dd class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /> <dfn>{notification_methods.NAME}</dfn></dd> + </dl> + </li> + <!-- END notification_types --> + </ul> + <!-- ELSE --> + <!-- IF .pagination or TOTAL_COUNT --> + <div class="topic-actions"> + <div class="pagination"> + <!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a> • <!-- ENDIF --> + <!-- IF TOTAL_COUNT -->{TOTAL_COUNT} • <!-- ENDIF --> + <!-- IF .pagination --> + <!-- INCLUDE pagination.html --> + <!-- ELSE --> + {PAGE_NUMBER} + <!-- ENDIF --> + </div> + </div> + <!-- ENDIF --> + + <ul class="topiclist"> + <li class="header"> + <dl> + <dt>{L_NOTIFICATIONS}</dt> + <dd class="mark">{L_MARK_READ}</dd> + </dl> + </li> + </ul> + + <div class="notification_list"> + <ul class="topiclist cplist"> + <!-- BEGIN notification_list --> + <li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->"> + <dl> + <dt> + <!-- IF notification_list.URL --><a href="{notification_list.URL}"><!-- ENDIF --> + {notification_list.AVATAR} + <div> + {notification_list.FORMATTED_TITLE}<br /> + {notification_list.TIME} + </div> + <!-- IF notification_list.URL --></a><!-- ENDIF --> + </dt> + <dd class="mark"><!-- IF notification_list.UNREAD --><input type="checkbox" name="mark[]" value="{notification_list.NOTIFICATION_ID}" /> <dfn>{L_MARK_READ}</dfn><!-- ENDIF --></dd> + </dl> + </li> + <!-- END notification_list --> + </ul> + </div> + + <!-- IF .pagination or TOTAL_COUNT --> + <div class="topic-actions"> + <div class="pagination"> + <!-- IF TOTAL_COUNT -->{TOTAL_COUNT} • <!-- ENDIF --> + <!-- IF .pagination --> + <!-- INCLUDE pagination.html --> + <!-- ELSE --> + {PAGE_NUMBER} + <!-- ENDIF --> + </div> + </div> + <!-- ENDIF --> + + <!-- ENDIF --> </div> </div> <fieldset class="submit-buttons"> + <input type="hidden" name="form_time" value="{FORM_TIME}" /> {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 1f5b45e006..3d8d640598 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -682,11 +682,11 @@ p.rules a { width: 310px; } -#notification_list ul li a { +.notification_list ul li a { text-decoration: none; } -#notification_list ul li img { +.notification_list ul li img { float: left; padding: 0 10px 10px 0; max-width: 50px; |