Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F726911
D142.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Mon, Jan 6, 3:14 AM
Size
3 KB
Mime Type
text/x-diff
Expires
Tue, Jan 7, 3:14 AM (2 d, 19 h ago)
Engine
blob
Format
Raw Data
Handle
536997
Attached To
D142: INP-1490 Use "width" method, to calculate menu frame in Admin Console
D142.diff
View Options
Index: branches/5.2.x/core/admin_templates/index.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/index.tpl
+++ branches/5.2.x/core/admin_templates/index.tpl
@@ -40,7 +40,7 @@
<inp2:m_if check="m_GetConfig" name="ResizableFrames">
<frame src="<inp2:m_t t='head' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" name="head" id="head_frame" scrolling="no" noresize frameborder="0" border="0">
<frameset id="sub_frameset" cols="<inp2:m_if check='m_RecallEquals' name='ShowAdminMenu' value='0' persistent='1'><inp2:adm_MenuFrameWidth/><inp2:m_else/>0</inp2:m_if>,*" border="1">
- <frame src="<inp2:m_t t='tree' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" name="menu" target="main" scrolling="auto" marginwidth="0" marginheight="0" border="1" frameborder="1">
+ <frame src="<inp2:m_t t='tree' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" id="menu_frame" name="menu" target="main" scrolling="auto" marginwidth="0" marginheight="0" border="1" frameborder="1">
<inp2:m_DefineElement name="root_node">
<frame src="<inp2:m_if check='adm_MainFrameLink'><inp2:adm_MainFrameLink/><inp2:m_else/><inp2:m_param name='section_url'/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" scrolling="auto" border="1" frameborder="1">
</inp2:m_DefineElement>
@@ -50,7 +50,7 @@
<inp2:m_else/>
<frame src="<inp2:m_t t='head' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" name="head" scrolling="no" noresize="noresize">
<frameset id="sub_frameset" cols="<inp2:m_if check='m_RecallEquals' name='ShowAdminMenu' value='0' persistent='1'><inp2:adm_MenuFrameWidth/><inp2:m_else/>0</inp2:m_if>,*" border="0">
- <frame src="<inp2:m_t t='tree' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" name="menu" target="main" noresize scrolling="auto" marginwidth="0" marginheight="0">
+ <frame src="<inp2:m_t t='tree' pass='m' m_cat_id='0' m_opener='s' no_pass_through='1'/>" id="menu_frame" name="menu" target="main" noresize scrolling="auto" marginwidth="0" marginheight="0">
<inp2:m_DefineElement name="root_node">
<frame src="<inp2:m_if check='adm_MainFrameLink'><inp2:adm_MainFrameLink/><inp2:m_else/><inp2:m_param name='section_url'/></inp2:m_if>" name="main" marginwidth="0" marginheight="0" frameborder="no" noresize scrolling="auto">
</inp2:m_DefineElement>
@@ -63,4 +63,4 @@
<p></p>
</body>
</noframes>
-</html>
\ No newline at end of file
+</html>
Index: branches/5.2.x/core/admin_templates/tree.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/tree.tpl
+++ branches/5.2.x/core/admin_templates/tree.tpl
@@ -13,15 +13,18 @@
}
function onTreeFrameResize() {
- var $frameset = $('#sub_frameset', window.parent.document);
- if (!$frameset.length) {
- return ;
+ var $menu_frame = $('#menu_frame', window.parent.document),
+ $width;
+
+ if (!$menu_frame.length) {
+ return;
}
- var $width = $frameset.attr('cols').split(',')[0];
- if (($width <= 0) || ($width == $last_width)) {
+ $width = $menu_frame.width();
+
+ if (($width <= 0) || ($width == $last_width)) {
// don't save zero width
- return ;
+ return;
}
clearTimeout($save_timer);
@@ -193,4 +196,4 @@
<!--## when form is on top, then 100% height is broken ##-->
<inp2:m_RenderElement name="kernel_form"/>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Event Timeline
Log In to Comment