diff options
Diffstat (limited to 'phpBB/styles')
18 files changed, 319 insertions, 98 deletions
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 28656d47d3..1d70adc48d 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -106,6 +106,47 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, update_topic_links) { phpbb.closeDarkenWrapper(3000); }); +// This callback will mark all notifications read +phpbb.addAjaxCallback('notification.mark_all_read', function(res) { + if (typeof res.success !== 'undefined') { + phpbb.markNotifications($('#notification_list li.bg2'), 0); + phpbb.closeDarkenWrapper(3000); + } +}); + +// This callback will mark a notification read +phpbb.addAjaxCallback('notification.mark_read', function(res) { + if (typeof res.success !== 'undefined') { + var unreadCount = Number($('#notification_list_button strong').html()) - 1; + phpbb.markNotifications($(this).parent('li.bg2'), unreadCount); + } +}); + +/** + * Mark notification popup rows as read. + * + * @param {jQuery} el jQuery object(s) to mark read. + * @param {int} unreadCount The new unread notifications count. + */ +phpbb.markNotifications = function(el, unreadCount) { + // Remove the unread status. + el.removeClass('bg2'); + el.find('a.mark_read').remove(); + + // Update the notification link to the real URL. + el.each(function() { + var link = $(this).find('a'); + link.attr('href', link.attr('data-real-url')); + }); + + // Update the unread count. + $('#notification_list_button strong').html(unreadCount); + // Remove the Mark all read link if there are no unread notifications. + if (!unreadCount) { + $('#mark_all_notifications').remove(); + } +}; + // This callback finds the post from the delete link, and removes it. phpbb.addAjaxCallback('post_delete', function() { var el = $(this), diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index a45f750a63..495df2871d 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -747,7 +747,7 @@ function parse_document(container) /** * Hide empty responsive tables */ - container.find('table.responsive > tbody').each(function() { + container.find('table.responsive > tbody').not('.responsive-skip-empty').each(function() { var items = $(this).children('tr'); if (items.length == 0) { diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html index e3efe49943..51f496605e 100644 --- a/phpBB/styles/prosilver/template/mcp_header.html +++ b/phpBB/styles/prosilver/template/mcp_header.html @@ -39,7 +39,7 @@ </div> </div> - <div id="cp-main" class="mcp-main"> + <div id="cp-main" class="mcp-main panel-container"> <!-- IF MESSAGE --> <div class="content"> <h2>{L_MESSAGE}</h2> diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index f7d0269edb..662008b7fa 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -60,8 +60,8 @@ <!-- EVENT overall_footer_after --> -{$SCRIPTS} <!-- IF S_PLUPLOAD --><!-- INCLUDE plupload.html --><!-- ENDIF --> +{$SCRIPTS} </body> </html> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index e4e1b3443b..a89585d899 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -36,7 +36,6 @@ <!-- ENDIF --> <!-- IF S_PLUPLOAD --> - <link href="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> <link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> <!-- ENDIF --> @@ -107,7 +106,12 @@ <div class="dropdown-contents"> <div class="header"> {L_NOTIFICATIONS} - <span class="header_settings"><a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a></span> + <span class="header_settings"> + <a href="{U_NOTIFICATION_SETTINGS}">{L_SETTINGS}</a> + <!-- IF NOTIFICATIONS_COUNT --> + <span id="mark_all_notifications"> • <a href="{U_MARK_ALL_NOTIFICATIONS}" data-ajax="notification.mark_all_read">{L_MARK_ALL_READ}</a></span> + <!-- ENDIF --> + </span> </div> <ul> @@ -118,17 +122,18 @@ <!-- ENDIF --> <!-- BEGIN notifications --> <li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->"> - <!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF --> + <!-- IF notifications.URL --> + <a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}" data-real-url="{notifications.URL}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"> + <!-- ENDIF --> <!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --> <div class="notification_text"> <p>{notifications.FORMATTED_TITLE}</p> <p>» {notifications.TIME}</p> - - <!-- IF not notifications.URL and notifications.U_MARK_READ --> - <p><a href="{notifications.U_MARK_READ}">{L_MARK_READ}</a></p> - <!-- ENDIF --> </div> <!-- IF notifications.URL --></a><!-- ENDIF --> + <!-- IF notifications.UNREAD --> + <a href="{notifications.U_MARK_READ}" class="mark_read icon-mark" data-ajax="notification.mark_read" title="{L_MARK_READ}"></a> + <!-- ENDIF --> </li> <!-- END notifications --> </ul> diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html index 290992ddd6..21acae1c44 100644 --- a/phpBB/styles/prosilver/template/plupload.html +++ b/phpBB/styles/prosilver/template/plupload.html @@ -1,5 +1,3 @@ -<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.full.min.js?assets_version={T_ASSETS_VERSION}"></script> -<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js?assets_version={T_ASSETS_VERSION}"></script> <script type="text/javascript"> //<![CDATA[ phpbb.plupload = { @@ -37,7 +35,6 @@ phpbb.plupload = { 'Status': '{LA_PLUPLOAD_STATUS}', 'Stop Upload': '{LA_PLUPLOAD_STOP_UPLOAD}', 'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}', - 'Upload element accepts only %d file(s) at a time. Extra files were stripped.': '{LA_PLUPLOAD_ERR_UPLOAD_LIMIT}', "Upload URL might be wrong or doesn't exist.": '{LA_PLUPLOAD_ERR_UPLOAD_URL}', 'Uploaded %d/%d files': '{LA_PLUPLOAD_UPLOADED}', '%d files queued': '{LA_PLUPLOAD_FILES_QUEUED}', @@ -51,14 +48,22 @@ phpbb.plupload = { unique_names: true, filters: [{FILTERS}], {S_RESIZE} - headers: {'X-PHPBB-USING-PLUPLOAD': '1'}, + headers: {'X-PHPBB-USING-PLUPLOAD': '1', 'X-Requested-With': 'XMLHttpRequest'}, file_data_name: 'fileupload', multipart_params: {'add_file': '{LA_ADD_FILE}'}, - img_path: '{T_ASSETS_PATH}/plupload/jquery.plupload.queue/img', - element_hook: '#attach-panel .inner', - form_hook: '#postform' - } -}; + form_hook: '#postform', + browse_button: 'add_files', + drop_element : 'message', + }, + lang: { + ERROR: '{LA_ERROR}', + TOO_MANY_ATTACHMENTS: '{LA_TOO_MANY_ATTACHMENTS}', + }, + order: '{ATTACH_ORDER}', + maxFiles: {MAX_ATTACHMENTS}, + data: {S_ATTACH_DATA}, +} //]]> </script> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/plupload.js"></script> +<!-- INCLUDEJS {T_ASSETS_PATH}/plupload/plupload.full.min.js --> +<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/plupload.js --> diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html index fa9dd19c09..8a2004c29b 100644 --- a/phpBB/styles/prosilver/template/posting_attach_body.html +++ b/phpBB/styles/prosilver/template/posting_attach_body.html @@ -1,9 +1,9 @@ -<div class="panel bg3" id="attach-panel"> +<div class="panel bg3 panel-container" id="attach-panel"> <div class="inner"> - <p>{L_ADD_ATTACHMENT_EXPLAIN}</p> + <p>{L_ADD_ATTACHMENT_EXPLAIN} <span class="hidden" id="drag-n-drop-message">{L_PLUPLOAD_DRAG_TEXTAREA}</span></p> - <fieldset class="fields2"> + <fieldset class="fields2" id="attach-panel-basic"> <dl> <dt><label for="fileupload">{L_FILENAME}{L_COLON}</label></dt> <dd> @@ -17,5 +17,73 @@ </dl> </fieldset> + <div id="attach-panel-multi"> + <input type="button" class="button2" value="{L_PLUPLOAD_ADD_FILES}" id="add_files" /> + </div> + + <div class="panel<!-- IF not .attach_row --> hidden<!-- ENDIF -->" id="file-list-container"> + <div class="inner"> + <table class="table1 zebra-list"> + <thead> + <tr> + <th class="attach-name">{L_PLUPLOAD_FILENAME}</th> + <th class="attach-comment">{L_FILE_COMMENT}</th> + <th class="attach-filesize">{L_PLUPLOAD_SIZE}</th> + <th class="attach-status">{L_PLUPLOAD_STATUS}</th> + </tr> + </thead> + <tbody class="responsive-skip-empty" id="file-list"> + <tr class="attach-row" id="attach-row-tpl"> + <td class="attach-name"> + <dfn style="display: none;">{L_PLUPLOAD_FILENAME}</dfn> + <span class="file-name"></span> + <span class="attach-controls"> + <input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode" /> + <input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" /> + </span> + <span class="clear"></span> + </td> + <td class="attach-comment"> + <dfn style="display: none;">{L_FILE_COMMENT}</dfn> + <textarea rows="1" cols="30" class="inputbox"></textarea> + </td> + <td class="attach-filesize"> + <dfn style="display: none;">{L_PLUPLOAD_SIZE}</dfn> + <span class="file-size"></span> + </td> + <td class="attach-status"> + <dfn style="display: none;">{L_PLUPLOAD_STATUS}</dfn> + <span class="file-progress"> + <span class="file-progress-bar"></span> + </span> + <span class="file-status"></span> + </td> + </tr> + <!-- BEGIN attach_row --> + <tr class="attach-row" data-attach-id="{attach_row.ATTACH_ID}"> + <td class="attach-name"> + <span class="file-name"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span> + <span class="attach-controls"> + <!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" /> <!-- ENDIF --> + <input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" /> + </span> + <span class="clear"></span> + </td> + <td class="attach-comment"> + <textarea name="comment_list[{attach_row.ASSOC_INDEX}]" rows="1" cols="30" class="inputbox">{attach_row.FILE_COMMENT}</textarea> + {attach_row.S_HIDDEN} + </td> + <td class="attach-filesize"> + <span class="file-size">{attach_row.FILESIZE}</span> + </td> + <td class="attach-status"> + <span class="file-status file-uploaded"></span> + </td> + </tr> + <!-- END attach_row --> + </tbody> + </table> + </div> + </div> </div> </div> diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 5677b92fc3..2ae224bc3a 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -149,34 +149,6 @@ </div> <!-- ENDIF --> - <!-- IF S_HAS_ATTACHMENTS --> - <div class="panel bg2"> - <div class="inner"> - <h3>{L_POSTED_ATTACHMENTS}</h3> - - <fieldset class="fields2"> - - <!-- BEGIN attach_row --> - <dl> - - <dt><label for="comment_list_{attach_row.ASSOC_INDEX}">{L_FILE_COMMENT}{L_COLON}</label></dt> - <dd><textarea name="comment_list[{attach_row.ASSOC_INDEX}]" id="comment_list_{attach_row.ASSOC_INDEX}" rows="1" cols="35" class="inputbox">{attach_row.FILE_COMMENT}</textarea></dd> - <dd><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></dd> - <dd style="margin-top: 5px;"> - <!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" onclick="attach_inline({attach_row.ASSOC_INDEX}, '{attach_row.A_FILENAME}');" class="button2" /> <!-- ENDIF --> - <input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2" /> - </dd> - </dl> - {attach_row.S_HIDDEN} - <!-- IF not attach_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF --> - <!-- END attach_row --> - - </fieldset> - - </div> - </div> - <!-- ENDIF --> - <!-- IF not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 --> <div class="panel bg2"> <div class="inner"> @@ -198,7 +170,15 @@ <div id="tabs" class="sub-panels" data-show-panel="options-panel"> <ul> <li id="options-panel-tab" class="activetab"><a href="#tabs" data-subpanel="options-panel"><span>{L_OPTIONS}</span></a></li> - <!-- IF S_SHOW_ATTACH_BOX --><li id="attach-panel-tab"><a href="#tabs" data-subpanel="attach-panel"><span>{L_ADD_ATTACHMENT}</span></a></li><!-- ENDIF --> + <!-- IF S_SHOW_ATTACH_BOX --> + <li id="attach-panel-tab"> + <a href="#tabs" data-subpanel="attach-panel"> + <span> + {L_ATTACHMENTS} <strong id="file-total-progress"><strong id="file-total-progress-bar"></strong></strong> + </span> + </a> + </li> + <!-- ENDIF --> <!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" data-subpanel="poll-panel"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF --> </ul> </div> diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html index c5d58b8eaa..8ce2c54294 100644 --- a/phpBB/styles/prosilver/template/ucp_header.html +++ b/phpBB/styles/prosilver/template/ucp_header.html @@ -98,4 +98,4 @@ </div> - <div id="cp-main" class="ucp-main"> + <div id="cp-main" class="ucp-main panel-container"> diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index d5e98d6197..57d9a33c12 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -90,6 +90,13 @@ text-align: left; } +/* Bulletin icons for list items +----------------------------------------*/ +.rtl ul.linklist.bulletin li:before { + padding-left: 4px; + padding-right: 0; +} + /* Dropdown menu ---------------------------------------- */ .rtl .dropdown-container.topic-tools { @@ -198,8 +205,9 @@ /* Pagination in viewforum for multipage topics */ .rtl .row .pagination { + background-position: 100% 50%; float: left; - padding: 1px 0 1px 15px; + padding: 1px 15px 1px 0; } .rtl .pagination span { @@ -278,16 +286,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a { /** * content.css */ -.rtl ul.topiclist dfn { - /* Labels for post/view counts */ - position: relative; - width: 1px; - height: 1px; - overflow: hidden; - display: block; - left: 0; -} - .rtl ul.topiclist dt, .rtl li.header dt { float: right; margin-right: 0; @@ -357,8 +355,8 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a { } .rtl li.header dd { - margin-left: 0; - margin-right: 1px; + padding-left: 0; + padding-right: 1px; } .rtl dl.icon { @@ -387,15 +385,18 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a { /* Post body styles ----------------------------------------*/ -.rtl .postbody { +.rtl .postbody, .rtl .postbody h3 { float: right; } +.rtl p.post-notice { + padding-left: 5px; + padding-right: 26px; +} + .rtl p.post-notice:before { left: auto; right: 0; - padding-left: 5px; - padding-right: 26px; } /* Topic review panel @@ -600,6 +601,10 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a { margin-left: 0; } +.tabs-container h2 { + float: right; +} + /* CP tabbed menu ----------------------------------------*/ .rtl #tabs { @@ -617,7 +622,12 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a { /* Mini tabbed menu used in MCP ----------------------------------------*/ .rtl #minitabs { - margin: -20px 0 0 7px; + margin-right: 0; + margin-left: 7px; +} + +.rtl .tabs-container #minitabs { + float: left; } .rtl #minitabs li { @@ -712,7 +722,7 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a { } .rtl fieldset.fields1 dd { - margin-right: 10em; + margin-right: 15em; margin-left: 0; border-right-width: 0; border-left-width: 1px; diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 68fbcde4f9..8c411a9f4d 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -76,8 +76,14 @@ hr { color: #000000; } -.bg1 { background-color: #ECF3F7; } -.bg2 { background-color: #e1ebf2; } +table.zebra-list tr:nth-child(odd) td, ul.zebra-list li:nth-child(odd), .bg1 { + background-color: #ECF3F7; +} + +table.zebra-list tr:nth-child(even) td, ul.zebra-list li:nth-child(even), .bg2 { + background-color: #e1ebf2; +} + .bg3 { background-color: #cadceb; } .ucprowbg { @@ -258,6 +264,11 @@ a:active { color: #368AD2; } color: #C8E6FF; } +/* Notification mark read link */ +#notification_list a.mark_read { + background-color: #FFFFFF; +} + /* Links for forum/topic lists */ a.forumtitle { color: #105289; @@ -716,6 +727,7 @@ a.sendemail { .icon-notification { background-image: url("./images/icon_notification.gif"); } .icon-pm { background-image: url("./images/icon_pm.gif"); } .icon-download { background-image: url("./images/icon_download.gif"); } +.icon-mark { background-image: url("./images/icon_mark.gif"); } /* Profile & navigation icons */ .email-icon, .email-icon a { background-image: url("./images/icon_contact_email.gif"); } @@ -797,11 +809,11 @@ Colours and backgrounds for cp.css /* Main CP box ----------------------------------------*/ -#cp-main h3, #cp-main hr, #cp-menu hr { +.panel-container h3, .panel-container hr, #cp-menu hr { border-color: #A4B3BF; } -#cp-main .panel li.row { +.panel-container .panel li.row { border-bottom-color: #B5C1CB; border-top-color: #F9F9F9; } @@ -810,11 +822,11 @@ ul.cplist { border-top-color: #B5C1CB; } -#cp-main .panel li.header dd, #cp-main .panel li.header dt { +.panel-container .panel li.header dd, .panel-container .panel li.header dt { color: #000000; } -#cp-main table.table1 thead th { +.panel-container table.table1 thead th { color: #333333; border-bottom-color: #333333; } @@ -915,11 +927,11 @@ ul.cplist { /* Preferences pane layout ----------------------------------------*/ -#cp-main h2 { +.panel-container h2 { color: #333333; } -#cp-main .panel { +.panel-container .panel { background-color: #F9F9F9; } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 66ee77f60b..288477f52a 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1015,6 +1015,7 @@ form > p.post-notice strong { list-style-type: none; font-size: 0.95em; clear: both; + position: relative; } #notification_list ul li:before, #notification_list ul li:after { diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 2003fef954..bf235b3fb5 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -20,16 +20,16 @@ padding: 0; } -#cp-main .panel p { +.panel-container .panel p { font-size: 1.1em; } -#cp-main .panel ol { +.panel-container .panel ol { margin-left: 2em; font-size: 1.1em; } -#cp-main .panel li.row { +.panel-container .panel li.row { border-bottom: 1px solid transparent; border-top: 1px solid transparent; } @@ -39,21 +39,21 @@ ul.cplist { border-top: 1px solid transparent; } -#cp-main .panel li.header dd, #cp-main .panel li.header dt { +.panel-container .panel li.header dd, .panel-container .panel li.header dt { margin-bottom: 2px; } -#cp-main table.table1 { +.panel-container table.table1 { margin-bottom: 1em; } -#cp-main table.table1 thead th { +.panel-container table.table1 thead th { font-weight: bold; border-bottom: 1px solid transparent; padding: 5px; } -#cp-main table.table1 tbody th { +.panel-container table.table1 tbody th { font-style: italic; background-color: transparent !important; border-bottom: none; @@ -102,12 +102,6 @@ ul.cplist { margin-bottom: 0px; } -.tabs-container #minitabs { - float: right; - margin-top: 19px; - max-width: 50%; -} - .tabs-container:after { display: block; clear: both; @@ -193,6 +187,12 @@ ul.cplist { margin: -20px 7px 0 0; } +.tabs-container #minitabs { + float: right; + margin-top: 19px; + max-width: 50%; +} + #minitabs ul { margin:0; padding: 0; diff --git a/phpBB/styles/prosilver/theme/images/icon_mark.gif b/phpBB/styles/prosilver/theme/images/icon_mark.gif Binary files differnew file mode 100644 index 0000000000..1a33fc3264 --- /dev/null +++ b/phpBB/styles/prosilver/theme/images/icon_mark.gif diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 7e3dc094f0..d43886256d 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -49,6 +49,29 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a { padding-left: 17px; } +/* Notification mark read link */ +#notification_list a.mark_read { + background-position: center center; + background-repeat: no-repeat; + border-radius: 3px 0 0 3px; + display: none; + margin-top: -20px; + position: absolute; + z-index: 2; + right: 0; + top: 50%; + width: 30px; + height: 40px; +} + +#notification_list li:hover a.mark_read { + display: block; +} + +#notification_list a.mark_read:hover { + width: 40px; +} + /* Links for forum/topic lists */ a.forumtitle { font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif; diff --git a/phpBB/styles/prosilver/theme/plupload.css b/phpBB/styles/prosilver/theme/plupload.css index 16c26822b5..8569eca662 100644 --- a/phpBB/styles/prosilver/theme/plupload.css +++ b/phpBB/styles/prosilver/theme/plupload.css @@ -1,11 +1,76 @@ -.plupload_filelist li.can_delete:hover { - cursor: pointer; +#attach-panel-multi { + display: none; + margin-bottom: 1em; } -.plupload_filelist li.can_delete:hover a { - background: url('../../../assets/plupload/jquery.plupload.queue/img/delete.gif'); +#file-list td { + vertical-align: middle; } -.plupload_filelist li a.working { - background: url('../../../assets/plupload/jquery.plupload.queue/img/throbber.gif'); +.attach-name { + width: 50%; +} + +.attach-comment { + width: 30%; +} + +.attach-filesize { + width: 15%; +} + +.attach-status { + width: 5%; +} + +.attach-filesize, .attach-status { + text-align: center; +} + +.attach-controls { + display: inline-block; + float: right; +} + +#attach-row-tpl, .nojs .file-inline-bbcode { + display: none; +} + +#file-total-progress { + height: 2px; + display: block; + position: relative; + margin: 4px -10px -6px -10px; +} + +.file-progress { + background-color: #CCCCCC; + display:inline-block; + height: 8px; + width: 50px; +} + +.file-progress-bar, #file-total-progress-bar { + background-color: green; + display: block; + height: 100%; + width: 0; +} + +.file-status.file-working { + background: url('../../../assets/plupload/img/throbber.gif'); +} + +.file-status.file-uploaded { + background: url('../../../assets/plupload/img/done.gif'); +} + +.file-status.file-error { + background: url('../../../assets/plupload/img/error.gif'); +} + +.file-status { + display: inline-block; + height: 16px; + width: 16px; } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 397ff12942..bfa2448296 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -499,6 +499,10 @@ fieldset.display-actions { margin: 0 25px; } +.attach-comment dfn { + width: 100%; +} + @media only screen and (max-width: 500px), only screen and (max-device-width: 500px) { p.responsive-center { @@ -526,4 +530,9 @@ fieldset.display-actions { display: block; margin-bottom: 5px; } + + .attach-controls { + margin-top: 5px; + width: 100%; + } } diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 16e0f6abaf..9ca989ea8b 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -198,12 +198,14 @@ function marklist(id, name, state) <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN --> <span class="error">{L_BOARD_DISABLED}</span><!-- ENDIF --> </td> <td class="genmed" align="{S_CONTENT_FLOW_END}"> + <!-- EVENT overall_header_navigation_prepend --> <a href="{U_FAQ}"><img src="{T_THEME_PATH}/images/icon_mini_faq.gif" width="12" height="13" alt="*" /> {L_FAQ}</a> <!-- IF S_DISPLAY_SEARCH --> <a href="{U_SEARCH}"><img src="{T_THEME_PATH}/images/icon_mini_search.gif" width="12" height="13" alt="*" /> {L_SEARCH}</a><!-- ENDIF --> <!-- IF not S_IS_BOT --> <!-- IF S_DISPLAY_MEMBERLIST --> <a href="{U_MEMBERLIST}"><img src="{T_THEME_PATH}/images/icon_mini_members.gif" width="12" height="13" alt="*" /> {L_MEMBERLIST}</a><!-- ENDIF --> <!-- IF S_USER_LOGGED_IN --> <a href="{U_PROFILE}"><img src="{T_THEME_PATH}/images/icon_mini_profile.gif" width="12" height="13" alt="*" /> {L_PROFILE}</a><!-- ENDIF --> <!-- ENDIF --> + <!-- EVENT overall_header_navigation_append --> </td> </tr> </table> |
