mirror of
https://github.com/friendica/friendica
synced 2024-12-23 08:00:16 +00:00
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: diabook-themes: some css/bug-fixes messages.po/strings.php at 100% Esperanto Typo * master:
This commit is contained in:
Simon L'nu
commit
f087fd5581
32 changed files with 8967 additions and 80 deletions
|
|
@ -1476,7 +1476,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
if(! $item['deleted'])
|
||||
logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
|
||||
|
||||
if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
|
||||
if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
|
||||
$xo = parse_xml_string($item['object'],false);
|
||||
$xt = parse_xml_string($item['target'],false);
|
||||
if($xt->type === ACTIVITY_OBJ_NOTE) {
|
||||
|
|
@ -2092,7 +2092,7 @@ function local_delivery($importer,$data) {
|
|||
|
||||
logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);
|
||||
|
||||
if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
|
||||
if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
|
||||
$xo = parse_xml_string($item['object'],false);
|
||||
$xt = parse_xml_string($item['target'],false);
|
||||
|
||||
|
|
|
|||
6954
view/eo/messages.po
Normal file
6954
view/eo/messages.po
Normal file
File diff suppressed because it is too large
Load diff
1578
view/eo/strings.php
Normal file
1578
view/eo/strings.php
Normal file
File diff suppressed because it is too large
Load diff
33
view/theme/diabook-aerith/login.tpl
Normal file
33
view/theme/diabook-aerith/login.tpl
Normal file
|
|
@ -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>
|
||||
|
|
@ -2372,7 +2372,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -2361,7 +2361,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -2343,7 +2343,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -2331,7 +2331,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
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-description, .vevent .event-location {
|
||||
.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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
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-description, .vevent .event-location {
|
||||
.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;
|
||||
}
|
||||
|
|
|
|||
33
view/theme/diabook-blue/login.tpl
Normal file
33
view/theme/diabook-blue/login.tpl
Normal file
|
|
@ -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>
|
||||
|
|
@ -2333,7 +2333,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -2322,7 +2322,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -2310,7 +2310,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -2298,7 +2298,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
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-description, .vevent .event-location {
|
||||
.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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
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-description, .vevent .event-location {
|
||||
.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;
|
||||
}
|
||||
|
||||
|
|
|
|||
33
view/theme/diabook-red/login.tpl
Normal file
33
view/theme/diabook-red/login.tpl
Normal file
|
|
@ -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>
|
||||
|
|
@ -2369,7 +2369,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -2358,7 +2358,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -2324,7 +2324,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -2312,7 +2312,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
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-description, .vevent .event-location {
|
||||
.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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
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-description, .vevent .event-location {
|
||||
.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;
|
||||
}
|
||||
|
||||
|
|
|
|||
BIN
view/theme/diabook/icons/events2.png
Normal file
BIN
view/theme/diabook/icons/events2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
33
view/theme/diabook/login.tpl
Normal file
33
view/theme/diabook/login.tpl
Normal file
|
|
@ -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>
|
||||
|
|
@ -2299,7 +2299,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -2277,7 +2277,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -2266,7 +2266,7 @@ a.mail-list-link {
|
|||
}
|
||||
|
||||
.vevent {
|
||||
border: 1px solid #CCCCCC;
|
||||
|
||||
}
|
||||
.vevent .event-description, .vevent .event-location {
|
||||
margin-left: 10px;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
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-description, .vevent .event-location {
|
||||
.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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
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-description, .vevent .event-location {
|
||||
.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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue