Merge branch 'master' of github.com:roundcube/roundcubemail

5 files changed, 33 insertions, 1 deletions

diff --git a/skins/default/addressbook.css b/skins/default/addressbook.css
index ad7aeffd8..a398325b4 100644
--- a/skins/default/addressbook.css
+++ b/skins/default/addressbook.css
@@ -310,6 +310,13 @@ body.iframe,
 	width: 60px;
 }
 
+#contactpic.droptarget.hover {
+	background-color: #f0f0ee;
+	box-shadow: 0 0 5px 0 #999;
+	-moz-box-shadow: 0 0 5px 0 #999;
+	-o-box-shadow: 0 0 5px 0 #999;
+}
+
 #contactphoto .formlinks
 {
 	margin-top: 0.5em;
diff --git a/skins/default/templates/contactadd.html b/skins/default/templates/contactadd.html
index 67b7bcd6e..05cc8aa82 100644
--- a/skins/default/templates/contactadd.html
+++ b/skins/default/templates/contactadd.html
@@ -33,6 +33,7 @@
 </div>
 
 <roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" />
+<roundcube:object name="fileDropArea" id="contactpic" />
 
 <script type="text/javascript">rcube_init_tabs('contacttabs')</script>
 
diff --git a/skins/default/templates/contactedit.html b/skins/default/templates/contactedit.html
index 77e466141..db8599ac6 100644
--- a/skins/default/templates/contactedit.html
+++ b/skins/default/templates/contactedit.html
@@ -22,7 +22,6 @@
   </div>
   <roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" />
   <div style="clear:both"></div>
-  
   <div id="contacttabs">
     <roundcube:object name="contacteditform" size="40" textareacols="60" deleteIcon="/images/icons/delete.png" form="editform" />
   </div>
@@ -34,6 +33,7 @@
 </div>
 
 <roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" />
+<roundcube:object name="fileDropArea" id="contactpic" />
 
 <script type="text/javascript">rcube_init_tabs('contacttabs')</script>
 
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index a9a3c9883..9856e2836 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -160,6 +160,29 @@
 
 #contactpic img {
 	width: 112px;
+	visibility: inherit;
+}
+
+#contactpic.droptarget {
+	background-image: url(images/filedrop.png);
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
+#contactpic.droptarget.hover {
+	background-color: #d9ecf4;
+	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
+	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
+	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
+	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
+}
+
+#contactpic.droptarget.active img {
+	opacity: 0.15;
+}
+
+#contactpic.droptarget.hover img {
+	opacity: 0.05;
 }
 
 #contacthead {
diff --git a/skins/larry/templates/contactedit.html b/skins/larry/templates/contactedit.html
index 39d48440b..9978c4757 100644
--- a/skins/larry/templates/contactedit.html
+++ b/skins/larry/templates/contactedit.html
@@ -19,6 +19,7 @@
 	<div id="contactphoto">
 		<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
 		<roundcube:if condition="env:photocol" />
+		<roundcube:object name="fileDropArea" id="contactpic" />
 		<div class="formlinks">
 			<roundcube:button command="upload-photo" id="uploadformlink" type="link" label="replacephoto" class="iconlink upload disabled" classAct="iconlink upload active" onclick="UI.show_uploadform();return false" condition="env:photocol" /><br/>
 			<roundcube:button command="delete-photo" type="link" label="delete" class="iconlink delete disabled" classAct="iconlink delete active" condition="env:photocol" />