summaryrefslogtreecommitdiff
path: root/plugins/enigma
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-07-30 12:08:58 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-07-30 12:08:58 +0200
commit6843acc9fced3dc1261e019ad4552b6e4c340ec7 (patch)
tree67d4f85b6b99d49f1ad28aa98fca213b6962fd7d /plugins/enigma
parent9f1652e29e2ed8be815cae4abf42bde989ffeb22 (diff)
parent6d1253681547343dcffb398a7e485bfb70087b57 (diff)
Merged changes to skin folders
Diffstat (limited to 'plugins/enigma')
-rw-r--r--plugins/enigma/lib/enigma_ui.php2
-rw-r--r--plugins/enigma/skins/default/templates/keys.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/enigma/lib/enigma_ui.php b/plugins/enigma/lib/enigma_ui.php
index 5901b58d9..9c32f2faf 100644
--- a/plugins/enigma/lib/enigma_ui.php
+++ b/plugins/enigma/lib/enigma_ui.php
@@ -129,7 +129,7 @@ class enigma_ui
$this->rc->output->set_env('contentframe', $attrib['name']);
$this->rc->output->set_env('blankpage', $attrib['src'] ?
- $this->rc->output->abs_url($attrib['src']) : 'program/blank.gif');
+ $this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif');
return html::tag('iframe', $attrib);
}
diff --git a/plugins/enigma/skins/default/templates/keys.html b/plugins/enigma/skins/default/templates/keys.html
index 810c4a211..4271eccb7 100644
--- a/plugins/enigma/skins/default/templates/keys.html
+++ b/plugins/enigma/skins/default/templates/keys.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="/this/enigma.css" />
<script type="text/javascript" src="/functions.js"></script>
<script type="text/javascript" src="/splitter.js"></script>
-<style type="text/css">
+<style type="text/css">
#enigmakeyslist { width: <roundcube:exp expression="!empty(cookie:enigmaviewsplitter) ? cookie:enigmaviewsplitter-5 : 210" />px; }
#enigmacontent-box { left: <roundcube:exp expression="!empty(cookie:enigmaviewsplitter) ? cookie:enigmaviewsplitter+5 : 220" />px;
<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:enigmaeviewsplitter) ? cookie:enigmaviewsplitter+5 : 220).')+\\'px\\');') : ''" />