clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

This commit is contained in:
zottel 2012-05-03 10:21:38 +02:00
parent 6000e7f30d d72db2e1aa
commit 35771a778d
43 changed files with 773 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
boot.php
View File

@ -9,9 +9,9 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1329' );
define ( 'FRIENDICA_VERSION', '2.3.1330' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1142 );
define ( 'DB_UPDATE_VERSION', 1143 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@ -1520,10 +1520,13 @@ function get_my_url() {
}
function zrl_init(&$a) {
proc_run('php','include/gprobe.php',bin2hex(get_my_url()));
$arr = array('zrl' => get_my_url(), 'url' => $a->cmd);
$tmp_str = get_my_url();
if(validate_url($tmp_str)) {
proc_run('php','include/gprobe.php',bin2hex($tmp_str));
$arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
call_hooks('zrl_init',$arr);
}
}
function zrl($s,$force = false) {
if(! strlen($s))

4
database.sql
View File

@ -1027,6 +1027,7 @@ CREATE TABLE IF NOT EXISTS `user` (
`account_expired` tinyint(1) NOT NULL DEFAULT '0',
`account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`service_class` char(32) NOT NULL,
`allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL,
@ -1042,7 +1043,8 @@ CREATE TABLE IF NOT EXISTS `user` (
KEY `verified` (`verified`),
KEY `unkmail` (`unkmail`),
KEY `cntunkmail` (`cntunkmail`),
KEY `account_removed` (`account_removed`)
KEY `account_removed` (`account_removed`),
KEY `service_class` (`service_class`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------

42
include/cache.php
View File

@ -14,22 +14,40 @@
}
public static function set($key,$value) {
$r = q("SELECT * FROM `cache` WHERE `k`='%s' limit 1",
dbesc($key)
);
if(count($r)) {
q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s' limit 1",
dbesc($value),
dbesc(datetime_convert()),
dbesc($key));
}
else {
q("INSERT INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')",
q("REPLACE INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')",
dbesc($key),
dbesc($value),
dbesc(datetime_convert()));
}
}
/*
*
* Leaving this legacy code temporaily to see how REPLACE fares
* as opposed to non-atomic checks when faced with fast moving key duplication.
* As a MySQL extension it isn't portable, but we're not yet very portable.
*/
/*
* $r = q("SELECT * FROM `cache` WHERE `k`='%s' limit 1",
* dbesc($key)
* );
* if(count($r)) {
* q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s' limit 1",
* dbesc($value),
* dbesc(datetime_convert()),
* dbesc($key));
* }
* else {
* q("INSERT INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')",
* dbesc($key),
* dbesc($value),
* dbesc(datetime_convert()));
* }
* }
*/
public static function clear(){
q("DELETE FROM `cache` WHERE `updated` < '%s'",

14
include/contact_widgets.php
View File

@ -146,6 +146,13 @@ function common_friends_visitor_widget($profile_uid) {
$cid = local_user();
else {
if(get_my_url()) {
$r = q("select id from contact where nurl = '%s' and uid = %d limit 1",
dbesc(normalise_link(get_my_url())),
intval($profile_uid)
);
if(count($r))
$cid = $r[0]['id'];
else {
$r = q("select id from gcontact where nurl = '%s' limit 1",
dbesc(normalise_link(get_my_url()))
);
@ -153,6 +160,7 @@ function common_friends_visitor_widget($profile_uid) {
$zcid = $r[0]['id'];
}
}
}
if($cid == 0 && $zcid == 0)
return;
@ -162,14 +170,14 @@ function common_friends_visitor_widget($profile_uid) {
if($cid)
$t = count_common_friends($profile_uid,$cid);
else
$t = count_common_friends($profile_uid,$cid);
$t = count_common_friends_zcid($profile_uid,$zcid);
if(! $t)
return;
if($cid)
$r = common_friends($profile_uid,$cid,5);
$r = common_friends($profile_uid,$cid,5,true);
else
$r = common_friends_zcid($profile_uid,$zcid);
$r = common_friends_zcid($profile_uid,$zcid,5,true);
return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
'$desc' => sprintf( tt("%d friend in common", "%d friends in common", $t), $t),

29
include/socgraph.php
View File

@ -99,11 +99,12 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
$gcid = $x[0]['id'];
if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo) {
q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s'
q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s'
where `nurl` = '%s' limit 1",
dbesc($name),
dbesc($profile_photo),
dbesc($connect_url),
dbesc($profile_url),
dbesc(normalise_link($profile_url))
);
}
@ -168,7 +169,7 @@ function count_common_friends($uid,$cid) {
$r = q("SELECT count(*) as `total`
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
where `glink`.`cid` = %d and `glink`.`uid` = %d
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) ",
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d ) ",
intval($cid),
intval($uid),
intval($uid),
@ -182,13 +183,18 @@ function count_common_friends($uid,$cid) {
}
function common_friends($uid,$cid,$limit=9999) {
function common_friends($uid,$cid,$limit=9999,$shuffle = false) {
if($shuffle)
$sql_extra = " order by rand() ";
else
$sql_extra = " order by `gcontact`.`name` asc ";
$r = q("SELECT `gcontact`.*
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
where `glink`.`cid` = %d and `glink`.`uid` = %d
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d )
order by `gcontact`.`name` asc limit 0, %d",
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d )
$sql_extra limit 0, %d",
intval($cid),
intval($uid),
intval($uid),
@ -206,7 +212,7 @@ function count_common_friends_zcid($uid,$zcid) {
$r = q("SELECT count(*) as `total`
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
where `glink`.`zcid` = %d
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) ",
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) ",
intval($zcid),
intval($uid)
);
@ -217,13 +223,18 @@ function count_common_friends_zcid($uid,$zcid) {
}
function common_friends_zcid($uid,$zcid,$limit = 6) {
function common_friends_zcid($uid,$zcid,$limit = 9999,$shuffle) {
if($shuffle)
$sql_extra = " order by rand() ";
else
$sql_extra = " order by `gcontact`.`name` asc ";
$r = q("SELECT `gcontact`.*
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
where `glink`.`zcid` = %d
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 )
order by `gcontact`.`name` asc limit 0, %d",
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 )
$sql_extra limit 0, %d",
intval($zcid),
intval($uid),
intval($limit)

30
mod/events.php
View File

@ -28,6 +28,9 @@ function events_post(&$a) {
$adjust = intval($_POST['adjust']);
$nofinish = intval($_POST['nofinish']);
// The default setting for the `private` field in event_store() is false, so mirror that
$private_event = false;
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
if($nofinish)
@ -65,14 +68,38 @@ function events_post(&$a) {
$share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0);
$c = q("select id from contact where uid = %d and self = 1 limit 1",
intval(local_user())
);
if(count($c))
$self = $c[0]['id'];
else
$self = 0;
if($share) {
$str_group_allow = perms2str($_POST['group_allow']);
$str_contact_allow = perms2str($_POST['contact_allow']);
$str_group_deny = perms2str($_POST['group_deny']);
$str_contact_deny = perms2str($_POST['contact_deny']);
// Undo the pseudo-contact of self, since there are real contacts now
if( strpos($str_contact_allow, '<' . $self . '>') !== false )
{
$str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
}
// Make sure to set the `private` field as true. This is necessary to
// have the posts show up correctly in Diaspora if an event is created
// as visible only to self at first, but then edited to display to others.
if( strlen($str_group_allow) or strlen($str_contact_allow) or strlen($str_group_deny) or strlen($str_contact_deny) )
{
$private_event = true;
}
}
else {
$str_contact_allow = '<' . local_user() . '>';
// Note: do not set `private` field for self-only events. It will
// keep even you from seeing them!
$str_contact_allow = '<' . $self . '>';
$str_group_allow = $str_contact_deny = $str_group_deny = '';
}
@ -91,6 +118,7 @@ function events_post(&$a) {
$datarray['allow_gid'] = $str_group_allow;
$datarray['deny_cid'] = $str_contact_deny;
$datarray['deny_gid'] = $str_group_deny;
$datarray['private'] = $private_event;
$datarray['id'] = $event_id;
$datarray['created'] = $created;
$datarray['edited'] = $edited;

36
mod/item.php
View File

@ -444,9 +444,28 @@ function item_post(&$a) {
$tags[] = '@' . $parent_contact['nick'];
}
$tagged = array();
if(count($tags)) {
foreach($tags as $tag) {
handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag);
// If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
// Robert Johnson should be first in the $tags array
$fullnametagged = false;
for($x = 0; $x < count($tagged); $x ++) {
if(stristr($tagged[$x],$tag . ' ')) {
$fullnametagged = true;
break;
}
}
if($fullnametagged)
continue;
$success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag);
if($success)
$tagged[] = $tag;
}
}
@ -861,20 +880,26 @@ function item_content(&$a) {
* @param unknown_type $str_tags string to add the tag to
* @param unknown_type $profile_uid
* @param unknown_type $tag the tag to replace
*
* @return boolean true if replaced, false if not replaced
*/
function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
$replaced = false;
//is it a hash tag?
if(strpos($tag,'#') === 0) {
//if the tag is replaced...
if(strpos($tag,'[url='))
//...do nothing
return;
return $replaced;
//base tag has the tags name only
$basetag = str_replace('_',' ',substr($tag,1));
//create text for link
$newtag = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
//replace tag by the link
$body = str_replace($tag, $newtag, $body);
$replaced = true;
//is the link already in str_tags?
if(! stristr($str_tags,$newtag)) {
@ -883,13 +908,13 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
$str_tags .= ',';
$str_tags .= $newtag;
}
return;
return $replaced;
}
//is it a person tag?
if(strpos($tag,'@') === 0) {
//is it already replaced?
if(strpos($tag,'[url='))
return;
return $replaced;
$stat = false;
//get the person's name
$name = substr($tag,1);
@ -965,6 +990,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
}
//if there is an url for this persons profile
if(isset($profile)) {
$replaced = true;
//create profile link
$profile = str_replace(',','%2c',$profile);
$newtag = '@[url=' . $profile . ']' . $newname . '[/url]';
@ -989,4 +1015,6 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
}
}
}
return $replaced;
}

2
mod/profiles.php
View File

@ -328,7 +328,7 @@ function profile_activity($changed, $value) {
$prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]';
if($t == 1 && strlen($value)) {
$message = sprintf( t('%1$s changed %2$s to %3$s'), $A, $changes, $value);
$message = sprintf( t('%1$s changed %2$s to "%3$s"'), $A, $changes, $value);
$message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof);
}
else

11
update.php
View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1142 );
define( 'UPDATE_VERSION' , 1143 );
/**
*
@ -1239,3 +1239,12 @@ function update_1141() {
}
function update_1142() {
$r = q("alter table user add service_class char(32) not null after expire_notification_sent, add index(service_class) ");
if(! $r)
return UPDATE_FAILED ;
return UPDATE_SUCCESS ;
}

15
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 2.3.1329\n"
"Project-Id-Version: 2.3.1330\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-05-01 10:00-0700\n"
"POT-Creation-Date: 2012-05-02 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -3584,7 +3584,7 @@ msgstr ""
msgid "Access to this profile has been restricted."
msgstr ""
#: ../../mod/profile.php:147
#: ../../mod/profile.php:151
msgid "Tips for New Members"
msgstr ""
@ -3783,7 +3783,7 @@ msgstr ""
#: ../../mod/profiles.php:331
#, php-format
msgid "%1$s changed %2$s to %3$s"
msgid "%1$s changed %2$s to \"%3$s\""
msgstr ""
#: ../../mod/profiles.php:332
@ -6431,6 +6431,13 @@ msgstr ""
msgid "Categories"
msgstr ""
#: ../../include/contact_widgets.php:183
#, php-format
msgid "%d friend in common"
msgid_plural "%d friends in common"
msgstr[0] ""
msgstr[1] ""
#: ../../include/auth.php:29
msgid "Logged out."
msgstr ""

1
view/head.tpl
View File

@ -6,7 +6,6 @@
<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" />
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
<link rel="search"

115
view/theme/diabook/bottom.tpl Normal file
View File

@ -0,0 +1,115 @@
<script type="text/javascript" src="$baseurl/view/theme/diabook/js/jquery.autogrow.textarea.js"></script>
<script type="text/javascript">
$(document).ready(function() {
$("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
var getQString = ifr_source.split("?");
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
});
$(document).ready(function(){
$("#sortable_boxes").sortable({
update: function(event, ui) {
var BoxOrder = $(this).sortable("toArray").toString();
$.cookie("Boxorder", BoxOrder , { expires: 365, path: "/" });
}
});
var cookie = $.cookie("Boxorder");
if (!cookie) return;
var SavedID = cookie.split(",");
for (var Sitem=0, m = SavedID.length; Sitem < m; Sitem++) {
$("#sortable_boxes").append($("#sortable_boxes").children("#" + SavedID[Sitem]));
}
});
function tautogrow(id){
$("textarea#comment-edit-text-" +id).autogrow();
};
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
function scrolldown(){
$("html, body").animate({scrollTop:$(document).height()}, "slow");
return false;
};
function scrolltop(){
$("html, body").animate({scrollTop:0}, "slow");
return false;
};
$(window).scroll(function () {
var footer_top = $(document).height() - 30;
$("div#footerbox").css("top", footer_top);
var scrollInfo = $(window).scrollTop();
if (scrollInfo <= "900"){
$("a#top").attr("id","down");
$("a#down").attr("onclick","scrolldown()");
$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
}
if (scrollInfo > "900"){
$("a#down").attr("id","top");
$("a#top").attr("onclick","scrolltop()");
$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
}
});
function insertFormatting(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
textarea = document.getElementById("comment-edit-text-" +id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
if (BBcode == "url"){
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url"){
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
function cmtBbOpen(id) {
$(".comment-edit-bb-" + id).show();
}
function cmtBbClose(id) {
$(".comment-edit-bb-" + id).hide();
}
</script>

14
view/theme/diabook/comment_item.tpl
View File

@ -13,13 +13,13 @@
<div class="comment-edit-photo-end"></div>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);" >$comment</textarea>
<div class="comment-edit-bb-$id" style="display:none;">
<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>
<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>
<a class="icon bb-image" style="cursor: pointer;" title="$edimg" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-url" style="cursor: pointer;" title="$edurl" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-video" style="cursor: pointer;" title="$edvideo" onclick="insertFormatting('$comment','video',$id);">video</a>
<a class="icon underline" style="cursor: pointer;" title="$eduline" onclick="insertFormatting('$comment','u',$id);">u</a>
<a class="icon italic" style="cursor: pointer;" title="$editalic" onclick="insertFormatting('$comment','i',$id);">i</a>
<a class="icon bold" style="cursor: pointer;" title="$edbold" onclick="insertFormatting('$comment','b',$id);">b</a>
<a class="icon quote" style="cursor: pointer;" title="$edquote" onclick="insertFormatting('$comment','quote',$id);">quote</a>
</div>
{{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >

14
view/theme/diabook/communityhome.tpl
View File

@ -1,8 +1,13 @@
<div id="close_pages">
<div id="pos_null" style="margin-bottom:-30px;">
</div>
<div id="sortable_boxes">
<div id="close_pages" style="margin-top:30px;">
{{ if $page }}
<div>$page</div>
{{ endif }}
</div>
<div id="close_profiles">
{{ if $comunity_profilest_title }}
@ -16,7 +21,7 @@
</div>
<div id="close_helpers">
{{ if $lastusers_title }}
{{ if $helpers }}
<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>
@ -26,7 +31,7 @@
</div>
<div id="close_services">
{{ if $lastusers_title }}
{{ if $con_services }}
<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
@ -97,3 +102,4 @@ $nv.search
<div id="twitter">
</div>
</div>

4
view/theme/diabook/diabook-aerith/style-network-wide.css
View File

@ -1290,8 +1290,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-aerith/style-network.css
View File

@ -1285,8 +1285,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-aerith/style-profile-wide.css
View File

@ -1266,8 +1266,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-aerith/style-profile.css
View File

@ -1261,8 +1261,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-blue/style-network-wide.css
View File

@ -1253,8 +1253,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-blue/style-network.css
View File

@ -1248,8 +1248,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-blue/style-profile-wide.css
View File

@ -1233,8 +1233,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-blue/style-profile.css
View File

@ -1228,8 +1228,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-green/style-network-wide.css
View File

@ -1266,8 +1266,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-green/style-network.css
View File

@ -1262,8 +1262,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-green/style-profile-wide.css
View File

@ -1242,8 +1242,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-green/style-profile.css
View File

@ -1237,8 +1237,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-pink/style-network-wide.css
View File

@ -1266,8 +1266,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-pink/style-network.css
View File

@ -1262,8 +1262,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-pink/style-profile-wide.css
View File

@ -1242,8 +1242,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-pink/style-profile.css
View File

@ -1237,8 +1237,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-red/style-network-wide.css
View File

@ -1287,8 +1287,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-red/style-network.css
View File

@ -1282,8 +1282,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-red/style-profile-wide.css
View File

@ -1246,8 +1246,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/diabook-red/style-profile.css
View File

@ -1241,8 +1241,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

37
view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
view/theme/diabook/js/jquery.twitter.search.js
View File

@ -202,7 +202,7 @@
// default styling
a: { textDecoration: 'none', color: '#3B5998' },
bird: { width: '50px', height: '20px', position: 'absolute', left: '-30px', top: '-20px', border: 'none' },
container: { overflow: 'hidden', backgroundColor: '', height: '360px' },
container: { overflow: 'hidden', backgroundColor: '', height: '600px' },
fail: { background: '#6cc5c3 url(http://cloud.github.com/downloads/malsup/twitter/failwhale.png) no-repeat 50% 50%', height: '100%', padding: '10px' },
frame: { border: '0px solid #C2CFF1', borderRadius: '0px', '-moz-border-radius': '0px', '-webkit-border-radius': '0px' },
tweet: { padding: '5px 10px', clear: 'left' },

4
view/theme/diabook/style-network-wide.css
View File

@ -1235,8 +1235,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/style-network.css
View File

@ -1229,8 +1229,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/style-profile-wide.css
View File

@ -1210,8 +1210,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

4
view/theme/diabook/style-profile.css
View File

@ -1205,8 +1205,8 @@ right_aside .directory-photo { margin: 0px; }
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
right_aside .items-wrapper{ overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
#page-sidebar-right_aside .label {max-width: 128px;}

1
view/theme/diabook/style-wide.css
View File

@ -557,6 +557,7 @@ code {
text-decoration: none;
}
/* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff;

1
view/theme/diabook/style.css
View File

@ -558,6 +558,7 @@ code {
text-decoration: none;
}
/* popup notifications */
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
div.jGrowl div.notice {
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
color: #ffffff;

665
view/theme/diabook/theme.php
View File

@ -3,13 +3,20 @@
/*
* Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.024)
* Version: (Version: 1.025)
* Author:
*/
$a = get_app();
$a->theme_info = array(
'family' => 'diabook',
'version' => '1.025'
);
function diabook_init(&$a) {
//print diabook-version for debugging
$diabook_version = "Diabook (Version: 1.024)";
$diabook_version = "Diabook (Version: 1.025)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@ -19,6 +26,14 @@ $resolution=false;
$resolution = get_pconfig(local_user(), "diabook", "resolution");
if ($resolution===false) $resolution="normal";
//Add META viewport tag respecting the resolution to header for tablets
if ($resolution=="wide") {
$a->page['htmlhead'] .= '<meta name="viewport" content="width=1200" />';
} else {
$a->page['htmlhead'] .= '<meta name="viewport" content="width=980" />';
}
$color = false;
$site_color = get_config("diabook", "color" );
if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");}
@ -34,226 +49,6 @@ if ($color=="green") $color_path = "/diabook-green/";
if ($color=="dark") $color_path = "/diabook-dark/";
/**
* prints last community activity
*/
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();
$sql_extra = "";
$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
$order = " ORDER BY `register_date` DESC ";
$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
0,
9
);
$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
if(count($r)) {
$photo = 'thumb';
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' => $profile_link,
'$photo' => $rr[$photo],
'$alt-text' => $rr['name'],
));
$aside['$lastusers_items'][] = $entry;
}
}
// last 10 liked items
$aside['$like_title'] = t('Last likes');
$aside['$like_items'] = array();
$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM
(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link`
FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri`
WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
GROUP BY `uri`
ORDER BY `T1`.`created` DESC
LIMIT 0,5",
$a->get_baseurl(),$a->get_baseurl()
);
foreach ($r as $rr) {
$author = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
$objauthor = '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
//var_dump($rr['verb'],$rr['object-type']); killme();
switch($rr['verb']){
case 'http://activitystrea.ms/schema/1.0/post':
switch ($rr['object-type']){
case 'http://activitystrea.ms/schema/1.0/event':
$post_type = t('event');
break;
default:
$post_type = t('status');
}
break;
default:
if ($rr['resource-id']){
$post_type = t('photo');
$m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
$rr['plink'] = $m[1];
} else {
$post_type = t('status');
}
}
$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
}
// last 12 photos
$aside['$photos_title'] = t('Last photos');
$aside['$photos_items'] = array();
$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM
(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo`
WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
`user`
WHERE `user`.`uid` = `photo`.`uid`
AND `user`.`blockwall`=0
AND `user`.`hidewall`=0
ORDER BY `photo`.`edited` DESC
LIMIT 0, 9",
dbesc(t('Contact Photos')),
dbesc(t('Profile Photos'))
);
if(count($r)) {
$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
foreach($r as $rr) {
$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
$photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
$entry = replace_macros($tpl,array(
'$id' => $rr['id'],
'$profile-link' => $photo_page,
'$photo' => $photo_url,
'$alt-text' => $rr['username']." : ".$rr['desc'],
));
$aside['$photos_items'][] = $entry;
}
}
//right_aside FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
<span class="sbox_l"></span>
<span class="sbox">
<input type="text" name="search" size="13" maxlength="50">
</span>
<span class="sbox_r" id="srch_clear"></span>';
$aside['$nv'] = $nv;
};
//Community Page
if(local_user()) {
$page = '<div id="" >
<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=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
$pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid'])
);
$pageD = array();
// Look if the profile is a community page
foreach($contacts as $contact) {
$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
};
$contacts = $pageD;
foreach($contacts as $contact) {
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
$contact["name"]."</a></li>";
}
$page .= '</ul></div></div>';
//if (sizeof($contacts) > 0)
$aside['$page'] = $page;
}
//END Community Page
//helpers
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
//end helpers
//connectable services
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
//end connectable services
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
$a->page['right_aside'] = replace_macros($tpl, $aside);
}
//profile_side at networkpages
if ($a->argv[0] === "network" && local_user()){
@ -278,10 +73,10 @@ if ($a->argv[0] === "network" && local_user()){
$tpl = get_markup_template('profile_side.tpl');
$a->page['aside'] .= replace_macros($tpl, array(
$a->page['aside'] = replace_macros($tpl, array(
'$userinfo' => $userinfo,
'$ps' => $ps,
));
)).$a->page['aside'];
}
@ -312,13 +107,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
}
}
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//footer
$tpl = get_markup_template('footer.tpl');
$a->page['footer'] .= replace_macros($tpl, array());
//js scripts
//load jquery.cookie.js
$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $cookieJS);
@ -327,15 +116,49 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script
$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
//load jquery.autogrow-textarea.js
$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogrow.textarea.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
//load jquery.ui.js
if($ccCookie != "9") {
$jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $jqueryuiJS);
}
//load jquery.twitter.search.js
if($_COOKIE['close_twitter'] != "1") {
$twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS);
}
//js scripts
$a->page['htmlhead'] .= '
<script>
$(function() {
$("a.lightbox").fancybox(); // Select all links with lightbox class
});
$(window).load(function() {
var footer_top = $(document).height() - 30;
$("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
});
</script>';
//check if twitterbox is active and print
if($_COOKIE['close_twitter'] != "1") {
$a->page['htmlhead'] .= '
<script>
$(function() {
$("#twitter").twitterSearch({
term: "friendica",
animInSpeed: 250,
bird: false,
avatar: false,
colorExterior: "#fff",
title: "Last Tweets",
timeout: 10000 });
});
</script>';}
//check if community_home-plugin is activated and change css
$nametocheck = "communityhome";
@ -349,112 +172,16 @@ $(document).ready(function() {
});
</script>';
}
//comment-edit-wrapper on photo_view
if ($a->argv[0].$a->argv[2] === "photos"."image"){
$a->page['htmlhead'] .= '
<script>
$(function(){
$(".comment-edit-form").css("display","table");
});
</script>';
}
$a->page['htmlhead'] .= '
<script>
$(function() {
$("a.lightbox").fancybox(); // Select all links with lightbox class
$("#twitter").twitterSearch({
term: "friendica",
animInSpeed: 250,
bird: false,
avatar: false,
colorExterior: "#fff",
title: "Last Tweets",
timeout: 10000 });
});
$(window).load(function() {
var footer_top = $(document).height() - 30;
$("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
});
</script>';
$a->page['htmlhead'] .= '
<script type="text/javascript">
function tautogrow(id){
$("textarea#comment-edit-text-" +id).autogrow();
};
</script>';
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
var getQString = ifr_source.split("?");
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
});
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
function scrolldown(){
$("html, body").animate({scrollTop:$(document).height()}, "slow");
return false;
};
function scrolltop(){
$("html, body").animate({scrollTop:0}, "slow");
return false;
};
$(window).scroll(function () {
var scrollInfo = $(window).scrollTop();
if (scrollInfo <= "900"){
$("a#top").attr("id","down");
$("a#down").attr("onclick","scrolldown()");
$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
}
if (scrollInfo > "900"){
$("a#down").attr("id","top");
$("a#top").attr("onclick","scrolltop()");
$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
}
});
</script>';
//restore right hand col at settingspage
if($a->argv[0] === "settings" && local_user()) {
$a->page['htmlhead'] .= '
<script>
@ -468,12 +195,11 @@ function restore_boxes(){
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
$.cookie("Boxorder",null, { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
}
</script>';}
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script>
@ -483,7 +209,6 @@ $a->page['htmlhead'] .= '
});
</script>';
if($ccCookie != "9") {
$a->page['htmlhead'] .= '
<script>
@ -580,45 +305,251 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
</script>';}}
</script>';}
}
//end js scripts
$a->page['htmlhead'] .= '
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
<script>
function insertFormatting(comment,BBcode,id) {
//footer
$tpl = get_markup_template('footer.tpl');
$a->page['footer'] .= replace_macros($tpl, array());
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
//
js_in_foot();
}
textarea = document.getElementById("comment-edit-text-" +id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
if (BBcode == "url"){
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url"){
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
function diabook_community_info() {
$a = get_app();
// comunity_profiles
if($_COOKIE['close_profiles'] != "1") {
$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;
}
return true;
}}
// last 12 users
if($_COOKIE['close_lastusers'] != "1") {
$aside['$lastusers_title'] = t('Last users');
$aside['$lastusers_items'] = array();
$sql_extra = "";
$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
$order = " ORDER BY `register_date` DESC ";
$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
0,
9
);
$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
if(count($r)) {
$photo = 'thumb';
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' => $profile_link,
'$photo' => $rr[$photo],
'$alt-text' => $rr['name'],
));
$aside['$lastusers_items'][] = $entry;
}
}}
// last 10 liked items
if($_COOKIE['close_lastlikes'] != "1") {
$aside['$like_title'] = t('Last likes');
$aside['$like_items'] = array();
$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM
(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link`
FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri`
WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
GROUP BY `uri`
ORDER BY `T1`.`created` DESC
LIMIT 0,5",
$a->get_baseurl(),$a->get_baseurl()
);
foreach ($r as $rr) {
$author = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
$objauthor = '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
//var_dump($rr['verb'],$rr['object-type']); killme();
switch($rr['verb']){
case 'http://activitystrea.ms/schema/1.0/post':
switch ($rr['object-type']){
case 'http://activitystrea.ms/schema/1.0/event':
$post_type = t('event');
break;
default:
$post_type = t('status');
}
break;
default:
if ($rr['resource-id']){
$post_type = t('photo');
$m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
$rr['plink'] = $m[1];
} else {
$post_type = t('status');
}
}
$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
}}
// last 12 photos
if($_COOKIE['close_photos'] != "1") {
$aside['$photos_title'] = t('Last photos');
$aside['$photos_items'] = array();
$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM
(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo`
WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
`user`
WHERE `user`.`uid` = `photo`.`uid`
AND `user`.`blockwall`=0
AND `user`.`hidewall`=0
ORDER BY `photo`.`edited` DESC
LIMIT 0, 9",
dbesc(t('Contact Photos')),
dbesc(t('Profile Photos'))
);
if(count($r)) {
$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
foreach($r as $rr) {
$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
$photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
$entry = replace_macros($tpl,array(
'$id' => $rr['id'],
'$profile-link' => $photo_page,
'$photo' => $photo_url,
'$alt-text' => $rr['username']." : ".$rr['desc'],
));
$aside['$photos_items'][] = $entry;
}
}}
//right_aside FIND FRIENDS
if($_COOKIE['close_friends'] != "1") {
if(local_user()) {
$nv = array();
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
<span class="sbox_l"></span>
<span class="sbox">
<input type="text" name="search" size="13" maxlength="50">
</span>
<span class="sbox_r" id="srch_clear"></span>';
$aside['$nv'] = $nv;
}}
//Community_Pages at right_aside
if($_COOKIE['close_pages'] != "1") {
if(local_user()) {
$page = '
<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=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
$pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid'])
);
$pageD = array();
// Look if the profile is a community page
foreach($contacts as $contact) {
$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
};
$contacts = $pageD;
foreach($contacts as $contact) {
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
$contact["name"]."</a></li>";
}
$page .= '</ul></div>';
//if (sizeof($contacts) > 0)
$aside['$page'] = $page;
}}
//END Community Page
//helpers
if($_COOKIE['close_helpers'] != "1") {
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
}
//end helpers
//connectable services
if($_COOKIE['close_services'] != "1") {
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
}
//end connectable services
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
//print right_aside
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
$a->page['right_aside'] = replace_macros($tpl, $aside);
}
function cmtBbOpen(id) {
$(".comment-edit-bb-" + id).show();
}
function cmtBbClose(id) {
$(".comment-edit-bb-" + id).hide();
function js_in_foot() {
/** @purpose insert stuff in bottom of page
*/
$a = get_app();
$baseurl = $a->get_baseurl($ssl_state);
$bottom['$baseurl'] = $baseurl;
$tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
$a->page['footer'] = $a->page['footer'].replace_macros($tpl, $bottom);
}
</script> ';