From a533dc2b271be3fda2d4f3f83080a2e1e8f5be77 Mon Sep 17 00:00:00 2001
From: OnkelTem <OnkelTem@239962.no-reply.drupal.org>
Date: Sat, 22 Dec 2012 15:35:24 +0400
Subject: [PATCH] Issue #1872628 by OnkelTem: Add contextual links to flexible
 layout

---
 plugins/layouts/flexible/flexible.inc |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/layouts/flexible/flexible.inc b/plugins/layouts/flexible/flexible.inc
index 93a7c93..c48f42d 100644
--- a/plugins/layouts/flexible/flexible.inc
+++ b/plugins/layouts/flexible/flexible.inc
@@ -389,9 +389,13 @@ function theme_panels_flexible($vars) {
   // needs it
   $display->add_css = $css;
 
-  $output = "<div class=\"panel-flexible " . $renderer->base['canvas'] . " clearfix\" $renderer->id_str>\n";
+  $output = "<div class=\"panel-flexible " . $renderer->base['canvas'] . (!empty($vars['classes_array']) ? ' '.implode(' ', $vars['classes_array']) : '') . " clearfix\" $renderer->id_str>\n";
   $output .= "<div class=\"panel-flexible-inside " . $renderer->base['canvas'] . "-inside\">\n";
 
+  if (isset($vars['title_suffix']['contextual_links'])) {
+    $output .= drupal_render($vars['title_suffix']['contextual_links']);
+  }
+
   $output .= panels_flexible_render_items($renderer, $settings['items']['canvas']['children'], $renderer->base['canvas']);
 
   // Wrap the whole thing up nice and snug
-- 
1.7.9.5