Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: prevent duplicate friend suggestions block filed items from deletion add the bang network filter is now a permission group small fix in css add right_aside to diabook-blue add connectable services to right_aside add PostIt to right_aside, fixes in css * master:
This commit is contained in:
Simon L'nu
commit
8a6c407282
2
boot.php
2
boot.php
|
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1289' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1291' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1133 );
|
||||
|
||||
|
|
|
|||
|
|
@ -1737,7 +1737,7 @@ function diaspora_retraction($importer,$xml) {
|
|||
contact_remove($contact['id']);
|
||||
}
|
||||
elseif($type === 'Post') {
|
||||
$r = q("select * from item where guid = '%s' and uid = %d limit 1",
|
||||
$r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
|
||||
dbesc('guid'),
|
||||
intval($importer['uid'])
|
||||
);
|
||||
|
|
@ -1785,7 +1785,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
|
|||
}
|
||||
|
||||
if($type === 'StatusMessage') {
|
||||
$r = q("select * from item where guid = '%s' and uid = %d limit 1",
|
||||
$r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
|
||||
dbesc($guid),
|
||||
intval($importer['uid'])
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1437,7 +1437,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
|||
}
|
||||
if($deleted && is_array($contact)) {
|
||||
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id`
|
||||
WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
|
||||
WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
|
||||
dbesc($uri),
|
||||
intval($importer['uid']),
|
||||
intval($contact['id'])
|
||||
|
|
@ -1898,6 +1898,14 @@ function local_delivery($importer,$data) {
|
|||
);
|
||||
if(count($r)) {
|
||||
$fid = $r[0]['id'];
|
||||
|
||||
// OK, we do. Do we already have an introduction for this person ?
|
||||
$r = q("select id from intro where uid = %d and fid = %d limit 1",
|
||||
intval($fsugg['uid']),
|
||||
intval($fid)
|
||||
);
|
||||
if(count($r))
|
||||
return 0;
|
||||
}
|
||||
if(! $fid)
|
||||
$r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo`,`request` ) VALUES ( '%s', '%s', '%s', '%s' ) ",
|
||||
|
|
@ -1918,6 +1926,7 @@ function local_delivery($importer,$data) {
|
|||
else
|
||||
return 0;
|
||||
|
||||
|
||||
$hash = random_string();
|
||||
|
||||
$r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
|
||||
|
|
@ -2038,7 +2047,7 @@ function local_delivery($importer,$data) {
|
|||
if($deleted) {
|
||||
|
||||
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id`
|
||||
WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
|
||||
WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
|
||||
dbesc($uri),
|
||||
intval($importer['importer_uid']),
|
||||
intval($importer['id'])
|
||||
|
|
|
|||
|
|
@ -250,6 +250,20 @@ function network_content(&$a, $update = 0) {
|
|||
if($cid)
|
||||
$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
|
||||
|
||||
if($nets) {
|
||||
$r = q("select id from contact where uid = %d and network = '%s' and self = 0",
|
||||
intval(local_user()),
|
||||
dbesc($nets)
|
||||
);
|
||||
|
||||
$str = '';
|
||||
if(count($r))
|
||||
foreach($r as $rr)
|
||||
$str .= '<' . $rr['id'] . '>';
|
||||
if(strlen($str))
|
||||
$def_acl = array('allow_cid' => $str);
|
||||
}
|
||||
|
||||
if(! $update) {
|
||||
if($group) {
|
||||
if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
|
||||
|
|
@ -269,9 +283,9 @@ function network_content(&$a, $update = 0) {
|
|||
'allow_location' => $a->user['allow_location'],
|
||||
'default_location' => $a->user['default-location'],
|
||||
'nickname' => $a->user['nickname'],
|
||||
'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
|
||||
'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
|
||||
'bang' => (($group || $cid) ? '!' : ''),
|
||||
'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
|
||||
'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb),
|
||||
'bang' => (($group || $cid || $nets) ? '!' : ''),
|
||||
'visitor' => 'block',
|
||||
'profile_uid' => local_user()
|
||||
);
|
||||
|
|
|
|||
61
view/theme/diabook-blue/communityhome.tpl
Executable file
61
view/theme/diabook-blue/communityhome.tpl
Executable file
|
|
@ -0,0 +1,61 @@
|
|||
{{ if $lastusers_title }}
|
||||
<h3 style="margin-top:0px;">Help or #NewHere ?</h3>
|
||||
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
|
||||
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
|
||||
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $lastusers_title }}
|
||||
<h3>Connectable Services</h3>
|
||||
<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
|
||||
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
|
||||
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
|
||||
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-blue/icons/posterous.png?" title="Posterous"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-blue/icons/tumblr.png?" title="Tumblr"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-blue/icons/twitter.png?" title="Twitter"></a>
|
||||
<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-blue/icons/wordpress.png?" title="WordPress"></a>
|
||||
<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-blue/icons/email.png?" title="E-Mail"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $lastusers_title }}
|
||||
<h3>$lastusers_title</h3>
|
||||
<div id='lastusers-wrapper' class='items-wrapper'>
|
||||
{{ for $lastusers_items as $i }}
|
||||
$i
|
||||
{{ endfor }}
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $activeusers_title }}
|
||||
<h3>$activeusers_title</h3>
|
||||
<div class='items-wrapper'>
|
||||
{{ for $activeusers_items as $i }}
|
||||
$i
|
||||
{{ endfor }}
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $photos_title }}
|
||||
<h3>$photos_title</h3>
|
||||
<div id='ra-photos-wrapper' class='items-wrapper'>
|
||||
{{ for $photos_items as $i }}
|
||||
$i
|
||||
{{ endfor }}
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $lastusers_title }}
|
||||
<h3>PostIt to Friendica</h3>
|
||||
<div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $like_title }}
|
||||
<h3>$like_title</h3>
|
||||
<ul id='likes'>
|
||||
{{ for $like_items as $i }}
|
||||
<li id='ra-photos-wrapper'>$i</li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
{{ endif }}
|
||||
10
view/theme/diabook-blue/directory_item.tpl
Executable file
10
view/theme/diabook-blue/directory_item.tpl
Executable file
|
|
@ -0,0 +1,10 @@
|
|||
|
||||
<div class="directory-item" id="directory-item-$id" >
|
||||
<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" >
|
||||
<div class="directory-photo" id="directory-photo-$id" >
|
||||
<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
|
||||
<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
8
view/theme/diabook-blue/fpostit/README
Normal file
8
view/theme/diabook-blue/fpostit/README
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fpostit
|
||||
|
||||
original author: Devlon Duthied
|
||||
|
||||
see his blog posting:
|
||||
http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
|
||||
|
||||
original published at github https://github.com/duthied/Friendika-Bookmarklet
|
||||
6
view/theme/diabook-blue/fpostit/fpostit.js
Executable file
6
view/theme/diabook-blue/fpostit/fpostit.js
Executable file
|
|
@ -0,0 +1,6 @@
|
|||
javascript: (function() {
|
||||
the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
|
||||
a_funct = function() {
|
||||
if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
|
||||
if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)}
|
||||
else {a_funct()}})()"
|
||||
135
view/theme/diabook-blue/fpostit/fpostit.php
Normal file
135
view/theme/diabook-blue/fpostit/fpostit.php
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
<?php
|
||||
if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
|
||||
if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
|
||||
if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
|
||||
if (!isset($hostname)) $hostname = '';
|
||||
if (!isset($username)) $username = '';
|
||||
|
||||
|
||||
if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
|
||||
setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
|
||||
setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
|
||||
}
|
||||
|
||||
?>
|
||||
<html>
|
||||
<head>
|
||||
<style>
|
||||
body {
|
||||
font-family: arial, Helvetica,sans-serif;
|
||||
margin: 0px;
|
||||
}
|
||||
.wrap1 {
|
||||
padding: 2px 5px;
|
||||
background-color: #000;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.wrap2 {
|
||||
margin-left: 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
.logo {
|
||||
margin-left: 3px;
|
||||
margin-right: 5px;
|
||||
float: left;
|
||||
}
|
||||
h2 {
|
||||
color: #ffffff;
|
||||
}
|
||||
.error {
|
||||
background-color: #FFFF66;
|
||||
font-size: 12px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<?php
|
||||
|
||||
if (isset($_GET['title'])) {
|
||||
$title = $_GET['title'];
|
||||
}
|
||||
if (isset($_GET['text'])) {
|
||||
$text = $_GET['text'];
|
||||
}
|
||||
if (isset($_GET['url'])) {
|
||||
$url = $_GET['url'];
|
||||
}
|
||||
|
||||
if ((isset($title)) && (isset($text)) && (isset($url))) {
|
||||
$content = "$title\nsource:$url\n\n$text";
|
||||
} else {
|
||||
$content = $_POST['content'];
|
||||
}
|
||||
|
||||
if (isset($_POST['submit'])) {
|
||||
|
||||
if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
|
||||
$acctname = $_POST["friendika_acct_name"];
|
||||
$tmp_account_array = explode("@", $acctname);
|
||||
if (isset($tmp_account_array[1])) {
|
||||
$username = $tmp_account_array[0];
|
||||
$hostname = $tmp_account_array[1];
|
||||
}
|
||||
$password = $_POST["friendika_password"];
|
||||
$content = $_POST["content"];
|
||||
|
||||
$url = "http://" . $hostname . '/api/statuses/update';
|
||||
$data = array('status' => $content);
|
||||
|
||||
// echo "posting to: $url<br/>";
|
||||
|
||||
$c = curl_init();
|
||||
curl_setopt($c, CURLOPT_URL, $url);
|
||||
curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
|
||||
curl_setopt($c, CURLOPT_POSTFIELDS, $data);
|
||||
curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
|
||||
curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
|
||||
$c_result = curl_exec($c);
|
||||
if(curl_errno($c)){
|
||||
$error = curl_error($c);
|
||||
showForm($error, $content);
|
||||
}
|
||||
|
||||
curl_close($c);
|
||||
if (!isset($error)) {
|
||||
echo '<script language="javascript" type="text/javascript">window.close();</script>';
|
||||
}
|
||||
|
||||
} else {
|
||||
$error = "Missing account name and/or password...try again please";
|
||||
showForm($error, $content);
|
||||
}
|
||||
|
||||
} else {
|
||||
showForm(null, $content);
|
||||
}
|
||||
|
||||
function showForm($error, $content) {
|
||||
$username_cookie = $_COOKIE['username'];
|
||||
$password_cookie = $_COOKIE['password'];
|
||||
|
||||
echo <<<EOF
|
||||
<div class='wrap1'>
|
||||
<h2><img class='logo' src='friendika-32.png' align='middle';/>
|
||||
Friendika Bookmarklet</h2>
|
||||
</div>
|
||||
|
||||
<div class="wrap2">
|
||||
<form method="post" action="{$_SERVER['PHP_SELF']}">
|
||||
Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
|
||||
Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
|
||||
Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
|
||||
<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
|
||||
<input type="submit" value="PostIt!" name="submit" /> <span class='error'>$error</span>
|
||||
</form>
|
||||
<p></p>
|
||||
</div>
|
||||
EOF;
|
||||
|
||||
}
|
||||
?>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
BIN
view/theme/diabook-blue/fpostit/friendika-32.png
Normal file
BIN
view/theme/diabook-blue/fpostit/friendika-32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
view/theme/diabook-blue/icons/StatusNet.png
Normal file
BIN
view/theme/diabook-blue/icons/StatusNet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
view/theme/diabook-blue/icons/email.png
Normal file
BIN
view/theme/diabook-blue/icons/email.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 880 B |
BIN
view/theme/diabook-blue/icons/facebook.png
Normal file
BIN
view/theme/diabook-blue/icons/facebook.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
view/theme/diabook-blue/icons/livejournal.png
Normal file
BIN
view/theme/diabook-blue/icons/livejournal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2 KiB |
BIN
view/theme/diabook-blue/icons/posterous.png
Normal file
BIN
view/theme/diabook-blue/icons/posterous.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
BIN
view/theme/diabook-blue/icons/tumblr.png
Normal file
BIN
view/theme/diabook-blue/icons/tumblr.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 938 B |
BIN
view/theme/diabook-blue/icons/twitter.png
Normal file
BIN
view/theme/diabook-blue/icons/twitter.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 964 B |
BIN
view/theme/diabook-blue/icons/wordpress.png
Normal file
BIN
view/theme/diabook-blue/icons/wordpress.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
|
|
@ -11,10 +11,10 @@
|
|||
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
|
||||
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
|
||||
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
|
||||
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
|
||||
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
|
||||
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" 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>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
20
view/theme/diabook-blue/right_aside.tpl
Normal file
20
view/theme/diabook-blue/right_aside.tpl
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<div id="profile_side">
|
||||
<div id="ps-usernameicon">
|
||||
<a href="$ps.usermenu.status.0" title="$userinfo.name">
|
||||
<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
|
||||
</a>
|
||||
<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
|
||||
</div>
|
||||
|
||||
<ul id="profile-side-menu" class="menu-profile-side">
|
||||
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
|
||||
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
|
||||
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
|
||||
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
|
||||
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
|
||||
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
2509
view/theme/diabook-blue/style-network.css
Normal file
2509
view/theme/diabook-blue/style-network.css
Normal file
File diff suppressed because it is too large
Load diff
2508
view/theme/diabook-blue/style-profile.css
Normal file
2508
view/theme/diabook-blue/style-profile.css
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -11,114 +11,206 @@ $a->theme_info = array(
|
|||
'extends' => 'diabook',
|
||||
);
|
||||
|
||||
//fancybox: provide $photo.href to photo_top.tpl to img in org. scale
|
||||
//change css on network and profilepages
|
||||
$cssFile = null;
|
||||
|
||||
//profile_side
|
||||
|
||||
$nav['usermenu']=array();
|
||||
$userinfo = null;
|
||||
/**
|
||||
* prints last community activity
|
||||
*/
|
||||
function diabook_community_info(){
|
||||
$a = get_app();
|
||||
//right_aside at networkpages
|
||||
|
||||
if(local_user()) {
|
||||
// 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,
|
||||
12
|
||||
);
|
||||
$tpl = file_get_contents( dirname(__file__).'/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,10",
|
||||
$a->get_baseurl(),$a->get_baseurl()
|
||||
);
|
||||
|
||||
|
||||
$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
|
||||
foreach ($r as $rr) {
|
||||
$author = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
|
||||
$objauthor = '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
|
||||
|
||||
$userinfo = array(
|
||||
'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
|
||||
'name' => $a->user['username'],
|
||||
);
|
||||
//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);
|
||||
|
||||
}
|
||||
|
||||
$ps['usermenu'][status] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
|
||||
$ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
|
||||
$ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
|
||||
$ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events'));
|
||||
$ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
|
||||
$ps['usermenu'][community] = Array('community/', t('Community'), "", "");
|
||||
|
||||
// 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, 12",
|
||||
dbesc(t('Contact Photos')),
|
||||
dbesc(t('Profile Photos'))
|
||||
);
|
||||
if(count($r)) {
|
||||
$tpl = file_get_contents( dirname(__file__).'/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'],
|
||||
));
|
||||
|
||||
if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
|
||||
$tpl = get_markup_template('profile_side.tpl');
|
||||
$aside['$photos_items'][] = $entry;
|
||||
}
|
||||
}
|
||||
|
||||
$fostitJS = "javascript: (function() {
|
||||
the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-blue/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
|
||||
a_funct = function() {
|
||||
if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
|
||||
if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)}
|
||||
else {a_funct()}})()" ;
|
||||
|
||||
$aside['$fostitJS'] = $fostitJS;
|
||||
|
||||
$url = $a->get_baseurl($ssl_state);
|
||||
$aside['$url'] = $url;
|
||||
|
||||
$a->page['aside'] .= replace_macros($tpl, array(
|
||||
'$userinfo' => $userinfo,
|
||||
'$ps' => $ps,
|
||||
));
|
||||
$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"){
|
||||
|
||||
// USER MENU
|
||||
if(local_user()) {
|
||||
|
||||
$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
|
||||
|
||||
$userinfo = array(
|
||||
'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
|
||||
'name' => $a->user['username'],
|
||||
);
|
||||
$ps = array('usermenu'=>array());
|
||||
$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
|
||||
$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
|
||||
$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
|
||||
$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
|
||||
$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
|
||||
$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
|
||||
$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Public Groups'), "", "");
|
||||
|
||||
$tpl = get_markup_template('profile_side.tpl');
|
||||
|
||||
$a->page['aside'] .= replace_macros($tpl, array(
|
||||
'$userinfo' => $userinfo,
|
||||
'$ps' => $ps,
|
||||
));
|
||||
|
||||
}
|
||||
|
||||
// COMMUNITY
|
||||
diabook_community_info();
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
//right_aside at profile pages
|
||||
if ($a->argv[0] === "profile"){
|
||||
|
||||
// COMMUNITY
|
||||
diabook_community_info();
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";
|
||||
|
||||
}
|
||||
|
||||
|
||||
// custom css
|
||||
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
|
||||
|
||||
//js scripts
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
|
||||
<script>
|
||||
|
||||
//contacts
|
||||
$('html').click(function() {
|
||||
$('#nav-contacts-linkmenu').removeClass('selected');
|
||||
document.getElementById( "nav-contacts-menu" ).style.display = "none";
|
||||
$(function() {
|
||||
$('a.lightbox').fancybox(); // Select all links with lightbox class
|
||||
});
|
||||
|
||||
$('#nav-contacts-linkmenu').click(function(event){
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
//messages
|
||||
$('html').click(function() {
|
||||
$('#nav-messages-linkmenu').removeClass('selected');
|
||||
document.getElementById( "nav-messages-menu" ).style.display = "none";
|
||||
});
|
||||
|
||||
$('#nav-messages-linkmenu').click(function(event){
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
//notifications
|
||||
$('html').click(function() {
|
||||
$('#nav-notifications-linkmenu').removeClass('selected');
|
||||
document.getElementById( "nav-notifications-menu" ).style.display = "none";
|
||||
});
|
||||
|
||||
$('#nav-notifications-linkmenu').click(function(event){
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
//usermenu
|
||||
$('html').click(function() {
|
||||
$('#nav-user-linkmenu').removeClass('selected');
|
||||
document.getElementById( "nav-user-menu" ).style.display = "none";
|
||||
});
|
||||
|
||||
$('#nav-user-linkmenu').click(function(event){
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
//settingsmenu
|
||||
$('html').click(function() {
|
||||
$('#nav-site-linkmenu').removeClass('selected');
|
||||
document.getElementById( "nav-site-menu" ).style.display = "none";
|
||||
});
|
||||
|
||||
$('#nav-site-linkmenu').click(function(event){
|
||||
event.stopPropagation();
|
||||
});
|
||||
//appsmenu
|
||||
$('html').click(function() {
|
||||
$('#nav-apps-link').removeClass('selected');
|
||||
document.getElementById( "nav-apps-menu" ).style.display = "none";
|
||||
});
|
||||
|
||||
$('#nav-apps-link').click(function(event){
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
|
||||
|
||||
$(document).ready(function() {
|
||||
$("a.fancy-photo").fancybox(); // Select all links with lightbox class
|
||||
$("a.fancy-album").fancybox();
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
EOT;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,27 @@
|
|||
{{ if $lastusers_title }}
|
||||
<h3 style="margin-top:0px;">Help or #NewHere?</h3>
|
||||
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; color:#000;" title="Friendica Support" target="blank">Friendica Support</a><br>
|
||||
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; color:#000;" title="Let's talk" target="blank">Let's talk</a><br>
|
||||
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; color:#000;" target="blank">NewHere</a>
|
||||
<h3 style="margin-top:0px;">Help or #NewHere ?</h3>
|
||||
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
|
||||
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
|
||||
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $lastusers_title }}
|
||||
<h3>Connectable Services</h3>
|
||||
<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
|
||||
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
|
||||
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
|
||||
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook/icons/posterous.png?" title="Posterous"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook/icons/tumblr.png?" title="Tumblr"></a>
|
||||
<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook/icons/twitter.png?" title="Twitter"></a>
|
||||
<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook/icons/wordpress.png?" title="WordPress"></a>
|
||||
<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook/icons/email.png?" title="E-Mail"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $lastusers_title }}
|
||||
<h3>$lastusers_title</h3>
|
||||
<div class='items-wrapper'>
|
||||
<div id='lastusers-wrapper' class='items-wrapper'>
|
||||
{{ for $lastusers_items as $i }}
|
||||
$i
|
||||
{{ endfor }}
|
||||
|
|
@ -25,19 +39,23 @@
|
|||
|
||||
{{ if $photos_title }}
|
||||
<h3>$photos_title</h3>
|
||||
<div class='items-wrapper'>
|
||||
<div id='ra-photos-wrapper' class='items-wrapper'>
|
||||
{{ for $photos_items as $i }}
|
||||
$i
|
||||
{{ endfor }}
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $lastusers_title }}
|
||||
<h3>PostIt to Friendica</h3>
|
||||
<div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $like_title }}
|
||||
<h3>$like_title</h3>
|
||||
<ul id='likes'>
|
||||
{{ for $like_items as $i }}
|
||||
<li>$i</li>
|
||||
<li id='ra-photos-wrapper'>$i</li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
{{ endif }}
|
||||
|
|
|
|||
8
view/theme/diabook/fpostit/README
Normal file
8
view/theme/diabook/fpostit/README
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fpostit
|
||||
|
||||
original author: Devlon Duthied
|
||||
|
||||
see his blog posting:
|
||||
http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
|
||||
|
||||
original published at github https://github.com/duthied/Friendika-Bookmarklet
|
||||
6
view/theme/diabook/fpostit/fpostit.js
Executable file
6
view/theme/diabook/fpostit/fpostit.js
Executable file
|
|
@ -0,0 +1,6 @@
|
|||
javascript: (function() {
|
||||
the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
|
||||
a_funct = function() {
|
||||
if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
|
||||
if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)}
|
||||
else {a_funct()}})()"
|
||||
135
view/theme/diabook/fpostit/fpostit.php
Normal file
135
view/theme/diabook/fpostit/fpostit.php
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
<?php
|
||||
if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
|
||||
if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
|
||||
if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
|
||||
if (!isset($hostname)) $hostname = '';
|
||||
if (!isset($username)) $username = '';
|
||||
|
||||
|
||||
if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
|
||||
setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
|
||||
setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
|
||||
}
|
||||
|
||||
?>
|
||||
<html>
|
||||
<head>
|
||||
<style>
|
||||
body {
|
||||
font-family: arial, Helvetica,sans-serif;
|
||||
margin: 0px;
|
||||
}
|
||||
.wrap1 {
|
||||
padding: 2px 5px;
|
||||
background-color: #000;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.wrap2 {
|
||||
margin-left: 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
.logo {
|
||||
margin-left: 3px;
|
||||
margin-right: 5px;
|
||||
float: left;
|
||||
}
|
||||
h2 {
|
||||
color: #ffffff;
|
||||
}
|
||||
.error {
|
||||
background-color: #FFFF66;
|
||||
font-size: 12px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<?php
|
||||
|
||||
if (isset($_GET['title'])) {
|
||||
$title = $_GET['title'];
|
||||
}
|
||||
if (isset($_GET['text'])) {
|
||||
$text = $_GET['text'];
|
||||
}
|
||||
if (isset($_GET['url'])) {
|
||||
$url = $_GET['url'];
|
||||
}
|
||||
|
||||
if ((isset($title)) && (isset($text)) && (isset($url))) {
|
||||
$content = "$title\nsource:$url\n\n$text";
|
||||
} else {
|
||||
$content = $_POST['content'];
|
||||
}
|
||||
|
||||
if (isset($_POST['submit'])) {
|
||||
|
||||
if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
|
||||
$acctname = $_POST["friendika_acct_name"];
|
||||
$tmp_account_array = explode("@", $acctname);
|
||||
if (isset($tmp_account_array[1])) {
|
||||
$username = $tmp_account_array[0];
|
||||
$hostname = $tmp_account_array[1];
|
||||
}
|
||||
$password = $_POST["friendika_password"];
|
||||
$content = $_POST["content"];
|
||||
|
||||
$url = "http://" . $hostname . '/api/statuses/update';
|
||||
$data = array('status' => $content);
|
||||
|
||||
// echo "posting to: $url<br/>";
|
||||
|
||||
$c = curl_init();
|
||||
curl_setopt($c, CURLOPT_URL, $url);
|
||||
curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
|
||||
curl_setopt($c, CURLOPT_POSTFIELDS, $data);
|
||||
curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
|
||||
curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
|
||||
$c_result = curl_exec($c);
|
||||
if(curl_errno($c)){
|
||||
$error = curl_error($c);
|
||||
showForm($error, $content);
|
||||
}
|
||||
|
||||
curl_close($c);
|
||||
if (!isset($error)) {
|
||||
echo '<script language="javascript" type="text/javascript">window.close();</script>';
|
||||
}
|
||||
|
||||
} else {
|
||||
$error = "Missing account name and/or password...try again please";
|
||||
showForm($error, $content);
|
||||
}
|
||||
|
||||
} else {
|
||||
showForm(null, $content);
|
||||
}
|
||||
|
||||
function showForm($error, $content) {
|
||||
$username_cookie = $_COOKIE['username'];
|
||||
$password_cookie = $_COOKIE['password'];
|
||||
|
||||
echo <<<EOF
|
||||
<div class='wrap1'>
|
||||
<h2><img class='logo' src='friendika-32.png' align='middle';/>
|
||||
Friendika Bookmarklet</h2>
|
||||
</div>
|
||||
|
||||
<div class="wrap2">
|
||||
<form method="post" action="{$_SERVER['PHP_SELF']}">
|
||||
Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
|
||||
Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
|
||||
Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
|
||||
<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
|
||||
<input type="submit" value="PostIt!" name="submit" /> <span class='error'>$error</span>
|
||||
</form>
|
||||
<p></p>
|
||||
</div>
|
||||
EOF;
|
||||
|
||||
}
|
||||
?>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
BIN
view/theme/diabook/fpostit/friendika-32.png
Normal file
BIN
view/theme/diabook/fpostit/friendika-32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
view/theme/diabook/icons/StatusNet.png
Normal file
BIN
view/theme/diabook/icons/StatusNet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
view/theme/diabook/icons/email.png
Normal file
BIN
view/theme/diabook/icons/email.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 880 B |
BIN
view/theme/diabook/icons/facebook.png
Normal file
BIN
view/theme/diabook/icons/facebook.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
view/theme/diabook/icons/livejournal.png
Normal file
BIN
view/theme/diabook/icons/livejournal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2 KiB |
BIN
view/theme/diabook/icons/posterous.png
Normal file
BIN
view/theme/diabook/icons/posterous.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
BIN
view/theme/diabook/icons/tumblr.png
Normal file
BIN
view/theme/diabook/icons/tumblr.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 938 B |
BIN
view/theme/diabook/icons/twitter.png
Normal file
BIN
view/theme/diabook/icons/twitter.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 964 B |
BIN
view/theme/diabook/icons/wordpress.png
Normal file
BIN
view/theme/diabook/icons/wordpress.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
|
|
@ -1161,7 +1161,9 @@ right_aside .directory-item { width: 50px; height: 50px; vertical-align: center;
|
|||
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%; border-bottom: 1px solid #D2D2D2;}
|
||||
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%; }
|
||||
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
|
|
@ -1232,13 +1234,13 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
|
|||
|
||||
.wall-item-container .wall-item-content {
|
||||
font-size: 13px;
|
||||
max-width: 720px;
|
||||
max-width: 420px;
|
||||
word-wrap: break-word;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.wall-item-container .wall-item-content img {
|
||||
max-width: 700px;
|
||||
max-width: 500px;
|
||||
}
|
||||
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
|
||||
display: table-cell;
|
||||
|
|
|
|||
|
|
@ -1018,8 +1018,8 @@ aside #side-peoplefind-url {
|
|||
margin: 0px 2px 2px 0px;
|
||||
}
|
||||
#contact-block .contact-block-link img {
|
||||
widht: 55px;
|
||||
height: 55px;
|
||||
widht: 48px;
|
||||
height: 48px;
|
||||
}
|
||||
#lost-password-link {
|
||||
float: left;
|
||||
|
|
@ -1161,8 +1161,9 @@ right_aside .directory-item { width: 50px; height: 50px; vertical-align: center;
|
|||
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%; border-bottom: 1px solid #D2D2D2;}
|
||||
|
||||
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%; }
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
border-bottom: 1px solid #D2D2D2;
|
||||
|
|
@ -1232,13 +1233,13 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli
|
|||
|
||||
.wall-item-container .wall-item-content {
|
||||
font-size: 13px;
|
||||
max-width: 720px;
|
||||
max-width: 420px;
|
||||
word-wrap: break-word;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.wall-item-container .wall-item-content img {
|
||||
max-width: 700px;
|
||||
max-width: 500px;
|
||||
}
|
||||
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
|
||||
display: table-cell;
|
||||
|
|
@ -2026,8 +2027,8 @@ box-shadow: 1px 1px 5px 0;
|
|||
/* ================== */
|
||||
|
||||
.contact-block-img {
|
||||
width: 55px;
|
||||
height: 55px;
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
padding-right: 3px;
|
||||
}
|
||||
.contact-block-div {
|
||||
|
|
|
|||
|
|
@ -130,6 +130,17 @@ function diabook_community_info(){
|
|||
}
|
||||
}
|
||||
|
||||
$fostitJS = "javascript: (function() {
|
||||
the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
|
||||
a_funct = function() {
|
||||
if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
|
||||
if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)}
|
||||
else {a_funct()}})()" ;
|
||||
|
||||
$aside['$fostitJS'] = $fostitJS;
|
||||
|
||||
$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);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{{ if $item.indent }}{{ else }}
|
||||
<div class="wall-item-decor">
|
||||
{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
|
||||
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{{ if $item.indent }}{{ else }}
|
||||
<div class="wall-item-decor">
|
||||
{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
|
||||
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
|
|
|||
Loading…
Reference in a new issue