From 1b6c84d8f453ff591451e3304547b239a3d86c5b Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Wed, 18 Apr 2012 02:36:30 +0200
Subject: [PATCH] diabook-themes: some css/bug-fixes

---
 view/theme/diabook-aerith/login.tpl           |  33 +++++++++++++
 .../diabook-aerith/style-network-wide.css     |   2 +-
 view/theme/diabook-aerith/style-network.css   |   2 +-
 .../diabook-aerith/style-profile-wide.css     |   2 +-
 view/theme/diabook-aerith/style-profile.css   |   2 +-
 view/theme/diabook-aerith/style-wide.css      |  45 ++++++++++++++---
 view/theme/diabook-aerith/style.css           |  46 ++++++++++++++----
 view/theme/diabook-blue/login.tpl             |  33 +++++++++++++
 .../theme/diabook-blue/style-network-wide.css |   2 +-
 view/theme/diabook-blue/style-network.css     |   2 +-
 .../theme/diabook-blue/style-profile-wide.css |   2 +-
 view/theme/diabook-blue/style-profile.css     |   2 +-
 view/theme/diabook-blue/style-wide.css        |  45 ++++++++++++++---
 view/theme/diabook-blue/style.css             |  45 ++++++++++++++---
 view/theme/diabook-red/login.tpl              |  33 +++++++++++++
 view/theme/diabook-red/style-network-wide.css |   2 +-
 view/theme/diabook-red/style-network.css      |   2 +-
 view/theme/diabook-red/style-profile-wide.css |   2 +-
 view/theme/diabook-red/style-profile.css      |   2 +-
 view/theme/diabook-red/style-wide.css         |  45 ++++++++++++++---
 view/theme/diabook-red/style.css              |  45 ++++++++++++++---
 view/theme/diabook/icons/events2.png          | Bin 0 -> 1823 bytes
 view/theme/diabook/login.tpl                  |  33 +++++++++++++
 view/theme/diabook/style-network-wide.css     |   2 +-
 view/theme/diabook/style-network.css          |   7 +--
 view/theme/diabook/style-profile-wide.css     |   2 +-
 view/theme/diabook/style-profile.css          |   2 +-
 view/theme/diabook/style-wide.css             |  44 +++++++++++++----
 view/theme/diabook/style.css                  |  43 +++++++++++++---
 29 files changed, 441 insertions(+), 86 deletions(-)
 create mode 100644 view/theme/diabook-aerith/login.tpl
 create mode 100644 view/theme/diabook-blue/login.tpl
 create mode 100644 view/theme/diabook-red/login.tpl
 create mode 100644 view/theme/diabook/icons/events2.png
 create mode 100644 view/theme/diabook/login.tpl

diff --git a/view/theme/diabook-aerith/login.tpl b/view/theme/diabook-aerith/login.tpl
new file mode 100644
index 0000000000..efa7c2d6dd
--- /dev/null
+++ b/view/theme/diabook-aerith/login.tpl
@@ -0,0 +1,33 @@
+
+<form action="$dest_url" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	{{ if $openid }}
+			<div id="login_openid">
+			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			</div>
+	{{ endif }}
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+	
+   <div id="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>	
+	
+	{{ for $hiddens as $k=>$v }}
+		<input type="hidden" name="$k" value="$v" />
+	{{ endfor }}
+	
+	
+</form>
+
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook-aerith/style-network-wide.css b/view/theme/diabook-aerith/style-network-wide.css
index 48aee84aea..5e424caf75 100644
--- a/view/theme/diabook-aerith/style-network-wide.css
+++ b/view/theme/diabook-aerith/style-network-wide.css
@@ -2372,7 +2372,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index abab80a6af..1d4628f38d 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -2361,7 +2361,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-aerith/style-profile-wide.css b/view/theme/diabook-aerith/style-profile-wide.css
index 8dd6bf28d9..f30805cfb4 100644
--- a/view/theme/diabook-aerith/style-profile-wide.css
+++ b/view/theme/diabook-aerith/style-profile-wide.css
@@ -2343,7 +2343,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index dc1fbd2851..e51491a88b 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -2331,7 +2331,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-aerith/style-wide.css b/view/theme/diabook-aerith/style-wide.css
index e92283ca0c..69191bca40 100644
--- a/view/theme/diabook-aerith/style-wide.css
+++ b/view/theme/diabook-aerith/style-wide.css
@@ -432,6 +432,12 @@ body {
   margin: 50px auto auto;
   display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
   font-size: 1.1em;
 }
@@ -1237,7 +1243,7 @@ aside #likes a:hover{
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-  margin-top: 20px;
+margin-bottom: 15px;
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -2634,16 +2640,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
 }
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2657,7 +2686,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index be944b0af8..ff736076d3 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -432,6 +432,12 @@ body {
   margin: 50px auto auto;
   display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
   font-size: 1.1em;
 }
@@ -1235,7 +1241,7 @@ aside #likes a:hover{
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-  margin-top: 20px;
+margin-bottom: 15px;
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -2622,16 +2628,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
 }
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2645,7 +2674,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
@@ -2658,7 +2687,6 @@ a.mail-list-link {
 .event-start .dtstart, .event-end .dtend {
         float: right;
 }
-
 .event-list-date {
         margin-bottom: 10px;
 }
diff --git a/view/theme/diabook-blue/login.tpl b/view/theme/diabook-blue/login.tpl
new file mode 100644
index 0000000000..efa7c2d6dd
--- /dev/null
+++ b/view/theme/diabook-blue/login.tpl
@@ -0,0 +1,33 @@
+
+<form action="$dest_url" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	{{ if $openid }}
+			<div id="login_openid">
+			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			</div>
+	{{ endif }}
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+	
+   <div id="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>	
+	
+	{{ for $hiddens as $k=>$v }}
+		<input type="hidden" name="$k" value="$v" />
+	{{ endfor }}
+	
+	
+</form>
+
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook-blue/style-network-wide.css b/view/theme/diabook-blue/style-network-wide.css
index 819417965c..4c6837d92b 100644
--- a/view/theme/diabook-blue/style-network-wide.css
+++ b/view/theme/diabook-blue/style-network-wide.css
@@ -2333,7 +2333,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 3f4756ccc8..dff0f452bc 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -2322,7 +2322,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-blue/style-profile-wide.css b/view/theme/diabook-blue/style-profile-wide.css
index 66f988a8db..846d2b3876 100644
--- a/view/theme/diabook-blue/style-profile-wide.css
+++ b/view/theme/diabook-blue/style-profile-wide.css
@@ -2310,7 +2310,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index c7b33dbc70..332b4fbfc8 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -2298,7 +2298,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-blue/style-wide.css b/view/theme/diabook-blue/style-wide.css
index b5f96a05b7..1f05684a93 100644
--- a/view/theme/diabook-blue/style-wide.css
+++ b/view/theme/diabook-blue/style-wide.css
@@ -431,6 +431,12 @@ body {
   margin: 50px auto auto;
   display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
   font-size: 1.1em;
 }
@@ -1197,7 +1203,7 @@ aside #side-peoplefind-url {
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-  margin-top: 20px;
+margin-bottom: 15px;
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -2590,16 +2596,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
 }
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2613,7 +2642,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index eb43b728e0..954b7d94a1 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -431,6 +431,12 @@ body {
   margin: 50px auto auto;
   display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
   font-size: 1.1em;
 }
@@ -1195,7 +1201,7 @@ aside #side-peoplefind-url {
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-  margin-top: 20px;
+margin-bottom: 15px;
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -2579,16 +2585,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
 }
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2602,7 +2631,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook-red/login.tpl b/view/theme/diabook-red/login.tpl
new file mode 100644
index 0000000000..efa7c2d6dd
--- /dev/null
+++ b/view/theme/diabook-red/login.tpl
@@ -0,0 +1,33 @@
+
+<form action="$dest_url" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	{{ if $openid }}
+			<div id="login_openid">
+			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			</div>
+	{{ endif }}
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+	
+   <div id="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>	
+	
+	{{ for $hiddens as $k=>$v }}
+		<input type="hidden" name="$k" value="$v" />
+	{{ endfor }}
+	
+	
+</form>
+
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook-red/style-network-wide.css b/view/theme/diabook-red/style-network-wide.css
index b58e7137d5..d8f9bccd8d 100644
--- a/view/theme/diabook-red/style-network-wide.css
+++ b/view/theme/diabook-red/style-network-wide.css
@@ -2369,7 +2369,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 8c0600b5a8..50a04fe830 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -2358,7 +2358,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-red/style-profile-wide.css b/view/theme/diabook-red/style-profile-wide.css
index 84510c5d4c..28280ad551 100644
--- a/view/theme/diabook-red/style-profile-wide.css
+++ b/view/theme/diabook-red/style-profile-wide.css
@@ -2324,7 +2324,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index 4f5de365bf..6bdadd3979 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -2312,7 +2312,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook-red/style-wide.css b/view/theme/diabook-red/style-wide.css
index 6ea2a8461c..adb19b90d1 100644
--- a/view/theme/diabook-red/style-wide.css
+++ b/view/theme/diabook-red/style-wide.css
@@ -431,6 +431,12 @@ body {
   margin: 50px auto auto;
   display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
   font-size: 1.1em;
 }
@@ -1226,7 +1232,7 @@ aside #side-peoplefind-url {
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-  margin-top: 20px;
+margin-bottom: 15px;
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -2618,16 +2624,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
 }
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2641,7 +2670,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index 1220962139..051871d103 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -431,6 +431,12 @@ body {
   margin: 50px auto auto;
   display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
   font-size: 1.1em;
 }
@@ -1224,7 +1230,7 @@ aside #side-peoplefind-url {
   margin-right: 20px;		
 	}
 #login-submit-wrapper{
-  margin-top: 20px;
+margin-bottom: 15px;
 	}
 .group_selected {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@@ -2607,16 +2613,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
 }
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2630,7 +2659,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
diff --git a/view/theme/diabook/icons/events2.png b/view/theme/diabook/icons/events2.png
new file mode 100644
index 0000000000000000000000000000000000000000..53f59c0067487b0633d6af432b8328150e54a60a
GIT binary patch
literal 1823
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
N002ovPDHLkV1lWycu@cV

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/login.tpl b/view/theme/diabook/login.tpl
new file mode 100644
index 0000000000..efa7c2d6dd
--- /dev/null
+++ b/view/theme/diabook/login.tpl
@@ -0,0 +1,33 @@
+
+<form action="$dest_url" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	{{ if $openid }}
+			<div id="login_openid">
+			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			</div>
+	{{ endif }}
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+	
+   <div id="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>	
+	
+	{{ for $hiddens as $k=>$v }}
+		<input type="hidden" name="$k" value="$v" />
+	{{ endfor }}
+	
+	
+</form>
+
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css
index 28f3638476..af819b0618 100644
--- a/view/theme/diabook/style-network-wide.css
+++ b/view/theme/diabook/style-network-wide.css
@@ -2299,7 +2299,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 21c08e856b..739a97b355 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -2287,7 +2287,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
@@ -2309,10 +2309,7 @@ a.mail-list-link {
         margin-bottom: 15px;
 }
 
-.event-description:before {
-        content: url('../../../images/calendar.png');
-        margin-right: 15px;
-}
+
 
 .event-start, .event-end {
         margin-left: 10px;
diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css
index e7cede6b86..21af162e83 100644
--- a/view/theme/diabook/style-profile-wide.css
+++ b/view/theme/diabook/style-profile-wide.css
@@ -2277,7 +2277,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 71b0348659..a830e810e4 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -2266,7 +2266,7 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
         margin-left: 10px;
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
index 6287a05ba6..2fff20d810 100644
--- a/view/theme/diabook/style-wide.css
+++ b/view/theme/diabook/style-wide.css
@@ -435,6 +435,10 @@ body {
 
 }
 
+#jappix_mini {
+right: 45px !important;
+}
+
 h4 {
   font-size: 1.1em;
 }
@@ -1190,7 +1194,7 @@ aside #side-peoplefind-url {
   margin-right: 20px;	
 	}
 #login-submit-wrapper{
-  margin-top: 20px;
+  margin-bottom: 15px;
 	}
 /* widget */
 .widget {
@@ -2550,16 +2554,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
 }
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2573,7 +2600,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
@@ -2586,7 +2613,6 @@ a.mail-list-link {
 .event-start .dtstart, .event-end .dtend {
         float: right;
 }
-
 .event-list-date {
         margin-bottom: 10px;
 }
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 0afb2cac88..39d60f3218 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -436,6 +436,10 @@ body {
   display: table;
 }
 
+#jappix_mini {
+right: 45px !important;
+}
+
 h4 {
   font-size: 1.1em;
 }
@@ -1193,7 +1197,7 @@ aside #side-peoplefind-url {
   margin-right: 20px;	
 	}
 #login-submit-wrapper{
-  margin-top: 20px;
+  margin-bottom: 15px;
 	}
 /* widget */
 .widget {
@@ -2545,16 +2549,39 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
 }
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+
 
 #new-event-link {
         margin-bottom: 10px;
@@ -2568,7 +2595,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
-- 
2.39.5