diff --git a/core/modules/block/block.module b/core/modules/block/block.module index 222d09a..eec89df 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -146,7 +146,7 @@ function block_menu() { 'page arguments' => array('block_admin_block_delete', 4), 'access arguments' => array('administer blocks'), 'type' => MENU_LOCAL_TASK, - 'context' => MENU_CONTEXT_NONE, + 'context' => MENU_CONTEXT_INLINE, 'file' => 'block.admin.inc', ); // Block administration is actually tied to theme and plugin definition so diff --git a/core/modules/overlay/images/background.png b/core/modules/overlay/images/background.png index 9be2193..5b1a8f4 100644 --- a/core/modules/overlay/images/background.png +++ b/core/modules/overlay/images/background.png @@ -2,4 +2,4 @@  IHDR -2ϽIDATc```O$UHOTJ~\IENDB` \ No newline at end of file +2ϽsBIT|d pHYs  ~tEXtSoftwareAdobe Fireworks CS6輲tEXtCreation Time1/25/13rWIDATcd``e 0hT!a.IENDB` \ No newline at end of file diff --git a/core/modules/overlay/images/close.png b/core/modules/overlay/images/close.png index 44d2b6b..97bf4ee 100644 --- a/core/modules/overlay/images/close.png +++ b/core/modules/overlay/images/close.png @@ -1,14 +1,5 @@ PNG  - IHDRJL pHYs   -OiCCPPhotoshop ICC profilexڝSgTS=BKKoR RB&*! J!QEEȠQ, -!{kּ> H3Q5 B.@ -$pd!s#~<<+"x M0B\t8K@zB@F&S`cbP-`'{[! eDh;VEX0fK9-0IWfH  0Q){`##xFW<+*x<$9E[-qWW.(I+6aa@.y24x6_-"bbϫp@t~,/;m%h^ uf@Wp~<5j>{-]cK'Xto(hw?G%fIq^D$.Tʳ?D*A, `6B$BB -dr`)B(Ͱ*`/@4Qhp.U=pa( Aa!ڈbX#!H$ ɈQ"K5H1RT UH=r9\F;2G1Q= C7F dt1r=6Ыhڏ>C03l0.B8, c˱" VcϱwE 6wB aAHXLXNH $4 7 Q'"K&b21XH,#/{C7$C2'ITFnR#,4H#dk9, +ȅ3![ -b@qS(RjJ4e2AURݨT5ZBRQ4u9̓IKhhitݕNWGw Ljg(gwLӋT071oUX**| -J&*/Tު UUT^S}FU3S ԖUPSSg;goT?~YYLOCQ_ cx,!k u5&|v*=9C3J3WRf?qtN (~))4L1e\kXHQG6EYAJ'\'GgSSݧ -M=:.kDwn^Loy}/TmG X $ <5qo</QC]@Caaᄑ.ȽJtq]zۯ6iܟ4)Y3sCQ? 0k߬~OCOg#/c/Wװwa>>r><72Y_7ȷOo_C#dz%gA[z|!?:eAAA!h쐭!ΑiP~aa~ 'W?pX15wCsDDDޛg1O9-J5*>.j<74?.fYXXIlK9.*6nl {/]py.,:@LN8A*%w% -yg"/6шC\*NH*Mz쑼5y$3,幄'L Lݛ:v m2=:1qB!Mggfvˬen/kY- -BTZ(*geWf͉9+̳ې7ᒶKW-X潬j9(xoʿܔĹdff-[n ڴ VE/(ۻCɾUUMfeI?m]Nmq#׹=TR+Gw- 6 U#pDy  :v{vg/jBFS[b[O>zG499?rCd&ˮ/~јѡ򗓿m|x31^VwwO| (hSЧc3- cHRMz%u0`:o_FIDATx 0 D5FN;H8\bbIZL(806q:"4B03Df,3|3HU"4ݛBVbf6,.)^6fyafhV~&y]u?а qzG`~A=gU݌ UM3y&JhۻgIENDB` \ No newline at end of file + IHDR&u2 pHYs  IDAT8MN"Qa74FD=1P@:8'N:/U;gߙLmĩT*NGf@:F` V>#KhV///vd/J\n%D,,Aeggh?чxx,0j٬kg2H&St:APj)uvss`;FIRxl$ud$xnɵt:]JrrrBY#ʆϘ0=n-TU}j5.5H&,d9jN!===3 h H^Q2mIzg+? (Ӭ (Ń`yFQ(caPYl`z& f`2L17`E9fs3Rmrq Ǐa1[nZ:26č.X.'FsRJא8VA2j԰L@jt}˺|~^\0 +YK_sK*exԌ-(rK2}Qo~@ +8$}xfT8D܋V Li;I_IENDB` \ No newline at end of file diff --git a/core/modules/overlay/overlay-child-rtl.css b/core/modules/overlay/overlay-child-rtl.css index 4195530..79b6ce1 100644 --- a/core/modules/overlay/overlay-child-rtl.css +++ b/core/modules/overlay/overlay-child-rtl.css @@ -8,36 +8,7 @@ html { direction: rtl; } -#overlay-title { - float: right; - left: auto; -} -#overlay { - padding: 0.2em; - padding-left: 26px; -} -#overlay-close-wrapper { - left: 0; - right: auto; -} -#overlay-close, -#overlay-close:hover { - background: transparent url(images/close.png) no-repeat; - border-top-right-radius: 0; - - -webkit-border-top-left-radius: 12px; - -webkit-border-bottom-left-radius: 12px; - -moz-border-radius-topleft: 12px; - -moz-border-radius-bottomleft: 12px; - border-top-left-radius: 12px; - border-bottom-left-radius: 12px; - background-color: #ffffff; -} - -/** - * Tabs on the overlay. - */ -#overlay-tabs { - left: 20px; +#overlay-close { + left: 5px; right: auto; } diff --git a/core/modules/overlay/overlay-child.css b/core/modules/overlay/overlay-child.css index aa0effc..da336e0 100644 --- a/core/modules/overlay/overlay-child.css +++ b/core/modules/overlay/overlay-child.css @@ -21,38 +21,31 @@ min-height: 100px; min-width: 700px; position: relative; - padding: .2em; - padding-bottom: 2em; - padding-right: 26px; /* LTR */ - width: 88%; -} -#overlay-titlebar { - padding: 0 20px; - position: relative; - white-space: nowrap; - z-index: 100; + width: 50%; + box-shadow: 0 0 2em 0 rgba(0,0,0,0.5); } #overlay-content { - background: #fff; clear: both; color: #000; - padding: .5em 1em; position: relative; } -#overlay-title-wrapper { - overflow: hidden; +#branding { + border-bottom: 1px solid #cdcdcd; } -#overlay-title { - color: #fff; - float: left; /* LTR */ - font-size: 20px; - margin: 0; - padding: 0.3em 0; + +#branding .breadcrumb, #branding .add-or-remove-shortcuts { + display: none; } -#overlay-title:active, -#overlay-title:focus { - outline: 0; + +body.overlay #branding h1.page-title { + display: block; + float: none; + line-height: 2em; +} + +.form-actions input.button-danger, .form-actions #edit-cancel { + display: none; } .overlay #skip-link { @@ -62,84 +55,17 @@ color: #fff; /* This is white to contrast with the dark background behind it. */ } -#overlay-close-wrapper { - position: absolute; - right: 0; /* LTR */ -} -#overlay-close, -#overlay-close:hover { - background: transparent url(images/close.png) no-repeat; /* LTR */ - border-top-left-radius: 0; /* LTR */ +#overlay-close { + background: transparent url(images/close.png) no-repeat scroll; + cursor: pointer; display: block; - height: 26px; - margin: 0; + height: 21px; padding: 0; - /* Replace with position:fixed to get a scrolling close button. */ - position: absolute; - width: 26px; - - -webkit-border-top-right-radius: 12px; - -webkit-border-bottom-right-radius: 12px; - -moz-border-radius-topright: 12px; - -moz-border-radius-bottomright: 12px; - border-top-right-radius: 12px; - border-bottom-right-radius: 12px; - background-color: #ffffff; -} - -/** - * Tabs on the overlay. - */ -#overlay-tabs { - line-height: 26px; - margin: -28px 0 0 0; position: absolute; - right: 20px; /* LTR */ - text-transform: uppercase; -} -#overlay-tabs li { - display: inline-block; - list-style: none; - margin: 0; - padding: 0; -} -#overlay-tabs li a, -#overlay-tabs li a:active, -#overlay-tabs li a:visited, -#overlay-tabs li a:hover { - background-color: #a6a7a2; - border-radius: 8px 8px 0 0; - color: #000; - display: inline-block; - font-size: 11px; - font-weight: bold; - margin: 0 1px; - outline: 0; - padding: 0 14px; - text-decoration: none; -} -#overlay-tabs li.active a, -#overlay-tabs li.active a.active, -#overlay-tabs li.active a:active, -#overlay-tabs li.active a:visited { - background-color: #fff; - margin-bottom: 0; - padding-bottom: 2px; -} -#overlay-tabs li a:focus, -#overlay-tabs li a:hover { - color: #fff; -} -#overlay-tabs li.active a:focus, -#overlay-tabs li.active a:hover { - color: #000; -} - -/** - * Add to shortcuts link - */ -#overlay-titlebar .add-or-remove-shortcuts { - padding-top: 0.9em; + right: 5px; /* LTR */ + top: 5px; + width: 21px; + z-index: 40; } /** diff --git a/core/modules/overlay/overlay-child.js b/core/modules/overlay/overlay-child.js index 80a8a2f..8675a3d 100644 --- a/core/modules/overlay/overlay-child.js +++ b/core/modules/overlay/overlay-child.js @@ -162,23 +162,6 @@ Drupal.overlayChild.behaviors.tabs = function (context, settings) { }); }; -/** - * If the shortcut add/delete button exists, move it to the overlay titlebar. - */ -Drupal.overlayChild.behaviors.shortcutAddLink = function (context, settings) { - // Remove any existing shortcut button markup from the titlebar. - $('#overlay-titlebar').find('.add-or-remove-shortcuts').remove(); - // If the shortcut add/delete button exists, move it to the titlebar. - var $addToShortcuts = $('.add-or-remove-shortcuts'); - if ($addToShortcuts.length) { - $addToShortcuts.insertAfter('#overlay-title'); - } - - $(document).bind('drupalOverlayBeforeLoad.drupal-overlay.drupal-overlay-child-loading', function () { - $('#overlay-titlebar').find('.add-or-remove-shortcuts').remove(); - }); -}; - // Workaround because of the way jQuery events works. // jQuery from the parent frame needs to be used to catch this event. parent.jQuery(document).bind('offsettopchange', function () { diff --git a/core/modules/overlay/overlay-parent.js b/core/modules/overlay/overlay-parent.js index caf9336..9965298 100644 --- a/core/modules/overlay/overlay-parent.js +++ b/core/modules/overlay/overlay-parent.js @@ -574,6 +574,15 @@ Drupal.overlay.eventhandlerOverrideLink = function (event) { return; } + // Only open links in the overlay if they are contextual links (but not the + // node edit link), or if the link is an action link or dropbutton link + // that is already in the overlay. + if (!($target.parent().parent().hasClass('contextual-links') && !$target.parent().hasClass('node-edit')) &&  + !$target.hasClass('button-action') &&  + !$target.parent().hasClass('dropbutton-action')) { + return; + } + var target = $target[0]; var href = target.href; // Only handle links that have an href attribute and use the HTTP(S) protocol. diff --git a/core/modules/overlay/templates/overlay.tpl.php b/core/modules/overlay/templates/overlay.tpl.php index 38e6664..29d6599 100644 --- a/core/modules/overlay/templates/overlay.tpl.php +++ b/core/modules/overlay/templates/overlay.tpl.php @@ -23,15 +23,7 @@
> -
-
-

>

-
-
- -
-

-
+
>