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 }} -

Help or #NewHere?

+

Help or #NewHere ?

Friendica Support
Let's talk
NewHere @@ -7,7 +7,7 @@ {{ if $lastusers_title }}

$lastusers_title

-
+
{{ for $lastusers_items as $i }} $i {{ endfor }} @@ -25,19 +25,23 @@ {{ if $photos_title }}

$photos_title

-
+
{{ for $photos_items as $i }} $i {{ endfor }}
{{ endif }} +{{ if $lastusers_title }} +

PostIt to Friendica

+
Post to Friendica from anywhere by bookmarking this Link.
+{{ endif }} {{ if $like_title }}

$like_title

    {{ for $like_items as $i }} -
  • $i
    • +
  • $i
    • {{ endfor }}
{{ 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 @@ + + + + + + + + $content); + + // echo "posting to: $url
"; + + $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 ''; + } + + } 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 << +

+ Friendika Bookmarklet

+
+ +
+
+ Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

+ Account ID:
+ Password:
+
+   $error +
+

+
+EOF; + +} +?> + + + \ 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 000000000..61764bf20 Binary files /dev/null and b/view/theme/diabook/fpostit/friendika-32.png differ 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 }}
- {{ if $item.lock }}$item.lock{{ endif }}
{{ 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 }}
- {{ if $item.lock }}$item.lock{{ endif }}
{{ endif }}