diabook-themes: some css/bug-fixes

diff --git a/view/theme/diabook-aerith/login.tpl b/view/theme/diabook-aerith/login.tpl
new file mode 100644 (file)
index 0000000..efa7c2d
--- /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 48aee84aea9d0e6ab3281386bd0e8bc9b08a1815..5e424caf752af9680b1457bebb7733d264d263c5 100644 (file)
--- 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 abab80a6af55874e92bf76612754c89bce1a4a4b..1d4628f38df40c41a9dafbe4f781a73ea8ebb720 100644 (file)
--- 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 8dd6bf28d92d5b8693461e89fc1184ff8adf416c..f30805cfb47d8c51d5e19f2821512e7532afcda4 100644 (file)
--- 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 dc1fbd2851868d29ff92abb23e4d6e36e43ee04b..e51491a88b6779a6a9a4dbf2af0013340edac731 100644 (file)
--- 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 e92283ca0ce9f038d4f5ec43c4b27e2db18be156..69191bca40d12ff2be3106889a35c648ed93c935 100644 (file)
--- 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 be944b0af8d625eaf29cf01f566d08968ae11b3c..ff736076d3ae882a6b6cf76bff78e1eced7441b2 100644 (file)
--- 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 (file)
index 0000000..efa7c2d
--- /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 819417965ceb1ba0a3be012293013813a2c48e9c..4c6837d92be96dbc9cecdba01cf644bea429fdc9 100644 (file)
--- 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 3f4756ccc8f82204156d61231e21b6ae0c1c8f58..dff0f452bc965dd57d7f3edce32b0147487c9a10 100644 (file)
--- 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 66f988a8dbd03411f10cb8bfec43fe5eb276f38c..846d2b38760a892813cbb7cf146e689d139a3c79 100644 (file)
--- 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 c7b33dbc701d01db8705d89692e8f281a020cdea..332b4fbfc8b5755aa9e9a9aa96072e96cf3a2a82 100644 (file)
--- 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 b5f96a05b72bc71a0718a2287e2204ea3937300f..1f05684a93c2316cfd4c42b818c24595191be73b 100644 (file)
--- 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 eb43b728e095a74f85c4fb049f5a83e52550a859..954b7d94a162cfdb594a0cc8a89fed9d6222d1f1 100644 (file)
--- 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 (file)
index 0000000..efa7c2d
--- /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 b58e7137d5dbfbd433276d2305109e8cdd7e6dbb..d8f9bccd8d7c3f722511551eb4eef4fdb493d6c8 100644 (file)
--- 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 8c0600b5a863b2850946b785efdfdaa967b434e4..50a04fe830b7a0a65a1afdeb4f0cd09d60af2c00 100644 (file)
--- 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 84510c5d4c7c0325607b151f85949db3da7d8ecc..28280ad5517e76fef92e30f875615002099f9aa4 100644 (file)
--- 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 4f5de365bfcd4fe548b3524834ecf5258ae0d666..6bdadd3979998f2e7e4d01b672193e44d6ed7ce1 100644 (file)
--- 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 6ea2a8461c128f26c61abf341bad63502ac30edd..adb19b90d10ccc05a49997dd5bb82fcdc3d938a9 100644 (file)
--- 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 122096213938fd2808ab175b4e42af3d543540ab..051871d103847a591b249bee7f7fc9055e66b2ba 100644 (file)
--- 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 (file)
index 0000000..53f59c0
Binary files /dev/null and b/view/theme/diabook/icons/events2.png differ

diff --git a/view/theme/diabook/login.tpl b/view/theme/diabook/login.tpl
new file mode 100644 (file)
index 0000000..efa7c2d
--- /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 28f3638476fb373fc6220864bd16407f37d84c60..af819b061866f322df921dc6d38a70c7691b4ed0 100644 (file)
--- 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 21c08e856bcc4f94c9eed1bc0c9264d7fb81573a..739a97b3555bc13197a4e5edecad12b0656ca6b7 100644 (file)
--- 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 e7cede6b86b14b5c2c5e9da4dc58f931fd23278d..21af162e83df98327ccabbf8320c49e1a0c38c3a 100644 (file)
--- 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 71b0348659400360ded530b8f9c6d4fb756a660f..a830e810e461dab9d58659240015a7d295b0bf92 100644 (file)
--- 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 6287a05ba68fcf5247df534a78a2d5eb39166b01..2fff20d810c03eee3b7f587ae423a81dc22e2596 100644 (file)
--- 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 0afb2cac8864367a1794cb9cc463393996253c5e..39d60f3218ae74b7217fe1e0719c0c503ed633c6 100644 (file)
--- 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;
 }