Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: diabook-themes: css-fixes diabook-themes: fixes in js diabook-themes: fixed pageheader diabook-themes: bugfixes / css-fixes make the "new calendar" (javascript interactive) the default remove zrl from query string catch a couple more Oo smilies add page_content_top hook * master:
This commit is contained in:
Simon L'nu
commit
9cb3fc226a
|
|
@ -225,6 +225,9 @@ if(! function_exists('paginate')) {
|
|||
function paginate(&$a) {
|
||||
$o = '';
|
||||
$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
|
||||
|
||||
// $stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped);
|
||||
|
||||
$stripped = str_replace('q=','',$stripped);
|
||||
$stripped = trim($stripped,'/');
|
||||
$pagenum = $a->pager['page'];
|
||||
|
|
@ -725,6 +728,8 @@ function smilies($s, $sample = false) {
|
|||
'\\o/',
|
||||
'o.O',
|
||||
'O.o',
|
||||
'o_O',
|
||||
'O_o',
|
||||
":'(",
|
||||
":-!",
|
||||
":-/",
|
||||
|
|
@ -759,6 +764,8 @@ function smilies($s, $sample = false) {
|
|||
'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
|
||||
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
|
||||
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
|
||||
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" />',
|
||||
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />',
|
||||
'<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
|
||||
'<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
|
||||
'<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
|
|||
|
||||
if(x($_GET,'zrl')) {
|
||||
$_SESSION['my_url'] = $_GET['zrl'];
|
||||
$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -243,6 +244,8 @@ if (file_exists($theme_info_file)){
|
|||
if(! x($a->page,'content'))
|
||||
$a->page['content'] = '';
|
||||
|
||||
if(! $install)
|
||||
call_hooks('page_content_top',$a->page['content']);
|
||||
|
||||
/**
|
||||
* Call module functions
|
||||
|
|
|
|||
|
|
@ -284,11 +284,11 @@ function events_content(&$a) {
|
|||
if (x($_GET,'id')){
|
||||
$tpl = get_markup_template("event.tpl");
|
||||
} else {
|
||||
if (get_config('experimentals','new_calendar')==1){
|
||||
// if (get_config('experimentals','new_calendar')==1){
|
||||
$tpl = get_markup_template("events-js.tpl");
|
||||
} else {
|
||||
$tpl = get_markup_template("events.tpl");
|
||||
}
|
||||
// } else {
|
||||
// $tpl = get_markup_template("events.tpl");
|
||||
// }
|
||||
}
|
||||
$o = replace_macros($tpl, array(
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
<div id="profile-jot-wrapper" >
|
||||
<div id="profile-jot-banner-wrapper">
|
||||
<div id="profile-jot-desc" > </div>
|
||||
<div id="character-counter" class="grey"></div>
|
||||
</div>
|
||||
<div id="profile-jot-banner-end"></div>
|
||||
|
||||
|
|
@ -15,6 +14,7 @@
|
|||
<input type="hidden" name="post_id" value="$post_id" />
|
||||
<input type="hidden" name="preview" id="jot-preview" value="0" />
|
||||
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
|
||||
<div id="character-counter" class="grey"></div>
|
||||
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
</div>
|
||||
|
||||
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
|
||||
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
|
||||
|
||||
{{ if $location }}
|
||||
|
|
|
|||
|
|
@ -1198,10 +1198,14 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1256,7 +1260,7 @@ right_aside {
|
|||
/* background: #F1F1F1; */
|
||||
}
|
||||
right_aside a{color: #3465A4;}
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
|
||||
margin-top:30px;}
|
||||
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
|
||||
right_aside .directory-photo { margin: 0px; }
|
||||
|
|
@ -1613,6 +1617,11 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
|
|||
|
|
@ -1193,10 +1193,14 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1251,7 +1255,7 @@ right_aside {
|
|||
/* background: #F1F1F1; */
|
||||
}
|
||||
right_aside a{color: #3465A4;}
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
|
||||
margin-top:30px;}
|
||||
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
|
||||
right_aside .directory-photo { margin: 0px; }
|
||||
|
|
@ -1603,6 +1607,11 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2076,6 +2085,7 @@ box-shadow: 2px 2px 5px 0px #000000;
|
|||
margin: 2px 5px 2px 5px;
|
||||
max-height: 85%;
|
||||
max-width: 85%;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.lframe {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -1191,8 +1191,10 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/opt/lampp/htdocs/friendica/view/theme/diabook/search_item.tpl/**
|
||||
/**
|
||||
* Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
|
||||
* Additional Changes: Michael Vogel <icarus@dabo.de>
|
||||
**/
|
||||
|
|
@ -1062,6 +1062,7 @@ aside {
|
|||
float: left;
|
||||
/* background: #F1F1F1; */
|
||||
}
|
||||
aside #page-sidebar{display: none;}
|
||||
aside .vcard .fn {
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
|
|
@ -1254,10 +1255,14 @@ section {
|
|||
}
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1622,6 +1627,11 @@ body .pageheader{
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2096,6 +2106,7 @@ box-shadow: 2px 2px 5px 0px #000000;
|
|||
margin: 2px 5px 2px 5px;
|
||||
max-height: 85%;
|
||||
max-width: 85%;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.lframe {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* Name: Diabook-aerith
|
||||
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||
* Version:
|
||||
* Version: (Version: 1.011)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
|
@ -164,7 +164,8 @@ function diabook_aerith_community_info(){
|
|||
$pagelist = array();
|
||||
|
||||
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
|
||||
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
|
||||
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
|
||||
ORDER BY `name` ASC",
|
||||
intval($a->user['uid'])
|
||||
);
|
||||
|
||||
|
|
@ -316,56 +317,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
|
|||
|
||||
//js scripts
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
$a->page['htmlhead'] .= '
|
||||
|
||||
<script>
|
||||
$(function() {
|
||||
$('a.lightbox').fancybox(); // Select all links with lightbox class
|
||||
|
||||
$("a.lightbox").fancybox(); // Select all links with lightbox class
|
||||
});
|
||||
|
||||
</script>';
|
||||
|
||||
</script>
|
||||
|
||||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
|
||||
$("right_aside").ready(function(){
|
||||
|
||||
if($.cookie('close_pages') == '1')
|
||||
if($.cookie("close_pages") == "1")
|
||||
{
|
||||
document.getElementById( "close_pages" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_helpers') == '1')
|
||||
if($.cookie("close_helpers") == "1")
|
||||
{
|
||||
document.getElementById( "close_helpers" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_services') == '1')
|
||||
if($.cookie("close_services") == "1")
|
||||
{
|
||||
document.getElementById( "close_services" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_friends') == '1')
|
||||
if($.cookie("close_friends") == "1")
|
||||
{
|
||||
document.getElementById( "close_friends" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_postit') == '1')
|
||||
if($.cookie("close_postit") == "1")
|
||||
{
|
||||
document.getElementById( "close_postit" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastusers') == '1')
|
||||
if($.cookie("close_lastusers") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastusers" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastphotos') == '1')
|
||||
if($.cookie("close_lastphotos") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastphotos" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastlikes') == '1')
|
||||
if($.cookie("close_lastlikes") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
};}
|
||||
|
|
@ -374,57 +377,55 @@ $("right_aside").ready(function(){
|
|||
|
||||
function close_pages(){
|
||||
document.getElementById( "close_pages" ).style.display = "none";
|
||||
$.cookie('close_pages','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_pages","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_helpers(){
|
||||
document.getElementById( "close_helpers" ).style.display = "none";
|
||||
$.cookie('close_helpers','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_helpers","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_services(){
|
||||
document.getElementById( "close_services" ).style.display = "none";
|
||||
$.cookie('close_services','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_services","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_friends(){
|
||||
document.getElementById( "close_friends" ).style.display = "none";
|
||||
$.cookie('close_friends','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_friends","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_postit(){
|
||||
document.getElementById( "close_postit" ).style.display = "none";
|
||||
$.cookie('close_postit','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_postit","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastusers(){
|
||||
document.getElementById( "close_lastusers" ).style.display = "none";
|
||||
$.cookie('close_lastusers','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastphotos(){
|
||||
document.getElementById( "close_lastphotos" ).style.display = "none";
|
||||
$.cookie('close_lastphotos','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastphotos","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastlikes(){
|
||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
$.cookie('close_lastlikes','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
|
||||
|
||||
function restore_boxes(){
|
||||
$.cookie('close_pages','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_helpers','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_services','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_friends','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_postit','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastusers','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
|
||||
alert('Right-hand column was restored. Please refresh your browser');
|
||||
};
|
||||
|
||||
</script>
|
||||
|
||||
EOT;
|
||||
|
||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_services","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_friends","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_postit","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||
alert("Right-hand column was restored. Please refresh your browser");
|
||||
};
|
||||
</script>';}
|
||||
|
|
@ -71,6 +71,10 @@
|
|||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.filer }}
|
||||
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
<div id="profile-jot-wrapper" >
|
||||
<div id="profile-jot-banner-wrapper">
|
||||
<div id="profile-jot-desc" > </div>
|
||||
<div id="character-counter" class="grey"></div>
|
||||
</div>
|
||||
<div id="profile-jot-banner-end"></div>
|
||||
|
||||
|
|
@ -15,6 +14,7 @@
|
|||
<input type="hidden" name="post_id" value="$post_id" />
|
||||
<input type="hidden" name="preview" id="jot-preview" value="0" />
|
||||
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
|
||||
<div id="character-counter" class="grey"></div>
|
||||
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
</div>
|
||||
|
||||
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
|
||||
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
|
||||
|
||||
{{ if $location }}
|
||||
|
|
|
|||
|
|
@ -1160,10 +1160,14 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1215,7 +1219,7 @@ right_aside {
|
|||
/* background: #F1F1F1; */
|
||||
}
|
||||
right_aside a{color: #1872A2;}
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
|
||||
margin-top:30px;}
|
||||
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
|
||||
right_aside .directory-photo { margin: 0px; }
|
||||
|
|
@ -1571,6 +1575,11 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
|
|||
|
|
@ -1159,10 +1159,14 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1214,7 +1218,7 @@ right_aside {
|
|||
/* background: #F1F1F1; */
|
||||
}
|
||||
right_aside a{color: #1872A2;}
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
|
||||
margin-top:30px;}
|
||||
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
|
||||
right_aside .directory-photo { margin: 0px; }
|
||||
|
|
@ -1566,6 +1570,11 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2035,6 +2044,7 @@ box-shadow: 2px 2px 5px 0px #000000;
|
|||
margin: 2px 5px 2px 5px;
|
||||
max-height: 85%;
|
||||
max-width: 85%;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.lframe {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -1156,8 +1156,10 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
|
|
|
|||
|
|
@ -1030,6 +1030,7 @@ aside {
|
|||
float: left;
|
||||
/* background: #F1F1F1; */
|
||||
}
|
||||
aside #page-sidebar{display: none;}
|
||||
aside .vcard .fn {
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
|
|
@ -1210,10 +1211,14 @@ section {
|
|||
}
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1575,6 +1580,11 @@ body .pageheader{
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2044,6 +2054,7 @@ box-shadow: 2px 2px 5px 0px #000000;
|
|||
margin: 2px 5px 2px 5px;
|
||||
max-height: 85%;
|
||||
max-width: 85%;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.lframe {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* Name: Diabook-blue
|
||||
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||
* Version:
|
||||
* Version: (Version: 1.011)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
|
@ -164,7 +164,8 @@ function diabook_blue_community_info(){
|
|||
$pagelist = array();
|
||||
|
||||
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
|
||||
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
|
||||
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
|
||||
ORDER BY `name` ASC",
|
||||
intval($a->user['uid'])
|
||||
);
|
||||
|
||||
|
|
@ -316,56 +317,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
|
|||
|
||||
//js scripts
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
$a->page['htmlhead'] .= '
|
||||
|
||||
<script>
|
||||
$(function() {
|
||||
$('a.lightbox').fancybox(); // Select all links with lightbox class
|
||||
|
||||
$("a.lightbox").fancybox(); // Select all links with lightbox class
|
||||
});
|
||||
|
||||
</script>';
|
||||
|
||||
</script>
|
||||
|
||||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
|
||||
$("right_aside").ready(function(){
|
||||
|
||||
if($.cookie('close_pages') == '1')
|
||||
if($.cookie("close_pages") == "1")
|
||||
{
|
||||
document.getElementById( "close_pages" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_helpers') == '1')
|
||||
if($.cookie("close_helpers") == "1")
|
||||
{
|
||||
document.getElementById( "close_helpers" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_services') == '1')
|
||||
if($.cookie("close_services") == "1")
|
||||
{
|
||||
document.getElementById( "close_services" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_friends') == '1')
|
||||
if($.cookie("close_friends") == "1")
|
||||
{
|
||||
document.getElementById( "close_friends" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_postit') == '1')
|
||||
if($.cookie("close_postit") == "1")
|
||||
{
|
||||
document.getElementById( "close_postit" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastusers') == '1')
|
||||
if($.cookie("close_lastusers") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastusers" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastphotos') == '1')
|
||||
if($.cookie("close_lastphotos") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastphotos" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastlikes') == '1')
|
||||
if($.cookie("close_lastlikes") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
};}
|
||||
|
|
@ -374,57 +377,55 @@ $("right_aside").ready(function(){
|
|||
|
||||
function close_pages(){
|
||||
document.getElementById( "close_pages" ).style.display = "none";
|
||||
$.cookie('close_pages','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_pages","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_helpers(){
|
||||
document.getElementById( "close_helpers" ).style.display = "none";
|
||||
$.cookie('close_helpers','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_helpers","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_services(){
|
||||
document.getElementById( "close_services" ).style.display = "none";
|
||||
$.cookie('close_services','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_services","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_friends(){
|
||||
document.getElementById( "close_friends" ).style.display = "none";
|
||||
$.cookie('close_friends','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_friends","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_postit(){
|
||||
document.getElementById( "close_postit" ).style.display = "none";
|
||||
$.cookie('close_postit','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_postit","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastusers(){
|
||||
document.getElementById( "close_lastusers" ).style.display = "none";
|
||||
$.cookie('close_lastusers','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastphotos(){
|
||||
document.getElementById( "close_lastphotos" ).style.display = "none";
|
||||
$.cookie('close_lastphotos','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastphotos","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastlikes(){
|
||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
$.cookie('close_lastlikes','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
|
||||
|
||||
function restore_boxes(){
|
||||
$.cookie('close_pages','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_helpers','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_services','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_friends','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_postit','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastusers','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
|
||||
alert('Right-hand column was restored. Please refresh your browser');
|
||||
};
|
||||
|
||||
</script>
|
||||
|
||||
EOT;
|
||||
|
||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_services","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_friends","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_postit","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||
alert("Right-hand column was restored. Please refresh your browser");
|
||||
};
|
||||
</script>';}
|
||||
|
|
|
|||
|
|
@ -71,6 +71,10 @@
|
|||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.filer }}
|
||||
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
<div id="profile-jot-wrapper" >
|
||||
<div id="profile-jot-banner-wrapper">
|
||||
<div id="profile-jot-desc" > </div>
|
||||
<div id="character-counter" class="grey"></div>
|
||||
</div>
|
||||
<div id="profile-jot-banner-end"></div>
|
||||
|
||||
|
|
@ -15,6 +14,7 @@
|
|||
<input type="hidden" name="post_id" value="$post_id" />
|
||||
<input type="hidden" name="preview" id="jot-preview" value="0" />
|
||||
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
|
||||
<div id="character-counter" class="grey"></div>
|
||||
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
</div>
|
||||
|
||||
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
|
||||
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
|
||||
|
||||
{{ if $location }}
|
||||
|
|
|
|||
|
|
@ -1198,10 +1198,14 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1253,7 +1257,7 @@ right_aside {
|
|||
/* background: #F1F1F1; */
|
||||
}
|
||||
right_aside a{color: red;}
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
|
||||
margin-top:30px;}
|
||||
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
|
||||
right_aside .directory-photo { margin: 0px; }
|
||||
|
|
@ -1609,6 +1613,11 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
|
|||
|
|
@ -1176,10 +1176,14 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1231,7 +1235,7 @@ right_aside {
|
|||
/* background: #F1F1F1; */
|
||||
}
|
||||
right_aside a{color: red;}
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
|
||||
margin-top:30px;}
|
||||
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
|
||||
right_aside .directory-photo { margin: 0px; }
|
||||
|
|
@ -1583,6 +1587,11 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2057,6 +2066,7 @@ box-shadow: 2px 2px 5px 0px #000000;
|
|||
margin: 2px 5px 2px 5px;
|
||||
max-height: 85%;
|
||||
max-width: 85%;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.lframe {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -1173,8 +1173,10 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
|
|
|
|||
|
|
@ -1061,6 +1061,7 @@ aside {
|
|||
float: left;
|
||||
/* background: #F1F1F1; */
|
||||
}
|
||||
aside #page-sidebar{display: none;}
|
||||
aside .vcard .fn {
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
|
|
@ -1243,10 +1244,14 @@ section {
|
|||
}
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1608,6 +1613,11 @@ body .pageheader{
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2081,6 +2091,7 @@ box-shadow: 2px 2px 5px 0px #000000;
|
|||
margin: 2px 5px 2px 5px;
|
||||
max-height: 85%;
|
||||
max-width: 85%;
|
||||
border-radius: 10px;
|
||||
}
|
||||
.lframe {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* Name: Diabook-red
|
||||
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||
* Version:
|
||||
* Version: (Version: 1.011)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
|
@ -164,7 +164,8 @@ function diabook_red_community_info(){
|
|||
$pagelist = array();
|
||||
|
||||
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
|
||||
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
|
||||
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
|
||||
ORDER BY `name` ASC",
|
||||
intval($a->user['uid'])
|
||||
);
|
||||
|
||||
|
|
@ -317,56 +318,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
|
|||
|
||||
//js scripts
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
$a->page['htmlhead'] .= '
|
||||
|
||||
<script>
|
||||
$(function() {
|
||||
$('a.lightbox').fancybox(); // Select all links with lightbox class
|
||||
|
||||
$("a.lightbox").fancybox(); // Select all links with lightbox class
|
||||
});
|
||||
|
||||
</script>';
|
||||
|
||||
</script>
|
||||
|
||||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
|
||||
$("right_aside").ready(function(){
|
||||
|
||||
if($.cookie('close_pages') == '1')
|
||||
if($.cookie("close_pages") == "1")
|
||||
{
|
||||
document.getElementById( "close_pages" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_helpers') == '1')
|
||||
if($.cookie("close_helpers") == "1")
|
||||
{
|
||||
document.getElementById( "close_helpers" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_services') == '1')
|
||||
if($.cookie("close_services") == "1")
|
||||
{
|
||||
document.getElementById( "close_services" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_friends') == '1')
|
||||
if($.cookie("close_friends") == "1")
|
||||
{
|
||||
document.getElementById( "close_friends" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_postit') == '1')
|
||||
if($.cookie("close_postit") == "1")
|
||||
{
|
||||
document.getElementById( "close_postit" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastusers') == '1')
|
||||
if($.cookie("close_lastusers") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastusers" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastphotos') == '1')
|
||||
if($.cookie("close_lastphotos") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastphotos" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastlikes') == '1')
|
||||
if($.cookie("close_lastlikes") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
};}
|
||||
|
|
@ -375,57 +378,55 @@ $("right_aside").ready(function(){
|
|||
|
||||
function close_pages(){
|
||||
document.getElementById( "close_pages" ).style.display = "none";
|
||||
$.cookie('close_pages','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_pages","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_helpers(){
|
||||
document.getElementById( "close_helpers" ).style.display = "none";
|
||||
$.cookie('close_helpers','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_helpers","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_services(){
|
||||
document.getElementById( "close_services" ).style.display = "none";
|
||||
$.cookie('close_services','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_services","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_friends(){
|
||||
document.getElementById( "close_friends" ).style.display = "none";
|
||||
$.cookie('close_friends','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_friends","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_postit(){
|
||||
document.getElementById( "close_postit" ).style.display = "none";
|
||||
$.cookie('close_postit','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_postit","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastusers(){
|
||||
document.getElementById( "close_lastusers" ).style.display = "none";
|
||||
$.cookie('close_lastusers','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastphotos(){
|
||||
document.getElementById( "close_lastphotos" ).style.display = "none";
|
||||
$.cookie('close_lastphotos','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastphotos","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastlikes(){
|
||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
$.cookie('close_lastlikes','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
|
||||
|
||||
function restore_boxes(){
|
||||
$.cookie('close_pages','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_helpers','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_services','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_friends','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_postit','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastusers','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
|
||||
alert('Right-hand column was restored. Please refresh your browser');
|
||||
};
|
||||
|
||||
</script>
|
||||
|
||||
EOT;
|
||||
|
||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_services","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_friends","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_postit","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||
alert("Right-hand column was restored. Please refresh your browser");
|
||||
};
|
||||
</script>';}
|
||||
|
|
|
|||
|
|
@ -71,6 +71,10 @@
|
|||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.filer }}
|
||||
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
<div id="profile-jot-wrapper" >
|
||||
<div id="profile-jot-banner-wrapper">
|
||||
<div id="profile-jot-desc" > </div>
|
||||
<div id="character-counter" class="grey"></div>
|
||||
</div>
|
||||
<div id="profile-jot-banner-end"></div>
|
||||
|
||||
|
|
@ -15,6 +14,7 @@
|
|||
<input type="hidden" name="post_id" value="$post_id" />
|
||||
<input type="hidden" name="preview" id="jot-preview" value="0" />
|
||||
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
|
||||
<div id="character-counter" class="grey"></div>
|
||||
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
</div>
|
||||
|
||||
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
|
||||
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
|
||||
|
||||
{{ if $location }}
|
||||
|
|
|
|||
|
|
@ -1144,8 +1144,13 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
|
|
@ -1196,7 +1201,7 @@ right_aside {
|
|||
|
||||
/* background: #F1F1F1; */
|
||||
}
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
|
||||
margin-top:30px;}
|
||||
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
|
||||
right_aside .directory-photo { margin: 0px; }
|
||||
|
|
@ -1544,6 +1549,11 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
|
|||
|
|
@ -1138,10 +1138,14 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1191,7 +1195,7 @@ right_aside {
|
|||
|
||||
/* background: #F1F1F1; */
|
||||
}
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
|
||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
|
||||
margin-top:30px;}
|
||||
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
|
||||
right_aside .directory-photo { margin: 0px; }
|
||||
|
|
@ -1539,6 +1543,11 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2003,6 +2012,9 @@ ul.tabs li .active {
|
|||
float: left;
|
||||
}
|
||||
/* photo */
|
||||
.photo {
|
||||
border-radius: 10px;
|
||||
}
|
||||
.lframe {
|
||||
float: left;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1135,8 +1135,11 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
max-width: 575px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
|
|
|
|||
|
|
@ -1022,7 +1022,7 @@ aside {
|
|||
float: left;
|
||||
/* background: #F1F1F1; */
|
||||
}
|
||||
|
||||
aside #page-sidebar{display: none;}
|
||||
aside .vcard .fn {
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
|
|
@ -1190,10 +1190,14 @@ section {
|
|||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1550,6 +1554,11 @@ body .pageheader{
|
|||
padding: 0.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.grey
|
||||
{
|
||||
display: inline;
|
||||
float: right;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2014,6 +2023,9 @@ ul.tabs li .active {
|
|||
float: left;
|
||||
}
|
||||
/* photo */
|
||||
.photo {
|
||||
border-radius: 10px;
|
||||
}
|
||||
.lframe {
|
||||
float: left;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* Name: Diabook
|
||||
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||
* Version:
|
||||
* Version: (Version: 1.011)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
|
@ -169,7 +169,8 @@ function diabook_community_info(){
|
|||
$pagelist = array();
|
||||
|
||||
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
|
||||
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
|
||||
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
|
||||
ORDER BY `name` ASC",
|
||||
intval($a->user['uid'])
|
||||
);
|
||||
|
||||
|
|
@ -264,7 +265,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
|
|||
}
|
||||
}
|
||||
|
||||
//tabs at right_aside on settings page
|
||||
//tabs at aside on settings page
|
||||
if ($a->argv[0] === "settings"){
|
||||
|
||||
$tabs = array(
|
||||
|
|
@ -323,55 +324,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
|
|||
|
||||
//js scripts
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
$a->page['htmlhead'] .= '
|
||||
|
||||
<script>
|
||||
$(function() {
|
||||
$('a.lightbox').fancybox(); // Select all links with lightbox class
|
||||
$("a.lightbox").fancybox(); // Select all links with lightbox class
|
||||
});
|
||||
|
||||
</script>
|
||||
</script>';
|
||||
|
||||
|
||||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
|
||||
$("right_aside").ready(function(){
|
||||
|
||||
if($.cookie('close_pages') == '1')
|
||||
if($.cookie("close_pages") == "1")
|
||||
{
|
||||
document.getElementById( "close_pages" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_helpers') == '1')
|
||||
if($.cookie("close_helpers") == "1")
|
||||
{
|
||||
document.getElementById( "close_helpers" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_services') == '1')
|
||||
if($.cookie("close_services") == "1")
|
||||
{
|
||||
document.getElementById( "close_services" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_friends') == '1')
|
||||
if($.cookie("close_friends") == "1")
|
||||
{
|
||||
document.getElementById( "close_friends" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_postit') == '1')
|
||||
if($.cookie("close_postit") == "1")
|
||||
{
|
||||
document.getElementById( "close_postit" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastusers') == '1')
|
||||
if($.cookie("close_lastusers") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastusers" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastphotos') == '1')
|
||||
if($.cookie("close_lastphotos") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastphotos" ).style.display = "none";
|
||||
};
|
||||
|
||||
if($.cookie('close_lastlikes') == '1')
|
||||
if($.cookie("close_lastlikes") == "1")
|
||||
{
|
||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
};}
|
||||
|
|
@ -380,60 +384,55 @@ $("right_aside").ready(function(){
|
|||
|
||||
function close_pages(){
|
||||
document.getElementById( "close_pages" ).style.display = "none";
|
||||
$.cookie('close_pages','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_pages","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_helpers(){
|
||||
document.getElementById( "close_helpers" ).style.display = "none";
|
||||
$.cookie('close_helpers','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_helpers","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_services(){
|
||||
document.getElementById( "close_services" ).style.display = "none";
|
||||
$.cookie('close_services','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_services","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_friends(){
|
||||
document.getElementById( "close_friends" ).style.display = "none";
|
||||
$.cookie('close_friends','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_friends","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_postit(){
|
||||
document.getElementById( "close_postit" ).style.display = "none";
|
||||
$.cookie('close_postit','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_postit","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastusers(){
|
||||
document.getElementById( "close_lastusers" ).style.display = "none";
|
||||
$.cookie('close_lastusers','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastphotos(){
|
||||
document.getElementById( "close_lastphotos" ).style.display = "none";
|
||||
$.cookie('close_lastphotos','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastphotos","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
function close_lastlikes(){
|
||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
$.cookie('close_lastlikes','1', { expires: 365, path: '/' });
|
||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
|
||||
|
||||
function restore_boxes(){
|
||||
$.cookie('close_pages','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_helpers','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_services','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_friends','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_postit','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastusers','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastphotos','2', { expires: 365, path: '/' });
|
||||
$.cookie('close_lastlikes','2', { expires: 365, path: '/' });
|
||||
alert('Right-hand column was restored. Please refresh your browser');
|
||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_services","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_friends","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_postit","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||
alert("Right-hand column was restored. Please refresh your browser");
|
||||
};
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
EOT;
|
||||
</script>';}
|
||||
|
|
@ -71,6 +71,10 @@
|
|||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.filer }}
|
||||
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user