bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse source
This commit is contained in:
Tobias Diekershoff 2012-04-17 18:07:20 +02:00
parent 757e3429ac b30c761aae
commit dbff4252d4
49 changed files with 1782 additions and 2357 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1313' );
define ( 'FRIENDICA_VERSION', '2.3.1314' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );

2
include/Scrape.php
View file

@ -593,7 +593,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
logger('probe_url: fetch feed: ' . $poll . ' returns: ' . $xml, LOGGER_DATA);
$a = get_app();
logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), $LOGGER_DATA);
logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA);
$feed->set_raw_data($xml);

5
include/conversation.php
View file

@ -342,7 +342,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
'body' => template_escape($body),
'text' => strip_tags(template_escape($body)),
'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
'lock' => $lock,
'location' => template_escape($location),
'indent' => '',
'owner_name' => template_escape($owner_name),
@ -400,6 +399,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
}
$comments_collapsed = false;
$comments_seen = 0;
$comment_lastcollapsed = false;
$comment_firstcollapsed = false;
$blowhard = 0;
@ -709,7 +709,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
}
$page_template = get_markup_template("conversation.tpl");
$o .= replace_macros($page_template, array(
$o = replace_macros($page_template, array(
'$baseurl' => $a->get_baseurl($ssl_state),
'$mode' => $mode,
'$user' => $a->user,
@ -1074,7 +1074,6 @@ function find_thread_parent_index($arr,$x) {
}
function render_location_google($item) {
$location = '';
$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
if($coord) {

55
include/items.php
View file

@ -107,7 +107,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
if(! strlen($last_update))
$last_update = 'now -30 days';
if(x($category)) {
if(isset($category)) {
$sql_extra .= file_tag_file_query('item',$category,'category');
}
@ -588,20 +588,21 @@ function get_atom_elements($feed,$item) {
if($rawobj) {
$res['object'] = '<object>' . "\n";
if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
$res['object-type'] = $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'];
$res['object'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
$child = $rawobj[0]['child'];
if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
$res['object-type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
$res['object'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
}
if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
$res['object'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
$res['object'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
$res['object'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
$res['object'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
$res['object'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
$res['object'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
if(! $body)
$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
$res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@ -626,20 +627,20 @@ function get_atom_elements($feed,$item) {
if($rawobj) {
$res['target'] = '<target>' . "\n";
if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
$res['target'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
$child = $rawobj[0]['child'];
if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
$res['target'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
}
if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
$res['target'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
$res['target'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
$res['target'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
$res['target'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
$res['target'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
$res['target'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
if(! $body)
$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
$res['target'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@ -2476,7 +2477,7 @@ function local_delivery($importer,$data) {
// find out if our user is involved in this conversation and wants to be notified.
if($datarray['type'] != 'activity') {
if(!x($datarray['type']) || $datarray['type'] != 'activity') {
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
dbesc($parent_uri),
@ -3048,7 +3049,7 @@ function item_expire($uid,$days) {
function drop_items($items) {
$uid = 0;
if((! local_user()) && (! $remote_user()))
if(! local_user() && ! remote_user())
return;
if(count($items)) {

5
include/network.php
View file

@ -172,7 +172,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
$url_parsed = @parse_url($newurl);
if (isset($url_parsed)) {
$redirects++;
return fetch_url($newurl,$binary,$redirects,$timeout);
return fetch_url($newurl,false,$redirects,$timeout);
}
}
$a->set_curl_code($http_code);
@ -206,6 +206,7 @@ function xml_status($st, $message = '') {
if(! function_exists('http_status_exit')) {
function http_status_exit($val) {
$err = '';
if($val >= 400)
$err = 'Error';
if($val >= 200 && $val < 300)
@ -452,7 +453,7 @@ function lrdd($uri, $debug = false) {
logger('lrdd: parse error: ' . $e);
}
if($dom) {
if(isset($dom) && $dom) {
$items = $dom->getElementsByTagName('link');
foreach($items as $item) {
$x = $item->getAttribute('rel');

1
include/pgettext.php
View file

@ -49,6 +49,7 @@ function get_language() {
if(isset($preferred))
return $preferred;
$a = get_app();
return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
}}

7
include/profile_advanced.php
View file

@ -2,7 +2,7 @@
function advanced_profile(&$a) {
$o .= '';
$o = '';
$o .= '<h2>' . t('Profile') . '</h2>';
@ -69,13 +69,12 @@ function advanced_profile(&$a) {
if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
}
return replace_macros($tpl, array(
'$title' => t('Profile'),
'$profile' => $profile,
));
}
return '';
}

1
include/security.php
View file

@ -339,6 +339,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
}
function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
if (!check_form_security_token($typename, $formname)) {
$a = get_app();
logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
header('HTTP/1.1 403 Forbidden');

7
mod/install.php
View file

@ -380,9 +380,9 @@ function check_funcs(&$checks) {
if(function_exists('apache_get_modules')){
if (! in_array('mod_rewrite',apache_get_modules())) {
check_add($ck_funcs, t('Apace mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
} else {
check_add($ck_funcs, t('Apace mod_rewrite module'), true, true, "");
check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
}
}
if(! function_exists('curl_init')){
@ -464,3 +464,6 @@ function load_database($db) {
}
return $errors;
}

2
mod/photo.php
View file

@ -170,7 +170,7 @@ function photo_init(&$a) {
}
// Writing in cachefile
if ($cachefile != '')
if (isset($cachefile) && $cachefile != '')
file_put_contents($cachefile, $data);
if(function_exists('header_remove')) {

1
mod/photos.php
View file

@ -330,7 +330,6 @@ function photos_post(&$a) {
// Create item container
$title = '';
$basename = basename($filename);
$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
$arr = array();

7
mod/wall_attach.php
View file

@ -98,7 +98,12 @@ function wall_attach_post(&$a) {
killme();
}
echo '<br /><br />[attachment]' . $r[0]['id'] . '[/attachment]' . '<br />';
$lf = '<br />';
if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
$lf = "\n";
echo $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
killme();
// NOTREACHED

210
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 2.3.1313\n"
"Project-Id-Version: 2.3.1314\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-15 10:00-0700\n"
"POT-Creation-Date: 2012-04-16 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"
@ -55,7 +55,7 @@ msgstr ""
#: ../../mod/profiles.php:7 ../../mod/profiles.php:329
#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3142
#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3170
#: ../../index.php:309
msgid "Permission denied."
msgstr ""
@ -142,8 +142,8 @@ msgstr ""
#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
#: ../../addon/openstreetmap/openstreetmap.php:70
#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
#: ../../addon/gravatar/gravatar.php:86
#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
#: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
#: ../../addon/statusnet/statusnet.php:278
#: ../../addon/statusnet/statusnet.php:292
@ -540,14 +540,14 @@ msgstr ""
msgid "I don't like this (toggle)"
msgstr ""
#: ../../mod/photos.php:1214 ../../include/conversation.php:960
#: ../../mod/photos.php:1214 ../../include/conversation.php:956
msgid "Share"
msgstr ""
#: ../../mod/photos.php:1215 ../../mod/editpost.php:104
#: ../../mod/wallmessage.php:145 ../../mod/message.php:188
#: ../../mod/message.php:357 ../../include/conversation.php:362
#: ../../include/conversation.php:702 ../../include/conversation.php:979
#: ../../include/conversation.php:698 ../../include/conversation.php:975
msgid "Please wait"
msgstr ""
@ -563,7 +563,7 @@ msgid "Comment"
msgstr ""
#: ../../mod/photos.php:1235 ../../mod/editpost.php:125
#: ../../include/conversation.php:556 ../../include/conversation.php:997
#: ../../include/conversation.php:556 ../../include/conversation.php:993
msgid "Preview"
msgstr ""
@ -636,7 +636,7 @@ msgstr ""
msgid "Edit post"
msgstr ""
#: ../../mod/editpost.php:80 ../../include/conversation.php:946
#: ../../mod/editpost.php:80 ../../include/conversation.php:942
msgid "Post to Email"
msgstr ""
@ -647,17 +647,17 @@ msgstr ""
#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
#: ../../mod/message.php:186 ../../mod/message.php:355
#: ../../include/conversation.php:961
#: ../../include/conversation.php:957
msgid "Upload photo"
msgstr ""
#: ../../mod/editpost.php:97 ../../include/conversation.php:963
#: ../../mod/editpost.php:97 ../../include/conversation.php:959
msgid "Attach file"
msgstr ""
#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
#: ../../mod/message.php:187 ../../mod/message.php:356
#: ../../include/conversation.php:965
#: ../../include/conversation.php:961
msgid "Insert web link"
msgstr ""
@ -673,35 +673,35 @@ msgstr ""
msgid "Insert Vorbis [.ogg] audio"
msgstr ""
#: ../../mod/editpost.php:102 ../../include/conversation.php:971
#: ../../mod/editpost.php:102 ../../include/conversation.php:967
msgid "Set your location"
msgstr ""
#: ../../mod/editpost.php:103 ../../include/conversation.php:973
#: ../../mod/editpost.php:103 ../../include/conversation.php:969
msgid "Clear browser location"
msgstr ""
#: ../../mod/editpost.php:105 ../../include/conversation.php:980
#: ../../mod/editpost.php:105 ../../include/conversation.php:976
msgid "Permission settings"
msgstr ""
#: ../../mod/editpost.php:113 ../../include/conversation.php:989
#: ../../mod/editpost.php:113 ../../include/conversation.php:985
msgid "CC: email addresses"
msgstr ""
#: ../../mod/editpost.php:114 ../../include/conversation.php:990
#: ../../mod/editpost.php:114 ../../include/conversation.php:986
msgid "Public post"
msgstr ""
#: ../../mod/editpost.php:117 ../../include/conversation.php:976
#: ../../mod/editpost.php:117 ../../include/conversation.php:972
msgid "Set title"
msgstr ""
#: ../../mod/editpost.php:119 ../../include/conversation.php:978
#: ../../mod/editpost.php:119 ../../include/conversation.php:974
msgid "Categories (comma-separated list)"
msgstr ""
#: ../../mod/editpost.php:120 ../../include/conversation.php:992
#: ../../mod/editpost.php:120 ../../include/conversation.php:988
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
@ -818,7 +818,7 @@ msgstr ""
msgid "Confirm"
msgstr ""
#: ../../mod/dfrn_request.php:628 ../../include/items.php:2662
#: ../../mod/dfrn_request.php:628 ../../include/items.php:2690
msgid "[Name Withheld]"
msgstr ""
@ -1645,9 +1645,9 @@ msgstr ""
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
#: ../../mod/register.php:388 ../../mod/register.php:442
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
#: ../../addon/facebook/facebook.php:622
#: ../../addon/facebook/facebook.php:1076
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2671
#: ../../addon/facebook/facebook.php:625
#: ../../addon/facebook/facebook.php:1090
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2699
msgid "Administrator"
msgstr ""
@ -1726,7 +1726,7 @@ msgid "Export personal data"
msgstr ""
#: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817
#: ../../include/nav.php:137
#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
msgid "Settings"
msgstr ""
@ -1782,7 +1782,8 @@ msgstr ""
#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450
#: ../../addon/impressum/impressum.php:75
#: ../../addon/openstreetmap/openstreetmap.php:80
#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
#: ../../addon/mathjax/mathjax.php:64 ../../addon/piwik/piwik.php:105
#: ../../addon/twitter/twitter.php:370
msgid "Settings updated."
msgstr ""
@ -2279,7 +2280,7 @@ msgid "Personal Notes"
msgstr ""
#: ../../mod/notes.php:63 ../../mod/filer.php:30
#: ../../addon/facebook/facebook.php:680 ../../include/text.php:652
#: ../../addon/facebook/facebook.php:683 ../../include/text.php:652
msgid "Save"
msgstr ""
@ -2313,7 +2314,7 @@ msgid "No recipient."
msgstr ""
#: ../../mod/wallmessage.php:124 ../../mod/message.php:169
#: ../../include/conversation.php:914
#: ../../include/conversation.php:910
msgid "Please enter a link URL:"
msgstr ""
@ -2707,7 +2708,7 @@ msgid "People Search"
msgstr ""
#: ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/facebook/facebook.php:1549
#: ../../addon/facebook/facebook.php:1574
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook-red/theme.php:80
@ -2723,7 +2724,7 @@ msgstr ""
msgid "status"
msgstr ""
#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1553
#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1578
#: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook-red/theme.php:94
#: ../../view/theme/diabook-blue/theme.php:94
@ -2741,7 +2742,7 @@ msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
#: ../../mod/display.php:142 ../../include/items.php:3054
#: ../../mod/display.php:142 ../../include/items.php:3082
msgid "Item not found."
msgstr ""
@ -3845,7 +3846,7 @@ msgstr ""
msgid "Edit visibility"
msgstr ""
#: ../../mod/filer.php:29 ../../include/conversation.php:918
#: ../../mod/filer.php:29 ../../include/conversation.php:914
msgid "Save to Folder:"
msgstr ""
@ -4176,110 +4177,110 @@ msgstr ""
msgid "Comma separated applications to ignore"
msgstr ""
#: ../../addon/facebook/facebook.php:620
#: ../../addon/facebook/facebook.php:623
msgid "Problems with Facebook Real-Time Updates"
msgstr ""
#: ../../addon/facebook/facebook.php:644
#: ../../addon/facebook/facebook.php:647
#: ../../include/contact_selectors.php:81
msgid "Facebook"
msgstr ""
#: ../../addon/facebook/facebook.php:645
#: ../../addon/facebook/facebook.php:648
msgid "Facebook Connector Settings"
msgstr ""
#: ../../addon/facebook/facebook.php:656
#: ../../addon/facebook/facebook.php:659
msgid "Facebook API Key"
msgstr ""
#: ../../addon/facebook/facebook.php:665
#: ../../addon/facebook/facebook.php:668
msgid ""
"Error: it appears that you have specified the App-ID and -Secret in your ."
"htconfig.php file. As long as they are specified there, they cannot be set "
"using this form.<br><br>"
msgstr ""
#: ../../addon/facebook/facebook.php:670
#: ../../addon/facebook/facebook.php:673
msgid ""
"Error: the given API Key seems to be incorrect (the application access token "
"could not be retrieved)."
msgstr ""
#: ../../addon/facebook/facebook.php:672
#: ../../addon/facebook/facebook.php:675
msgid "The given API Key seems to work correctly."
msgstr ""
#: ../../addon/facebook/facebook.php:674
#: ../../addon/facebook/facebook.php:677
msgid ""
"The correctness of the API Key could not be detected. Somthing strange's "
"going on."
msgstr ""
#: ../../addon/facebook/facebook.php:677
#: ../../addon/facebook/facebook.php:680
msgid "App-ID / API-Key"
msgstr ""
#: ../../addon/facebook/facebook.php:678
#: ../../addon/facebook/facebook.php:681
msgid "Application secret"
msgstr ""
#: ../../addon/facebook/facebook.php:679
#: ../../addon/facebook/facebook.php:682
#, php-format
msgid "Polling Interval (min. %1$s minutes)"
msgstr ""
#: ../../addon/facebook/facebook.php:683
#: ../../addon/facebook/facebook.php:686
msgid "Real-Time Updates"
msgstr ""
#: ../../addon/facebook/facebook.php:687
#: ../../addon/facebook/facebook.php:690
msgid "Real-Time Updates are activated."
msgstr ""
#: ../../addon/facebook/facebook.php:688
#: ../../addon/facebook/facebook.php:691
msgid "Deactivate Real-Time Updates"
msgstr ""
#: ../../addon/facebook/facebook.php:690
#: ../../addon/facebook/facebook.php:693
msgid "Real-Time Updates not activated."
msgstr ""
#: ../../addon/facebook/facebook.php:690
#: ../../addon/facebook/facebook.php:693
msgid "Activate Real-Time Updates"
msgstr ""
#: ../../addon/facebook/facebook.php:704
#: ../../addon/facebook/facebook.php:707
msgid "The new values have been saved."
msgstr ""
#: ../../addon/facebook/facebook.php:723
#: ../../addon/facebook/facebook.php:726
msgid "Post to Facebook"
msgstr ""
#: ../../addon/facebook/facebook.php:815
#: ../../addon/facebook/facebook.php:818
msgid ""
"Post to Facebook cancelled because of multi-network access permission "
"conflict."
msgstr ""
#: ../../addon/facebook/facebook.php:1033
#: ../../addon/facebook/facebook.php:1039
msgid "View on Friendica"
msgstr ""
#: ../../addon/facebook/facebook.php:1058
#: ../../addon/facebook/facebook.php:1072
msgid "Facebook post failed. Queued for retry."
msgstr ""
#: ../../addon/facebook/facebook.php:1094
#: ../../addon/facebook/facebook.php:1108
msgid "Your Facebook connection became invalid. Please Re-authenticate."
msgstr ""
#: ../../addon/facebook/facebook.php:1095
#: ../../addon/facebook/facebook.php:1109
msgid "Facebook connection became invalid"
msgstr ""
#: ../../addon/facebook/facebook.php:1096
#: ../../addon/facebook/facebook.php:1110
#, php-format
msgid ""
"Hi %1$s,\n"
@ -4801,6 +4802,27 @@ msgstr ""
msgid "The default zoom level. (1:world, 18:highest)"
msgstr ""
#: ../../addon/mathjax/mathjax.php:37
msgid ""
"The MathJax addon renders mathematical formulae written using the LaTeX "
"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
"your wall,network tab and private mail."
msgstr ""
#: ../../addon/mathjax/mathjax.php:38
msgid "Use the MathJax renderer"
msgstr ""
#: ../../addon/mathjax/mathjax.php:72
msgid "MathJax Base URL"
msgstr ""
#: ../../addon/mathjax/mathjax.php:72
msgid ""
"The URL for the javascript file that should be included to use MathJax. Can "
"be either the MathJax CDN or another installation of MathJax."
msgstr ""
#: ../../addon/editplain/editplain.php:46
msgid "Editplain settings updated."
msgstr ""
@ -6611,11 +6633,11 @@ msgstr ""
msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
#: ../../include/items.php:2669
#: ../../include/items.php:2697
msgid "A new person is sharing with you at "
msgstr ""
#: ../../include/items.php:2669
#: ../../include/items.php:2697
msgid "You have a new follower at "
msgstr ""
@ -6646,30 +6668,30 @@ msgid ""
"form has been opened for too long (>3 hours) before submitting it."
msgstr ""
#: ../../include/Contact.php:145 ../../include/conversation.php:813
#: ../../include/Contact.php:145 ../../include/conversation.php:809
msgid "View Status"
msgstr ""
#: ../../include/Contact.php:146 ../../include/conversation.php:814
#: ../../include/Contact.php:146 ../../include/conversation.php:810
msgid "View Profile"
msgstr ""
#: ../../include/Contact.php:147 ../../include/conversation.php:815
#: ../../include/Contact.php:147 ../../include/conversation.php:811
msgid "View Photos"
msgstr ""
#: ../../include/Contact.php:148 ../../include/Contact.php:161
#: ../../include/conversation.php:816
#: ../../include/conversation.php:812
msgid "Network Posts"
msgstr ""
#: ../../include/Contact.php:149 ../../include/Contact.php:161
#: ../../include/conversation.php:817
#: ../../include/conversation.php:813
msgid "Edit Contact"
msgstr ""
#: ../../include/Contact.php:150 ../../include/Contact.php:161
#: ../../include/conversation.php:818
#: ../../include/conversation.php:814
msgid "Send PM"
msgstr ""
@ -6686,13 +6708,13 @@ msgstr ""
msgid "Select"
msgstr ""
#: ../../include/conversation.php:334 ../../include/conversation.php:672
#: ../../include/conversation.php:673
#: ../../include/conversation.php:334 ../../include/conversation.php:668
#: ../../include/conversation.php:669
#, php-format
msgid "View %s's profile @ %s"
msgstr ""
#: ../../include/conversation.php:344 ../../include/conversation.php:684
#: ../../include/conversation.php:344 ../../include/conversation.php:680
#, php-format
msgid "%s from %s"
msgstr ""
@ -6748,118 +6770,118 @@ msgstr ""
msgid "save to folder"
msgstr ""
#: ../../include/conversation.php:674
#: ../../include/conversation.php:670
msgid "to"
msgstr ""
#: ../../include/conversation.php:675
#: ../../include/conversation.php:671
msgid "Wall-to-Wall"
msgstr ""
#: ../../include/conversation.php:676
#: ../../include/conversation.php:672
msgid "via Wall-To-Wall:"
msgstr ""
#: ../../include/conversation.php:721
#: ../../include/conversation.php:717
msgid "Delete Selected Items"
msgstr ""
#: ../../include/conversation.php:872
#: ../../include/conversation.php:868
#, php-format
msgid "%s likes this."
msgstr ""
#: ../../include/conversation.php:872
#: ../../include/conversation.php:868
#, php-format
msgid "%s doesn't like this."
msgstr ""
#: ../../include/conversation.php:876
#: ../../include/conversation.php:872
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgstr ""
#: ../../include/conversation.php:878
#: ../../include/conversation.php:874
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgstr ""
#: ../../include/conversation.php:884
#: ../../include/conversation.php:880
msgid "and"
msgstr ""
#: ../../include/conversation.php:887
#: ../../include/conversation.php:883
#, php-format
msgid ", and %d other people"
msgstr ""
#: ../../include/conversation.php:888
#: ../../include/conversation.php:884
#, php-format
msgid "%s like this."
msgstr ""
#: ../../include/conversation.php:888
#: ../../include/conversation.php:884
#, php-format
msgid "%s don't like this."
msgstr ""
#: ../../include/conversation.php:913
#: ../../include/conversation.php:909
msgid "Visible to <strong>everybody</strong>"
msgstr ""
#: ../../include/conversation.php:915
#: ../../include/conversation.php:911
msgid "Please enter a video link/URL:"
msgstr ""
#: ../../include/conversation.php:916
#: ../../include/conversation.php:912
msgid "Please enter an audio link/URL:"
msgstr ""
#: ../../include/conversation.php:917
#: ../../include/conversation.php:913
msgid "Tag term:"
msgstr ""
#: ../../include/conversation.php:919
#: ../../include/conversation.php:915
msgid "Where are you right now?"
msgstr ""
#: ../../include/conversation.php:962
#: ../../include/conversation.php:958
msgid "upload photo"
msgstr ""
#: ../../include/conversation.php:964
#: ../../include/conversation.php:960
msgid "attach file"
msgstr ""
#: ../../include/conversation.php:966
#: ../../include/conversation.php:962
msgid "web link"
msgstr ""
#: ../../include/conversation.php:967
#: ../../include/conversation.php:963
msgid "Insert video link"
msgstr ""
#: ../../include/conversation.php:968
#: ../../include/conversation.php:964
msgid "video link"
msgstr ""
#: ../../include/conversation.php:969
#: ../../include/conversation.php:965
msgid "Insert audio link"
msgstr ""
#: ../../include/conversation.php:970
#: ../../include/conversation.php:966
msgid "audio link"
msgstr ""
#: ../../include/conversation.php:972
#: ../../include/conversation.php:968
msgid "set location"
msgstr ""
#: ../../include/conversation.php:974
#: ../../include/conversation.php:970
msgid "clear location"
msgstr ""
#: ../../include/conversation.php:981
#: ../../include/conversation.php:977
msgid "permissions"
msgstr ""

2
view/de/strings.php
View file

@ -1214,7 +1214,7 @@ $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
$a->strings["Connect Services"] = "Verbinde Dienste";
$a->strings["PostIt to Friendica"] = "Bei Friendica posten";
$a->strings["Post to Friendica"] = "Wenn du diesen Link";
$a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
$a->strings[" from anywhere by bookmarking this Link."] = " zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
$a->strings["Your profile page"] = "Deine Profilseite";
$a->strings["Your contacts"] = "Deine Kontakte";

7
view/theme/diabook-aerith/communityhome.tpl
View file

@ -42,13 +42,6 @@ $nv.search
{{ endif }}
</div>
<div id="close_postit">
{{ if $lastusers_title }}
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>
<div id="close_lastusers">
{{ if $lastusers_title }}
<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>

8
view/theme/diabook-aerith/fpostit/README
View file

@ -1,8 +0,0 @@
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-aerith/fpostit/fpostit.js
View file

@ -1,6 +0,0 @@
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-aerith/fpostit/fpostit.php
View file

@ -1,135 +0,0 @@
<?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';/>
Friendica Bookmarklet</h2>
</div>
<div class="wrap2">
<form method="post" action="{$_SERVER['PHP_SELF']}">
Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.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" />&nbsp;&nbsp;<span class='error'>$error</span>
</form>
<p></p>
</div>
EOF;
}
?>
</body>
</html>

BIN
view/theme/diabook-aerith/fpostit/friendika-32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

2
view/theme/diabook-aerith/style-network.css
View file

@ -1393,7 +1393,7 @@ transition: all 0.2s ease-in-out;
.wall-item-container .wall-item-content img {
max-width: 400px;
max-height: 400px;
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;

2
view/theme/diabook-aerith/style-profile.css
View file

@ -1367,7 +1367,7 @@ transition: all 0.2s ease-in-out;
.wall-item-container .wall-item-content img {
max-width: 400px;
max-height: 400px;
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;

34
view/theme/diabook-aerith/theme.php
View file

@ -3,13 +3,13 @@
/*
* Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.019)
* Version: (Version: 1.020)
* Author:
*/
//print diabook-version for debugging
$diabook_version = "Diabook-aerith (Version: 1.019)";
$diabook_version = "Diabook-aerith (Version: 1.020)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
@ -131,14 +131,7 @@ function diabook_aerith_community_info(){
}
}
$fostitJS = "javascript: (function() {
the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/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;
//nav FIND FRIENDS
if(local_user()) {
@ -206,13 +199,7 @@ function diabook_aerith_community_info(){
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
@ -255,9 +242,9 @@ if ($a->argv[0] === "network" && local_user()){
}
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
if($ccCookie != "8") {
if($ccCookie != "7") {
// COMMUNITY
diabook_aerith_community_info();
@ -270,7 +257,7 @@ if ($a->argv[0] === "network" && local_user()){
//right_aside at profile pages
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
if($ccCookie != "8") {
if($ccCookie != "7") {
// COMMUNITY
diabook_aerith_community_info();
@ -369,7 +356,7 @@ $a->page['htmlhead'] .= '
</script>';
if($ccCookie != "8") {
if($ccCookie != "7") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
@ -394,10 +381,6 @@ $("right_aside").ready(function(){
document.getElementById( "close_friends" ).style.display = "none";
};
if($.cookie("close_postit") == "1")
{
document.getElementById( "close_postit" ).style.display = "none";
};
if($.cookie("close_lastusers") == "1")
{
@ -436,10 +419,6 @@ function close_friends(){
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
function close_postit(){
document.getElementById( "close_postit" ).style.display = "none";
$.cookie("close_postit","1", { expires: 365, path: "/" });
};
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
@ -464,7 +443,6 @@ function restore_boxes(){
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });

6
view/theme/diabook-blue/communityhome.tpl
View file

@ -42,12 +42,6 @@ $nv.search
{{ endif }}
</div>
<div id="close_postit">
{{ if $lastusers_title }}
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>
<div id="close_lastusers">
{{ if $lastusers_title }}

8
view/theme/diabook-blue/fpostit/README
View file

@ -1,8 +0,0 @@
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
View file

@ -1,6 +0,0 @@
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
View file

@ -1,135 +0,0 @@
<?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';/>
Friendica Bookmarklet</h2>
</div>
<div class="wrap2">
<form method="post" action="{$_SERVER['PHP_SELF']}">
Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.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" />&nbsp;&nbsp;<span class='error'>$error</span>
</form>
<p></p>
</div>
EOF;
}
?>
</body>
</html>

BIN
view/theme/diabook-blue/fpostit/friendika-32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

2
view/theme/diabook-blue/style-network.css
View file

@ -1355,7 +1355,7 @@ transition: all 0.2s ease-in-out;
.wall-item-container .wall-item-content img {
max-width: 400px;
max-height: 400px;
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;

2
view/theme/diabook-blue/style-profile.css
View file

@ -1334,7 +1334,7 @@ transition: all 0.2s ease-in-out;
.wall-item-container .wall-item-content img {
max-width: 400px;
max-height: 400px;
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;

36
view/theme/diabook-blue/theme.php
View file

@ -3,13 +3,13 @@
/*
* Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.019)
* Version: (Version: 1.020)
* Author:
*/
//print diabook-version for debugging
$diabook_version = "Diabook-blue (Version: 1.019)";
$diabook_version = "Diabook-blue (Version: 1.020)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@ -130,14 +130,6 @@ function diabook_blue_community_info(){
}
}
$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;
//nav FIND FRIENDS
if(local_user()) {
@ -205,13 +197,7 @@ function diabook_blue_community_info(){
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
@ -254,9 +240,9 @@ if ($a->argv[0] === "network" && local_user()){
}
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
if($ccCookie != "8") {
if($ccCookie != "7") {
// COMMUNITY
diabook_blue_community_info();
@ -269,7 +255,7 @@ if ($a->argv[0] === "network" && local_user()){
//right_aside at profile pages
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
if($ccCookie != "8") {
if($ccCookie != "7") {
// COMMUNITY
diabook_blue_community_info();
@ -369,7 +355,7 @@ $a->page['htmlhead'] .= '
</script>';
if($ccCookie != "8") {
if($ccCookie != "7") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
@ -394,10 +380,6 @@ $("right_aside").ready(function(){
document.getElementById( "close_friends" ).style.display = "none";
};
if($.cookie("close_postit") == "1")
{
document.getElementById( "close_postit" ).style.display = "none";
};
if($.cookie("close_lastusers") == "1")
{
@ -436,11 +418,6 @@ function close_friends(){
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
function close_postit(){
document.getElementById( "close_postit" ).style.display = "none";
$.cookie("close_postit","1", { expires: 365, path: "/" });
};
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
@ -464,7 +441,6 @@ function restore_boxes(){
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });

6
view/theme/diabook-red/communityhome.tpl
View file

@ -42,12 +42,6 @@ $nv.search
{{ endif }}
</div>
<div id="close_postit">
{{ if $lastusers_title }}
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>
<div id="close_lastusers">
{{ if $lastusers_title }}

8
view/theme/diabook-red/fpostit/README
View file

@ -1,8 +0,0 @@
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-red/fpostit/fpostit.js
View file

@ -1,6 +0,0 @@
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-red/fpostit/fpostit.php
View file

@ -1,135 +0,0 @@
<?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';/>
Friendica Bookmarklet</h2>
</div>
<div class="wrap2">
<form method="post" action="{$_SERVER['PHP_SELF']}">
Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.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" />&nbsp;&nbsp;<span class='error'>$error</span>
</form>
<p></p>
</div>
EOF;
}
?>
</body>
</html>

BIN
view/theme/diabook-red/fpostit/friendika-32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

2
view/theme/diabook-red/style-network.css
View file

@ -1389,7 +1389,7 @@ transition: all 0.2s ease-in-out;
.wall-item-container .wall-item-content img {
max-width: 400px;
max-height: 400px;
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;

2
view/theme/diabook-red/style-profile.css
View file

@ -1347,7 +1347,7 @@ transition: all 0.2s ease-in-out;
.wall-item-container .wall-item-content img {
max-width: 400px;
max-height: 400px;
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;

37
view/theme/diabook-red/theme.php
View file

@ -3,13 +3,13 @@
/*
* Name: Diabook-red
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.019)
* Version: (Version: 1.020)
* Author:
*/
//print diabook-version for debugging
$diabook_version = "Diabook-red (Version: 1.019)";
$diabook_version = "Diabook-red (Version: 1.020)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@ -130,14 +130,6 @@ function diabook_red_community_info(){
}
}
$fostitJS = "javascript: (function() {
the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-red/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;
//nav FIND FRIENDS
if(local_user()) {
@ -205,13 +197,7 @@ function diabook_red_community_info(){
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
@ -254,9 +240,9 @@ if ($a->argv[0] === "network" && local_user()){
}
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
if($ccCookie != "8") {
if($ccCookie != "7") {
// COMMUNITY
diabook_red_community_info();
@ -269,7 +255,7 @@ if ($a->argv[0] === "network" && local_user()){
//right_aside at profile pages
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
if($ccCookie != "8") {
if($ccCookie != "7") {
// COMMUNITY
diabook_red_community_info();
@ -367,7 +353,7 @@ $a->page['htmlhead'] .= '
</script>';
if($ccCookie != "8") {
if($ccCookie != "7") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
@ -392,11 +378,6 @@ $("right_aside").ready(function(){
document.getElementById( "close_friends" ).style.display = "none";
};
if($.cookie("close_postit") == "1")
{
document.getElementById( "close_postit" ).style.display = "none";
};
if($.cookie("close_lastusers") == "1")
{
document.getElementById( "close_lastusers" ).style.display = "none";
@ -434,11 +415,6 @@ function close_friends(){
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
function close_postit(){
document.getElementById( "close_postit" ).style.display = "none";
$.cookie("close_postit","1", { expires: 365, path: "/" });
};
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
@ -462,7 +438,6 @@ function restore_boxes(){
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });

7
view/theme/diabook/communityhome.tpl
View file

@ -42,13 +42,6 @@ $nv.search
{{ endif }}
</div>
<div id="close_postit">
{{ if $lastusers_title }}
<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
{{ endif }}
</div>
<div id="close_lastusers">
{{ if $lastusers_title }}
<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>

8
view/theme/diabook/fpostit/README
View file

@ -1,8 +0,0 @@
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
View file

@ -1,6 +0,0 @@
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
View file

@ -1,135 +0,0 @@
<?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';/>
Friendica Bookmarklet</h2>
</div>
<div class="wrap2">
<form method="post" action="{$_SERVER['PHP_SELF']}">
Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.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" />&nbsp;&nbsp;<span class='error'>$error</span>
</form>
<p></p>
</div>
EOF;
}
?>
</body>
</html>

BIN
view/theme/diabook/fpostit/friendika-32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

2
view/theme/diabook/style-network.css
View file

@ -1331,7 +1331,7 @@ transition: all 0.2s ease-in-out;
.wall-item-container .wall-item-content img {
max-width: 400px;
max-height: 400px;
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;

2
view/theme/diabook/style-profile.css
View file

@ -1307,7 +1307,7 @@ transition: all 0.2s ease-in-out;
.wall-item-container .wall-item-content img {
max-width: 400px;
max-height: 400px;
}
.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
display: table-cell;

34
view/theme/diabook/theme.php
View file

@ -3,13 +3,13 @@
/*
* 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.019)
* Version: (Version: 1.020)
* Author:
*/
//print diabook-version for debugging
$diabook_version = "Diabook (Version: 1.019)";
$diabook_version = "Diabook (Version: 1.020)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@ -136,14 +136,7 @@ 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;
//right_aside FIND FRIENDS
if(local_user()) {
@ -212,13 +205,7 @@ function diabook_community_info(){
$aside['$con_services'] = $con_services;
//end connectable services
//postit
$postit = array();
$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
$aside['$postit'] = $postit;
//end postit
//get_baseurl
$url = $a->get_baseurl($ssl_state);
@ -264,9 +251,9 @@ if ($a->argv[0] === "network" && local_user()){
}
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
if($ccCookie != "8") {
if($ccCookie != "7") {
// COMMUNITY
diabook_community_info();
@ -280,7 +267,7 @@ if ($a->argv[0] === "network" && local_user()){
//right_aside at profile pages
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
if($ccCookie != "8") {
if($ccCookie != "7") {
// COMMUNITY
diabook_community_info();
@ -383,7 +370,7 @@ $a->page['htmlhead'] .= '
</script>';
if($ccCookie != "8") {
if($ccCookie != "7") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
@ -408,10 +395,6 @@ $("right_aside").ready(function(){
document.getElementById( "close_friends" ).style.display = "none";
};
if($.cookie("close_postit") == "1")
{
document.getElementById( "close_postit" ).style.display = "none";
};
if($.cookie("close_lastusers") == "1")
{
@ -450,10 +433,6 @@ function close_friends(){
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
function close_postit(){
document.getElementById( "close_postit" ).style.display = "none";
$.cookie("close_postit","1", { expires: 365, path: "/" });
};
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
@ -478,7 +457,6 @@ function restore_boxes(){
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });

180
view/theme/dispy-dark/style.css
View file

@ -53,16 +53,19 @@ body, button, input, select, textarea {
select {
border: 1px #555 dotted;
padding: 3px;
margin: 2px;
margin: 3px;
color: #eec;
background: #2e2f2e;
}
option {
padding: 3px;
vertical-align: middle;
color: #eec;
background: #2e2f2e;
}
option[selected="selected"] {
color: #2e2f2e;
background: #eec;
}
ul, ol {
padding: 0;
}
@ -158,17 +161,6 @@ a:hover {
.fakelink:hover {
color: #729fcf;
}
input[type=submit] {
background-color: #eee;
color: #2e302e;
font-weight: bold;
margin-top: 10px;
height: 22px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
border: 0;
}
.smalltext {
font-size: 0.7em;
}
@ -477,7 +469,8 @@ div.jGrowl div.info {
color: black;
text-decoration: underline;
}
nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
nav #nav-notifications-linkmenu.on .icon.s22.notify,
nav #nav-notifications-linkmenu.selected .icon.s22.notify {
background-image: url("../../../images/icons/22/notify_on.png");
}
.show {
@ -542,6 +535,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
.search-box #search-text {
margin: 8px;
width: 10em;
height: 14px;
color: #eec;
}
#scrollup {
@ -683,7 +677,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
}
/** sysmsg **/
/**
* sysmsg
*/
#sysmsg_info {
position: fixed;
bottom: 0;
@ -719,8 +715,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* aside
**/
* aside
*/
#asidemain {
float: left;
font-size: smaller;
@ -742,21 +738,21 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
margin: 20px;
}
/* http://css-tricks.com/snippets/css/css-box-shadow/
* box-shadow:
* 1. The horizontal offset of the shadow, positive means
* the shadow will be on the right of the box, a negative
* offset will put the shadow on the left of the box.
* 2. The vertical offset of the shadow, a negative one
* means the box-shadow will be above the box, a
* positive one means the shadow will be below the box.
* 3. The blur radius (optional), if set to 0 the shadow
* will be sharp, the higher the number, the more blurred
* it will be.
* 4. The spread radius (optional), positive values increase
* the size of the shadow, negative values decrease the size.
* Default is 0 (the shadow is same size as blur).
* 5. Colo[u]r
*/
* box-shadow:
* 1. The horizontal offset of the shadow, positive means
* the shadow will be on the right of the box, a negative
* offset will put the shadow on the left of the box.
* 2. The vertical offset of the shadow, a negative one
* means the box-shadow will be above the box, a
* positive one means the shadow will be below the box.
* 3. The blur radius (optional), if set to 0 the shadow
* will be sharp, the higher the number, the more blurred
* it will be.
* 4. The spread radius (optional), positive values increase
* the size of the shadow, negative values decrease the size.
* Default is 0 (the shadow is same size as blur).
* 5. Colo[u]r
*/
.vcard #profile-photo-wrapper img {
box-shadow: 3px 3px 10px 0 #000;
}
@ -808,8 +804,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* contacts block
*/
* contacts block
*/
.contact-block-div {
width: 50px;
height: 50px;
@ -827,20 +823,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* jot
**/
*/
#jot {
/*width: 785px;*/
margin: 10px 0 20px 0px;
width: 100%;
/*width: 785px;*/
margin: 10px 0 20px 0px;
width: 100%;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;
height: 35px;
overflow: none;
width: 100%;
/*background-color: #0e232e;*/
/*border-bottom: 2px solid #9eabb0;*/
margin: 0px;
padding: 0px;
height: 35px;
overflow: none;
width: 100%;
/*background-color: #0e232e;*/
/*border-bottom: 2px solid #9eabb0;*/
}
#jot #jot-tools span {
float: left;
@ -1012,15 +1008,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
padding: 0;
}
#profile-jot-submit {
height: 22px;
height: auto;
background-color: #555753;
color: #eeeeec;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
border: 0;
border: 2px outset #222420;
margin: 0;
float: right;
text-shadow: 1px 1px #111;
width: auto;
}
#profile-jot-submit:active {
box-shadow: 0 0 0 0;
}
#jot-perms-icon {
height: 22px;
@ -1112,7 +1113,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
display: inline;
}
/** tabs **/
/**
* tabs
*/
.tabs {
list-style: none;
margin: 10px 0;
@ -1185,7 +1188,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
margin: 0px 15px 0px 5px;
}
/* removing it from here, vs. putting it in .wall-item-content
* might break things for people. we shall see ;) */
* might break things for people. we shall see ;) */
[id^="tread-wrapper"], [class^="tread-wrapper"] {
margin: 15px 0 0 0;
padding: 0px;
@ -1496,7 +1499,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* item text style
**/
*/
.wall-item-body code {
display: block;
padding: 0 0 10px 5px;
@ -1511,7 +1514,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* profile
**/
*/
div[id$="text"] {
font-weight: bold;
border-bottom: 1px solid #ccc;
@ -1530,7 +1533,7 @@ div[id$="wrapper"] br {
/**
* photos
**/
*/
.photos {
height: auto;
overflow: auto;
@ -1932,7 +1935,15 @@ div[id$="wrapper"] br {
#profile-edit-form div {
clear: both;
}
.settings-block {
}
.settings-block label {
clear: left;
}
.settings-block input {
margin: 10px 5px;
}
/*#register-form label, */
/*#profile-edit-form label {*/
/* width: 300px; */
@ -2001,6 +2012,12 @@ div[id$="wrapper"] br {
#id_ssl_policy {
width: 374px;
}
#theme-preview {
}
#theme-preview img {
margin: 10px 10px 10px 288px;
}
/**
@ -2130,7 +2147,7 @@ div[id$="wrapper"] br {
/**
* events
**/
*/
.clear { clear: both; }
.eventcal {
float:left;
@ -2251,7 +2268,7 @@ div[id$="wrapper"] br {
margin-top: 30px;
}
/* was tired of having no way of moving it around, so
* here's a little 'hook' to do so */
* here's a little 'hook' to do so */
.delete-checked {
position: absolute;
left: 35px;
@ -2379,7 +2396,7 @@ div[id$="wrapper"] br {
/**
* ADMIN
* admin
*/
#pending-update {
float:right;
@ -2468,7 +2485,7 @@ div[id$="wrapper"] br {
/**
* Form fields
* form fields
*/
.field {
/*margin-bottom: 10px;*/
@ -2477,22 +2494,43 @@ div[id$="wrapper"] br {
width: 100%;
}
.field label, label {
float: left;
width: 275px;
display: block;
width: 38%;
display: inline-block;
font-size: 1.077em;
margin: 0 10px 0.5em 0;
margin: 0 10px 1em 0;
border: 1px #2e2f2e solid;
padding: 5px;
background: #eec;
vertical-align: middle;
color: #111;
}
.field input, input[type="text"] {
input,
input[type="text"],
input[type="password"],
input[type="search"] {
width: 250px;
height: 25px;
border: 1px #999 solid;
}
input[type="checkbox"], input[type="radio"] {
border: 1px #999 solid;
margin: 0 0 0 0;
}
input[type="submit"], input[type="button"] {
background-color: #eee;
border: 2px outset #aaa;
border-radius: 5px;
box-shadow: 1px 3px 4px 0 #111;
color: #2e302e;
cursor: pointer;
font-weight: bold;
width: auto;
text-shadow: 1px 1px #000;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
input[type="submit"]:active, input[type="button"]:active {
box-shadow: 0 0 0 0;
}
.field textarea {
width: 80%;
height: 100px;
@ -2532,7 +2570,7 @@ div[id$="wrapper"] br {
/*
* UPDATE
* update
*/
.popup {
width: 100%;
@ -2630,7 +2668,7 @@ div[id$="wrapper"] br {
/**
* ICONS
* icons
*/
.iconspacer {
display: block;
@ -2837,7 +2875,9 @@ footer {
}
/** acl **/
/**
* acl
*/
#photo-edit-perms-select,
#photos-upload-permissions-wrapper,
#profile-jot-acl-wrapper {
@ -3005,7 +3045,7 @@ footer {
/*
* ADDONS THEMING
* addons theming
*/
#sidebar-page-list {
@ -3018,7 +3058,13 @@ footer {
#sidebar-page-list li {
list-style: none;
}
#jappix_mini {
margin-left: 130px;
position: fixed;
bottom: 0;
right: 175px !important; /* override the jappix css */
z-index: 999;
}
@media handheld {
body {

1
view/theme/dispy/jot-header.tpl
View file

@ -346,4 +346,3 @@ function enableOnUser(){
}
</script>

216
view/theme/dispy/style.css
View file

@ -9,11 +9,22 @@
/* from html5boilerplate */
/* these are to tell browsers they should be displayed a certain way */
article, aside, details, figcaption, figure, footer,
header, hgroup, nav, section {
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
nav,
section {
display: block;
}
audio, canvas, video, time {
audio,
canvas,
video,
time {
display: inline-block;
*display: inline;
*zoom: 1;
@ -46,23 +57,29 @@ body {
font-size: 16px;
line-height: 1.1em;
}
body, button, input, select, textarea {
body,
button,
input,
select,
textarea {
font-family: sans-serif;
color: #222;
background-color: #efefef;
background-color: #e8e8e8;
}
select {
border: 1px #555 dotted;
padding: 3px;
margin: 2px;
margin: 3px;
color: #222;
background: #efefef;
background: #e8e8e8;
}
option {
padding: 3px;
vertical-align: middle;
color: #222;
background: #efefef;
background: #e8e8e8;
}
option[selected="selected"] {
background: #cca;
}
ul, ol {
padding: 0;
@ -71,6 +88,10 @@ ul, ol {
:focus {
outline: 0;
}
[disabled="disabled"] {
background: #ddd;
color: #333;
}
/* remember to highlight inserts somehow! */
ins {
@ -159,17 +180,6 @@ a:hover {
.fakelink:hover {
color: #729fcf;
}
input[type=submit] {
background-color: #555753;
color: #eeeeec;
font-weight: bold;
margin-top: 10px;
height: 22px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
border: 0;
}
.smalltext {
font-size: 0.7em;
}
@ -478,7 +488,8 @@ div.jGrowl div.info {
color: black;
text-decoration: underline;
}
nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
nav #nav-notifications-linkmenu.on .icon.s22.notify,
nav #nav-notifications-linkmenu.selected .icon.s22.notify {
background-image: url("../../../images/icons/22/notify_on.png");
}
.show {
@ -543,6 +554,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
.search-box #search-text {
margin: 8px;
width: 10em;
height: 14px;
color: #eec;
}
#scrollup {
@ -684,7 +696,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
}
/** sysmsg **/
/**
* sysmsg
*/
#sysmsg_info {
position: fixed;
bottom: 0;
@ -720,8 +734,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* aside
**/
* aside
*/
#asidemain {
float: left;
font-size: smaller;
@ -743,21 +757,21 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
margin: 20px;
}
/* http://css-tricks.com/snippets/css/css-box-shadow/
* box-shadow:
* 1. The horizontal offset of the shadow, positive means
* the shadow will be on the right of the box, a negative
* offset will put the shadow on the left of the box.
* 2. The vertical offset of the shadow, a negative one
* means the box-shadow will be above the box, a
* positive one means the shadow will be below the box.
* 3. The blur radius (optional), if set to 0 the shadow
* will be sharp, the higher the number, the more blurred
* it will be.
* 4. The spread radius (optional), positive values increase
* the size of the shadow, negative values decrease the size.
* Default is 0 (the shadow is same size as blur).
* 5. Colo[u]r
*/
* box-shadow:
* 1. The horizontal offset of the shadow, positive means
* the shadow will be on the right of the box, a negative
* offset will put the shadow on the left of the box.
* 2. The vertical offset of the shadow, a negative one
* means the box-shadow will be above the box, a
* positive one means the shadow will be below the box.
* 3. The blur radius (optional), if set to 0 the shadow
* will be sharp, the higher the number, the more blurred
* it will be.
* 4. The spread radius (optional), positive values increase
* the size of the shadow, negative values decrease the size.
* Default is 0 (the shadow is same size as blur).
* 5. Colo[u]r
*/
.vcard #profile-photo-wrapper img {
box-shadow: 3px 3px 10px 0 #000;
}
@ -809,8 +823,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* contacts block
*/
* contacts block
*/
.contact-block-div {
width: 50px;
height: 50px;
@ -828,20 +842,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* jot
**/
*/
#jot {
/*width: 785px;*/
margin: 10px 0 20px 0px;
width: 100%;
/*width: 785px;*/
margin: 10px 0 20px 0px;
width: 100%;
}
#jot #jot-tools {
margin: 0px;
padding: 0px;
height: 35px;
overflow: none;
width: 100%;
/*background-color: #0e232e;*/
/*border-bottom: 2px solid #9eabb0;*/
margin: 0px;
padding: 0px;
height: 35px;
overflow: none;
width: 100%;
/*background-color: #0e232e;*/
/*border-bottom: 2px solid #9eabb0;*/
}
#jot #jot-tools span {
float: left;
@ -880,7 +894,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
border-radius: 5px;
border: 1px #ccc solid;
color: #666;
font-size: small;
font-size: smaller;
}
#jot-category:focus {
color: #111;
@ -1013,15 +1027,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
padding: 0;
}
#profile-jot-submit {
height: 22px;
height: auto;
background-color: #555753;
color: #eeeeec;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
border: 0;
border: 2px outset #222420;
margin: 0;
float: right;
text-shadow: 1px 1px #111;
width: auto;
}
#profile-jot-submit:active {
box-shadow: 0 0 0 0;
}
#jot-perms-icon {
height: 22px;
@ -1113,7 +1132,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
display: inline;
}
/** tabs **/
/**
* tabs
*/
.tabs {
list-style: none;
margin: 10px 0;
@ -1155,7 +1176,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
.wall-item-outside-wrapper {
border: 1px solid #aaa;
border-radius: 5px;
box-shadow: 5px 0 10px 0 #999;
box-shadow: 5px 0 10px 0 #888;
}
.wall-item-outside-wrapper.comment {
margin-top: 5px;
@ -1186,7 +1207,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
margin: 0px 15px 0px 5px;
}
/* removing it from here, vs. putting it in .wall-item-content
* might break things for people. we shall see ;) */
* might break things for people. we shall see ;) */
[id^="tread-wrapper"], [class^="tread-wrapper"] {
margin: 15px 0 0 0;
padding: 0px;
@ -1497,7 +1518,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* item text style
**/
*/
.wall-item-body code {
display: block;
padding: 0 0 10px 5px;
@ -1512,7 +1533,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
/**
* profile
**/
*/
div[id$="text"] {
font-weight: bold;
border-bottom: 1px solid #ccc;
@ -1531,7 +1552,7 @@ div[id$="wrapper"] br {
/**
* photos
**/
*/
.photos {
height: auto;
overflow: auto;
@ -1933,7 +1954,15 @@ div[id$="wrapper"] br {
#profile-edit-form div {
clear: both;
}
.settings-block {
}
.settings-block label {
clear: left;
}
.settings-block input {
margin: 10px 5px;
}
/*#register-form label, */
/*#profile-edit-form label {*/
/* width: 300px; */
@ -2002,6 +2031,12 @@ div[id$="wrapper"] br {
#id_ssl_policy {
width: 374px;
}
#theme-preview {
}
#theme-preview img {
margin: 10px 10px 10px 288px;
}
/**
@ -2131,7 +2166,7 @@ div[id$="wrapper"] br {
/**
* events
**/
*/
.clear { clear: both; }
.eventcal {
float:left;
@ -2252,7 +2287,7 @@ div[id$="wrapper"] br {
margin-top: 30px;
}
/* was tired of having no way of moving it around, so
* here's a little 'hook' to do so */
* here's a little 'hook' to do so */
.delete-checked {
position: absolute;
left: 35px;
@ -2380,7 +2415,7 @@ div[id$="wrapper"] br {
/**
* ADMIN
* admin
*/
#pending-update {
float:right;
@ -2469,7 +2504,7 @@ div[id$="wrapper"] br {
/**
* Form fields
* form fields
*/
.field {
/*margin-bottom: 10px;*/
@ -2478,22 +2513,43 @@ div[id$="wrapper"] br {
width: 100%;
}
.field label, label {
float: left;
width: 275px;
display: block;
width: 38%;
display: inline-block;
font-size: 1.077em;
margin: 0 10px 0.5em 0;
margin: 0 10px 1em 0;
border: 1px #999 solid;
padding: 5px;
background: #ccc;
vertical-align: middle;
color: #111;
}
.field input, input[type="text"] {
input,
input[type="text"],
input[type="password"],
input[type="search"] {
width: 250px;
height: 25px;
border: 1px #999 solid;
}
input[type="checkbox"], input[type="radio"] {
border: 1px #999 solid;
margin: 0 0 0 0;
}
input[type="submit"], input[type="button"] {
background-color: #555753;
border: 2px outset #444;
border-radius: 5px;
box-shadow: 1px 3px 4px 0 #111;
color: #eeeeec;
cursor: pointer;
font-weight: bold;
width: auto;
text-shadow: 1px 1px #111;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
input[type="submit"]:active, input[type="button"]:active {
box-shadow: 0 0 0 0;
}
.field textarea {
width: 80%;
height: 100px;
@ -2533,7 +2589,7 @@ div[id$="wrapper"] br {
/*
* UPDATE
* update
*/
.popup {
width: 100%;
@ -2631,7 +2687,7 @@ div[id$="wrapper"] br {
/**
* ICONS
* icons
*/
.iconspacer {
display: block;
@ -2838,7 +2894,9 @@ footer {
}
/** acl **/
/**
* acl
*/
#photo-edit-perms-select,
#photos-upload-permissions-wrapper,
#profile-jot-acl-wrapper {
@ -3006,7 +3064,7 @@ footer {
/*
* ADDONS THEMING
* addons theming
*/
#sidebar-page-list {
@ -3019,7 +3077,13 @@ footer {
#sidebar-page-list li {
list-style: none;
}
#jappix_mini {
margin-left: 130px;
position: fixed;
bottom: 0;
right: 175px !important; /* override the jappix css */
z-index: 999;
}
@media handheld {
body {