Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: bbcode toolbar attached to the comment text field minor css-fixes diabook-themes: small icon fix diabook-nav-icons with gradient use local_user for tag completion if available. See bug #368 more sane defaults datetime_convert fix empty string timezone Some new German translations send zrl after dfrn_request homecoming for manual entries fix to wall_upload photos default permissions to use cid rather than uid. fixed z-index of youtube-vids fixed bug to hide right_side * master:
This commit is contained in:
Simon L'nu
commit
16c48b2200
2
boot.php
2
boot.php
|
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1305' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1306' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1137 );
|
||||
|
||||
|
|
|
|||
|
|
@ -80,6 +80,16 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang
|
|||
if(! function_exists('datetime_convert')) {
|
||||
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
|
||||
// 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
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ function dfrn_request_post(&$a) {
|
|||
|
||||
// (ignore reply, nothing we can do it failed)
|
||||
|
||||
goaway($dfrn_url);
|
||||
goaway(zrl($dfrn_url));
|
||||
return; // NOTREACHED
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ function item_post(&$a) {
|
|||
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
|
||||
if(! strlen($image_uri))
|
||||
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` = ''
|
||||
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
|
||||
dbesc($srch),
|
||||
|
|
@ -447,7 +447,7 @@ function item_post(&$a) {
|
|||
|
||||
if(count($tags)) {
|
||||
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) {
|
||||
$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)
|
||||
);
|
||||
if(! count($r))
|
||||
|
|
@ -21,6 +21,7 @@ function wall_attach_post(&$a) {
|
|||
$visitor = 0;
|
||||
|
||||
$page_owner_uid = $r[0]['uid'];
|
||||
$page_owner_cid = $r[0]['id'];
|
||||
$page_owner_nick = $r[0]['nickname'];
|
||||
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
|
||||
|
||||
|
|
@ -73,7 +74,7 @@ function wall_attach_post(&$a) {
|
|||
dbesc($filedata),
|
||||
dbesc($created),
|
||||
dbesc($created),
|
||||
dbesc('<' . $page_owner_uid . '>'),
|
||||
dbesc('<' . $page_owner_cid . '>'),
|
||||
dbesc(''),
|
||||
dbesc(''),
|
||||
dbesc('')
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ function wall_upload_post(&$a) {
|
|||
|
||||
if($a->argc > 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)
|
||||
);
|
||||
if(! count($r))
|
||||
|
|
@ -16,10 +16,13 @@ function wall_upload_post(&$a) {
|
|||
else
|
||||
return;
|
||||
|
||||
|
||||
|
||||
$can_post = false;
|
||||
$visitor = 0;
|
||||
|
||||
$page_owner_uid = $r[0]['uid'];
|
||||
$default_cid = $r[0]['id'];
|
||||
$page_owner_nick = $r[0]['nickname'];
|
||||
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
|
||||
|
||||
|
|
@ -34,6 +37,7 @@ function wall_upload_post(&$a) {
|
|||
if(count($r)) {
|
||||
$can_post = true;
|
||||
$visitor = remote_user();
|
||||
$default_cid = $visitor;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -76,7 +80,7 @@ function wall_upload_post(&$a) {
|
|||
|
||||
$smallest = 0;
|
||||
|
||||
$defperm = '<' . $page_owner_uid . '>';
|
||||
$defperm = '<' . $default_cid . '>';
|
||||
|
||||
$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 ""
|
||||
"Project-Id-Version: friendica\n"
|
||||
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
|
||||
"POT-Creation-Date: 2012-04-05 10:00-0700\n"
|
||||
"PO-Revision-Date: 2012-04-06 10:40+0000\n"
|
||||
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
|
||||
"POT-Creation-Date: 2012-04-06 10:00-0700\n"
|
||||
"PO-Revision-Date: 2012-04-08 23:57+0000\n"
|
||||
"Last-Translator: zottel <transifex@zottel.net>\n"
|
||||
"Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -216,7 +216,7 @@ msgstr "l, F j"
|
|||
msgid "Edit event"
|
||||
msgstr "Veranstaltung bearbeiten"
|
||||
|
||||
#: ../../mod/events.php:272 ../../include/text.php:1050
|
||||
#: ../../mod/events.php:272 ../../include/text.php:1053
|
||||
msgid "link to source"
|
||||
msgstr "Link zum Originalbeitrag"
|
||||
|
||||
|
|
@ -410,7 +410,7 @@ msgstr "wurde getaggt in einem"
|
|||
#: ../../view/theme/diabook-red/theme.php:82
|
||||
#: ../../view/theme/diabook-blue/theme.php:82
|
||||
#: ../../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/conversation.php:126
|
||||
msgid "photo"
|
||||
|
|
@ -2234,7 +2234,7 @@ msgstr "Markierte"
|
|||
msgid "Shared Links"
|
||||
msgstr "Geteilte Links"
|
||||
|
||||
#: ../../mod/network.php:270
|
||||
#: ../../mod/network.php:274
|
||||
#, php-format
|
||||
msgid "Warning: This group contains %s member from an insecure network."
|
||||
msgid_plural ""
|
||||
|
|
@ -2242,31 +2242,31 @@ msgid_plural ""
|
|||
msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk."
|
||||
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."
|
||||
msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."
|
||||
|
||||
#: ../../mod/network.php:318
|
||||
#: ../../mod/network.php:322
|
||||
msgid "No such group"
|
||||
msgstr "Es gibt keine solche Gruppe"
|
||||
|
||||
#: ../../mod/network.php:329
|
||||
#: ../../mod/network.php:333
|
||||
msgid "Group is empty"
|
||||
msgstr "Gruppe ist leer"
|
||||
|
||||
#: ../../mod/network.php:333
|
||||
#: ../../mod/network.php:337
|
||||
msgid "Group: "
|
||||
msgstr "Gruppe: "
|
||||
|
||||
#: ../../mod/network.php:343
|
||||
#: ../../mod/network.php:347
|
||||
msgid "Contact: "
|
||||
msgstr "Kontakt: "
|
||||
|
||||
#: ../../mod/network.php:345
|
||||
#: ../../mod/network.php:349
|
||||
msgid "Private messages to this person are at risk of public disclosure."
|
||||
msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
|
||||
|
||||
#: ../../mod/network.php:350
|
||||
#: ../../mod/network.php:354
|
||||
msgid "Invalid contact."
|
||||
msgstr "Ungültiger Kontakt."
|
||||
|
||||
|
|
@ -2275,7 +2275,7 @@ msgid "Personal Notes"
|
|||
msgstr "Persönliche Notizen"
|
||||
|
||||
#: ../../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"
|
||||
msgstr "Speichern"
|
||||
|
||||
|
|
@ -2538,7 +2538,7 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
|
|||
msgid "No contacts."
|
||||
msgstr "Keine Kontakte."
|
||||
|
||||
#: ../../mod/viewcontacts.php:76 ../../include/text.php:586
|
||||
#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
|
||||
msgid "View Contacts"
|
||||
msgstr "Kontakte anzeigen"
|
||||
|
||||
|
|
@ -4397,7 +4397,7 @@ msgstr "Neueste Favoriten"
|
|||
#: ../../view/theme/diabook-red/theme.php:74
|
||||
#: ../../view/theme/diabook-blue/theme.php:74
|
||||
#: ../../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
|
||||
msgid "event"
|
||||
msgstr "Veranstaltung"
|
||||
|
|
@ -5223,21 +5223,21 @@ msgstr "Verbinde Dienste"
|
|||
#: ../../view/theme/diabook/theme.php:212
|
||||
#: ../../view/theme/diabook-aerith/theme.php:207
|
||||
msgid "PostIt to Friendica"
|
||||
msgstr "PostIt nach Friendica"
|
||||
msgstr "Bei Friendica posten"
|
||||
|
||||
#: ../../view/theme/diabook-red/theme.php:207
|
||||
#: ../../view/theme/diabook-blue/theme.php:207
|
||||
#: ../../view/theme/diabook/theme.php:212
|
||||
#: ../../view/theme/diabook-aerith/theme.php:207
|
||||
msgid "Post to Friendica"
|
||||
msgstr "Bei Friendica veröffentlichen"
|
||||
msgstr "Wenn du diesen Link"
|
||||
|
||||
#: ../../view/theme/diabook-red/theme.php:208
|
||||
#: ../../view/theme/diabook-blue/theme.php:208
|
||||
#: ../../view/theme/diabook/theme.php:213
|
||||
#: ../../view/theme/diabook-aerith/theme.php:208
|
||||
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-blue/theme.php:236
|
||||
|
|
@ -5695,158 +5695,158 @@ msgstr "(kein Betreff)"
|
|||
msgid "noreply"
|
||||
msgstr "noreply"
|
||||
|
||||
#: ../../include/text.php:240
|
||||
#: ../../include/text.php:243
|
||||
msgid "prev"
|
||||
msgstr "vorige"
|
||||
|
||||
#: ../../include/text.php:242
|
||||
#: ../../include/text.php:245
|
||||
msgid "first"
|
||||
msgstr "erste"
|
||||
|
||||
#: ../../include/text.php:271
|
||||
#: ../../include/text.php:274
|
||||
msgid "last"
|
||||
msgstr "letzte"
|
||||
|
||||
#: ../../include/text.php:274
|
||||
#: ../../include/text.php:277
|
||||
msgid "next"
|
||||
msgstr "nächste"
|
||||
|
||||
#: ../../include/text.php:565
|
||||
#: ../../include/text.php:568
|
||||
msgid "No contacts"
|
||||
msgstr "Keine Kontakte"
|
||||
|
||||
#: ../../include/text.php:574
|
||||
#: ../../include/text.php:577
|
||||
#, php-format
|
||||
msgid "%d Contact"
|
||||
msgid_plural "%d Contacts"
|
||||
msgstr[0] "%d Kontakt"
|
||||
msgstr[1] "%d Kontakte"
|
||||
|
||||
#: ../../include/text.php:647 ../../include/nav.php:91
|
||||
#: ../../include/text.php:650 ../../include/nav.php:91
|
||||
msgid "Search"
|
||||
msgstr "Suche"
|
||||
|
||||
#: ../../include/text.php:828
|
||||
#: ../../include/text.php:831
|
||||
msgid "Monday"
|
||||
msgstr "Montag"
|
||||
|
||||
#: ../../include/text.php:828
|
||||
#: ../../include/text.php:831
|
||||
msgid "Tuesday"
|
||||
msgstr "Dienstag"
|
||||
|
||||
#: ../../include/text.php:828
|
||||
#: ../../include/text.php:831
|
||||
msgid "Wednesday"
|
||||
msgstr "Mittwoch"
|
||||
|
||||
#: ../../include/text.php:828
|
||||
#: ../../include/text.php:831
|
||||
msgid "Thursday"
|
||||
msgstr "Donnerstag"
|
||||
|
||||
#: ../../include/text.php:828
|
||||
#: ../../include/text.php:831
|
||||
msgid "Friday"
|
||||
msgstr "Freitag"
|
||||
|
||||
#: ../../include/text.php:828
|
||||
#: ../../include/text.php:831
|
||||
msgid "Saturday"
|
||||
msgstr "Samstag"
|
||||
|
||||
#: ../../include/text.php:828
|
||||
#: ../../include/text.php:831
|
||||
msgid "Sunday"
|
||||
msgstr "Sonntag"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "January"
|
||||
msgstr "Januar"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "February"
|
||||
msgstr "Februar"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "March"
|
||||
msgstr "März"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "April"
|
||||
msgstr "April"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "May"
|
||||
msgstr "Mai"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "June"
|
||||
msgstr "Juni"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "July"
|
||||
msgstr "Juli"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "August"
|
||||
msgstr "August"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "September"
|
||||
msgstr "September"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "October"
|
||||
msgstr "Oktober"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "November"
|
||||
msgstr "November"
|
||||
|
||||
#: ../../include/text.php:832
|
||||
#: ../../include/text.php:835
|
||||
msgid "December"
|
||||
msgstr "Dezember"
|
||||
|
||||
#: ../../include/text.php:916
|
||||
#: ../../include/text.php:919
|
||||
msgid "bytes"
|
||||
msgstr "Byte"
|
||||
|
||||
#: ../../include/text.php:933
|
||||
#: ../../include/text.php:936
|
||||
msgid "Categories:"
|
||||
msgstr "Kategorien:"
|
||||
|
||||
#: ../../include/text.php:945
|
||||
#: ../../include/text.php:948
|
||||
msgid "remove"
|
||||
msgstr "löschen"
|
||||
|
||||
#: ../../include/text.php:945
|
||||
#: ../../include/text.php:948
|
||||
msgid "[remove]"
|
||||
msgstr "[löschen]"
|
||||
|
||||
#: ../../include/text.php:948
|
||||
#: ../../include/text.php:951
|
||||
msgid "Filed under:"
|
||||
msgstr "Abgelegt unter:"
|
||||
|
||||
#: ../../include/text.php:964 ../../include/text.php:976
|
||||
#: ../../include/text.php:967 ../../include/text.php:979
|
||||
msgid "Click to open/close"
|
||||
msgstr "Zum öffnen/schließen klicken"
|
||||
|
||||
#: ../../include/text.php:1068
|
||||
#: ../../include/text.php:1071
|
||||
msgid "Select an alternate language"
|
||||
msgstr "Alternative Sprache auswählen"
|
||||
|
||||
#: ../../include/text.php:1080
|
||||
#: ../../include/text.php:1083
|
||||
msgid "default"
|
||||
msgstr "standard"
|
||||
|
||||
#: ../../include/text.php:1296
|
||||
#: ../../include/text.php:1299
|
||||
msgid "activity"
|
||||
msgstr "Aktivität"
|
||||
|
||||
#: ../../include/text.php:1298
|
||||
#: ../../include/text.php:1301
|
||||
msgid "comment"
|
||||
msgstr "Kommentar"
|
||||
|
||||
#: ../../include/text.php:1299
|
||||
#: ../../include/text.php:1302
|
||||
msgid "post"
|
||||
msgstr "Beitrag"
|
||||
|
||||
#: ../../include/text.php:1454
|
||||
#: ../../include/text.php:1457
|
||||
msgid "Item filed"
|
||||
msgstr "Beitrag abgelegt"
|
||||
|
||||
|
|
@ -6220,7 +6220,7 @@ msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben."
|
|||
#: ../../include/enotify.php:42
|
||||
#, php-format
|
||||
msgid "%s sent you %s."
|
||||
msgstr "%s hat Dir geschickt %s"
|
||||
msgstr "%s hat Dir %s geschickt"
|
||||
|
||||
#: ../../include/enotify.php:42
|
||||
msgid "a private message"
|
||||
|
|
@ -6316,7 +6316,7 @@ msgstr "%s markierte %s"
|
|||
|
||||
#: ../../include/enotify.php:121
|
||||
msgid "your post"
|
||||
msgstr "Dein Beitrag"
|
||||
msgstr "Deinen Beitrag"
|
||||
|
||||
#: ../../include/enotify.php:130
|
||||
msgid "[Friendica:Notify] Introduction received"
|
||||
|
|
|
|||
|
|
@ -1159,9 +1159,9 @@ $a->strings["Invite Friends"] = "Freunde einladen";
|
|||
$a->strings["Community Pages"] = "Foren";
|
||||
$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
|
||||
$a->strings["Connect Services"] = "Verbinde Dienste";
|
||||
$a->strings["PostIt to Friendica"] = "PostIt nach Friendica";
|
||||
$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen";
|
||||
$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst.";
|
||||
$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["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
|
||||
$a->strings["Your profile page"] = "Deine Profilseite";
|
||||
$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["[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 %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["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";
|
||||
|
|
@ -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["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt";
|
||||
$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["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.";
|
||||
|
|
|
|||
39
view/theme/diabook-aerith/comment_item.tpl
Normal file
39
view/theme/diabook-aerith/comment_item.tpl
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
|
||||
<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
<input type="hidden" name="type" value="$type" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<input type="hidden" name="parent" value="$parent" />
|
||||
<input type="hidden" name="return" value="$return_path" />
|
||||
<input type="hidden" name="jsreload" value="$jsreload" />
|
||||
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
|
||||
|
||||
<div class="comment-edit-photo" id="comment-edit-photo-$id" >
|
||||
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
|
||||
</div>
|
||||
<div class="comment-edit-photo-end"></div>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>
|
||||
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>
|
||||
<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
|
||||
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
|
||||
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
|
||||
{{ if $qcomment }}
|
||||
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
|
||||
<option value=""></option>
|
||||
{{ for $qcomment as $qc }}
|
||||
<option value="$qc">$qc</option>
|
||||
{{ endfor }}
|
||||
</select>
|
||||
{{ endif }}
|
||||
|
||||
<div class="comment-edit-text-end"></div>
|
||||
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
|
||||
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
|
||||
<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
|
||||
<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
|
||||
</div>
|
||||
|
||||
<div class="comment-edit-end"></div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
BIN
view/theme/diabook-aerith/icons/bb-image.png
Normal file
BIN
view/theme/diabook-aerith/icons/bb-image.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 697 B |
BIN
view/theme/diabook-aerith/icons/bb-video.png
Normal file
BIN
view/theme/diabook-aerith/icons/bb-video.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 917 B |
BIN
view/theme/diabook-aerith/icons/bold.png
Normal file
BIN
view/theme/diabook-aerith/icons/bold.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 699 B |
Binary file not shown.
|
Before Width: | Height: | Size: 568 B After Width: | Height: | Size: 803 B |
BIN
view/theme/diabook-aerith/icons/contacts3.png
Normal file
BIN
view/theme/diabook-aerith/icons/contacts3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 568 B |
BIN
view/theme/diabook-aerith/icons/italic.png
Normal file
BIN
view/theme/diabook-aerith/icons/italic.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 577 B |
Binary file not shown.
|
Before Width: | Height: | Size: 579 B After Width: | Height: | Size: 901 B |
BIN
view/theme/diabook-aerith/icons/messages3.png
Executable file
BIN
view/theme/diabook-aerith/icons/messages3.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 579 B |
Binary file not shown.
|
Before Width: | Height: | Size: 754 B After Width: | Height: | Size: 1 KiB |
BIN
view/theme/diabook-aerith/icons/notifications3.png
Executable file
BIN
view/theme/diabook-aerith/icons/notifications3.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 754 B |
Binary file not shown.
|
Before Width: | Height: | Size: 795 B After Width: | Height: | Size: 1.1 KiB |
BIN
view/theme/diabook-aerith/icons/notify3.png
Executable file
BIN
view/theme/diabook-aerith/icons/notify3.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 795 B |
BIN
view/theme/diabook-aerith/icons/underline.png
Normal file
BIN
view/theme/diabook-aerith/icons/underline.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 604 B |
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>
|
||||
|
|
@ -1298,6 +1298,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 575px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #3465A4;
|
||||
|
|
@ -1447,7 +1448,7 @@ transition: all 0.2s ease-in-out;
|
|||
}
|
||||
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 0px 0px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
background-color: #fff;
|
||||
width: 500px;
|
||||
}
|
||||
|
|
@ -2173,7 +2174,7 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
|
|||
|
|
@ -1291,6 +1291,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 575px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #3465A4;
|
||||
|
|
@ -1439,7 +1440,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-left: 12px;
|
||||
}
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 5px 1px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-photo {
|
||||
display: none;
|
||||
|
|
@ -2162,7 +2163,7 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
|
|||
|
|
@ -82,7 +82,27 @@
|
|||
#adminpage table tr:hover { background-color: #eeeeee; }
|
||||
#adminpage .selectall { text-align: right; }
|
||||
/* icons */
|
||||
|
||||
.icon.bold{
|
||||
background-image: url("../../../view/theme/diabook-aerith/icons/bold.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.underline{
|
||||
background-image: url("../../../view/theme/diabook-aerith/icons/underline.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.italic{
|
||||
background-image: url("../../../view/theme/diabook-aerith/icons/italic.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.bb-image{
|
||||
background-image: url("../../../view/theme/diabook-aerith/icons/bb-image.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.bb-video{
|
||||
background-image: url("../../../view/theme/diabook-aerith/icons/bb-video.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
|
||||
.icon.contacts {
|
||||
background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");}
|
||||
.icon.notifications {
|
||||
|
|
@ -1276,7 +1296,7 @@ body .pageheader{
|
|||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
max-width: 775px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
|
|
@ -1331,6 +1351,7 @@ body .pageheader{
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 775px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #3465A4;
|
||||
|
|
@ -1592,7 +1613,7 @@ body .pageheader{
|
|||
padding-left: 12px;
|
||||
}
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 5px 1px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-photo {
|
||||
display: none;
|
||||
|
|
@ -2324,7 +2345,7 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
|
|||
|
|
@ -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.014)
|
||||
* Version: (Version: 1.016)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
||||
//print diabook-version for debugging
|
||||
$diabook_version = "Diabook-aerith (Version: 1.014)";
|
||||
$diabook_version = "Diabook-aerith (Version: 1.016)";
|
||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||
|
||||
|
||||
|
|
@ -366,6 +366,35 @@ $a->page['htmlhead'] .= '
|
|||
|
||||
</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()){
|
||||
$a->page['htmlhead'] .= '
|
||||
|
|
@ -374,7 +403,12 @@ $a->page['htmlhead'] .= '
|
|||
$(function() {
|
||||
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
||||
});
|
||||
</script>';
|
||||
|
||||
|
||||
if($ccCookie != "8") {
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
$("right_aside").ready(function(){
|
||||
|
||||
if($.cookie("close_pages") == "1")
|
||||
|
|
@ -458,9 +492,10 @@ function close_lastlikes(){
|
|||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
|
||||
</script>';}
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
function restore_boxes(){
|
||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||
|
|
@ -471,5 +506,32 @@ function restore_boxes(){
|
|||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||
alert("Right-hand column was restored. Please refresh your browser");
|
||||
};
|
||||
</script>';}
|
||||
}
|
||||
</script>';}
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
|
||||
<script type="text/javascript">
|
||||
function insertFormatting(BBcode,id) {
|
||||
|
||||
var tmpStr = $("#comment-edit-text-" + id).val();
|
||||
if(tmpStr == "Kommentar") {
|
||||
tmpStr = "";
|
||||
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
|
||||
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
|
||||
openMenu("comment-edit-submit-wrapper-" + id);
|
||||
}
|
||||
|
||||
textarea = document.getElementById("comment-edit-text-" +id);
|
||||
if (document.selection) {
|
||||
textarea.focus();
|
||||
selected = document.selection.createRange();
|
||||
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
|
||||
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
|
||||
var start = textarea.selectionStart;
|
||||
var end = textarea.selectionEnd;
|
||||
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
</script> ';
|
||||
39
view/theme/diabook-blue/comment_item.tpl
Normal file
39
view/theme/diabook-blue/comment_item.tpl
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
|
||||
<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
<input type="hidden" name="type" value="$type" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<input type="hidden" name="parent" value="$parent" />
|
||||
<input type="hidden" name="return" value="$return_path" />
|
||||
<input type="hidden" name="jsreload" value="$jsreload" />
|
||||
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
|
||||
|
||||
<div class="comment-edit-photo" id="comment-edit-photo-$id" >
|
||||
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
|
||||
</div>
|
||||
<div class="comment-edit-photo-end"></div>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>
|
||||
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>
|
||||
<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
|
||||
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
|
||||
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
|
||||
{{ if $qcomment }}
|
||||
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
|
||||
<option value=""></option>
|
||||
{{ for $qcomment as $qc }}
|
||||
<option value="$qc">$qc</option>
|
||||
{{ endfor }}
|
||||
</select>
|
||||
{{ endif }}
|
||||
|
||||
<div class="comment-edit-text-end"></div>
|
||||
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
|
||||
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
|
||||
<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
|
||||
<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
|
||||
</div>
|
||||
|
||||
<div class="comment-edit-end"></div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
BIN
view/theme/diabook-blue/icons/bb-image.png
Normal file
BIN
view/theme/diabook-blue/icons/bb-image.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 697 B |
BIN
view/theme/diabook-blue/icons/bb-video.png
Normal file
BIN
view/theme/diabook-blue/icons/bb-video.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 917 B |
BIN
view/theme/diabook-blue/icons/bold.png
Normal file
BIN
view/theme/diabook-blue/icons/bold.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 699 B |
BIN
view/theme/diabook-blue/icons/italic.png
Normal file
BIN
view/theme/diabook-blue/icons/italic.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 577 B |
BIN
view/theme/diabook-blue/icons/underline.png
Normal file
BIN
view/theme/diabook-blue/icons/underline.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 604 B |
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>
|
||||
|
|
@ -1260,6 +1260,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 575px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #1872A2;
|
||||
|
|
@ -1409,7 +1410,7 @@ transition: all 0.2s ease-in-out;
|
|||
}
|
||||
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 0px 0px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
background-color: #fff;
|
||||
width: 500px;
|
||||
}
|
||||
|
|
@ -2134,7 +2135,7 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
|
|||
|
|
@ -1258,6 +1258,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 575px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #1872A2;
|
||||
|
|
@ -1406,7 +1407,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-left: 12px;
|
||||
}
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 5px 1px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-photo {
|
||||
display: none;
|
||||
|
|
@ -2129,7 +2130,7 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
|
|||
|
|
@ -82,7 +82,27 @@
|
|||
#adminpage table tr:hover { background-color: #eeeeee; }
|
||||
#adminpage .selectall { text-align: right; }
|
||||
/* icons */
|
||||
|
||||
.icon.bold{
|
||||
background-image: url("../../../view/theme/diabook-blue/icons/bold.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.underline{
|
||||
background-image: url("../../../view/theme/diabook-blue/icons/underline.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.italic{
|
||||
background-image: url("../../../view/theme/diabook-blue/icons/italic.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.bb-image{
|
||||
background-image: url("../../../view/theme/diabook-blue/icons/bb-image.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.bb-video{
|
||||
background-image: url("../../../view/theme/diabook-blue/icons/bb-video.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
|
||||
.icon.contacts {
|
||||
background-image: url("../../../view/theme/diabook-blue/icons/contacts.png");}
|
||||
.icon.notifications {
|
||||
|
|
@ -1236,7 +1256,7 @@ body .pageheader{
|
|||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
max-width: 775px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
|
|
@ -1287,6 +1307,7 @@ body .pageheader{
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 775px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: #1872A2;
|
||||
|
|
@ -1550,7 +1571,7 @@ body .pageheader{
|
|||
padding-left: 12px;
|
||||
}
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 5px 1px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-photo {
|
||||
display: none;
|
||||
|
|
@ -2281,7 +2302,7 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
|
|||
|
|
@ -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.014)
|
||||
* Version: (Version: 1.016)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
||||
//print diabook-version for debugging
|
||||
$diabook_version = "Diabook-blue (Version: 1.014)";
|
||||
$diabook_version = "Diabook-blue (Version: 1.016)";
|
||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||
|
||||
//change css on network and profilepages
|
||||
|
|
@ -366,15 +366,50 @@ $a->page['htmlhead'] .= '
|
|||
|
||||
</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()){
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
|
||||
$(function() {
|
||||
$(function() {
|
||||
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
||||
});
|
||||
</script>';
|
||||
|
||||
|
||||
if($ccCookie != "8") {
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
$("right_aside").ready(function(){
|
||||
|
||||
if($.cookie("close_pages") == "1")
|
||||
|
|
@ -458,9 +493,10 @@ function close_lastlikes(){
|
|||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
|
||||
</script>';}
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
function restore_boxes(){
|
||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||
|
|
@ -471,5 +507,32 @@ function restore_boxes(){
|
|||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||
alert("Right-hand column was restored. Please refresh your browser");
|
||||
};
|
||||
}
|
||||
</script>';}
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
|
||||
<script type="text/javascript">
|
||||
function insertFormatting(BBcode,id) {
|
||||
|
||||
var tmpStr = $("#comment-edit-text-" + id).val();
|
||||
if(tmpStr == "Kommentar") {
|
||||
tmpStr = "";
|
||||
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
|
||||
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
|
||||
openMenu("comment-edit-submit-wrapper-" + id);
|
||||
}
|
||||
|
||||
textarea = document.getElementById("comment-edit-text-" +id);
|
||||
if (document.selection) {
|
||||
textarea.focus();
|
||||
selected = document.selection.createRange();
|
||||
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
|
||||
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
|
||||
var start = textarea.selectionStart;
|
||||
var end = textarea.selectionEnd;
|
||||
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
</script> ';
|
||||
|
|
|
|||
39
view/theme/diabook-red/comment_item.tpl
Normal file
39
view/theme/diabook-red/comment_item.tpl
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
|
||||
<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
<input type="hidden" name="type" value="$type" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<input type="hidden" name="parent" value="$parent" />
|
||||
<input type="hidden" name="return" value="$return_path" />
|
||||
<input type="hidden" name="jsreload" value="$jsreload" />
|
||||
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
|
||||
|
||||
<div class="comment-edit-photo" id="comment-edit-photo-$id" >
|
||||
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
|
||||
</div>
|
||||
<div class="comment-edit-photo-end"></div>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>
|
||||
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>
|
||||
<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
|
||||
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
|
||||
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
|
||||
{{ if $qcomment }}
|
||||
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
|
||||
<option value=""></option>
|
||||
{{ for $qcomment as $qc }}
|
||||
<option value="$qc">$qc</option>
|
||||
{{ endfor }}
|
||||
</select>
|
||||
{{ endif }}
|
||||
|
||||
<div class="comment-edit-text-end"></div>
|
||||
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
|
||||
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
|
||||
<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
|
||||
<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
|
||||
</div>
|
||||
|
||||
<div class="comment-edit-end"></div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
BIN
view/theme/diabook-red/icons/bb-image.png
Normal file
BIN
view/theme/diabook-red/icons/bb-image.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 697 B |
BIN
view/theme/diabook-red/icons/bb-video.png
Normal file
BIN
view/theme/diabook-red/icons/bb-video.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 917 B |
BIN
view/theme/diabook-red/icons/bold.png
Normal file
BIN
view/theme/diabook-red/icons/bold.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 699 B |
BIN
view/theme/diabook-red/icons/italic.png
Normal file
BIN
view/theme/diabook-red/icons/italic.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 577 B |
BIN
view/theme/diabook-red/icons/underline.png
Normal file
BIN
view/theme/diabook-red/icons/underline.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 604 B |
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>
|
||||
|
|
@ -1295,6 +1295,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 575px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: red;
|
||||
|
|
@ -1444,7 +1445,7 @@ transition: all 0.2s ease-in-out;
|
|||
}
|
||||
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 0px 0px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
background-color: #fff;
|
||||
width: 500px;
|
||||
}
|
||||
|
|
@ -2171,7 +2172,7 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
|
|||
|
|
@ -1271,6 +1271,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 575px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: red;
|
||||
|
|
@ -1419,7 +1420,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-left: 12px;
|
||||
}
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 5px 1px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-photo {
|
||||
display: none;
|
||||
|
|
@ -2143,7 +2144,7 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
|
|||
|
|
@ -82,7 +82,27 @@
|
|||
#adminpage table tr:hover { background-color: #eeeeee; }
|
||||
#adminpage .selectall { text-align: right; }
|
||||
/* icons */
|
||||
|
||||
.icon.bold{
|
||||
background-image: url("../../../view/theme/diabook-red/icons/bold.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.underline{
|
||||
background-image: url("../../../view/theme/diabook-red/icons/underline.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.italic{
|
||||
background-image: url("../../../view/theme/diabook-red/icons/italic.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.bb-image{
|
||||
background-image: url("../../../view/theme/diabook-red/icons/bb-image.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.bb-video{
|
||||
background-image: url("../../../view/theme/diabook-red/icons/bb-video.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
|
||||
.icon.contacts {
|
||||
background-image: url("../../../view/theme/diabook-red/icons/contacts.png");}
|
||||
.icon.notifications {
|
||||
|
|
@ -1266,7 +1286,7 @@ body .pageheader{
|
|||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
max-width: 775px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
|
|
@ -1317,6 +1337,7 @@ body .pageheader{
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 775px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.tread-wrapper a{
|
||||
color: red;
|
||||
|
|
@ -1579,7 +1600,7 @@ body .pageheader{
|
|||
padding-left: 12px;
|
||||
}
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 5px 1px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-photo {
|
||||
display: none;
|
||||
|
|
@ -2310,7 +2331,7 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
|
|||
|
|
@ -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.014)
|
||||
* Version: (Version: 1.016)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
||||
//print diabook-version for debugging
|
||||
$diabook_version = "Diabook-red (Version: 1.014)";
|
||||
$diabook_version = "Diabook-red (Version: 1.016)";
|
||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||
|
||||
//change css on network and profilepages
|
||||
|
|
@ -367,15 +367,50 @@ $a->page['htmlhead'] .= '
|
|||
|
||||
</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()){
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
|
||||
$(function() {
|
||||
$(function() {
|
||||
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
||||
});
|
||||
</script>';
|
||||
|
||||
|
||||
if($ccCookie != "8") {
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
$("right_aside").ready(function(){
|
||||
|
||||
if($.cookie("close_pages") == "1")
|
||||
|
|
@ -459,9 +494,10 @@ function close_lastlikes(){
|
|||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
|
||||
</script>';}
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
function restore_boxes(){
|
||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||
|
|
@ -472,5 +508,32 @@ function restore_boxes(){
|
|||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||
alert("Right-hand column was restored. Please refresh your browser");
|
||||
};
|
||||
}
|
||||
</script>';}
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
|
||||
<script type="text/javascript">
|
||||
function insertFormatting(BBcode,id) {
|
||||
|
||||
var tmpStr = $("#comment-edit-text-" + id).val();
|
||||
if(tmpStr == "Kommentar") {
|
||||
tmpStr = "";
|
||||
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
|
||||
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
|
||||
openMenu("comment-edit-submit-wrapper-" + id);
|
||||
}
|
||||
|
||||
textarea = document.getElementById("comment-edit-text-" +id);
|
||||
if (document.selection) {
|
||||
textarea.focus();
|
||||
selected = document.selection.createRange();
|
||||
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
|
||||
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
|
||||
var start = textarea.selectionStart;
|
||||
var end = textarea.selectionEnd;
|
||||
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
</script> ';
|
||||
39
view/theme/diabook/comment_item.tpl
Normal file
39
view/theme/diabook/comment_item.tpl
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
|
||||
<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
<input type="hidden" name="type" value="$type" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<input type="hidden" name="parent" value="$parent" />
|
||||
<input type="hidden" name="return" value="$return_path" />
|
||||
<input type="hidden" name="jsreload" value="$jsreload" />
|
||||
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
|
||||
|
||||
<div class="comment-edit-photo" id="comment-edit-photo-$id" >
|
||||
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
|
||||
</div>
|
||||
<div class="comment-edit-photo-end"></div>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>
|
||||
<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>
|
||||
<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
|
||||
<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
|
||||
<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>
|
||||
{{ if $qcomment }}
|
||||
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
|
||||
<option value=""></option>
|
||||
{{ for $qcomment as $qc }}
|
||||
<option value="$qc">$qc</option>
|
||||
{{ endfor }}
|
||||
</select>
|
||||
{{ endif }}
|
||||
|
||||
<div class="comment-edit-text-end"></div>
|
||||
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
|
||||
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
|
||||
<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
|
||||
<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
|
||||
</div>
|
||||
|
||||
<div class="comment-edit-end"></div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
BIN
view/theme/diabook/icons/bb-image.png
Normal file
BIN
view/theme/diabook/icons/bb-image.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 697 B |
BIN
view/theme/diabook/icons/bb-video.png
Normal file
BIN
view/theme/diabook/icons/bb-video.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 917 B |
BIN
view/theme/diabook/icons/bold.png
Normal file
BIN
view/theme/diabook/icons/bold.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 699 B |
Binary file not shown.
|
Before Width: | Height: | Size: 559 B After Width: | Height: | Size: 773 B |
BIN
view/theme/diabook/icons/contacts3.png
Normal file
BIN
view/theme/diabook/icons/contacts3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 559 B |
BIN
view/theme/diabook/icons/italic.png
Normal file
BIN
view/theme/diabook/icons/italic.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 577 B |
BIN
view/theme/diabook/icons/messages.png
Executable file → Normal file
BIN
view/theme/diabook/icons/messages.png
Executable file → Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 488 B After Width: | Height: | Size: 777 B |
BIN
view/theme/diabook/icons/messages3.png
Normal file
BIN
view/theme/diabook/icons/messages3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 488 B |
Binary file not shown.
|
Before Width: | Height: | Size: 714 B After Width: | Height: | Size: 926 B |
BIN
view/theme/diabook/icons/notifications3.png
Executable file
BIN
view/theme/diabook/icons/notifications3.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 714 B |
Binary file not shown.
|
Before Width: | Height: | Size: 534 B After Width: | Height: | Size: 1,001 B |
BIN
view/theme/diabook/icons/notify3.png
Executable file
BIN
view/theme/diabook/icons/notify3.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 534 B |
BIN
view/theme/diabook/icons/underline.png
Normal file
BIN
view/theme/diabook/icons/underline.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 604 B |
|
|
@ -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' >
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -1241,6 +1241,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 575px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.wall-item-decor {
|
||||
position: absolute;
|
||||
|
|
@ -1385,7 +1386,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-left: 12px;
|
||||
}
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 5px 1px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-photo {
|
||||
display: none;
|
||||
|
|
@ -2103,7 +2104,6 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
@ -2549,4 +2549,4 @@ list-style-type: disc;
|
|||
#photos-upload-newalbum-div {
|
||||
float: left;
|
||||
width: 175px;
|
||||
}
|
||||
}
|
||||
|
|
@ -1235,6 +1235,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 575px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
.wall-item-decor {
|
||||
position: absolute;
|
||||
|
|
@ -1379,7 +1380,7 @@ transition: all 0.2s ease-in-out;
|
|||
padding-left: 12px;
|
||||
}
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 5px 1px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-photo {
|
||||
display: none;
|
||||
|
|
@ -2100,7 +2101,6 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
@ -2546,4 +2546,4 @@ list-style-type: disc;
|
|||
#photos-upload-newalbum-div {
|
||||
float: left;
|
||||
width: 175px;
|
||||
}
|
||||
}
|
||||
|
|
@ -2526,4 +2526,4 @@ list-style-type: disc;
|
|||
#photos-upload-newalbum-div {
|
||||
float: left;
|
||||
width: 175px;
|
||||
}
|
||||
}
|
||||
|
|
@ -83,6 +83,27 @@
|
|||
#adminpage .selectall { text-align: right; }
|
||||
/* icons */
|
||||
|
||||
.icon.bold{
|
||||
background-image: url("../../../view/theme/diabook/icons/bold.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.underline{
|
||||
background-image: url("../../../view/theme/diabook/icons/underline.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.italic{
|
||||
background-image: url("../../../view/theme/diabook/icons/italic.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.bb-image{
|
||||
background-image: url("../../../view/theme/diabook/icons/bb-image.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
.icon.bb-video{
|
||||
background-image: url("../../../view/theme/diabook/icons/bb-video.png");
|
||||
float: right;
|
||||
margin-top: 2px;}
|
||||
|
||||
.icon.contacts {
|
||||
background-image: url("../../../view/theme/diabook/icons/contacts.png");}
|
||||
.icon.notifications {
|
||||
|
|
@ -1219,7 +1240,7 @@ body .pageheader{
|
|||
font-size: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-top: 0px;
|
||||
max-width: 575px;
|
||||
max-width: 775px;
|
||||
}
|
||||
.qcomment{
|
||||
max-width: 122px;
|
||||
|
|
@ -1269,6 +1290,7 @@ body .pageheader{
|
|||
padding: 5px;
|
||||
margin-bottom: 0px;
|
||||
width: 775px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.wall-item-decor {
|
||||
|
|
@ -1516,7 +1538,7 @@ body .pageheader{
|
|||
padding-left: 12px;
|
||||
}
|
||||
.wall-item-comment-wrapper {
|
||||
margin: 1px 5px 1px 80px;
|
||||
margin: 1px 5px 17px 80px;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-photo {
|
||||
display: none;
|
||||
|
|
@ -2246,7 +2268,6 @@ blockquote {
|
|||
color: #777;
|
||||
}
|
||||
.oembed {
|
||||
font-size: large;
|
||||
font-weight: bold;
|
||||
}
|
||||
.aprofile dt{
|
||||
|
|
@ -2687,4 +2708,4 @@ list-style-type: disc;
|
|||
#photos-upload-newalbum-div {
|
||||
float: left;
|
||||
width: 175px;
|
||||
}
|
||||
}
|
||||
|
|
@ -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.014)
|
||||
* Version: (Version: 1.016)
|
||||
* Author:
|
||||
*/
|
||||
|
||||
|
||||
//print diabook-version for debugging
|
||||
$diabook_version = "Diabook (Version: 1.014)";
|
||||
$diabook_version = "Diabook (Version: 1.016)";
|
||||
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
|
||||
|
||||
//change css on network and profilepages
|
||||
|
|
@ -376,11 +376,12 @@ $a->page['htmlhead'] .= '
|
|||
|
||||
</script>';
|
||||
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
|
||||
$(document).ready(function() {
|
||||
$(".embed_yt iframe").each(function(){
|
||||
$("iframe").each(function(){
|
||||
var ifr_source = $(this).attr("src");
|
||||
var wmode = "wmode=transparent";
|
||||
if(ifr_source.indexOf("?") != -1) {
|
||||
|
|
@ -391,7 +392,18 @@ $(document).ready(function() {
|
|||
}
|
||||
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>';
|
||||
|
||||
|
|
@ -403,7 +415,12 @@ $a->page['htmlhead'] .= '
|
|||
$(function() {
|
||||
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
|
||||
});
|
||||
</script>';
|
||||
|
||||
|
||||
if($ccCookie != "8") {
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
$("right_aside").ready(function(){
|
||||
|
||||
if($.cookie("close_pages") == "1")
|
||||
|
|
@ -487,9 +504,10 @@ function close_lastlikes(){
|
|||
document.getElementById( "close_lastlikes" ).style.display = "none";
|
||||
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
|
||||
};
|
||||
|
||||
|
||||
</script>';}
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
function restore_boxes(){
|
||||
$.cookie("close_pages","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_helpers","2", { expires: 365, path: "/" });
|
||||
|
|
@ -500,5 +518,32 @@ function restore_boxes(){
|
|||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||
alert("Right-hand column was restored. Please refresh your browser");
|
||||
};
|
||||
</script>';}
|
||||
}
|
||||
</script>';}
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
|
||||
<script type="text/javascript">
|
||||
function insertFormatting(BBcode,id) {
|
||||
|
||||
var tmpStr = $("#comment-edit-text-" + id).val();
|
||||
if(tmpStr == "Kommentar") {
|
||||
tmpStr = "";
|
||||
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
|
||||
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
|
||||
openMenu("comment-edit-submit-wrapper-" + id);
|
||||
}
|
||||
|
||||
textarea = document.getElementById("comment-edit-text-" +id);
|
||||
if (document.selection) {
|
||||
textarea.focus();
|
||||
selected = document.selection.createRange();
|
||||
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
|
||||
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
|
||||
var start = textarea.selectionStart;
|
||||
var end = textarea.selectionEnd;
|
||||
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
</script> ';
|
||||
Loading…
Reference in a new issue