Incorporated last changes in Chameleon (login page and contactprint t…

…emplate).
Anisotropic · Jul 25, 2015 · f647e72 · f647e72
1 parent beea589
commit f647e72
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 3 deletions.
diff --git a/skins/chameleon-blue/colors.less b/skins/chameleon-blue/colors.less
@@ -3,8 +3,6 @@
 @text-color:  #4c4c4c;
 //@main-color:  #f25829;
 //@link-color:  #f25829;
-//@main-color:  #498fc1;
-//@link-color:  #498fc1;
 @main-color:  #60AADF;
 @link-color:  #60AADF;
 @button-color: #000000;

diff --git a/skins/chameleon-blue/styles.css b/skins/chameleon-blue/styles.css
diff --git a/skins/chameleon-blue/styles.less b/skins/chameleon-blue/styles.less
@@ -143,6 +143,15 @@ body.login #header {
 	margin-top: 10px;
 }
 
+#logon_page {
+	padding: 5px;
+	margin-bottom: 15px;
+	border: solid 2px @main-color;
+	background-color: screen(@main-color, #eee);
+	color: darken(@main-color, 25%);
+	display: none;
+}
+
 .topgradient {
 	height: 0;
 }

diff --git a/skins/chameleon-blue/templates/contactprint.html b/skins/chameleon-blue/templates/contactprint.html
@@ -0,0 +1,19 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<link rel="stylesheet" type="text/css" href="./skins/larry/print.css" />
+</head>
+<body>
+
+<div id="header"><roundcube:object name="logo" src="/images/kolab_logo.png" id="toplogo" border="0" alt="Logo" /></div>
+
+<div id="contact-details" class="boxcontent">
+	<div id="contactphoto"><roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" placeholderGroup="/images/contactgroup.png" /></div>
+	<roundcube:object name="contacthead" id="contacthead" />
+	<br style="clear:both" />
+	<roundcube:object name="contactdetails" />
+</div>
+
+</body>
+</html>
diff --git a/skins/chameleon-blue/templates/login.html b/skins/chameleon-blue/templates/login.html
@@ -54,5 +54,14 @@ <h1 class="voice login-title"><roundcube:label name="welcome" /></h1>
   /images/watermark.png
 " />
 
+<script type="text/javascript">
+$(document).ready(function() {
+    var div = $('#logon_page');
+
+    if (div.length && div.text())
+        div.prependTo($('#login-form div.box-inner')).show();
+});
+</script>
+
 </body>
 </html>