Added skinning for Larry

git-svn-id: https://svn.roundcube.net/trunk@5997 208e9e7b-5314-0410-a742-e7e81cd9613c

7 files changed, 89 insertions, 30 deletions

diff --git a/plugins/vcard_attachments/package.xml b/plugins/vcard_attachments/package.xml
index e09b8db53..066c908bf 100644
--- a/plugins/vcard_attachments/package.xml
+++ b/plugins/vcard_attachments/package.xml
@@ -19,11 +19,11 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2010-10-14</date>
+	<date>2012-03-11</date>
 	<time>19:00</time>
 	<version>
-		<release>3.0</release>
-		<api>3.0</api>
+		<release>3.1-beta</release>
+		<api>3.1-beta</api>
 	</version>
 	<stability>
 		<release>stable</release>
@@ -31,10 +31,11 @@
 	</stability>
 	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
 	<notes>
+- Add styles for new skin "Larry"
 - Exec contact_create hook when adding contact (#1486964)
 - Make icons skinable
 - Display vcard icon on messages list when message is of type vcard
-    </notes>
+	</notes>
 	<contents>
 		<dir baseinstalldir="/" name="/">
 			<file name="vcard_attachments.php" role="php">
@@ -59,8 +60,12 @@
 			<file name="localization/ru_RU.inc" role="data"></file>
 			<file name="localization/sv_SE.inc" role="data"></file>
 			<file name="localization/zh_TW.inc" role="data"></file>
+			<file name="skins/default/style.css" role="data"></file>
 			<file name="skins/default/vcard_add_contact.png" role="data"></file>
 			<file name="skins/default/vcard.png" role="data"></file>
+			<file name="skins/larry/style.css" role="data"></file>
+			<file name="skins/larry/vcard_add_contact.png" role="data"></file>
+			<file name="skins/larry/vcard.png" role="data"></file>
 		</dir>
 		<!-- / -->
 	</contents>
@@ -76,25 +81,41 @@
 	</dependencies>
 	<phprelease/>
 	<changelog>
-	    <release>
-        	<date>2010-04-28</date>
-        	<time>12:00:00</time>
-            <version>
-        		<release>2.0</release>
-		        <api>2.0</api>
-        	</version>
-        	<stability>
-		        <release>stable</release>
-        		<api>stable</api>
-	        </stability>
-        	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-	        <notes>
+		<release>
+			<date>2010-04-28</date>
+			<time>12:00:00</time>
+			<version>
+				<release>2.0</release>
+				<api>2.0</api>
+			</version>
+			<stability>
+				<release>stable</release>
+				<api>stable</api>
+			</stability>
+			<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+			<notes>
 - Added support for Content-Type: text/directory; profile=vCard
 - Added handler for message bodies of type vCard (#1486683)
 - Added support for more than one vCard attachment/body
 - Added support for more than one contact in one vCard file
 - Created package.xml
-            </notes>
-        </release>
+			</notes>
+		</release>
+		<release>
+			<date>2012-03-11</date>
+			<time>19:00:00</time>
+			<version>
+				<release>3.1</release>
+				<api>3.1</api>
+			</version>
+			<stability>
+				<release>stable</release>
+				<api>stable</api>
+			</stability>
+			<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
+			<notes>
+				- Add styles for new skin "Larry"
+			</notes>
+		</release>
 	</changelog>
 </package>
diff --git a/plugins/vcard_attachments/skins/default/style.css b/plugins/vcard_attachments/skins/default/style.css
new file mode 100644
index 000000000..044d3983e
--- /dev/null
+++ b/plugins/vcard_attachments/skins/default/style.css
@@ -0,0 +1,17 @@
+
+p.vcardattachment {
+	margin: 0.5em 1em;
+	border: 1px solid #999;
+	border-radius:4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	width: auto;
+}
+
+p.vcardattachment a {
+	display: block;
+	background: url(vcard_add_contact.png) 4px 0px no-repeat;
+	padding: 0.7em 0.5em 0.3em 42px;
+	height: 22px;
+}
diff --git a/plugins/vcard_attachments/skins/larry/style.css b/plugins/vcard_attachments/skins/larry/style.css
new file mode 100644
index 000000000..eb70082ee
--- /dev/null
+++ b/plugins/vcard_attachments/skins/larry/style.css
@@ -0,0 +1,21 @@
+
+p.vcardattachment {
+	margin: 0.5em 1em;
+	width: auto;
+	background: #f9f9f9;
+	border: 1px solid #d3d3d3;
+	border-radius:4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	box-shadow: 0 0 2px #ccc;
+	-o-box-shadow: 0 0 2px #ccc;
+	-webkit-box-shadow: 0 0 2px #ccc;
+	-moz-box-shadow: 0 0 2px #ccc;
+}
+
+p.vcardattachment a {
+	display: block;
+	background: url(vcard_add_contact.png) 6px 2px no-repeat;
+	padding: 1.2em 0.5em 0.7em 46px;
+}
diff --git a/plugins/vcard_attachments/skins/larry/vcard.png b/plugins/vcard_attachments/skins/larry/vcard.png
new file mode 100644
index 000000000..8bf6b1b72
--- /dev/null
+++ b/plugins/vcard_attachments/skins/larry/vcard.png
diff --git a/plugins/vcard_attachments/skins/larry/vcard_add_contact.png b/plugins/vcard_attachments/skins/larry/vcard_add_contact.png
new file mode 100644
index 000000000..a8ce459f8
--- /dev/null
+++ b/plugins/vcard_attachments/skins/larry/vcard_add_contact.png
diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
index fdb2d3289..c321e84aa 100644
--- a/plugins/vcard_attachments/vcard_attachments.php
+++ b/plugins/vcard_attachments/vcard_attachments.php
@@ -76,29 +76,29 @@ class vcard_attachments extends rcube_plugin
             if (in_array($part, $this->vcard_bodies))
                 $p['content'] = '';
 
-            $style = 'margin:0.5em 1em; padding:0.2em 0.5em; border:1px solid #999; '
-                .'border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; width: auto';
-
             foreach ($vcards as $idx => $vcard) {
                 $display = $vcard->displayname;
                 if ($vcard->email[0])
                     $display .= ' <'.$vcard->email[0].'>';
 
                 // add box below messsage body
-                $p['content'] .= html::p(array('style' => $style),
+                $p['content'] .= html::p(array('class' => 'vcardattachment'),
                     html::a(array(
                         'href' => "#",
-                        'onclick' => "return plugin_vcard_save_contact('".JQ($part.':'.$idx)."')",
-                        'title' => $this->gettext('addvcardmsg')),
-                        html::img(array('src' => $icon, 'style' => "vertical-align:middle")))
-                    . ' ' . html::span(null, Q($display)));
+                        'onclick' => "return plugin_vcard_save_contact('" . JQ($part.':'.$idx) . "')",
+                        'title' => $this->gettext('addvcardmsg'),
+                        ),
+                        html::span(null, Q($display)))
+                    );
             }
 
             $attach_script = true;
         }
 
-        if ($attach_script)
+        if ($attach_script) {
             $this->include_script('vcardattach.js');
+            $this->include_stylesheet($this->local_skin_path() . '/style.css');
+        }
 
         return $p;
     }
diff --git a/plugins/vcard_attachments/vcardattach.js b/plugins/vcard_attachments/vcardattach.js
index ef19190e7..31df2468d 100644
--- a/plugins/vcard_attachments/vcardattach.js
+++ b/plugins/vcard_attachments/vcardattach.js
@@ -5,7 +5,7 @@
 function plugin_vcard_save_contact(mime_id)
 {
   var lock = rcmail.set_busy(true, 'loading');
-  rcmail.http_post('plugin.savevcard', '_uid='+rcmail.env.uid+'&_mbox='+urlencode(rcmail.env.mailbox)+'&_part='+urlencode(mime_id), lock);
+  rcmail.http_post('plugin.savevcard', { _uid: rcmail.env.uid, _mbox: urlencode(rcmail.env.mailbox), _part: urlencode(mime_id) }, lock);
   
   return false;
 }
@@ -14,7 +14,7 @@ function plugin_vcard_insertrow(data)
 {
   var ctype = data.row.ctype;
   if (ctype == 'text/vcard' || ctype == 'text/x-vcard' || ctype == 'text/directory') {
-    $('#rcmrow'+data.uid+' > td.attachment').html('<img src="'+rcmail.env.vcard_icon+'" alt="">');
+    $('#rcmrow'+data.uid+' > td.attachment').html('<img src="'+rcmail.env.vcard_icon+'" alt="" />');
   }
 }