diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 10:37:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-20 10:37:30 +0200 |
| commit | ccb8fd18e2e20d3f843c713e7c23aeba2227148c (patch) | |
| tree | e2f7dec128700c128ad670f3d314fec075b15949 /phpBB/styles/prosilver/template | |
| parent | 99e08bffd827ac4b1f3396955ec0ee6ae73bb0b6 (diff) | |
| parent | 0f034ca7173c700c9b6de4b9ebf9cead56f17207 (diff) | |
| download | forums-ccb8fd18e2e20d3f843c713e7c23aeba2227148c.tar forums-ccb8fd18e2e20d3f843c713e7c23aeba2227148c.tar.gz forums-ccb8fd18e2e20d3f843c713e7c23aeba2227148c.tar.bz2 forums-ccb8fd18e2e20d3f843c713e7c23aeba2227148c.tar.xz forums-ccb8fd18e2e20d3f843c713e7c23aeba2227148c.zip | |
Merge pull request #2514 from prototech/ticket/12553
[ticket/12553] Right-to-left fixes.
* prototech/ticket/12553:
[ticket/12553] Fix responsive user profile.
[ticket/12553] Fix responsive post profile.
[ticket/12553] Remove dropdown-trigger class from member search input.
[ticket/12553] Fix the merge topic list.
[ticket/12553] Fix dropdown position of live search
[ticket/12553] Fix the responsive topic/forum lists.
[ticket/12553] Align the text in responsive tables to the right.
[ticket/12553] Center the responsive CP menus instead of floating right.
[ticket/12553] Open the notification dropdown to the left.
[ticket/12553] Fix alignment of contact icon.
[ticket/12553] Fix incorrect alignment in ACP responsive tables.
[ticket/12553] Align alert text to the right.
[ticket/12553] Remove incorrect size for site logo.
[ticket/12553] Fix links in the last post column that are not clickable.
[ticket/12553] Align contact icons to the right.
[ticket/12553] Move Place inline and Delete buttons left of the file name.
Diffstat (limited to 'phpBB/styles/prosilver/template')
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 33 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_search.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/navbar_header.html | 4 |
3 files changed, 3 insertions, 36 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 3d42439c1d..7e4875d7bc 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -378,39 +378,6 @@ function parse_document(container) }); /** - * Dropdowns - */ - container.find('.dropdown-container').each(function() { - var $this = $(this), - trigger = $this.find('.dropdown-trigger:first'), - contents = $this.find('.dropdown'), - options = { - direction: 'auto', - verticalDirection: 'auto' - }, - data; - - if (!trigger.length) { - data = $this.attr('data-dropdown-trigger'); - trigger = data ? $this.children(data) : $this.children('a:first'); - } - - if (!contents.length) { - data = $this.attr('data-dropdown-contents'); - contents = data ? $this.children(data) : $this.children('div:first'); - } - - if (!trigger.length || !contents.length) return; - - if ($this.hasClass('dropdown-up')) options.verticalDirection = 'up'; - if ($this.hasClass('dropdown-down')) options.verticalDirection = 'down'; - if ($this.hasClass('dropdown-left')) options.direction = 'left'; - if ($this.hasClass('dropdown-right')) options.direction = 'right'; - - phpbb.registerDropdown(trigger, contents, options); - }); - - /** * Adjust HTML code for IE8 and older versions */ if (oldBrowser) { diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index f4439b6934..4c14baf2b6 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -10,9 +10,9 @@ <dl style="overflow: visible;"> <dt><label for="username">{L_USERNAME}{L_COLON}</label></dt> <dd> + <!-- IF U_LIVE_SEARCH --><div class="dropdown-container dropdown-{S_CONTENT_FLOW_END}"><!-- ENDIF --> <input type="text" name="username" id="username" value="{USERNAME}" class="inputbox"<!-- IF U_LIVE_SEARCH --> autocomplete="off" data-filter="phpbb.search.filter" data-ajax="member_search" data-min-length="3" data-url="{U_LIVE_SEARCH}" data-results="#user-search" data-overlay="false"<!-- ENDIF --> /> <!-- IF U_LIVE_SEARCH --> - <div class="dropdown-container"> <div class="dropdown live-search hidden" id="user-search"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents search-results"> diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index 804fa5b2aa..1eb120ef3e 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -17,8 +17,8 @@ <ul class="linklist bulletin"> <!-- IF not S_IS_BOT and S_USER_LOGGED_IN --> <!-- IF S_NOTIFICATIONS_DISPLAY --> - <li class="small-icon icon-notification" data-skip-responsive="true"> - <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a> + <li class="small-icon icon-notification dropdown-container dropdown-{S_CONTENT_FLOW_END}" data-skip-responsive="true"> + <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"><span>{L_NOTIFICATIONS} [</span><strong>{NOTIFICATIONS_COUNT}</strong><span>]</span></a> <!-- INCLUDE notification_dropdown.html --> </li> <!-- ENDIF --> |