mirror of
https://github.com/friendica/friendica
synced 2024-11-10 05:42:54 +00:00
Merge branch 'master' of https://github.com/friendica/friendica
This commit is contained in:
commit
1370ba5d16
30 changed files with 593 additions and 418 deletions
2
boot.php
2
boot.php
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
||||||
require_once('include/cache.php');
|
require_once('include/cache.php');
|
||||||
|
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '2.3.1305' );
|
define ( 'FRIENDICA_VERSION', '2.3.1306' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1137 );
|
define ( 'DB_UPDATE_VERSION', 1137 );
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,16 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang
|
||||||
if(! function_exists('datetime_convert')) {
|
if(! function_exists('datetime_convert')) {
|
||||||
function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") {
|
function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") {
|
||||||
|
|
||||||
|
// Defaults to UTC if nothing is set, but throws an exception if set to empty string.
|
||||||
|
// Provide some sane defaults regardless.
|
||||||
|
|
||||||
|
if($from === '')
|
||||||
|
$from = 'UTC';
|
||||||
|
if($to === '')
|
||||||
|
$to = 'UTC';
|
||||||
|
if($s === '')
|
||||||
|
$s = 'now';
|
||||||
|
|
||||||
// Slight hackish adjustment so that 'zero' datetime actually returns what is intended
|
// Slight hackish adjustment so that 'zero' datetime actually returns what is intended
|
||||||
// otherwise we end up with -0001-11-30 ...
|
// otherwise we end up with -0001-11-30 ...
|
||||||
// add 32 days so that we at least get year 00, and then hack around the fact that
|
// add 32 days so that we at least get year 00, and then hack around the fact that
|
||||||
|
|
|
@ -180,7 +180,7 @@ function dfrn_request_post(&$a) {
|
||||||
|
|
||||||
// (ignore reply, nothing we can do it failed)
|
// (ignore reply, nothing we can do it failed)
|
||||||
|
|
||||||
goaway($dfrn_url);
|
goaway(zrl($dfrn_url));
|
||||||
return; // NOTREACHED
|
return; // NOTREACHED
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -351,7 +351,7 @@ function item_post(&$a) {
|
||||||
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
|
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
|
||||||
if(! strlen($image_uri))
|
if(! strlen($image_uri))
|
||||||
continue;
|
continue;
|
||||||
$srch = '<' . intval($profile_uid) . '>';
|
$srch = '<' . intval($contact_record['id']) . '>';
|
||||||
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
|
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
|
||||||
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
|
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
dbesc($srch),
|
dbesc($srch),
|
||||||
|
@ -447,7 +447,7 @@ function item_post(&$a) {
|
||||||
|
|
||||||
if(count($tags)) {
|
if(count($tags)) {
|
||||||
foreach($tags as $tag) {
|
foreach($tags as $tag) {
|
||||||
handle_tag($a, $body, $inform, $str_tags, $profile_uid, $tag);
|
handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ function wall_attach_post(&$a) {
|
||||||
|
|
||||||
if($a->argc > 1) {
|
if($a->argc > 1) {
|
||||||
$nick = $a->argv[1];
|
$nick = $a->argv[1];
|
||||||
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
|
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
|
||||||
dbesc($nick)
|
dbesc($nick)
|
||||||
);
|
);
|
||||||
if(! count($r))
|
if(! count($r))
|
||||||
|
@ -21,6 +21,7 @@ function wall_attach_post(&$a) {
|
||||||
$visitor = 0;
|
$visitor = 0;
|
||||||
|
|
||||||
$page_owner_uid = $r[0]['uid'];
|
$page_owner_uid = $r[0]['uid'];
|
||||||
|
$page_owner_cid = $r[0]['id'];
|
||||||
$page_owner_nick = $r[0]['nickname'];
|
$page_owner_nick = $r[0]['nickname'];
|
||||||
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
|
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
|
||||||
|
|
||||||
|
@ -73,7 +74,7 @@ function wall_attach_post(&$a) {
|
||||||
dbesc($filedata),
|
dbesc($filedata),
|
||||||
dbesc($created),
|
dbesc($created),
|
||||||
dbesc($created),
|
dbesc($created),
|
||||||
dbesc('<' . $page_owner_uid . '>'),
|
dbesc('<' . $page_owner_cid . '>'),
|
||||||
dbesc(''),
|
dbesc(''),
|
||||||
dbesc(''),
|
dbesc(''),
|
||||||
dbesc('')
|
dbesc('')
|
||||||
|
|
|
@ -6,7 +6,7 @@ function wall_upload_post(&$a) {
|
||||||
|
|
||||||
if($a->argc > 1) {
|
if($a->argc > 1) {
|
||||||
$nick = $a->argv[1];
|
$nick = $a->argv[1];
|
||||||
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
|
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
|
||||||
dbesc($nick)
|
dbesc($nick)
|
||||||
);
|
);
|
||||||
if(! count($r))
|
if(! count($r))
|
||||||
|
@ -16,10 +16,13 @@ function wall_upload_post(&$a) {
|
||||||
else
|
else
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$can_post = false;
|
$can_post = false;
|
||||||
$visitor = 0;
|
$visitor = 0;
|
||||||
|
|
||||||
$page_owner_uid = $r[0]['uid'];
|
$page_owner_uid = $r[0]['uid'];
|
||||||
|
$default_cid = $r[0]['id'];
|
||||||
$page_owner_nick = $r[0]['nickname'];
|
$page_owner_nick = $r[0]['nickname'];
|
||||||
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
|
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
|
||||||
|
|
||||||
|
@ -34,6 +37,7 @@ function wall_upload_post(&$a) {
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
$can_post = true;
|
$can_post = true;
|
||||||
$visitor = remote_user();
|
$visitor = remote_user();
|
||||||
|
$default_cid = $visitor;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -76,7 +80,7 @@ function wall_upload_post(&$a) {
|
||||||
|
|
||||||
$smallest = 0;
|
$smallest = 0;
|
||||||
|
|
||||||
$defperm = '<' . $page_owner_uid . '>';
|
$defperm = '<' . $default_cid . '>';
|
||||||
|
|
||||||
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
|
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
|
||||||
|
|
||||||
|
|
628
util/messages.po
628
util/messages.po
File diff suppressed because it is too large
Load diff
|
@ -16,9 +16,9 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: friendica\n"
|
"Project-Id-Version: friendica\n"
|
||||||
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
|
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
|
||||||
"POT-Creation-Date: 2012-04-05 10:00-0700\n"
|
"POT-Creation-Date: 2012-04-06 10:00-0700\n"
|
||||||
"PO-Revision-Date: 2012-04-06 10:40+0000\n"
|
"PO-Revision-Date: 2012-04-08 23:57+0000\n"
|
||||||
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
|
"Last-Translator: zottel <transifex@zottel.net>\n"
|
||||||
"Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
|
"Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
@ -216,7 +216,7 @@ msgstr "l, F j"
|
||||||
msgid "Edit event"
|
msgid "Edit event"
|
||||||
msgstr "Veranstaltung bearbeiten"
|
msgstr "Veranstaltung bearbeiten"
|
||||||
|
|
||||||
#: ../../mod/events.php:272 ../../include/text.php:1050
|
#: ../../mod/events.php:272 ../../include/text.php:1053
|
||||||
msgid "link to source"
|
msgid "link to source"
|
||||||
msgstr "Link zum Originalbeitrag"
|
msgstr "Link zum Originalbeitrag"
|
||||||
|
|
||||||
|
@ -410,7 +410,7 @@ msgstr "wurde getaggt in einem"
|
||||||
#: ../../view/theme/diabook-red/theme.php:82
|
#: ../../view/theme/diabook-red/theme.php:82
|
||||||
#: ../../view/theme/diabook-blue/theme.php:82
|
#: ../../view/theme/diabook-blue/theme.php:82
|
||||||
#: ../../view/theme/diabook/theme.php:86
|
#: ../../view/theme/diabook/theme.php:86
|
||||||
#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294
|
#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297
|
||||||
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
|
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
|
||||||
#: ../../include/conversation.php:126
|
#: ../../include/conversation.php:126
|
||||||
msgid "photo"
|
msgid "photo"
|
||||||
|
@ -2234,7 +2234,7 @@ msgstr "Markierte"
|
||||||
msgid "Shared Links"
|
msgid "Shared Links"
|
||||||
msgstr "Geteilte Links"
|
msgstr "Geteilte Links"
|
||||||
|
|
||||||
#: ../../mod/network.php:270
|
#: ../../mod/network.php:274
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Warning: This group contains %s member from an insecure network."
|
msgid "Warning: This group contains %s member from an insecure network."
|
||||||
msgid_plural ""
|
msgid_plural ""
|
||||||
|
@ -2242,31 +2242,31 @@ msgid_plural ""
|
||||||
msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk."
|
msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk."
|
||||||
msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken."
|
msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken."
|
||||||
|
|
||||||
#: ../../mod/network.php:273
|
#: ../../mod/network.php:277
|
||||||
msgid "Private messages to this group are at risk of public disclosure."
|
msgid "Private messages to this group are at risk of public disclosure."
|
||||||
msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."
|
msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."
|
||||||
|
|
||||||
#: ../../mod/network.php:318
|
#: ../../mod/network.php:322
|
||||||
msgid "No such group"
|
msgid "No such group"
|
||||||
msgstr "Es gibt keine solche Gruppe"
|
msgstr "Es gibt keine solche Gruppe"
|
||||||
|
|
||||||
#: ../../mod/network.php:329
|
#: ../../mod/network.php:333
|
||||||
msgid "Group is empty"
|
msgid "Group is empty"
|
||||||
msgstr "Gruppe ist leer"
|
msgstr "Gruppe ist leer"
|
||||||
|
|
||||||
#: ../../mod/network.php:333
|
#: ../../mod/network.php:337
|
||||||
msgid "Group: "
|
msgid "Group: "
|
||||||
msgstr "Gruppe: "
|
msgstr "Gruppe: "
|
||||||
|
|
||||||
#: ../../mod/network.php:343
|
#: ../../mod/network.php:347
|
||||||
msgid "Contact: "
|
msgid "Contact: "
|
||||||
msgstr "Kontakt: "
|
msgstr "Kontakt: "
|
||||||
|
|
||||||
#: ../../mod/network.php:345
|
#: ../../mod/network.php:349
|
||||||
msgid "Private messages to this person are at risk of public disclosure."
|
msgid "Private messages to this person are at risk of public disclosure."
|
||||||
msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
|
msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
|
||||||
|
|
||||||
#: ../../mod/network.php:350
|
#: ../../mod/network.php:354
|
||||||
msgid "Invalid contact."
|
msgid "Invalid contact."
|
||||||
msgstr "Ungültiger Kontakt."
|
msgstr "Ungültiger Kontakt."
|
||||||
|
|
||||||
|
@ -2275,7 +2275,7 @@ msgid "Personal Notes"
|
||||||
msgstr "Persönliche Notizen"
|
msgstr "Persönliche Notizen"
|
||||||
|
|
||||||
#: ../../mod/notes.php:63 ../../mod/filer.php:30
|
#: ../../mod/notes.php:63 ../../mod/filer.php:30
|
||||||
#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649
|
#: ../../addon/facebook/facebook.php:673 ../../include/text.php:652
|
||||||
msgid "Save"
|
msgid "Save"
|
||||||
msgstr "Speichern"
|
msgstr "Speichern"
|
||||||
|
|
||||||
|
@ -2538,7 +2538,7 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
|
||||||
msgid "No contacts."
|
msgid "No contacts."
|
||||||
msgstr "Keine Kontakte."
|
msgstr "Keine Kontakte."
|
||||||
|
|
||||||
#: ../../mod/viewcontacts.php:76 ../../include/text.php:586
|
#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
|
||||||
msgid "View Contacts"
|
msgid "View Contacts"
|
||||||
msgstr "Kontakte anzeigen"
|
msgstr "Kontakte anzeigen"
|
||||||
|
|
||||||
|
@ -4397,7 +4397,7 @@ msgstr "Neueste Favoriten"
|
||||||
#: ../../view/theme/diabook-red/theme.php:74
|
#: ../../view/theme/diabook-red/theme.php:74
|
||||||
#: ../../view/theme/diabook-blue/theme.php:74
|
#: ../../view/theme/diabook-blue/theme.php:74
|
||||||
#: ../../view/theme/diabook/theme.php:78
|
#: ../../view/theme/diabook/theme.php:78
|
||||||
#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1292
|
#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295
|
||||||
#: ../../include/conversation.php:45 ../../include/conversation.php:118
|
#: ../../include/conversation.php:45 ../../include/conversation.php:118
|
||||||
msgid "event"
|
msgid "event"
|
||||||
msgstr "Veranstaltung"
|
msgstr "Veranstaltung"
|
||||||
|
@ -5223,21 +5223,21 @@ msgstr "Verbinde Dienste"
|
||||||
#: ../../view/theme/diabook/theme.php:212
|
#: ../../view/theme/diabook/theme.php:212
|
||||||
#: ../../view/theme/diabook-aerith/theme.php:207
|
#: ../../view/theme/diabook-aerith/theme.php:207
|
||||||
msgid "PostIt to Friendica"
|
msgid "PostIt to Friendica"
|
||||||
msgstr "PostIt nach Friendica"
|
msgstr "Bei Friendica posten"
|
||||||
|
|
||||||
#: ../../view/theme/diabook-red/theme.php:207
|
#: ../../view/theme/diabook-red/theme.php:207
|
||||||
#: ../../view/theme/diabook-blue/theme.php:207
|
#: ../../view/theme/diabook-blue/theme.php:207
|
||||||
#: ../../view/theme/diabook/theme.php:212
|
#: ../../view/theme/diabook/theme.php:212
|
||||||
#: ../../view/theme/diabook-aerith/theme.php:207
|
#: ../../view/theme/diabook-aerith/theme.php:207
|
||||||
msgid "Post to Friendica"
|
msgid "Post to Friendica"
|
||||||
msgstr "Bei Friendica veröffentlichen"
|
msgstr "Wenn du diesen Link"
|
||||||
|
|
||||||
#: ../../view/theme/diabook-red/theme.php:208
|
#: ../../view/theme/diabook-red/theme.php:208
|
||||||
#: ../../view/theme/diabook-blue/theme.php:208
|
#: ../../view/theme/diabook-blue/theme.php:208
|
||||||
#: ../../view/theme/diabook/theme.php:213
|
#: ../../view/theme/diabook/theme.php:213
|
||||||
#: ../../view/theme/diabook-aerith/theme.php:208
|
#: ../../view/theme/diabook-aerith/theme.php:208
|
||||||
msgid " from anywhere by bookmarking this Link."
|
msgid " from anywhere by bookmarking this Link."
|
||||||
msgstr " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst."
|
msgstr "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen."
|
||||||
|
|
||||||
#: ../../view/theme/diabook-red/theme.php:236
|
#: ../../view/theme/diabook-red/theme.php:236
|
||||||
#: ../../view/theme/diabook-blue/theme.php:236
|
#: ../../view/theme/diabook-blue/theme.php:236
|
||||||
|
@ -5695,158 +5695,158 @@ msgstr "(kein Betreff)"
|
||||||
msgid "noreply"
|
msgid "noreply"
|
||||||
msgstr "noreply"
|
msgstr "noreply"
|
||||||
|
|
||||||
#: ../../include/text.php:240
|
#: ../../include/text.php:243
|
||||||
msgid "prev"
|
msgid "prev"
|
||||||
msgstr "vorige"
|
msgstr "vorige"
|
||||||
|
|
||||||
#: ../../include/text.php:242
|
#: ../../include/text.php:245
|
||||||
msgid "first"
|
msgid "first"
|
||||||
msgstr "erste"
|
msgstr "erste"
|
||||||
|
|
||||||
#: ../../include/text.php:271
|
#: ../../include/text.php:274
|
||||||
msgid "last"
|
msgid "last"
|
||||||
msgstr "letzte"
|
msgstr "letzte"
|
||||||
|
|
||||||
#: ../../include/text.php:274
|
#: ../../include/text.php:277
|
||||||
msgid "next"
|
msgid "next"
|
||||||
msgstr "nächste"
|
msgstr "nächste"
|
||||||
|
|
||||||
#: ../../include/text.php:565
|
#: ../../include/text.php:568
|
||||||
msgid "No contacts"
|
msgid "No contacts"
|
||||||
msgstr "Keine Kontakte"
|
msgstr "Keine Kontakte"
|
||||||
|
|
||||||
#: ../../include/text.php:574
|
#: ../../include/text.php:577
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%d Contact"
|
msgid "%d Contact"
|
||||||
msgid_plural "%d Contacts"
|
msgid_plural "%d Contacts"
|
||||||
msgstr[0] "%d Kontakt"
|
msgstr[0] "%d Kontakt"
|
||||||
msgstr[1] "%d Kontakte"
|
msgstr[1] "%d Kontakte"
|
||||||
|
|
||||||
#: ../../include/text.php:647 ../../include/nav.php:91
|
#: ../../include/text.php:650 ../../include/nav.php:91
|
||||||
msgid "Search"
|
msgid "Search"
|
||||||
msgstr "Suche"
|
msgstr "Suche"
|
||||||
|
|
||||||
#: ../../include/text.php:828
|
#: ../../include/text.php:831
|
||||||
msgid "Monday"
|
msgid "Monday"
|
||||||
msgstr "Montag"
|
msgstr "Montag"
|
||||||
|
|
||||||
#: ../../include/text.php:828
|
#: ../../include/text.php:831
|
||||||
msgid "Tuesday"
|
msgid "Tuesday"
|
||||||
msgstr "Dienstag"
|
msgstr "Dienstag"
|
||||||
|
|
||||||
#: ../../include/text.php:828
|
#: ../../include/text.php:831
|
||||||
msgid "Wednesday"
|
msgid "Wednesday"
|
||||||
msgstr "Mittwoch"
|
msgstr "Mittwoch"
|
||||||
|
|
||||||
#: ../../include/text.php:828
|
#: ../../include/text.php:831
|
||||||
msgid "Thursday"
|
msgid "Thursday"
|
||||||
msgstr "Donnerstag"
|
msgstr "Donnerstag"
|
||||||
|
|
||||||
#: ../../include/text.php:828
|
#: ../../include/text.php:831
|
||||||
msgid "Friday"
|
msgid "Friday"
|
||||||
msgstr "Freitag"
|
msgstr "Freitag"
|
||||||
|
|
||||||
#: ../../include/text.php:828
|
#: ../../include/text.php:831
|
||||||
msgid "Saturday"
|
msgid "Saturday"
|
||||||
msgstr "Samstag"
|
msgstr "Samstag"
|
||||||
|
|
||||||
#: ../../include/text.php:828
|
#: ../../include/text.php:831
|
||||||
msgid "Sunday"
|
msgid "Sunday"
|
||||||
msgstr "Sonntag"
|
msgstr "Sonntag"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "January"
|
msgid "January"
|
||||||
msgstr "Januar"
|
msgstr "Januar"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "February"
|
msgid "February"
|
||||||
msgstr "Februar"
|
msgstr "Februar"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "March"
|
msgid "March"
|
||||||
msgstr "März"
|
msgstr "März"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "April"
|
msgid "April"
|
||||||
msgstr "April"
|
msgstr "April"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "May"
|
msgid "May"
|
||||||
msgstr "Mai"
|
msgstr "Mai"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "June"
|
msgid "June"
|
||||||
msgstr "Juni"
|
msgstr "Juni"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "July"
|
msgid "July"
|
||||||
msgstr "Juli"
|
msgstr "Juli"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "August"
|
msgid "August"
|
||||||
msgstr "August"
|
msgstr "August"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "September"
|
msgid "September"
|
||||||
msgstr "September"
|
msgstr "September"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "October"
|
msgid "October"
|
||||||
msgstr "Oktober"
|
msgstr "Oktober"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "November"
|
msgid "November"
|
||||||
msgstr "November"
|
msgstr "November"
|
||||||
|
|
||||||
#: ../../include/text.php:832
|
#: ../../include/text.php:835
|
||||||
msgid "December"
|
msgid "December"
|
||||||
msgstr "Dezember"
|
msgstr "Dezember"
|
||||||
|
|
||||||
#: ../../include/text.php:916
|
#: ../../include/text.php:919
|
||||||
msgid "bytes"
|
msgid "bytes"
|
||||||
msgstr "Byte"
|
msgstr "Byte"
|
||||||
|
|
||||||
#: ../../include/text.php:933
|
#: ../../include/text.php:936
|
||||||
msgid "Categories:"
|
msgid "Categories:"
|
||||||
msgstr "Kategorien:"
|
msgstr "Kategorien:"
|
||||||
|
|
||||||
#: ../../include/text.php:945
|
#: ../../include/text.php:948
|
||||||
msgid "remove"
|
msgid "remove"
|
||||||
msgstr "löschen"
|
msgstr "löschen"
|
||||||
|
|
||||||
#: ../../include/text.php:945
|
#: ../../include/text.php:948
|
||||||
msgid "[remove]"
|
msgid "[remove]"
|
||||||
msgstr "[löschen]"
|
msgstr "[löschen]"
|
||||||
|
|
||||||
#: ../../include/text.php:948
|
#: ../../include/text.php:951
|
||||||
msgid "Filed under:"
|
msgid "Filed under:"
|
||||||
msgstr "Abgelegt unter:"
|
msgstr "Abgelegt unter:"
|
||||||
|
|
||||||
#: ../../include/text.php:964 ../../include/text.php:976
|
#: ../../include/text.php:967 ../../include/text.php:979
|
||||||
msgid "Click to open/close"
|
msgid "Click to open/close"
|
||||||
msgstr "Zum öffnen/schließen klicken"
|
msgstr "Zum öffnen/schließen klicken"
|
||||||
|
|
||||||
#: ../../include/text.php:1068
|
#: ../../include/text.php:1071
|
||||||
msgid "Select an alternate language"
|
msgid "Select an alternate language"
|
||||||
msgstr "Alternative Sprache auswählen"
|
msgstr "Alternative Sprache auswählen"
|
||||||
|
|
||||||
#: ../../include/text.php:1080
|
#: ../../include/text.php:1083
|
||||||
msgid "default"
|
msgid "default"
|
||||||
msgstr "standard"
|
msgstr "standard"
|
||||||
|
|
||||||
#: ../../include/text.php:1296
|
#: ../../include/text.php:1299
|
||||||
msgid "activity"
|
msgid "activity"
|
||||||
msgstr "Aktivität"
|
msgstr "Aktivität"
|
||||||
|
|
||||||
#: ../../include/text.php:1298
|
#: ../../include/text.php:1301
|
||||||
msgid "comment"
|
msgid "comment"
|
||||||
msgstr "Kommentar"
|
msgstr "Kommentar"
|
||||||
|
|
||||||
#: ../../include/text.php:1299
|
#: ../../include/text.php:1302
|
||||||
msgid "post"
|
msgid "post"
|
||||||
msgstr "Beitrag"
|
msgstr "Beitrag"
|
||||||
|
|
||||||
#: ../../include/text.php:1454
|
#: ../../include/text.php:1457
|
||||||
msgid "Item filed"
|
msgid "Item filed"
|
||||||
msgstr "Beitrag abgelegt"
|
msgstr "Beitrag abgelegt"
|
||||||
|
|
||||||
|
@ -6220,7 +6220,7 @@ msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben."
|
||||||
#: ../../include/enotify.php:42
|
#: ../../include/enotify.php:42
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%s sent you %s."
|
msgid "%s sent you %s."
|
||||||
msgstr "%s hat Dir geschickt %s"
|
msgstr "%s hat Dir %s geschickt"
|
||||||
|
|
||||||
#: ../../include/enotify.php:42
|
#: ../../include/enotify.php:42
|
||||||
msgid "a private message"
|
msgid "a private message"
|
||||||
|
@ -6316,7 +6316,7 @@ msgstr "%s markierte %s"
|
||||||
|
|
||||||
#: ../../include/enotify.php:121
|
#: ../../include/enotify.php:121
|
||||||
msgid "your post"
|
msgid "your post"
|
||||||
msgstr "Dein Beitrag"
|
msgstr "Deinen Beitrag"
|
||||||
|
|
||||||
#: ../../include/enotify.php:130
|
#: ../../include/enotify.php:130
|
||||||
msgid "[Friendica:Notify] Introduction received"
|
msgid "[Friendica:Notify] Introduction received"
|
||||||
|
|
|
@ -1159,9 +1159,9 @@ $a->strings["Invite Friends"] = "Freunde einladen";
|
||||||
$a->strings["Community Pages"] = "Foren";
|
$a->strings["Community Pages"] = "Foren";
|
||||||
$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
|
$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
|
||||||
$a->strings["Connect Services"] = "Verbinde Dienste";
|
$a->strings["Connect Services"] = "Verbinde Dienste";
|
||||||
$a->strings["PostIt to Friendica"] = "PostIt nach Friendica";
|
$a->strings["PostIt to Friendica"] = "Bei Friendica posten";
|
||||||
$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen";
|
$a->strings["Post to Friendica"] = "Wenn du diesen Link";
|
||||||
$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst.";
|
$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 posts and conversations"] = "Deine Beiträge und Unterhaltungen";
|
||||||
$a->strings["Your profile page"] = "Deine Profilseite";
|
$a->strings["Your profile page"] = "Deine Profilseite";
|
||||||
$a->strings["Your contacts"] = "Deine Kontakte";
|
$a->strings["Your contacts"] = "Deine Kontakte";
|
||||||
|
@ -1401,7 +1401,7 @@ $a->strings["%s Administrator"] = "der Administrator von %s";
|
||||||
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
|
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
|
||||||
$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s";
|
$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s";
|
||||||
$a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben.";
|
$a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben.";
|
||||||
$a->strings["%s sent you %s."] = "%s hat Dir geschickt %s";
|
$a->strings["%s sent you %s."] = "%s hat Dir %s geschickt";
|
||||||
$a->strings["a private message"] = "eine private Nachricht";
|
$a->strings["a private message"] = "eine private Nachricht";
|
||||||
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
|
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
|
||||||
$a->strings["%s's"] = "%s's";
|
$a->strings["%s's"] = "%s's";
|
||||||
|
@ -1421,7 +1421,7 @@ $a->strings["tagged you"] = "erwähnte Dich";
|
||||||
$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag";
|
$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag";
|
||||||
$a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt";
|
$a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt";
|
||||||
$a->strings["%s tagged %s"] = "%s markierte %s";
|
$a->strings["%s tagged %s"] = "%s markierte %s";
|
||||||
$a->strings["your post"] = "Dein Beitrag";
|
$a->strings["your post"] = "Deinen Beitrag";
|
||||||
$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten";
|
$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten";
|
||||||
$a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten";
|
$a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten";
|
||||||
$a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten.";
|
$a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten.";
|
||||||
|
|
4
view/theme/diabook-aerith/oembed_video.tpl
Normal file
4
view/theme/diabook-aerith/oembed_video.tpl
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
|
||||||
|
<img width='$tw' height='$th' src='$turl' >
|
||||||
|
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
|
||||||
|
</a>
|
|
@ -2173,7 +2173,7 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
|
|
@ -2162,7 +2162,7 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
|
|
@ -1276,7 +1276,7 @@ body .pageheader{
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
max-width: 575px;
|
max-width: 775px;
|
||||||
}
|
}
|
||||||
.qcomment{
|
.qcomment{
|
||||||
max-width: 122px;
|
max-width: 122px;
|
||||||
|
@ -2324,7 +2324,7 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
/*
|
/*
|
||||||
* Name: Diabook-aerith
|
* Name: Diabook-aerith
|
||||||
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||||
* Version: (Version: 1.014)
|
* Version: (Version: 1.015)
|
||||||
* Author:
|
* Author:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
//print diabook-version for debugging
|
//print diabook-version for debugging
|
||||||
$diabook_version = "Diabook-aerith (Version: 1.014)";
|
$diabook_version = "Diabook-aerith (Version: 1.015)";
|
||||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||||
|
|
||||||
|
|
||||||
|
@ -366,6 +366,35 @@ $a->page['htmlhead'] .= '
|
||||||
|
|
||||||
</script>';
|
</script>';
|
||||||
|
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
|
|
||||||
|
$(document).ready(function() {
|
||||||
|
$("iframe").each(function(){
|
||||||
|
var ifr_source = $(this).attr("src");
|
||||||
|
var wmode = "wmode=transparent";
|
||||||
|
if(ifr_source.indexOf("?") != -1) {
|
||||||
|
var getQString = ifr_source.split("?");
|
||||||
|
var oldString = getQString[1];
|
||||||
|
var newString = getQString[0];
|
||||||
|
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
|
||||||
|
}
|
||||||
|
else $(this).attr("src",ifr_source+"?"+wmode);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
function yt_iframe() {
|
||||||
|
|
||||||
|
$("iframe").load(function() {
|
||||||
|
var ifr_src = $(this).contents().find("body iframe").attr("src");
|
||||||
|
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
|
||||||
|
});
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
</script>';
|
||||||
|
|
||||||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
|
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
|
||||||
$a->page['htmlhead'] .= '
|
$a->page['htmlhead'] .= '
|
||||||
|
@ -374,7 +403,12 @@ $a->page['htmlhead'] .= '
|
||||||
$(function() {
|
$(function() {
|
||||||
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
||||||
});
|
});
|
||||||
|
</script>';
|
||||||
|
|
||||||
|
|
||||||
|
if($ccCookie != "8") {
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
$("right_aside").ready(function(){
|
$("right_aside").ready(function(){
|
||||||
|
|
||||||
if($.cookie("close_pages") == "1")
|
if($.cookie("close_pages") == "1")
|
||||||
|
@ -458,9 +492,10 @@ function close_lastlikes(){
|
||||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||||
};
|
};
|
||||||
|
</script>';}
|
||||||
|
|
||||||
|
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
function restore_boxes(){
|
function restore_boxes(){
|
||||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||||
|
@ -471,5 +506,5 @@ function restore_boxes(){
|
||||||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||||
alert("Right-hand column was restored. Please refresh your browser");
|
alert("Right-hand column was restored. Please refresh your browser");
|
||||||
};
|
}
|
||||||
</script>';}
|
</script>';}
|
4
view/theme/diabook-blue/oembed_video.tpl
Normal file
4
view/theme/diabook-blue/oembed_video.tpl
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
|
||||||
|
<img width='$tw' height='$th' src='$turl' >
|
||||||
|
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
|
||||||
|
</a>
|
|
@ -2134,7 +2134,7 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
|
|
@ -2129,7 +2129,7 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
|
|
@ -1236,7 +1236,7 @@ body .pageheader{
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
max-width: 575px;
|
max-width: 775px;
|
||||||
}
|
}
|
||||||
.qcomment{
|
.qcomment{
|
||||||
max-width: 122px;
|
max-width: 122px;
|
||||||
|
@ -2281,7 +2281,7 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
/*
|
/*
|
||||||
* Name: Diabook-blue
|
* Name: Diabook-blue
|
||||||
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||||
* Version: (Version: 1.014)
|
* Version: (Version: 1.015)
|
||||||
* Author:
|
* Author:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
//print diabook-version for debugging
|
//print diabook-version for debugging
|
||||||
$diabook_version = "Diabook-blue (Version: 1.014)";
|
$diabook_version = "Diabook-blue (Version: 1.015)";
|
||||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||||
|
|
||||||
//change css on network and profilepages
|
//change css on network and profilepages
|
||||||
|
@ -366,15 +366,50 @@ $a->page['htmlhead'] .= '
|
||||||
|
|
||||||
</script>';
|
</script>';
|
||||||
|
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
|
|
||||||
|
$(document).ready(function() {
|
||||||
|
$("iframe").each(function(){
|
||||||
|
var ifr_source = $(this).attr("src");
|
||||||
|
var wmode = "wmode=transparent";
|
||||||
|
if(ifr_source.indexOf("?") != -1) {
|
||||||
|
var getQString = ifr_source.split("?");
|
||||||
|
var oldString = getQString[1];
|
||||||
|
var newString = getQString[0];
|
||||||
|
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
|
||||||
|
}
|
||||||
|
else $(this).attr("src",ifr_source+"?"+wmode);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
function yt_iframe() {
|
||||||
|
|
||||||
|
$("iframe").load(function() {
|
||||||
|
var ifr_src = $(this).contents().find("body iframe").attr("src");
|
||||||
|
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
|
||||||
|
});
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
</script>';
|
||||||
|
|
||||||
|
|
||||||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
|
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
|
||||||
$a->page['htmlhead'] .= '
|
$a->page['htmlhead'] .= '
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
||||||
});
|
});
|
||||||
|
</script>';
|
||||||
|
|
||||||
|
|
||||||
|
if($ccCookie != "8") {
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
$("right_aside").ready(function(){
|
$("right_aside").ready(function(){
|
||||||
|
|
||||||
if($.cookie("close_pages") == "1")
|
if($.cookie("close_pages") == "1")
|
||||||
|
@ -458,9 +493,10 @@ function close_lastlikes(){
|
||||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||||
};
|
};
|
||||||
|
</script>';}
|
||||||
|
|
||||||
|
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
function restore_boxes(){
|
function restore_boxes(){
|
||||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||||
|
@ -471,5 +507,5 @@ function restore_boxes(){
|
||||||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||||
alert("Right-hand column was restored. Please refresh your browser");
|
alert("Right-hand column was restored. Please refresh your browser");
|
||||||
};
|
}
|
||||||
</script>';}
|
</script>';}
|
||||||
|
|
4
view/theme/diabook-red/oembed_video.tpl
Normal file
4
view/theme/diabook-red/oembed_video.tpl
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
|
||||||
|
<img width='$tw' height='$th' src='$turl' >
|
||||||
|
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
|
||||||
|
</a>
|
|
@ -2171,7 +2171,7 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
|
|
@ -2143,7 +2143,7 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
|
|
@ -1266,7 +1266,7 @@ body .pageheader{
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
max-width: 575px;
|
max-width: 775px;
|
||||||
}
|
}
|
||||||
.qcomment{
|
.qcomment{
|
||||||
max-width: 122px;
|
max-width: 122px;
|
||||||
|
@ -2310,7 +2310,7 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
|
|
@ -3,13 +3,13 @@
|
||||||
/*
|
/*
|
||||||
* Name: Diabook-red
|
* Name: Diabook-red
|
||||||
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||||
* Version: (Version: 1.014)
|
* Version: (Version: 1.015)
|
||||||
* Author:
|
* Author:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
//print diabook-version for debugging
|
//print diabook-version for debugging
|
||||||
$diabook_version = "Diabook-red (Version: 1.014)";
|
$diabook_version = "Diabook-red (Version: 1.015)";
|
||||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||||
|
|
||||||
//change css on network and profilepages
|
//change css on network and profilepages
|
||||||
|
@ -367,15 +367,50 @@ $a->page['htmlhead'] .= '
|
||||||
|
|
||||||
</script>';
|
</script>';
|
||||||
|
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
|
|
||||||
|
$(document).ready(function() {
|
||||||
|
$("iframe").each(function(){
|
||||||
|
var ifr_source = $(this).attr("src");
|
||||||
|
var wmode = "wmode=transparent";
|
||||||
|
if(ifr_source.indexOf("?") != -1) {
|
||||||
|
var getQString = ifr_source.split("?");
|
||||||
|
var oldString = getQString[1];
|
||||||
|
var newString = getQString[0];
|
||||||
|
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
|
||||||
|
}
|
||||||
|
else $(this).attr("src",ifr_source+"?"+wmode);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
function yt_iframe() {
|
||||||
|
|
||||||
|
$("iframe").load(function() {
|
||||||
|
var ifr_src = $(this).contents().find("body iframe").attr("src");
|
||||||
|
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
|
||||||
|
});
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
</script>';
|
||||||
|
|
||||||
|
|
||||||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
|
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
|
||||||
$a->page['htmlhead'] .= '
|
$a->page['htmlhead'] .= '
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
||||||
});
|
});
|
||||||
|
</script>';
|
||||||
|
|
||||||
|
|
||||||
|
if($ccCookie != "8") {
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
$("right_aside").ready(function(){
|
$("right_aside").ready(function(){
|
||||||
|
|
||||||
if($.cookie("close_pages") == "1")
|
if($.cookie("close_pages") == "1")
|
||||||
|
@ -459,9 +494,10 @@ function close_lastlikes(){
|
||||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||||
};
|
};
|
||||||
|
</script>';}
|
||||||
|
|
||||||
|
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
function restore_boxes(){
|
function restore_boxes(){
|
||||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||||
|
@ -472,5 +508,5 @@ function restore_boxes(){
|
||||||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||||
alert("Right-hand column was restored. Please refresh your browser");
|
alert("Right-hand column was restored. Please refresh your browser");
|
||||||
};
|
}
|
||||||
</script>';}
|
</script>';}
|
|
@ -1,4 +1,4 @@
|
||||||
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
|
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
|
||||||
<img width='$tw' height='$th' src='$turl' >
|
<img width='$tw' height='$th' src='$turl' >
|
||||||
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
|
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -2103,7 +2103,6 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
@ -2549,4 +2548,4 @@ list-style-type: disc;
|
||||||
#photos-upload-newalbum-div {
|
#photos-upload-newalbum-div {
|
||||||
float: left;
|
float: left;
|
||||||
width: 175px;
|
width: 175px;
|
||||||
}
|
}
|
|
@ -2100,7 +2100,6 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
@ -2546,4 +2545,4 @@ list-style-type: disc;
|
||||||
#photos-upload-newalbum-div {
|
#photos-upload-newalbum-div {
|
||||||
float: left;
|
float: left;
|
||||||
width: 175px;
|
width: 175px;
|
||||||
}
|
}
|
|
@ -2526,4 +2526,4 @@ list-style-type: disc;
|
||||||
#photos-upload-newalbum-div {
|
#photos-upload-newalbum-div {
|
||||||
float: left;
|
float: left;
|
||||||
width: 175px;
|
width: 175px;
|
||||||
}
|
}
|
|
@ -1219,7 +1219,7 @@ body .pageheader{
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
margin-top: 0px;
|
margin-top: 0px;
|
||||||
max-width: 575px;
|
max-width: 775px;
|
||||||
}
|
}
|
||||||
.qcomment{
|
.qcomment{
|
||||||
max-width: 122px;
|
max-width: 122px;
|
||||||
|
@ -2246,7 +2246,6 @@ blockquote {
|
||||||
color: #777;
|
color: #777;
|
||||||
}
|
}
|
||||||
.oembed {
|
.oembed {
|
||||||
font-size: large;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.aprofile dt{
|
.aprofile dt{
|
||||||
|
@ -2687,4 +2686,4 @@ list-style-type: disc;
|
||||||
#photos-upload-newalbum-div {
|
#photos-upload-newalbum-div {
|
||||||
float: left;
|
float: left;
|
||||||
width: 175px;
|
width: 175px;
|
||||||
}
|
}
|
|
@ -3,13 +3,13 @@
|
||||||
/*
|
/*
|
||||||
* Name: Diabook
|
* Name: Diabook
|
||||||
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
|
||||||
* Version: (Version: 1.014)
|
* Version: (Version: 1.015)
|
||||||
* Author:
|
* Author:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
//print diabook-version for debugging
|
//print diabook-version for debugging
|
||||||
$diabook_version = "Diabook (Version: 1.014)";
|
$diabook_version = "Diabook (Version: 1.015)";
|
||||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||||
|
|
||||||
//change css on network and profilepages
|
//change css on network and profilepages
|
||||||
|
@ -376,11 +376,12 @@ $a->page['htmlhead'] .= '
|
||||||
|
|
||||||
</script>';
|
</script>';
|
||||||
|
|
||||||
|
|
||||||
$a->page['htmlhead'] .= '
|
$a->page['htmlhead'] .= '
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$(".embed_yt iframe").each(function(){
|
$("iframe").each(function(){
|
||||||
var ifr_source = $(this).attr("src");
|
var ifr_source = $(this).attr("src");
|
||||||
var wmode = "wmode=transparent";
|
var wmode = "wmode=transparent";
|
||||||
if(ifr_source.indexOf("?") != -1) {
|
if(ifr_source.indexOf("?") != -1) {
|
||||||
|
@ -391,7 +392,18 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
else $(this).attr("src",ifr_source+"?"+wmode);
|
else $(this).attr("src",ifr_source+"?"+wmode);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function yt_iframe() {
|
||||||
|
|
||||||
|
$("iframe").load(function() {
|
||||||
|
var ifr_src = $(this).contents().find("body iframe").attr("src");
|
||||||
|
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
|
||||||
|
});
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
</script>';
|
</script>';
|
||||||
|
|
||||||
|
@ -403,7 +415,12 @@ $a->page['htmlhead'] .= '
|
||||||
$(function() {
|
$(function() {
|
||||||
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
||||||
});
|
});
|
||||||
|
</script>';
|
||||||
|
|
||||||
|
|
||||||
|
if($ccCookie != "8") {
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
$("right_aside").ready(function(){
|
$("right_aside").ready(function(){
|
||||||
|
|
||||||
if($.cookie("close_pages") == "1")
|
if($.cookie("close_pages") == "1")
|
||||||
|
@ -487,9 +504,10 @@ function close_lastlikes(){
|
||||||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||||
};
|
};
|
||||||
|
</script>';}
|
||||||
|
|
||||||
|
|
||||||
|
$a->page['htmlhead'] .= '
|
||||||
|
<script>
|
||||||
function restore_boxes(){
|
function restore_boxes(){
|
||||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||||
|
@ -500,5 +518,5 @@ function restore_boxes(){
|
||||||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||||
alert("Right-hand column was restored. Please refresh your browser");
|
alert("Right-hand column was restored. Please refresh your browser");
|
||||||
};
|
}
|
||||||
</script>';}
|
</script>';}
|
Loading…
Reference in a new issue