From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Tue, 19 Aug 2014 12:08:35 -0400 Subject: [PATCH] Fix merge error that disabled contact drag'n'drop --- plugins/help/skins/larry/templates/help.html | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/help/skins/larry/templates/help.html b/plugins/help/skins/larry/templates/help.html index 9790c15..39caaa6 100644 --- a/plugins/help/skins/larry/templates/help.html +++ b/plugins/help/skins/larry/templates/help.html @@ -3,7 +3,6 @@ <head> <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> -<link rel="stylesheet" type="text/css" href="/this/help.css" /> </head> <body> @@ -18,8 +17,11 @@ <roundcube:container name="helptabs" id="helptabsbar" /> </div> -<div id="pluginbody" class="uibox offset scroller"> -<roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:99%" src="/watermark.html" /> +<div id="pluginbody" class="uibox offset"> + <div class="iframebox help_<roundcube:var name='env:action' />"> + <roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:100%" frameborder="0" src="/watermark.html" /> + </div> + <roundcube:object name="message" id="message" class="statusbar" /> </div> </div> -- Gitblit v1.9.1