Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
f175af05f9
|
@ -6,7 +6,7 @@
|
|||
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
|
||||
<meta name="viewport" content="width=800, initial-scale=1, maximum-scale=3">
|
||||
<meta name="viewport" content="width=800, initial-scale=1, maximum-scale=3" />
|
||||
|
||||
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
|
||||
<link rel="search"
|
||||
|
|
|
@ -4,9 +4,20 @@
|
|||
{{ endif }}
|
||||
</div>
|
||||
|
||||
<div id="close_profiles">
|
||||
{{ if $comunity_profilest_title }}
|
||||
<h3>$comunity_profilest_title<a id="close_comunity_profiles_icon" onClick="close_profiles()" class="icon close_box" title="close"></a></h3>
|
||||
<div id='lastusers-wrapper' class='items-wrapper'>
|
||||
{{ for $comunity_profiles_items as $i }}
|
||||
$i
|
||||
{{ endfor }}
|
||||
</div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
<div id="close_helpers">
|
||||
{{ if $lastusers_title }}
|
||||
<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
|
||||
<h3>$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
|
||||
<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
|
||||
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
|
||||
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
|
||||
|
|
|
@ -1182,7 +1182,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1191,14 +1191,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1178,7 +1178,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1187,14 +1187,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1158,7 +1158,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1167,14 +1167,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1154,7 +1154,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1163,14 +1163,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1148,7 +1148,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1157,14 +1157,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1144,7 +1144,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1153,14 +1153,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1128,7 +1128,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1137,14 +1137,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1124,7 +1124,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1133,14 +1133,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1158,7 +1158,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1167,14 +1167,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1155,7 +1155,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1164,14 +1164,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1134,7 +1134,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1143,14 +1143,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1130,7 +1130,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1139,14 +1139,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1158,7 +1158,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1167,14 +1167,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1155,7 +1155,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1164,14 +1164,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1134,7 +1134,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1143,14 +1143,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1130,7 +1130,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1139,14 +1139,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1182,7 +1182,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1191,14 +1191,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1178,7 +1178,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1187,14 +1187,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1141,7 +1141,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1150,14 +1150,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -1137,7 +1137,7 @@ list-style-type: disc;
|
|||
}
|
||||
/* widget: search */
|
||||
span.sbox_l {
|
||||
background: white url('../diabook/icons/srch_l.gif') no-repeat top left;
|
||||
background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-left: 10px;
|
||||
|
@ -1146,14 +1146,14 @@ span.sbox_l {
|
|||
}
|
||||
|
||||
span.sbox_r {
|
||||
background: white url('../diabook/icons/srch_r.gif') no-repeat top left;
|
||||
background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left;
|
||||
float: left;
|
||||
width: 19px; height: 19px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
span.sbox input {
|
||||
background: white url('../diabook/icons/srch_bg.gif') repeat-x top left;
|
||||
background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left;
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
border: 0;
|
||||
|
|
|
@ -44,6 +44,26 @@ function diabook_community_info(){
|
|||
$a = get_app();
|
||||
|
||||
|
||||
// comunity_profiles
|
||||
$aside['$comunity_profilest_title'] = t('Community Profiles');
|
||||
$aside['$comunity_profiles_items'] = array();
|
||||
$r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id
|
||||
where glink.cid = 0 and glink.uid = 0 order by rand() limit 9");
|
||||
$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
|
||||
if(count($r)) {
|
||||
$photo = 'photo';
|
||||
foreach($r as $rr) {
|
||||
$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
|
||||
$entry = replace_macros($tpl,array(
|
||||
'$id' => $rr['id'],
|
||||
'$profile-link' => zrl($rr['url']),
|
||||
'$photo' => $rr[$photo],
|
||||
'$alt-text' => $rr['name'],
|
||||
));
|
||||
$aside['$comunity_profiles_items'][] = $entry;
|
||||
}
|
||||
}
|
||||
|
||||
// last 12 users
|
||||
$aside['$lastusers_title'] = t('Last users');
|
||||
$aside['$lastusers_items'] = array();
|
||||
|
@ -175,9 +195,8 @@ function diabook_community_info(){
|
|||
|
||||
//Community Page
|
||||
if(local_user()) {
|
||||
$page = '<div id="page-sidebar-right_aside" class="widget">
|
||||
<div class="title tool">
|
||||
<h3>'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
|
||||
$page = '<div id="page-sidebar-right_aside" >
|
||||
<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
|
||||
<div id="sidebar-page-list"><ul>';
|
||||
|
||||
$pagelist = array();
|
||||
|
@ -266,9 +285,9 @@ if ($a->argv[0] === "network" && local_user()){
|
|||
|
||||
}
|
||||
|
||||
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
|
||||
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
|
||||
|
||||
if($ccCookie != "8") {
|
||||
if($ccCookie != "9") {
|
||||
// COMMUNITY
|
||||
diabook_community_info();
|
||||
|
||||
|
@ -282,7 +301,7 @@ if ($a->argv[0] === "network" && local_user()){
|
|||
|
||||
//right_aside at profile pages
|
||||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
|
||||
if($ccCookie != "8") {
|
||||
if($ccCookie != "9") {
|
||||
// COMMUNITY
|
||||
diabook_community_info();
|
||||
|
||||
|
@ -356,7 +375,7 @@ $a->page['htmlhead'] .= '
|
|||
bird: false,
|
||||
avatar: false,
|
||||
colorExterior: "#fff",
|
||||
title: "Last tweets",
|
||||
title: "Last Tweets",
|
||||
timeout: 10000 });
|
||||
});
|
||||
|
||||
|
@ -442,6 +461,7 @@ $a->page['htmlhead'] .= '
|
|||
function restore_boxes(){
|
||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_profiles","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_services","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_friends","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_twitter","2", { expires: 365, path: "/" });
|
||||
|
@ -464,7 +484,7 @@ $a->page['htmlhead'] .= '
|
|||
</script>';
|
||||
|
||||
|
||||
if($ccCookie != "8") {
|
||||
if($ccCookie != "9") {
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
$("right_aside").ready(function(){
|
||||
|
@ -473,6 +493,11 @@ $("right_aside").ready(function(){
|
|||
{
|
||||
document.getElementById( "close_pages" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie("close_profiles") == "1")
|
||||
{
|
||||
document.getElementById( "close_profiles" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie("close_helpers") == "1")
|
||||
{
|
||||
|
@ -516,6 +541,11 @@ function close_pages(){
|
|||
$.cookie("close_pages","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_profiles(){
|
||||
document.getElementById( "close_profiles" ).style.display = "none";
|
||||
$.cookie("close_profiles","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_helpers(){
|
||||
document.getElementById( "close_helpers" ).style.display = "none";
|
||||
$.cookie("close_helpers","1", { expires: 365, path: "/" });
|
||||
|
|
|
@ -73,8 +73,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
||||
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
|
||||
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;}
|
||||
#search-text{border:1px #eec solid;background:#2e2f2e;color:#eec;}
|
||||
.search-box #search-text{margin:8px;width:10em;height:14px;color:#eec;}
|
||||
#search-text{border:1px #eec solid;background:#2e2f2e;color:#eec;font-size:8pt;margin:8px;width:10em;height:14px;}
|
||||
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
|
||||
#user-menu{box-shadow:5px 0 10px 0 #111;display:block;width:75%;margin:3px 0 0 0;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("dark/menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;}
|
||||
#user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;}
|
||||
|
|
|
@ -477,13 +477,11 @@ nav #nav-notifications-linkmenu {
|
|||
#search-text {
|
||||
border: 1px #eec solid;
|
||||
background: #2e2f2e;
|
||||
color: #eec; }
|
||||
|
||||
.search-box #search-text {
|
||||
color: #eec;
|
||||
font-size: 8pt;
|
||||
margin: 8px;
|
||||
width: 10em;
|
||||
height: 14px;
|
||||
color: #eec; }
|
||||
height: 14px; }
|
||||
|
||||
#scrollup {
|
||||
position: fixed;
|
||||
|
|
|
@ -73,8 +73,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
||||
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
|
||||
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;border-radius:5px;}
|
||||
#search-text{border:1px #eec solid;background:#2e3436;color:#eec;}
|
||||
.search-box #search-text{margin:8px;width:10em;height:14px;color:#eec;}
|
||||
#search-text{border:1px #eec solid;background:#2e3436;color:#eec;font-size:8pt;margin:8px;width:10em;height:14px;}
|
||||
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
|
||||
#user-menu{box-shadow:5px 0 10px 0 #111;display:block;width:75%;margin:3px 0 0 0;position:relative;background-color:#555753;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#555753 url("light/menu-user-pin.jpg") 98% center no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;}
|
||||
#user-menu-label{font-size:12px;padding:3px 20px 9px 5px;height:10px;}
|
||||
|
|
|
@ -478,13 +478,11 @@ nav #nav-notifications-linkmenu {
|
|||
#search-text {
|
||||
border: 1px #eec solid;
|
||||
background: #2e3436;
|
||||
color: #eec; }
|
||||
|
||||
.search-box #search-text {
|
||||
color: #eec;
|
||||
font-size: 8pt;
|
||||
margin: 8px;
|
||||
width: 10em;
|
||||
height: 14px;
|
||||
color: #eec; }
|
||||
height: 14px; }
|
||||
|
||||
#scrollup {
|
||||
position: fixed;
|
||||
|
|
Loading…
Reference in a new issue