Merge remote branch 'friendica/master' into blog-like
This commit is contained in:
Fabrixxm
commit
40f2ec189e
25 changed files with 501 additions and 340 deletions
2
boot.php
2
boot.php
|
|
@ -11,7 +11,7 @@ require_once('include/cache.php');
|
|||
require_once('library/Mobile_Detect/Mobile_Detect.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1470' );
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1471' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1156 );
|
||||
|
||||
|
|
|
|||
|
|
@ -198,10 +198,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
|||
|
||||
$a = get_app();
|
||||
|
||||
// Move all spaces out of the tags
|
||||
$Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
|
||||
$Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
|
||||
|
||||
// Hide all [noparse] contained bbtags by spacefying them
|
||||
// POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image?
|
||||
|
||||
|
|
@ -210,6 +206,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
|||
$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text);
|
||||
|
||||
|
||||
// Move all spaces out of the tags
|
||||
$Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
|
||||
$Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
|
||||
|
||||
// Extract the private images which use data url's since preg has issues with
|
||||
// large data sizes. Stash them away while we do bbcode conversion, and then put them back
|
||||
// in after we've done all the regex matching. We cannot use any preg functions to do this.
|
||||
|
|
|
|||
|
|
@ -755,6 +755,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
$item_result = $arr['output'];
|
||||
if($firstcollapsed) {
|
||||
$item_result['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
|
||||
$item_result['hidden_comments_num'] = $total_children;
|
||||
$item_result['hidden_comments_text'] = tt('comment', 'comments', $total_children);
|
||||
$item_result['hide_text'] = t('show more');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2061,11 +2061,20 @@ function diaspora_profile($importer,$xml,$msg) {
|
|||
$image_url = unxmlify($xml->image_url);
|
||||
$birthday = unxmlify($xml->birthday);
|
||||
|
||||
$r = q("SELECT DISTINCT ( `resource-id` ) FROM `photo` WHERE `uid` = %d AND `contact-id` = %d AND `album` = 'Contact Photos' ",
|
||||
|
||||
$handle_parts = explode("@", $diaspora_handle);
|
||||
if($name === '') {
|
||||
$name = $handle_parts[0];
|
||||
}
|
||||
if(strpos($image_url, $handle_parts[1]) === false) {
|
||||
$image_url = "http://" . $handle_parts[1] . $image_url;
|
||||
}
|
||||
|
||||
/* $r = q("SELECT DISTINCT ( `resource-id` ) FROM `photo` WHERE `uid` = %d AND `contact-id` = %d AND `album` = 'Contact Photos' ",
|
||||
intval($importer['uid']),
|
||||
intval($contact['id'])
|
||||
);
|
||||
$oldphotos = ((count($r)) ? $r : null);
|
||||
$oldphotos = ((count($r)) ? $r : null);*/
|
||||
|
||||
require_once('include/Photo.php');
|
||||
|
||||
|
|
@ -2098,7 +2107,7 @@ function diaspora_profile($importer,$xml,$msg) {
|
|||
intval($importer['uid'])
|
||||
);
|
||||
|
||||
if($r) {
|
||||
/* if($r) {
|
||||
if($oldphotos) {
|
||||
foreach($oldphotos as $ph) {
|
||||
q("DELETE FROM `photo` WHERE `uid` = %d AND `contact-id` = %d AND `album` = 'Contact Photos' AND `resource-id` = '%s' ",
|
||||
|
|
@ -2108,7 +2117,7 @@ function diaspora_profile($importer,$xml,$msg) {
|
|||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
} */
|
||||
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@ function onepoll_run($argv, $argc){
|
|||
openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
|
||||
$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
|
||||
unset($password);
|
||||
logger("Mail: Connect");
|
||||
logger("Mail: Connect to " . $mailconf[0]['user']);
|
||||
if($mbox) {
|
||||
q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
dbesc(datetime_convert()),
|
||||
|
|
@ -289,7 +289,7 @@ function onepoll_run($argv, $argc){
|
|||
$msgs = email_poll($mbox,$contact['addr']);
|
||||
|
||||
if(count($msgs)) {
|
||||
logger("Mail: Parsing ".count($msgs)." mails.", LOGGER_DEBUG);
|
||||
logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG);
|
||||
|
||||
foreach($msgs as $msg_uid) {
|
||||
logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
|
||||
|
|
@ -339,15 +339,15 @@ function onepoll_run($argv, $argc){
|
|||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
logger("Mail: Deleting ".$msg_uid);
|
||||
logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']);
|
||||
imap_delete($mbox, $msg_uid, FT_UID);
|
||||
break;
|
||||
case 2:
|
||||
logger("Mail: Mark as seen ".$msg_uid);
|
||||
logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf[0]['user']);
|
||||
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
||||
break;
|
||||
case 3:
|
||||
logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']);
|
||||
logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']." for ".$mailconf[0]['user']);
|
||||
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
||||
if ($mailconf[0]['movetofolder'] != "")
|
||||
imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
|
||||
|
|
@ -377,12 +377,12 @@ function onepoll_run($argv, $argc){
|
|||
|
||||
$r = email_get_msg($mbox,$msg_uid, $reply);
|
||||
if(! $r) {
|
||||
logger("Mail: can't fetch msg ".$msg_uid);
|
||||
logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']);
|
||||
continue;
|
||||
}
|
||||
$datarray['body'] = escape_tags($r['body']);
|
||||
|
||||
logger("Mail: Importing ".$msg_uid);
|
||||
logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']);
|
||||
|
||||
// some mailing lists have the original author as 'from' - add this sender info to msg body.
|
||||
// todo: adding a gravatar for the original author would be cool
|
||||
|
|
@ -423,15 +423,15 @@ function onepoll_run($argv, $argc){
|
|||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
logger("Mail: Deleting ".$msg_uid);
|
||||
logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']);
|
||||
imap_delete($mbox, $msg_uid, FT_UID);
|
||||
break;
|
||||
case 2:
|
||||
logger("Mail: Mark as seen ".$msg_uid);
|
||||
logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf[0]['user']);
|
||||
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
||||
break;
|
||||
case 3:
|
||||
logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']);
|
||||
logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']." for ".$mailconf[0]['user']);
|
||||
imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
|
||||
if ($mailconf[0]['movetofolder'] != "")
|
||||
imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
|
||||
|
|
|
|||
|
|
@ -584,6 +584,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
|
|||
|
||||
if (!$comments_collapsed){
|
||||
$threads[$threadsid]['num_comments'] = sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),$comments[$item['parent']] );
|
||||
$threads[$threadsid]['hidden_comments_num'] = $comments[$item['parent']];
|
||||
$threads[$threadsid]['hidden_comments_text'] = tt('comment', 'comments', $comments[$item['parent']]);
|
||||
$threads[$threadsid]['hide_text'] = t('show more');
|
||||
$comments_collapsed = true;
|
||||
$comment_firstcollapsed = true;
|
||||
|
|
|
|||
|
|
@ -254,6 +254,8 @@ class Item extends BaseObject {
|
|||
if(($nb_children > 2) || ($thread_level > 1)) {
|
||||
$result['children'][0]['comment_firstcollapsed'] = true;
|
||||
$result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
|
||||
$result['children'][0]['hidden_comments_num'] = $total_children;
|
||||
$result['children'][0]['hidden_comments_text'] = tt('comment', 'comments', $total_children);
|
||||
$result['children'][0]['hide_text'] = t('show more');
|
||||
if($thread_level > 1) {
|
||||
$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
|
||||
|
|
|
|||
376
util/messages.po
376
util/messages.po
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.0.1470\n"
|
||||
"Project-Id-Version: 3.0.1471\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-09-18 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-09-19 10:00-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -89,7 +89,7 @@ msgid "Return to contact editor"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/crepair.php:148 ../../mod/settings.php:545
|
||||
#: ../../mod/settings.php:571 ../../mod/admin.php:690 ../../mod/admin.php:699
|
||||
#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -126,7 +126,7 @@ msgid "New photo from this URL"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
|
||||
#: ../../mod/events.php:439 ../../mod/photos.php:1005
|
||||
#: ../../mod/events.php:455 ../../mod/photos.php:1005
|
||||
#: ../../mod/photos.php:1081 ../../mod/photos.php:1338
|
||||
#: ../../mod/photos.php:1378 ../../mod/photos.php:1419
|
||||
#: ../../mod/photos.php:1451 ../../mod/install.php:246
|
||||
|
|
@ -135,8 +135,8 @@ msgstr ""
|
|||
#: ../../mod/settings.php:543 ../../mod/settings.php:697
|
||||
#: ../../mod/settings.php:769 ../../mod/settings.php:976
|
||||
#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
|
||||
#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:687
|
||||
#: ../../mod/admin.php:823 ../../mod/admin.php:1022 ../../mod/admin.php:1109
|
||||
#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689
|
||||
#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112
|
||||
#: ../../mod/profiles.php:583 ../../mod/invite.php:119
|
||||
#: ../../addon/fromgplus/fromgplus.php:40
|
||||
#: ../../addon/facebook/facebook.php:619
|
||||
|
|
@ -176,7 +176,7 @@ msgstr ""
|
|||
#: ../../view/theme/diabook/theme.php:757
|
||||
#: ../../view/theme/diabook/config.php:190
|
||||
#: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70
|
||||
#: ../../include/conversation.php:601 ../../object/Item.php:532
|
||||
#: ../../include/conversation.php:608 ../../object/Item.php:532
|
||||
msgid "Submit"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -223,91 +223,91 @@ msgstr ""
|
|||
msgid "Event title and start time are required."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:263
|
||||
#: ../../mod/events.php:279
|
||||
msgid "l, F j"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:285
|
||||
#: ../../mod/events.php:301
|
||||
msgid "Edit event"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:307 ../../include/text.php:1147
|
||||
#: ../../mod/events.php:323 ../../include/text.php:1147
|
||||
msgid "link to source"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
|
||||
#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:131
|
||||
#: ../../include/nav.php:52 ../../boot.php:1689
|
||||
msgid "Events"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:332
|
||||
#: ../../mod/events.php:348
|
||||
msgid "Create New Event"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:333 ../../addon/dav/friendica/layout.fnk.php:263
|
||||
#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
|
||||
msgid "Previous"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:334 ../../mod/install.php:205
|
||||
#: ../../mod/events.php:350 ../../mod/install.php:205
|
||||
#: ../../addon/dav/friendica/layout.fnk.php:266
|
||||
msgid "Next"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:407
|
||||
#: ../../mod/events.php:423
|
||||
msgid "hour:minute"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:417
|
||||
#: ../../mod/events.php:433
|
||||
msgid "Event details"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:418
|
||||
#: ../../mod/events.php:434
|
||||
#, php-format
|
||||
msgid "Format is %s %s. Starting date and Title are required."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:420
|
||||
#: ../../mod/events.php:436
|
||||
msgid "Event Starts:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:420 ../../mod/events.php:434
|
||||
#: ../../mod/events.php:436 ../../mod/events.php:450
|
||||
msgid "Required"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:423
|
||||
#: ../../mod/events.php:439
|
||||
msgid "Finish date/time is not known or not relevant"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:425
|
||||
#: ../../mod/events.php:441
|
||||
msgid "Event Finishes:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:428
|
||||
#: ../../mod/events.php:444
|
||||
msgid "Adjust for viewer timezone"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:430
|
||||
#: ../../mod/events.php:446
|
||||
msgid "Description:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:432 ../../mod/directory.php:134
|
||||
#: ../../mod/events.php:448 ../../mod/directory.php:134
|
||||
#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
|
||||
#: ../../boot.php:1226
|
||||
msgid "Location:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:434
|
||||
#: ../../mod/events.php:450
|
||||
msgid "Title:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:436
|
||||
#: ../../mod/events.php:452
|
||||
msgid "Share this event"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136
|
||||
#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
|
||||
#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
|
||||
#: ../../include/conversation.php:1283
|
||||
#: ../../include/conversation.php:1290
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -430,7 +430,7 @@ msgstr ""
|
|||
#: ../../addon/communityhome/communityhome.php:163
|
||||
#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399
|
||||
#: ../../include/diaspora.php:1824 ../../include/conversation.php:125
|
||||
#: ../../include/conversation.php:255
|
||||
#: ../../include/conversation.php:253
|
||||
msgid "photo"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -537,7 +537,7 @@ msgid "Use as profile photo"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1224 ../../mod/content.php:601
|
||||
#: ../../include/conversation.php:428 ../../object/Item.php:103
|
||||
#: ../../include/conversation.php:435 ../../object/Item.php:103
|
||||
msgid "Private Message"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -578,51 +578,51 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1356 ../../mod/content.php:665
|
||||
#: ../../include/conversation.php:575 ../../object/Item.php:185
|
||||
#: ../../include/conversation.php:582 ../../object/Item.php:185
|
||||
msgid "I like this (toggle)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1357 ../../mod/content.php:666
|
||||
#: ../../include/conversation.php:576 ../../object/Item.php:186
|
||||
#: ../../include/conversation.php:583 ../../object/Item.php:186
|
||||
msgid "I don't like this (toggle)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1358 ../../include/conversation.php:1244
|
||||
#: ../../mod/photos.php:1358 ../../include/conversation.php:1251
|
||||
msgid "Share"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1359 ../../mod/editpost.php:112
|
||||
#: ../../mod/content.php:482 ../../mod/content.php:843
|
||||
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
|
||||
#: ../../mod/message.php:481 ../../include/conversation.php:671
|
||||
#: ../../include/conversation.php:921 ../../include/conversation.php:1263
|
||||
#: ../../mod/message.php:481 ../../include/conversation.php:678
|
||||
#: ../../include/conversation.php:928 ../../include/conversation.php:1270
|
||||
#: ../../object/Item.php:237
|
||||
msgid "Please wait"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1375 ../../mod/photos.php:1416
|
||||
#: ../../mod/photos.php:1448 ../../mod/content.php:688
|
||||
#: ../../include/conversation.php:598 ../../object/Item.php:529
|
||||
#: ../../include/conversation.php:605 ../../object/Item.php:529
|
||||
msgid "This is you"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1377 ../../mod/photos.php:1418
|
||||
#: ../../mod/photos.php:1450 ../../mod/content.php:690
|
||||
#: ../../include/conversation.php:600 ../../boot.php:574
|
||||
#: ../../include/conversation.php:607 ../../boot.php:574
|
||||
#: ../../object/Item.php:531
|
||||
msgid "Comment"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1379 ../../mod/editpost.php:133
|
||||
#: ../../mod/content.php:700 ../../include/conversation.php:610
|
||||
#: ../../include/conversation.php:1281 ../../object/Item.php:541
|
||||
#: ../../mod/content.php:700 ../../include/conversation.php:617
|
||||
#: ../../include/conversation.php:1288 ../../object/Item.php:541
|
||||
msgid "Preview"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1479 ../../mod/content.php:439
|
||||
#: ../../mod/content.php:721 ../../mod/settings.php:606
|
||||
#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694
|
||||
#: ../../include/conversation.php:440 ../../include/conversation.php:874
|
||||
#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696
|
||||
#: ../../include/conversation.php:447 ../../include/conversation.php:881
|
||||
#: ../../object/Item.php:116
|
||||
msgid "Delete"
|
||||
msgstr ""
|
||||
|
|
@ -689,29 +689,29 @@ msgstr ""
|
|||
msgid "Edit post"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:88 ../../include/conversation.php:1230
|
||||
#: ../../mod/editpost.php:88 ../../include/conversation.php:1237
|
||||
msgid "Post to Email"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:103 ../../mod/content.php:708
|
||||
#: ../../mod/settings.php:605 ../../include/conversation.php:433
|
||||
#: ../../mod/settings.php:605 ../../include/conversation.php:440
|
||||
#: ../../object/Item.php:107
|
||||
msgid "Edit"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
|
||||
#: ../../mod/message.php:291 ../../mod/message.php:478
|
||||
#: ../../include/conversation.php:1245
|
||||
#: ../../include/conversation.php:1252
|
||||
msgid "Upload photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:105 ../../include/conversation.php:1247
|
||||
#: ../../mod/editpost.php:105 ../../include/conversation.php:1254
|
||||
msgid "Attach file"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
|
||||
#: ../../mod/message.php:292 ../../mod/message.php:479
|
||||
#: ../../include/conversation.php:1249
|
||||
#: ../../include/conversation.php:1256
|
||||
msgid "Insert web link"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -727,35 +727,35 @@ msgstr ""
|
|||
msgid "Insert Vorbis [.ogg] audio"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:110 ../../include/conversation.php:1255
|
||||
#: ../../mod/editpost.php:110 ../../include/conversation.php:1262
|
||||
msgid "Set your location"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:111 ../../include/conversation.php:1257
|
||||
#: ../../mod/editpost.php:111 ../../include/conversation.php:1264
|
||||
msgid "Clear browser location"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:113 ../../include/conversation.php:1264
|
||||
#: ../../mod/editpost.php:113 ../../include/conversation.php:1271
|
||||
msgid "Permission settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:121 ../../include/conversation.php:1273
|
||||
#: ../../mod/editpost.php:121 ../../include/conversation.php:1280
|
||||
msgid "CC: email addresses"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:122 ../../include/conversation.php:1274
|
||||
#: ../../mod/editpost.php:122 ../../include/conversation.php:1281
|
||||
msgid "Public post"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:125 ../../include/conversation.php:1260
|
||||
#: ../../mod/editpost.php:125 ../../include/conversation.php:1267
|
||||
msgid "Set title"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:127 ../../include/conversation.php:1262
|
||||
#: ../../mod/editpost.php:127 ../../include/conversation.php:1269
|
||||
msgid "Categories (comma-separated list)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:128 ../../include/conversation.php:1276
|
||||
#: ../../mod/editpost.php:128 ../../include/conversation.php:1283
|
||||
msgid "Example: bob@example.com, mary@example.com"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1297,31 +1297,31 @@ msgid "Group: "
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:438 ../../mod/content.php:720
|
||||
#: ../../include/conversation.php:439 ../../include/conversation.php:873
|
||||
#: ../../include/conversation.php:446 ../../include/conversation.php:880
|
||||
#: ../../object/Item.php:115
|
||||
msgid "Select"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:455 ../../mod/content.php:813
|
||||
#: ../../mod/content.php:814 ../../include/conversation.php:639
|
||||
#: ../../include/conversation.php:640 ../../include/conversation.php:890
|
||||
#: ../../mod/content.php:814 ../../include/conversation.php:646
|
||||
#: ../../include/conversation.php:647 ../../include/conversation.php:897
|
||||
#: ../../object/Item.php:206 ../../object/Item.php:207
|
||||
#, php-format
|
||||
msgid "View %s's profile @ %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:465 ../../mod/content.php:825
|
||||
#: ../../include/conversation.php:653 ../../include/conversation.php:904
|
||||
#: ../../include/conversation.php:660 ../../include/conversation.php:911
|
||||
#: ../../object/Item.php:219
|
||||
#, php-format
|
||||
msgid "%s from %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:480 ../../include/conversation.php:919
|
||||
#: ../../mod/content.php:480 ../../include/conversation.php:926
|
||||
msgid "View in context"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:586 ../../include/conversation.php:680
|
||||
#: ../../mod/content.php:586 ../../include/conversation.php:687
|
||||
#: ../../object/Item.php:256
|
||||
#, php-format
|
||||
msgid "%d comment"
|
||||
|
|
@ -1331,112 +1331,112 @@ msgstr[1] ""
|
|||
|
||||
#: ../../mod/content.php:587 ../../addon/page/page.php:76
|
||||
#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
|
||||
#: ../../include/contact_widgets.php:195 ../../include/conversation.php:681
|
||||
#: ../../include/contact_widgets.php:195 ../../include/conversation.php:688
|
||||
#: ../../boot.php:575 ../../object/Item.php:257
|
||||
msgid "show more"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:665 ../../include/conversation.php:575
|
||||
#: ../../mod/content.php:665 ../../include/conversation.php:582
|
||||
#: ../../object/Item.php:185
|
||||
msgid "like"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:666 ../../include/conversation.php:576
|
||||
#: ../../mod/content.php:666 ../../include/conversation.php:583
|
||||
#: ../../object/Item.php:186
|
||||
msgid "dislike"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:668 ../../include/conversation.php:578
|
||||
#: ../../mod/content.php:668 ../../include/conversation.php:585
|
||||
#: ../../object/Item.php:188
|
||||
msgid "Share this"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:668 ../../include/conversation.php:578
|
||||
#: ../../mod/content.php:668 ../../include/conversation.php:585
|
||||
#: ../../object/Item.php:188
|
||||
msgid "share"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:692 ../../include/conversation.php:602
|
||||
#: ../../mod/content.php:692 ../../include/conversation.php:609
|
||||
#: ../../object/Item.php:533
|
||||
msgid "Bold"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:693 ../../include/conversation.php:603
|
||||
#: ../../mod/content.php:693 ../../include/conversation.php:610
|
||||
#: ../../object/Item.php:534
|
||||
msgid "Italic"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:694 ../../include/conversation.php:604
|
||||
#: ../../mod/content.php:694 ../../include/conversation.php:611
|
||||
#: ../../object/Item.php:535
|
||||
msgid "Underline"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:695 ../../include/conversation.php:605
|
||||
#: ../../mod/content.php:695 ../../include/conversation.php:612
|
||||
#: ../../object/Item.php:536
|
||||
msgid "Quote"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:696 ../../include/conversation.php:606
|
||||
#: ../../mod/content.php:696 ../../include/conversation.php:613
|
||||
#: ../../object/Item.php:537
|
||||
msgid "Code"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:697 ../../include/conversation.php:607
|
||||
#: ../../mod/content.php:697 ../../include/conversation.php:614
|
||||
#: ../../object/Item.php:538
|
||||
msgid "Image"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:698 ../../include/conversation.php:608
|
||||
#: ../../mod/content.php:698 ../../include/conversation.php:615
|
||||
#: ../../object/Item.php:539
|
||||
msgid "Link"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:699 ../../include/conversation.php:609
|
||||
#: ../../mod/content.php:699 ../../include/conversation.php:616
|
||||
#: ../../object/Item.php:540
|
||||
msgid "Video"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:733 ../../include/conversation.php:539
|
||||
#: ../../mod/content.php:733 ../../include/conversation.php:546
|
||||
#: ../../object/Item.php:169
|
||||
msgid "add star"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:734 ../../include/conversation.php:540
|
||||
#: ../../mod/content.php:734 ../../include/conversation.php:547
|
||||
#: ../../object/Item.php:170
|
||||
msgid "remove star"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:735 ../../include/conversation.php:541
|
||||
#: ../../mod/content.php:735 ../../include/conversation.php:548
|
||||
#: ../../object/Item.php:171
|
||||
msgid "toggle star status"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:738 ../../include/conversation.php:544
|
||||
#: ../../mod/content.php:738 ../../include/conversation.php:551
|
||||
#: ../../object/Item.php:174
|
||||
msgid "starred"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:739 ../../include/conversation.php:545
|
||||
#: ../../mod/content.php:739 ../../include/conversation.php:552
|
||||
#: ../../object/Item.php:175
|
||||
msgid "add tag"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:743 ../../include/conversation.php:443
|
||||
#: ../../mod/content.php:743 ../../include/conversation.php:450
|
||||
#: ../../object/Item.php:119
|
||||
msgid "save to folder"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:815 ../../include/conversation.php:641
|
||||
#: ../../mod/content.php:815 ../../include/conversation.php:648
|
||||
#: ../../object/Item.php:208
|
||||
msgid "to"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:816 ../../include/conversation.php:642
|
||||
#: ../../mod/content.php:816 ../../include/conversation.php:649
|
||||
#: ../../object/Item.php:209
|
||||
msgid "Wall-to-Wall"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/content.php:817 ../../include/conversation.php:643
|
||||
#: ../../mod/content.php:817 ../../include/conversation.php:650
|
||||
#: ../../object/Item.php:210
|
||||
msgid "via Wall-To-Wall:"
|
||||
msgstr ""
|
||||
|
|
@ -1522,7 +1522,7 @@ msgid "if applicable"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
|
||||
#: ../../mod/admin.php:692
|
||||
#: ../../mod/admin.php:694
|
||||
msgid "Approve"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1723,12 +1723,12 @@ msgid "View all contacts"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
|
||||
#: ../../mod/admin.php:696
|
||||
#: ../../mod/admin.php:698
|
||||
msgid "Unblock"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
|
||||
#: ../../mod/admin.php:695
|
||||
#: ../../mod/admin.php:697
|
||||
msgid "Block"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1825,7 +1825,7 @@ msgstr ""
|
|||
msgid "Update public posts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/contacts.php:371 ../../mod/admin.php:1167
|
||||
#: ../../mod/contacts.php:371 ../../mod/admin.php:1170
|
||||
msgid "Update now"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2039,7 +2039,7 @@ msgid "Remove account"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:69 ../../mod/newmember.php:22
|
||||
#: ../../mod/admin.php:782 ../../mod/admin.php:987
|
||||
#: ../../mod/admin.php:785 ../../mod/admin.php:990
|
||||
#: ../../addon/dav/friendica/layout.fnk.php:225
|
||||
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
|
||||
#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
|
||||
|
|
@ -2687,7 +2687,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
|
||||
#: ../../mod/message.php:242 ../../mod/message.php:250
|
||||
#: ../../include/conversation.php:1181 ../../include/conversation.php:1198
|
||||
#: ../../include/conversation.php:1188 ../../include/conversation.php:1205
|
||||
msgid "Please enter a link URL:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3094,25 +3094,25 @@ msgstr ""
|
|||
#: ../../view/theme/diabook/theme.php:565
|
||||
#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824
|
||||
#: ../../include/conversation.php:120 ../../include/conversation.php:129
|
||||
#: ../../include/conversation.php:250 ../../include/conversation.php:259
|
||||
#: ../../include/conversation.php:248 ../../include/conversation.php:257
|
||||
msgid "status"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
|
||||
#: ../../addon/communityhome/communityhome.php:172
|
||||
#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840
|
||||
#: ../../include/conversation.php:137
|
||||
#: ../../include/conversation.php:136
|
||||
#, php-format
|
||||
msgid "%1$s likes %2$s's %3$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/like.php:164 ../../include/conversation.php:140
|
||||
#: ../../mod/like.php:164 ../../include/conversation.php:139
|
||||
#, php-format
|
||||
msgid "%1$s doesn't like %2$s's %3$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
|
||||
#: ../../mod/admin.php:731 ../../mod/admin.php:930 ../../mod/display.php:29
|
||||
#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
|
||||
#: ../../mod/display.php:145 ../../include/items.php:3774
|
||||
msgid "Item not found."
|
||||
msgstr ""
|
||||
|
|
@ -3183,7 +3183,7 @@ msgstr ""
|
|||
msgid "%s posted an update."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/mood.php:62 ../../include/conversation.php:228
|
||||
#: ../../mod/mood.php:62 ../../include/conversation.php:226
|
||||
#, php-format
|
||||
msgid "%1$s is currently %2$s"
|
||||
msgstr ""
|
||||
|
|
@ -3361,15 +3361,15 @@ msgstr ""
|
|||
msgid "Site"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:97 ../../mod/admin.php:686 ../../mod/admin.php:698
|
||||
#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701
|
||||
msgid "Users"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:98 ../../mod/admin.php:780 ../../mod/admin.php:822
|
||||
#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825
|
||||
msgid "Plugins"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:99 ../../mod/admin.php:985 ../../mod/admin.php:1021
|
||||
#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024
|
||||
msgid "Themes"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3377,7 +3377,7 @@ msgstr ""
|
|||
msgid "DB updates"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1108
|
||||
#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111
|
||||
msgid "Logs"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3393,19 +3393,19 @@ msgstr ""
|
|||
msgid "User registrations waiting for confirmation"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:183 ../../mod/admin.php:668
|
||||
#: ../../mod/admin.php:183 ../../mod/admin.php:669
|
||||
msgid "Normal Account"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:184 ../../mod/admin.php:669
|
||||
#: ../../mod/admin.php:184 ../../mod/admin.php:670
|
||||
msgid "Soapbox Account"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:185 ../../mod/admin.php:670
|
||||
#: ../../mod/admin.php:185 ../../mod/admin.php:671
|
||||
msgid "Community/Celebrity Account"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:186 ../../mod/admin.php:671
|
||||
#: ../../mod/admin.php:186 ../../mod/admin.php:672
|
||||
msgid "Automatic Friend Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3421,9 +3421,9 @@ msgstr ""
|
|||
msgid "Message queues"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:685
|
||||
#: ../../mod/admin.php:779 ../../mod/admin.php:821 ../../mod/admin.php:984
|
||||
#: ../../mod/admin.php:1020 ../../mod/admin.php:1107
|
||||
#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:687
|
||||
#: ../../mod/admin.php:782 ../../mod/admin.php:824 ../../mod/admin.php:987
|
||||
#: ../../mod/admin.php:1023 ../../mod/admin.php:1110
|
||||
msgid "Administration"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3848,148 +3848,152 @@ msgstr ""
|
|||
msgid "User '%s' blocked"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:688
|
||||
#: ../../mod/admin.php:690
|
||||
msgid "select all"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:689
|
||||
#: ../../mod/admin.php:691
|
||||
msgid "User registrations waiting for confirm"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:690
|
||||
#: ../../mod/admin.php:692
|
||||
msgid "Request date"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:690 ../../mod/admin.php:699
|
||||
#: ../../mod/admin.php:692 ../../mod/admin.php:702
|
||||
#: ../../include/contact_selectors.php:79
|
||||
msgid "Email"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:691
|
||||
#: ../../mod/admin.php:693
|
||||
msgid "No registrations."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:693
|
||||
#: ../../mod/admin.php:695
|
||||
msgid "Deny"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:699
|
||||
msgid "Site admin"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:702
|
||||
msgid "Register date"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:699
|
||||
#: ../../mod/admin.php:702
|
||||
msgid "Last login"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:699
|
||||
#: ../../mod/admin.php:702
|
||||
msgid "Last item"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:699
|
||||
#: ../../mod/admin.php:702
|
||||
msgid "Account"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:701
|
||||
#: ../../mod/admin.php:704
|
||||
msgid ""
|
||||
"Selected users will be deleted!\\n\\nEverything these users had posted on "
|
||||
"this site will be permanently deleted!\\n\\nAre you sure?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:702
|
||||
#: ../../mod/admin.php:705
|
||||
msgid ""
|
||||
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
|
||||
"site will be permanently deleted!\\n\\nAre you sure?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:743
|
||||
#: ../../mod/admin.php:746
|
||||
#, php-format
|
||||
msgid "Plugin %s disabled."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:747
|
||||
#: ../../mod/admin.php:750
|
||||
#, php-format
|
||||
msgid "Plugin %s enabled."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:757 ../../mod/admin.php:955
|
||||
#: ../../mod/admin.php:760 ../../mod/admin.php:958
|
||||
msgid "Disable"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:759 ../../mod/admin.php:957
|
||||
#: ../../mod/admin.php:762 ../../mod/admin.php:960
|
||||
msgid "Enable"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:781 ../../mod/admin.php:986
|
||||
#: ../../mod/admin.php:784 ../../mod/admin.php:989
|
||||
msgid "Toggle"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:789 ../../mod/admin.php:996
|
||||
#: ../../mod/admin.php:792 ../../mod/admin.php:999
|
||||
msgid "Author: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:790 ../../mod/admin.php:997
|
||||
#: ../../mod/admin.php:793 ../../mod/admin.php:1000
|
||||
msgid "Maintainer: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:919
|
||||
#: ../../mod/admin.php:922
|
||||
msgid "No themes found."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:978
|
||||
#: ../../mod/admin.php:981
|
||||
msgid "Screenshot"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1026
|
||||
#: ../../mod/admin.php:1029
|
||||
msgid "[Experimental]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1027
|
||||
#: ../../mod/admin.php:1030
|
||||
msgid "[Unsupported]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1054
|
||||
#: ../../mod/admin.php:1057
|
||||
msgid "Log settings updated."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1110
|
||||
#: ../../mod/admin.php:1113
|
||||
msgid "Clear"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1116
|
||||
#: ../../mod/admin.php:1119
|
||||
msgid "Debugging"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1117
|
||||
#: ../../mod/admin.php:1120
|
||||
msgid "Log file"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1117
|
||||
#: ../../mod/admin.php:1120
|
||||
msgid ""
|
||||
"Must be writable by web server. Relative to your Friendica top-level "
|
||||
"directory."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1118
|
||||
#: ../../mod/admin.php:1121
|
||||
msgid "Log level"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1168
|
||||
#: ../../mod/admin.php:1171
|
||||
msgid "Close"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1174
|
||||
#: ../../mod/admin.php:1177
|
||||
msgid "FTP Host"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1175
|
||||
#: ../../mod/admin.php:1178
|
||||
msgid "FTP Path"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1176
|
||||
#: ../../mod/admin.php:1179
|
||||
msgid "FTP User"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:1177
|
||||
#: ../../mod/admin.php:1180
|
||||
msgid "FTP Password"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4005,48 +4009,48 @@ msgstr ""
|
|||
msgid "Tips for New Members"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/ping.php:185
|
||||
#: ../../mod/ping.php:235
|
||||
msgid "{0} wants to be your friend"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/ping.php:190
|
||||
#: ../../mod/ping.php:240
|
||||
msgid "{0} sent you a message"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/ping.php:195
|
||||
#: ../../mod/ping.php:245
|
||||
msgid "{0} requested registration"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/ping.php:201
|
||||
#: ../../mod/ping.php:251
|
||||
#, php-format
|
||||
msgid "{0} commented %s's post"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/ping.php:206
|
||||
#: ../../mod/ping.php:256
|
||||
#, php-format
|
||||
msgid "{0} liked %s's post"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/ping.php:211
|
||||
#: ../../mod/ping.php:261
|
||||
#, php-format
|
||||
msgid "{0} disliked %s's post"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/ping.php:216
|
||||
#: ../../mod/ping.php:266
|
||||
#, php-format
|
||||
msgid "{0} is now friends with %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/ping.php:221
|
||||
#: ../../mod/ping.php:271
|
||||
msgid "{0} posted"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/ping.php:226
|
||||
#: ../../mod/ping.php:276
|
||||
#, php-format
|
||||
msgid "{0} tagged %s's post with #%s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/ping.php:232
|
||||
#: ../../mod/ping.php:282
|
||||
msgid "{0} mentioned you in a post"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4408,8 +4412,8 @@ msgstr ""
|
|||
msgid "Edit visibility"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/filer.php:29 ../../include/conversation.php:1185
|
||||
#: ../../include/conversation.php:1202
|
||||
#: ../../mod/filer.php:29 ../../include/conversation.php:1192
|
||||
#: ../../include/conversation.php:1209
|
||||
msgid "Save to Folder:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4417,7 +4421,7 @@ msgstr ""
|
|||
msgid "- select -"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/tagger.php:95 ../../include/conversation.php:267
|
||||
#: ../../mod/tagger.php:95 ../../include/conversation.php:265
|
||||
#, php-format
|
||||
msgid "%1$s tagged %2$s's %3$s with %4$s"
|
||||
msgstr ""
|
||||
|
|
@ -4675,7 +4679,7 @@ msgid "Unable to set contact photo."
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608
|
||||
#: ../../include/conversation.php:173
|
||||
#: ../../include/conversation.php:171
|
||||
#, php-format
|
||||
msgid "%1$s is now friends with %2$s"
|
||||
msgstr ""
|
||||
|
|
@ -5342,7 +5346,7 @@ msgstr ""
|
|||
|
||||
#: ../../addon/communityhome/communityhome.php:155
|
||||
#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397
|
||||
#: ../../include/conversation.php:117 ../../include/conversation.php:247
|
||||
#: ../../include/conversation.php:117 ../../include/conversation.php:245
|
||||
msgid "event"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -7624,7 +7628,7 @@ msgstr[1] ""
|
|||
msgid "poke"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:719 ../../include/conversation.php:212
|
||||
#: ../../include/text.php:719 ../../include/conversation.php:210
|
||||
msgid "poked"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -8514,151 +8518,151 @@ msgstr ""
|
|||
msgid "stopped following"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:220 ../../include/conversation.php:1082
|
||||
#: ../../include/Contact.php:220 ../../include/conversation.php:1089
|
||||
msgid "Poke"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:221 ../../include/conversation.php:1076
|
||||
#: ../../include/Contact.php:221 ../../include/conversation.php:1083
|
||||
msgid "View Status"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:222 ../../include/conversation.php:1077
|
||||
#: ../../include/Contact.php:222 ../../include/conversation.php:1084
|
||||
msgid "View Profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:223 ../../include/conversation.php:1078
|
||||
#: ../../include/Contact.php:223 ../../include/conversation.php:1085
|
||||
msgid "View Photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:224 ../../include/Contact.php:237
|
||||
#: ../../include/conversation.php:1079
|
||||
#: ../../include/conversation.php:1086
|
||||
msgid "Network Posts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:225 ../../include/Contact.php:237
|
||||
#: ../../include/conversation.php:1080
|
||||
#: ../../include/conversation.php:1087
|
||||
msgid "Edit Contact"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:226 ../../include/Contact.php:237
|
||||
#: ../../include/conversation.php:1081
|
||||
#: ../../include/conversation.php:1088
|
||||
msgid "Send PM"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:208
|
||||
#: ../../include/conversation.php:206
|
||||
#, php-format
|
||||
msgid "%1$s poked %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:292
|
||||
#: ../../include/conversation.php:290
|
||||
msgid "post/item"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:293
|
||||
#: ../../include/conversation.php:291
|
||||
#, php-format
|
||||
msgid "%1$s marked %2$s's %3$s as favorite"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:982
|
||||
#: ../../include/conversation.php:989
|
||||
msgid "Delete Selected Items"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1140
|
||||
#: ../../include/conversation.php:1147
|
||||
#, php-format
|
||||
msgid "%s likes this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1140
|
||||
#: ../../include/conversation.php:1147
|
||||
#, php-format
|
||||
msgid "%s doesn't like this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1144
|
||||
#: ../../include/conversation.php:1151
|
||||
#, php-format
|
||||
msgid "<span %1$s>%2$d people</span> like this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1146
|
||||
#: ../../include/conversation.php:1153
|
||||
#, php-format
|
||||
msgid "<span %1$s>%2$d people</span> don't like this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1152
|
||||
#: ../../include/conversation.php:1159
|
||||
msgid "and"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1155
|
||||
#: ../../include/conversation.php:1162
|
||||
#, php-format
|
||||
msgid ", and %d other people"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1156
|
||||
#: ../../include/conversation.php:1163
|
||||
#, php-format
|
||||
msgid "%s like this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1156
|
||||
#: ../../include/conversation.php:1163
|
||||
#, php-format
|
||||
msgid "%s don't like this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1180 ../../include/conversation.php:1197
|
||||
#: ../../include/conversation.php:1187 ../../include/conversation.php:1204
|
||||
msgid "Visible to <strong>everybody</strong>"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1182 ../../include/conversation.php:1199
|
||||
#: ../../include/conversation.php:1189 ../../include/conversation.php:1206
|
||||
msgid "Please enter a video link/URL:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1183 ../../include/conversation.php:1200
|
||||
#: ../../include/conversation.php:1190 ../../include/conversation.php:1207
|
||||
msgid "Please enter an audio link/URL:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1184 ../../include/conversation.php:1201
|
||||
#: ../../include/conversation.php:1191 ../../include/conversation.php:1208
|
||||
msgid "Tag term:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1186 ../../include/conversation.php:1203
|
||||
#: ../../include/conversation.php:1193 ../../include/conversation.php:1210
|
||||
msgid "Where are you right now?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1246
|
||||
#: ../../include/conversation.php:1253
|
||||
msgid "upload photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1248
|
||||
#: ../../include/conversation.php:1255
|
||||
msgid "attach file"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1250
|
||||
#: ../../include/conversation.php:1257
|
||||
msgid "web link"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1251
|
||||
#: ../../include/conversation.php:1258
|
||||
msgid "Insert video link"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1252
|
||||
#: ../../include/conversation.php:1259
|
||||
msgid "video link"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1253
|
||||
#: ../../include/conversation.php:1260
|
||||
msgid "Insert audio link"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1254
|
||||
#: ../../include/conversation.php:1261
|
||||
msgid "audio link"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1256
|
||||
#: ../../include/conversation.php:1263
|
||||
msgid "set location"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1258
|
||||
#: ../../include/conversation.php:1265
|
||||
msgid "clear location"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:1265
|
||||
#: ../../include/conversation.php:1272
|
||||
msgid "permissions"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@ function cmtBbOpen(comment, id) {
|
|||
return false;
|
||||
}
|
||||
function cmtBbClose(comment, id) {
|
||||
if($(comment).hasClass('comment-edit-text-empty')) {
|
||||
$(".comment-edit-bb-" + id).hide();
|
||||
return true;
|
||||
}
|
||||
// if($(comment).hasClass('comment-edit-text-empty')) {
|
||||
// $(".comment-edit-bb-" + id).hide();
|
||||
// return true;
|
||||
// }
|
||||
return false;
|
||||
}
|
||||
$(document).ready(function() {
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@
|
|||
<script type="text/javascript">
|
||||
tinyMCE.init({ mode : "none"});
|
||||
</script>-->
|
||||
<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
|
||||
<script type="text/javascript">var $j = jQuery.noConflict();</script>
|
||||
<script type="text/javascript" src="$baseurl/view/theme/frost/js/jquery.divgrow-1.3.1.min.js" ></script>
|
||||
<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
|
||||
<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
|
||||
|
|
@ -16,5 +14,4 @@
|
|||
<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/acl.min.js" ></script>
|
||||
<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.min.js" ></script>
|
||||
<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/theme.min.js"></script>
|
||||
<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
|
||||
|
||||
|
|
|
|||
|
|
@ -27,4 +27,7 @@
|
|||
var updateInterval = $update_interval;
|
||||
var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
|
||||
</script>
|
||||
<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
|
||||
<script type="text/javascript">var $j = jQuery.noConflict();</script>
|
||||
<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
|
||||
|
||||
|
|
|
|||
|
|
@ -315,6 +315,22 @@
|
|||
prev = ident;
|
||||
});
|
||||
|
||||
|
||||
var bimgs = $j(".wall-item-body > img").not(function() { return this.complete; });
|
||||
var bimgcount = bimgs.length;
|
||||
|
||||
if (bimgcount) {
|
||||
bimgs.load(function() {
|
||||
bimgcount--;
|
||||
if (! bimgcount) {
|
||||
collapseHeight();
|
||||
|
||||
}
|
||||
});
|
||||
} else {
|
||||
collapseHeight();
|
||||
}
|
||||
|
||||
// reset vars for inserting individual items
|
||||
|
||||
/*prev = 'live-' + src;
|
||||
|
|
@ -349,22 +365,6 @@
|
|||
}
|
||||
/* autocomplete @nicknames */
|
||||
$j(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl");
|
||||
|
||||
var bimgs = $j(".wall-item-body > img").not(function() { return this.complete; });
|
||||
var bimgcount = bimgs.length;
|
||||
|
||||
if (bimgcount) {
|
||||
bimgs.load(function() {
|
||||
bimgcount--;
|
||||
if (! bimgcount) {
|
||||
collapseHeight();
|
||||
|
||||
}
|
||||
});
|
||||
} else {
|
||||
collapseHeight();
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
2
view/theme/frost-mobile/js/main.min.js
vendored
2
view/theme/frost-mobile/js/main.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1361,6 +1361,13 @@ input#dfrn-url {
|
|||
-webkit-border-radius: 7px;
|
||||
}
|
||||
|
||||
.wall-item-content img.smiley {
|
||||
display: inline;
|
||||
margin: auto;
|
||||
border-radius: 0;
|
||||
-webkit-border-radius: 0;
|
||||
}
|
||||
|
||||
.comment .wall-item-content img {
|
||||
max-width: 280px;
|
||||
}
|
||||
|
|
@ -3398,6 +3405,7 @@ aside input[type='text'] {
|
|||
text-decoration: none;
|
||||
}
|
||||
.field .onoff .off {
|
||||
|
||||
border-color:#666666;
|
||||
padding-left: 40px;
|
||||
background-position: left center;
|
||||
|
|
|
|||
|
|
@ -1316,6 +1316,11 @@ input#dfrn-url {
|
|||
max-width: 100%;
|
||||
}
|
||||
|
||||
.wall-item-content img.smiley {
|
||||
display: inline;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.divgrow-showmore {
|
||||
display: block;
|
||||
clear: both;
|
||||
|
|
|
|||
|
|
@ -45,10 +45,10 @@ function cmtBbOpen(comment, id) {
|
|||
return false;
|
||||
}
|
||||
function cmtBbClose(comment, id) {
|
||||
if($(comment).hasClass('comment-edit-text-empty')) {
|
||||
$(".comment-edit-bb-" + id).hide();
|
||||
return true;
|
||||
}
|
||||
// if($(comment).hasClass('comment-edit-text-empty')) {
|
||||
// $(".comment-edit-bb-" + id).hide();
|
||||
// return true;
|
||||
// }
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<div id="follow-sidebar" class="widget">
|
||||
<h3>$connect</h3>
|
||||
<div id="connect-desc">$desc</div>
|
||||
<form action="follow" method="post" />
|
||||
<form action="follow" method="post" >
|
||||
<input id="side-follow-url" type="text-sidebar" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,11 +14,18 @@
|
|||
<input type="hidden" name="coord" id="jot-coord" value="" />
|
||||
<input type="hidden" name="post_id" value="$post_id" />
|
||||
<input type="hidden" name="preview" id="jot-preview" value="0" />
|
||||
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
|
||||
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
|
||||
<div id="jot-title-wrap">
|
||||
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
|
||||
</div>
|
||||
<div id="jot-category-wrap">
|
||||
<input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" />
|
||||
</div>
|
||||
<div id="jot-text-wrap">
|
||||
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
<textarea rows="5" cols="88" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
|
||||
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /><br>
|
||||
<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" >
|
||||
{{ if $content }}$content{{ else }}$share
|
||||
{{ endif }}
|
||||
</textarea>
|
||||
</div>
|
||||
|
||||
<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
<div id="peoplefind-sidebar" class="widget">
|
||||
<h3>$findpeople</h3>
|
||||
<div id="peoplefind-desc">$desc</div>
|
||||
<form action="dirfind" method="post" />
|
||||
<input id="side-peoplefind-url" type="text-sidebar" name="search" size="24" title="$hint" /><input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
|
||||
<form action="dirfind" method="post" >
|
||||
<input id="side-peoplefind-url" type="text-sidebar" name="search" size="24" title="$hint" />
|
||||
<input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
|
||||
</form>
|
||||
<div class="side-link" id="side-invite-link"><a href="match" >$similar</a></div>
|
||||
<div class="side-link" id="side-invite-link"><a href="suggest" >$suggest</a></div>
|
||||
<div class="side-link" id="side-invite-link" ><a href="randprof" target="extlink" >$random</a></div>
|
||||
<div class="side-link" id="side-invite-link"><a href="randprof" target="extlink" >$random</a></div>
|
||||
{{ if $inv }}
|
||||
<div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div>
|
||||
<div class="side-link" id="side-invite-link"><a href="invite" >$inv</a></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -109,10 +109,11 @@ li.widget-list {
|
|||
|
||||
|
||||
input[type=text] {
|
||||
float: left;
|
||||
border: 1px solid #b0b0b0;
|
||||
padding: 2px;
|
||||
width: 466px;
|
||||
margin-left: 0px;
|
||||
width: 575px;
|
||||
margin-top: 10px;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
-webkit-border-radius: 3px 3px 3px 3px;
|
||||
-moz-border-radius: 3px 3px 3px 3px;
|
||||
|
|
@ -647,7 +648,7 @@ aside h4 {
|
|||
padding: 5px 5px 5px 5px;
|
||||
}
|
||||
#netsearch-box input[type="text"] {
|
||||
width: 97%;
|
||||
width: 90%;
|
||||
}
|
||||
#netsearch-box input[type="submit"] {
|
||||
width: auto;
|
||||
|
|
@ -869,6 +870,7 @@ ul .sidebar-group-li .icon {
|
|||
|
||||
#profile-jot-text_tbl {
|
||||
margin-bottom: 10px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
#profile-jot-text_ifr {
|
||||
|
|
@ -882,7 +884,7 @@ ul .sidebar-group-li .icon {
|
|||
#jot-title {
|
||||
margin: 0px;
|
||||
height: 20px;
|
||||
width: 466px;
|
||||
width: 575px;
|
||||
font-weight: bold;
|
||||
border: 1px solid #cccccc;
|
||||
}
|
||||
|
|
@ -955,7 +957,7 @@ ul .sidebar-group-li .icon {
|
|||
#profile-jot-submit {
|
||||
width: 80px;
|
||||
float: right;
|
||||
margin-right: 90px;
|
||||
margin-right: 145px;
|
||||
margin-top: -20px;
|
||||
margin-left: 10px;
|
||||
padding: 5px 5px;
|
||||
|
|
@ -1073,7 +1075,7 @@ ul .sidebar-group-li .icon {
|
|||
}
|
||||
|
||||
#profile-jot-wrapper {
|
||||
margin-top: 0px;
|
||||
margin-top: -15px;
|
||||
padding-top: 0px;
|
||||
}
|
||||
|
||||
|
|
@ -1177,10 +1179,9 @@ profile-jot-banner-wrapper {
|
|||
-webkit-transition: all 0.25s ease-in-out;
|
||||
-moz-transition: all 0.25s ease-in-out;
|
||||
margin-top: 20px;
|
||||
margin-left: 100px;
|
||||
padding-bottom: 5px;
|
||||
float: right;
|
||||
width: 100%;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.wall-item-tools:hover {
|
||||
|
|
@ -1189,11 +1190,30 @@ profile-jot-banner-wrapper {
|
|||
transition: all 0.25s ease-in-out;
|
||||
-webkit-transition: all 0.25s ease-in-out;
|
||||
-moz-transition: all 0.25s ease-in-out;
|
||||
margin-left: 140px;
|
||||
}
|
||||
|
||||
.wall-item-social {
|
||||
filter: alpha(opacity=60);
|
||||
opacity: 0.7;
|
||||
transition: all 0.25s ease-in-out;
|
||||
-webkit-transition: all 0.25s ease-in-out;
|
||||
-moz-transition: all 0.25s ease-in-out;
|
||||
margin-top: 20px;
|
||||
margin-left: 0px;
|
||||
padding-bottom: 5px;
|
||||
float: left;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.wall-item-social:hover {
|
||||
filter: alpha(opacity=100);
|
||||
opacity: 1;
|
||||
transition: all 0.25s ease-in-out;
|
||||
-webkit-transition: all 0.25s ease-in-out;
|
||||
-moz-transition: all 0.25s ease-in-out;
|
||||
}
|
||||
|
||||
.wall-item-outside-wrapper.comment .wall-item-tools {
|
||||
/*margin: 5px 5px 0px 70px;*/
|
||||
float: right;
|
||||
}
|
||||
|
||||
|
|
@ -1213,7 +1233,8 @@ profile-jot-banner-wrapper {
|
|||
}
|
||||
|
||||
.wall-item-delete-wrapper {
|
||||
float: right;
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.wall-item-links-wrapper a.icon {
|
||||
|
|
@ -1224,6 +1245,7 @@ profile-jot-banner-wrapper {
|
|||
|
||||
.pencil {
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.star-item {
|
||||
|
|
@ -1912,6 +1934,7 @@ select[size],
|
|||
select[multiple],
|
||||
select[size][multiple] {
|
||||
-webkit-appearance: listbox;
|
||||
margin: 5px 0px 10px 30px;
|
||||
}
|
||||
|
||||
select {
|
||||
|
|
@ -1925,7 +1948,7 @@ keygen, select {
|
|||
/*-webkit-border-radius: ;*/
|
||||
}
|
||||
|
||||
input, textarea, keygen {
|
||||
textarea, keygen {
|
||||
margin-top: 3px;
|
||||
font-size: 0.9em;
|
||||
letter-spacing: normal;
|
||||
|
|
@ -1938,6 +1961,20 @@ input, textarea, keygen {
|
|||
text-align: -webkit-auto;
|
||||
}
|
||||
|
||||
input {
|
||||
margin-top: 3px;
|
||||
margin-right: 10px;
|
||||
/*font-size: 0.9em;
|
||||
letter-spacing: normal;
|
||||
word-spacing: normal;
|
||||
line-height: 1.2em;
|
||||
text-transform: none;
|
||||
text-indent: 0px;
|
||||
text-shadow: none;
|
||||
display: inline-block;
|
||||
text-align: -webkit-auto;*/
|
||||
}
|
||||
|
||||
.qq-upload-button {
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
|
|
@ -2423,7 +2460,7 @@ margin-left: 0px;
|
|||
}
|
||||
|
||||
#follow-sidebar {
|
||||
margin-bottom: 20px;
|
||||
margin-bottom: 80px;
|
||||
}
|
||||
|
||||
#follow-sidebar h3:before {
|
||||
|
|
@ -3389,7 +3426,7 @@ tr {
|
|||
.no { background-position: -90px -20px;}
|
||||
.pause { background-position: -110px -20px;}
|
||||
.play { background-position: -130px -20px;}
|
||||
.pencil { background-position: -150px -20px; margin-right: 10px;}
|
||||
.pencil { background-position: -150px -20px; margin-right: 12px;}
|
||||
.small-pencil { background-position: -170px -20px;}
|
||||
.recycle { background-position: -190px -20px;}
|
||||
.remote-link { background-position: -210px -20px; margin-right: 10px;}
|
||||
|
|
@ -3497,7 +3534,7 @@ footer {
|
|||
}
|
||||
|
||||
#acl-list {
|
||||
height: auto;
|
||||
height: 400px;
|
||||
border: 1px solid #cccccc;
|
||||
background-color: #efefef;
|
||||
clear: both;
|
||||
|
|
@ -3506,7 +3543,6 @@ footer {
|
|||
}
|
||||
|
||||
#acl-list-content {
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
.acl-list-item {
|
||||
|
|
@ -3807,4 +3843,3 @@ div.wall-item-content-wrapper.shiny {
|
|||
background-image: url("shiny.png");
|
||||
background-repeat: repeat-x;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
/*
|
||||
* Name: Smoothly
|
||||
* Description: Like coffee with milk. Theme works fine with iPad[2].
|
||||
* Version: 0.8.2
|
||||
* Version: Version 0.9.19-4
|
||||
* Author: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||
* Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||
* Screenshot: <a href="screenshot.png">Screenshot</a>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
|
||||
<div class="wall-item-info" id="wall-item-info-$item.id">
|
||||
<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id"
|
||||
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
|
||||
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
|
||||
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
|
||||
</a>
|
||||
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
|
||||
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
|
||||
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
|
||||
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
|
||||
</a>
|
||||
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
|
||||
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
|
||||
<ul>
|
||||
$item.item_photo_menu
|
||||
|
|
@ -15,63 +15,83 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="wall-item-photo-end"></div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">
|
||||
{{ if $item.location }}
|
||||
<span class="icon globe"></span>$item.location
|
||||
{{ endif }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-lock-wrapper">
|
||||
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
|
||||
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
|
||||
{{ if $item.lock }}
|
||||
<div class="wall-item-lock">
|
||||
<img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />
|
||||
</div>
|
||||
{{ else }}
|
||||
<div class="wall-item-lock"></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
<div class="wall-item-content" id="wall-item-content-$item.id" >
|
||||
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
|
||||
<div class="wall-item-title-end"></div>
|
||||
<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
|
||||
<div class="body-tag">
|
||||
{{ for $item.tags as $tag }}
|
||||
<span class='tag'>$tag</span>
|
||||
{{ endfor }}
|
||||
</div>
|
||||
<div class="body-tag">
|
||||
{{ for $item.tags as $tag }}
|
||||
<span class='tag'>$tag</span>
|
||||
{{ endfor }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
<div class="wall-item-social" id="wall-item-social-$item.id">
|
||||
{{ if $item.vote }}
|
||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
||||
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
||||
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
||||
{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
||||
{{ if $item.vote.share }}
|
||||
<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> {{ endif }}
|
||||
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.plink }}
|
||||
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
|
||||
<div class="wall-item-links-wrapper">
|
||||
<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
|
||||
{{ if $item.star }}
|
||||
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
||||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
||||
{{ if $item.drop.dropping }}
|
||||
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
|
||||
{{ if $item.drop.dropping }}
|
||||
<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /> {{ endif }}
|
||||
|
||||
<div class="wall-item-delete-end"></div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-author">
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
|
||||
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
|
||||
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-wrapper-end"></div>
|
||||
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
|
||||
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
|
||||
<div class="wall-item-comment-wrapper" >
|
||||
$item.comment
|
||||
</div>
|
||||
<div class="wall-item-comment-wrapper" >$item.comment</div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-outside-wrapper-end $item.indent" ></div>
|
||||
|
|
|
|||
|
|
@ -24,11 +24,21 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="wall-item-photo-end"></div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">
|
||||
{{ if $item.location }}
|
||||
<span class="icon globe"></span>$item.location
|
||||
{{ endif }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-lock-wrapper">
|
||||
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div> {{ else }}<div class="wall-item-lock"></div>{{ endif }}
|
||||
{{ if $item.lock }}
|
||||
<div class="wall-item-lock">
|
||||
<img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />
|
||||
</div>
|
||||
{{ else }}
|
||||
<div class="wall-item-lock"></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
<div class="wall-item-content" id="wall-item-content-$item.id" >
|
||||
|
||||
|
|
@ -58,34 +68,45 @@
|
|||
<hr class="line-dots">
|
||||
</div>
|
||||
-->
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
<div class="wall-item-social" id="wall-item-social-$item.id">
|
||||
{{ if $item.vote }}
|
||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
||||
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
||||
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
||||
{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
||||
{{ if $item.vote.share }}
|
||||
<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> {{ endif }}
|
||||
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.plink }}
|
||||
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
|
||||
<div class="wall-item-links-wrapper">
|
||||
<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.star }}
|
||||
{{ if $item.star }}
|
||||
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
||||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
||||
{{ if $item.drop.dropping }}
|
||||
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
|
||||
{{ if $item.drop.dropping }}
|
||||
<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /> {{ endif }}
|
||||
|
||||
<div class="wall-item-delete-end"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="wall-item-wrapper-end"></div>
|
||||
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
|
||||
|
|
|
|||
|
|
@ -12,45 +12,59 @@
|
|||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
|
||||
<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
|
||||
<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
|
||||
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
|
||||
<ul>
|
||||
$item.item_photo_menu
|
||||
</ul>
|
||||
</div>
|
||||
<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
|
||||
<ul>
|
||||
$item.item_photo_menu
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wall-item-photo-end"></div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
|
||||
<div class="wall-item-location" id="wall-item-location-$item.id">
|
||||
{{ if $item.location }}
|
||||
<span class="icon globe"></span>$item.location
|
||||
{{ endif }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-lock-wrapper">
|
||||
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
|
||||
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
|
||||
{{ if $item.lock }}
|
||||
<div class="wall-item-lock">
|
||||
<img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />
|
||||
</div>
|
||||
{{ else }}
|
||||
<div class="wall-item-lock"></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
<div class="wall-item-content" id="wall-item-content-$item.id" >
|
||||
<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
|
||||
<div class="wall-item-title-end"></div>
|
||||
<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
|
||||
<div class="body-tag">
|
||||
{{ for $item.tags as $tag }}
|
||||
<span class='tag'>$tag</span>
|
||||
{{ endfor }}
|
||||
</div>
|
||||
<div class="body-tag">
|
||||
{{ for $item.tags as $tag }}
|
||||
<span class='tag'>$tag</span>
|
||||
{{ endfor }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
|
||||
<div class="wall-item-social" id="wall-item-social-$item.id">
|
||||
{{ if $item.vote }}
|
||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
||||
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
||||
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
||||
{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
||||
{{ if $item.vote.share }}
|
||||
<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> {{ endif }}
|
||||
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.plink }}
|
||||
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
|
||||
{{ endif }}
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
<div class="wall-item-links-wrapper">
|
||||
<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.star }}
|
||||
|
|
@ -58,24 +72,36 @@
|
|||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
||||
{{ if $item.drop.dropping }}
|
||||
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
|
||||
{{ if $item.drop.dropping }}
|
||||
<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /> {{ endif }}
|
||||
|
||||
<div class="wall-item-delete-end"></div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-author">
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
|
||||
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
|
||||
<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
|
||||
</a>
|
||||
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-wrapper-end"></div>
|
||||
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
|
||||
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
|
||||
<div class="wall-item-comment-wrapper" >
|
||||
$item.comment
|
||||
</div>
|
||||
<div class="wall-item-comment-wrapper" >$item.comment</div>
|
||||
</div>
|
||||
|
||||
<div class="wall-item-outside-wrapper-end $item.indent" ></div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{{if $item.comment_firstcollapsed}}
|
||||
<div class="hide-comments-outer">
|
||||
<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
|
||||
<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span>
|
||||
<span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
|
||||
</div>
|
||||
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
|
||||
{{endif}}
|
||||
|
||||
<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
|
||||
<div class="wall-item-outside-wrapper $item.indent wallwall" id="wall-item-outside-wrapper-$item.id" >
|
||||
<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
|
||||
|
|
@ -30,8 +32,13 @@
|
|||
<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
|
||||
</div>
|
||||
<div class="wall-item-lock-wrapper">
|
||||
{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
|
||||
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
|
||||
{{ if $item.lock }}
|
||||
<div class="wall-item-lock">
|
||||
<img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />
|
||||
</div>
|
||||
{{ else }}
|
||||
<div class="wall-item-lock"></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
<div class="wall-item-content" id="wall-item-content-$item.id" >
|
||||
<div class="wall-item-author">
|
||||
|
|
@ -54,31 +61,43 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
<div class="wall-item-social" id="wall-item-social-$item.id">
|
||||
{{ if $item.vote }}
|
||||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
|
||||
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
|
||||
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
|
||||
{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
|
||||
{{ if $item.vote.share }}
|
||||
<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> {{ endif }}
|
||||
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $item.plink }}
|
||||
<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
|
||||
<div class="wall-item-links-wrapper">
|
||||
<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a>
|
||||
</div>
|
||||
{{ endif }}
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
|
||||
{{ if $item.star }}
|
||||
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
|
||||
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
|
||||
{{ endif }}
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="wall-item-tools" id="wall-item-tools-$item.id">
|
||||
{{ if $item.edpost }}
|
||||
<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
|
||||
{{ endif }}
|
||||
|
||||
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
|
||||
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
|
||||
{{ if $item.drop.dropping }}
|
||||
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
|
||||
{{ endif }}
|
||||
</div>
|
||||
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
|
||||
|
||||
{{ if $item.drop.dropping }}
|
||||
<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" /> {{ endif }}
|
||||
<div class="wall-item-delete-end"></div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue