From 87f17ded1d1e618e2152d1448f760b3228cdcb5f Mon Sep 17 00:00:00 2001 From: Damien Pobel Date: Wed, 27 Nov 2013 07:32:37 +0100 Subject: [PATCH] Fix EZP-21929: eZOE searchreplace plugin interface is broken --- .../design/standard/stylesheets/skins/default/dialog.css | 1 + .../ezoe/design/standard/stylesheets/skins/o2k7/dialog.css | 1 + .../standard/templates/ezoe/customattributes/link.tpl | 6 +++--- extension/ezoe/design/standard/templates/ezoe/tag_link.tpl | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/extension/ezoe/design/standard/stylesheets/skins/default/dialog.css b/extension/ezoe/design/standard/stylesheets/skins/default/dialog.css index 9153da20f1d..5b988b3a9b2 100644 --- a/extension/ezoe/design/standard/stylesheets/skins/default/dialog.css +++ b/extension/ezoe/design/standard/stylesheets/skins/default/dialog.css @@ -85,6 +85,7 @@ td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #A .tabs a:link, .tabs a:visited, .tabs a:hover {color:black;} /* Panels */ +.panel_wrapper div.panel {display:none;} .panel_wrapper div.current {display:block; width:100%; height:auto; overflow:visible;} .panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;} .panel_wrapper div.current:after /* Terminate floating elements flow */ diff --git a/extension/ezoe/design/standard/stylesheets/skins/o2k7/dialog.css b/extension/ezoe/design/standard/stylesheets/skins/o2k7/dialog.css index d6887cf5bf8..a430648c956 100644 --- a/extension/ezoe/design/standard/stylesheets/skins/o2k7/dialog.css +++ b/extension/ezoe/design/standard/stylesheets/skins/o2k7/dialog.css @@ -83,6 +83,7 @@ td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #A .tabs a:link, .tabs a:visited, .tabs a:hover {color:black;} /* Panels */ +.panel_wrapper div.panel {display:none;} .panel_wrapper div.current {display:block; width:100%; height:auto; overflow:visible;} .panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;} .panel_wrapper div.current:after /* Terminate floating elements flow */ diff --git a/extension/ezoe/design/standard/templates/ezoe/customattributes/link.tpl b/extension/ezoe/design/standard/templates/ezoe/customattributes/link.tpl index 2d24fef215d..8dc8ff22057 100644 --- a/extension/ezoe/design/standard/templates/ezoe/customattributes/link.tpl +++ b/extension/ezoe/design/standard/templates/ezoe/customattributes/link.tpl @@ -93,7 +93,7 @@ eZOEPopupUtils.settings.onInitDoneArray.push( function( editorElement ) // setup navigation on bookmark / browse / search links to their 'boxes' (panels) jQuery( 'a.atr_link_search_link, a.atr_link_browse_link, a.atr_link_bookmark_link' ).click( function(){ ezoeLinkAttribute.id = ezoeLinkAttribute.lid( this.id ); - jQuery('div.panel').hide(); + jQuery('div.panel, div.link-dialog').hide(); jQuery('#' + ezoeLinkAttribute.box( this.id ) ).show(); jQuery('#' + ezoeLinkAttribute.box( this.id ) + ' input[type=text]:first').focus(); }); @@ -195,8 +195,8 @@ var ezoeLinkAttribute = { { ezoeLinkAttribute.id = null; jQuery('div.panel').hide(); - jQuery('div.panel:first').show(); - jQuery('div.panel:first input[type=text]:first').focus(); + jQuery('div.link-dialog').show(); + jQuery('div.link-dialog input[type=text]:first').focus(); } }; diff --git a/extension/ezoe/design/standard/templates/ezoe/tag_link.tpl b/extension/ezoe/design/standard/templates/ezoe/tag_link.tpl index d00c22053ee..46bb70e221d 100644 --- a/extension/ezoe/design/standard/templates/ezoe/tag_link.tpl +++ b/extension/ezoe/design/standard/templates/ezoe/tag_link.tpl @@ -31,7 +31,7 @@ tinyMCEPopup.onInit.add( eZOEPopupUtils.BIND( eZOEPopupUtils.init, window, {
-
+