From d76b052f90346b49d64aeef9024ab56f8be79f53 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Sat, 24 Mar 2012 04:05:21 +0100
Subject: [PATCH] add PostIt to right_aside, fixes in css
---
view/theme/diabook/communityhome.tpl | 12 +-
view/theme/diabook/fpostit/README | 8 ++
view/theme/diabook/fpostit/fpostit.js | 6 +
view/theme/diabook/fpostit/fpostit.php | 135 ++++++++++++++++++++
view/theme/diabook/fpostit/friendika-32.png | Bin 0 -> 1593 bytes
view/theme/diabook/style-network.css | 8 +-
view/theme/diabook/style-profile.css | 17 +--
view/theme/diabook/theme.php | 9 ++
view/theme/diabook/wall_item.tpl | 1 -
view/theme/diabook/wallwall_item.tpl | 1 -
10 files changed, 180 insertions(+), 17 deletions(-)
create mode 100644 view/theme/diabook/fpostit/README
create mode 100755 view/theme/diabook/fpostit/fpostit.js
create mode 100644 view/theme/diabook/fpostit/fpostit.php
create mode 100644 view/theme/diabook/fpostit/friendika-32.png
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 944aec2dd..46681998d 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -1,5 +1,5 @@
{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or #NewHere?</h3>
+<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>
@@ -7,7 +7,7 @@
{{ 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 +25,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 }}
diff --git a/view/theme/diabook/fpostit/README b/view/theme/diabook/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/view/theme/diabook/fpostit/README
@@ -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
diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js
new file mode 100755
index 000000000..d183c7573
--- /dev/null
+++ b/view/theme/diabook/fpostit/fpostit.js
@@ -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()}})()"
\ No newline at end of file
diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php
new file mode 100644
index 000000000..acf77a6c8
--- /dev/null
+++ b/view/theme/diabook/fpostit/fpostit.php
@@ -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: #729FCF;
+ 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>
\ No newline at end of file
diff --git a/view/theme/diabook/fpostit/friendika-32.png b/view/theme/diabook/fpostit/friendika-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..61764bf20a35fb21995b667e9a5e25436685a8a7
GIT binary patch
literal 1593
zcmV-92FCe`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L03itg03ithOzq;@000HdNkl<ZSi_~4
zJ8T@+6^6evyWHhNA`M!W3B_`e#E>i(P8=f+Y^Mqc1WDr}2vQk{QV2|+A}XxHfQrbj
zRH(85xk;}eX_zVqV1$KI$q_6^imXtyL@uc%ce#(b_xvgD%<ht2>Ji=M&inl5|IcfT
zk+r<M%;MrA0C(@+q`ezBHa|~wW&+8n*XP*WyvN+!i?muB)a$dfS`B9Fvut%5%++SO
zbH72oK1(OhsntZM9ogA=z>nW~cVMU8ZZk781Awt_EiW&B7^A=0&%>nLiE=zTF-F`Y
z?jnYe_L%k%19FkaK*b=2KJJkieXtuAdLjSn+z01=1918BWlo<yJp^#|>ebmi#Ot+6
zd};o$s8<Cz9wRPCipV`3d&E8Mk`Imz=jLjk2jO{aaykKbA$RibE}^+jXg_RD)a$Qb
z_``)eXU?3Vdg;<7mX?-Sz4!IMP8`pU{pi$$rY0ho8*(8x6afc$vB%*qKp~x1o%M|t
zUt}k!9eo-11i%p<q<Ad1&KE0lts5)X&YnH{#`*K-?^KtTmbiHF;-~%H#<90vnO0qH
z>PJixiZ(PPAQm8s^ZmeF?Cdnz=xsAO(@FBVaF<-N=#qcy`!ug#n_pR3xd8mK3UKSz
ze-_?6Il*+Li$cWY2shJyLy_ci0i--vac-j3Y_i#FQ=jYM?zlvBSqVZ}McY#^X#4s<
zPrZ8T)J*laOG{I$YhS<c_KCxgPZ+@k(QKb#;R%==V;>_Wkj&ZH*<z#9X1d)Ydc>u~
zg0LtdDzsyb^#^N5deLU8S3bR>qYE$d)9;;xa7ct;qgt!*(277b#xPPckcsy828~XO
z&Tf|&97!b$DHg11?OtGGYg+=U?e;FW|9wMW-EKqoxLKS?X(0y*BOpOH1|D_`U<2JX
z0>Y_Jik*j>G<t3N?UagM06>N#EOR>D9xAf0TBc#I-GEMjkO5htwFbpv<?}wj_+S(A
zIHr1}Wd^Nns4ni($>R{@;Ctz7((s+?@NK{Z7L&Gx6%|Jz&slFc^QS+?n-4e$MGa9s
z@)DT|VVGq|!YpH4>8tMZq1g3}E2WE5-+6=B`0s%%2t$Q@gDYkQ2pf7d9>A#28t<it
zA`|R@H<jKt!!-Pc*?7d+7$sqRn|R_iFl(mAJzIT>&yA8iJ_tc2^D0F%dsYBRj$WQp
zbG7>-v^y!}_aha|%vLyTO)2D=B?j!700?0+-hHjc-#=O4=)(Ji5XT~&teehX+0-9f
zzp_KGypG1fd|Ch|LnaPSWxVrUz}F7;X%Y_mmXUV`Vf@T7AWIAk6QlA7vSdy+jQl46
zkUc&El5rLO=peuJ|E1028PG@xrObbgPZm8P?~eyilu?aTv6^6^`e<UOj3cv#w)Yk$
zN(r9?fJ*~^l`dcgf4kP_z29v<Qd=`<b)o*V0eyH`kF+PN4+2o$@ev3qOk#Aly2kvk
zKO!{mgJolxn?zKP94Bh1hkR%}Gt+2Y-U}d#7!9dXNC3*pc3;6N6%Kv-HA3ULgt53c
z+BZ|5077rCyC$Rz7a$)Lr~v@E5n`2oIc=2;#8gi5kWtAh5CaxN;@dT#y6pIwiU=|x
zr4Ek?E1q?8ve+M}Rt361^Zq7u`<Z%qfma~1Vk$CvF(b<|vd~8{ABi%J;LspZ(<lc{
zsech$F=EYifHu%A8Cd<tjX<-5<d%UXVZu`cBl`XF7od-a{*d0nV@F6DHgl;c<EcU=
zQiNwl|K3dlZUW5`!0$i5oxgYa&$~14FHXwAJPp7^+yHvTh!yiLG4Bu5l~Q*c&L6(#
zdcq~cOp+|D-K2BxO93B^#=u?hx6ggD_1RxOo1Fg14{G}1$r`nZq_2Q`8v&Qo-&iGX
zHxk{V7}tlCCmDRCFUydWuiqhGyG6eCC3yTf@YiuE{TA>c*hx_BnWmC&u29haG4LlI
rGxj`Ruw!GZjr6p}i@z8)_TTs)qHGuE{mw-x00000NkvXXu0mjfEd=xj
literal 0
HcmV?d00001
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index f0cf04d65..23ab0d4bf 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -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;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index f0cf04d65..a721d62ab 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -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 {
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index b487b8f88..4600c92fb 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -130,6 +130,15 @@ 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;
+
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
$a->page['right_aside'] = replace_macros($tpl, $aside);
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 20d24702b..123834064 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -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 }}
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index e02e5a8be..c5b6b36b5 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -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 }}