From 32107a13953dff6bf8fdbe8ff15a6b9604eccc27 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 26 May 2009 12:28:04 +0000
Subject: Tweak default skin with better icons (sprites) and move IE hacks to
 an external file included by conditional comments

git-svn-id: https://svn.roundcube.net/trunk@2541 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/skins/default/includes/links.html       |  7 ++++++-
 roundcubemail/skins/default/includes/messagemenu.html | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'roundcubemail/skins/default/includes')

diff --git a/roundcubemail/skins/default/includes/links.html b/roundcubemail/skins/default/includes/links.html
index 30aeb4c19..222027e42 100644
--- a/roundcubemail/skins/default/includes/links.html
+++ b/roundcubemail/skins/default/includes/links.html
@@ -1,3 +1,8 @@
 <link rel="index" href="$__comm_path" />
 <link rel="shortcut icon" href="/images/favicon.ico"/>
-<link rel="stylesheet" type="text/css" href="/common.css" />
\ No newline at end of file
+<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:if condition="env:task != 'login'" />
+<link rel="stylesheet" type="text/css" href="/<roundcube:exp expression="env:task=='addressbook'?'addresses':env:task" />.css" />
+<roundcube:endif />
+<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="/iehacks.css" /><![endif]-->
+<!--[if lte IE 6]><link rel="stylesheet" type="text/css" href="/ie6hacks.css" /><![endif]-->
\ No newline at end of file
diff --git a/roundcubemail/skins/default/includes/messagemenu.html b/roundcubemail/skins/default/includes/messagemenu.html
index 13b984b3e..1725b6b96 100644
--- a/roundcubemail/skins/default/includes/messagemenu.html
+++ b/roundcubemail/skins/default/includes/messagemenu.html
@@ -1,10 +1,12 @@
 <div id="messagemenu">
-    <ul class="toolbarmenu">
-	<li><roundcube:button class="printlink" command="print" label="printmessage" classAct="printlink active" /></li>
-	<li><roundcube:button class="downloadlink" command="download" label="emlsave" classAct="downloadlink active" /></li>
-	<li><roundcube:button class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /></li>
-	<li><hr /></li>
-	<li><roundcube:button class="openlink" command="open" label="openinextwin" target="_blank" classAct="openlink active" /></li>
-	<roundcube:container name="messagemenu" id="messagemenu" />
-    </ul>
+  <ul class="toolbarmenu">
+    <li><roundcube:button class="printlink" command="print" label="printmessage" classAct="printlink active" /></li>
+    <li><roundcube:button class="downloadlink" command="download" label="emlsave" classAct="downloadlink active" /></li>
+    <li><roundcube:button class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /></li>
+  <roundcube:if condition="env:action != 'show'" />
+    <li class="separator">&nbsp;</li>
+    <li><roundcube:button class="openlink" command="open" label="openinextwin" target="_blank" classAct="openlink active" /></li>
+  <roundcube:endif />
+    <roundcube:container name="messagemenu" id="messagemenu" />
+  </ul>
 </div>
-- 
cgit v1.2.3