From 6b8edbdeeefe17fb50f337f61b9af35beeac74a0 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 26 Jul 2011 17:21:26 +0000
Subject: Always show address book name if multiple books are configured; fix
 styling

git-svn-id: https://svn.roundcube.net/trunk@4969 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/skins/default/addressbook.css            | 2 +-
 roundcubemail/skins/default/templates/contactadd.html  | 6 +++---
 roundcubemail/skins/default/templates/contactedit.html | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'roundcubemail/skins/default')

diff --git a/roundcubemail/skins/default/addressbook.css b/roundcubemail/skins/default/addressbook.css
index 63c60c08a..69b913e84 100644
--- a/roundcubemail/skins/default/addressbook.css
+++ b/roundcubemail/skins/default/addressbook.css
@@ -390,5 +390,5 @@ fieldset.contactfieldgroup legend
 {
   color: #666;
   font-size: 10px;
-  margin-left: 2px;
+  margin: -5px 0 8px 2px;
 }
diff --git a/roundcubemail/skins/default/templates/contactadd.html b/roundcubemail/skins/default/templates/contactadd.html
index 305940afd..67b7bcd6e 100644
--- a/roundcubemail/skins/default/templates/contactadd.html
+++ b/roundcubemail/skins/default/templates/contactadd.html
@@ -10,9 +10,9 @@
 <div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div>
 <div id="contact-details" class="boxcontent">
 <form name="editform" method="post" action="./">
-  <div id="sourcename" style="height: 20px">
-    <roundcube:label name="addressbook" />: <roundcube:object name="sourceselector" class="hint" id="sourceselect" />
-  </div>
+  <roundcube:if condition="strlen(env:sourcename)" />
+    <div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:object name="sourceselector" class="hint" id="sourceselect" /></div>
+  <roundcube:endif />
   <div id="contactphoto">
     <roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
     <div class="formlinks">
diff --git a/roundcubemail/skins/default/templates/contactedit.html b/roundcubemail/skins/default/templates/contactedit.html
index 681201caa..77e466141 100644
--- a/roundcubemail/skins/default/templates/contactedit.html
+++ b/roundcubemail/skins/default/templates/contactedit.html
@@ -10,6 +10,9 @@
 <div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div>
 <div id="contact-details" class="boxcontent">
 <form name="editform" method="post" action="./">
+  <roundcube:if condition="strlen(env:sourcename)" />
+    <div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" /></div>
+  <roundcube:endif />
   <div id="contactphoto">
     <roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
     <div class="formlinks">
-- 
cgit v1.2.3