mexon/friendica
1
0
Fork 0
Code Pull requests Activity

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

Browse source
This commit is contained in:
Domovoy 2012-08-12 17:34:23 +02:00
commit 04f14d96c6
52 changed files with 961 additions and 258 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
boot.php
View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1431' ); define ( 'FRIENDICA_VERSION', '3.0.1432' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1154 ); define ( 'DB_UPDATE_VERSION', 1154 );
@ -365,6 +365,7 @@ if(! class_exists('App')) {
public $videowidth = 425; public $videowidth = 425;
public $videoheight = 350; public $videoheight = 350;
public $force_max_items = 0; public $force_max_items = 0;
public $theme_thread_allow = true;
private $scheme; private $scheme;
private $hostname; private $hostname;

4
include/bbcode.php
View file

@ -323,6 +323,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text); $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
// Try to Oembed // Try to Oembed
if ($tryoembed) { if ($tryoembed) {
$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="$1">$1</a></video>', $Text); $Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="$1">$1</a></video>', $Text);

3
include/conversation.php
View file

@ -545,6 +545,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
'$edurl' => t('Link'), '$edurl' => t('Link'),
'$edvideo' => t('Video'), '$edvideo' => t('Video'),
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$indent' => $indent,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$ww' => (($mode === 'network') ? $commentww : '') '$ww' => (($mode === 'network') ? $commentww : '')
)); ));
@ -623,7 +624,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
/* /*
* I don't like this very much... * I don't like this very much...
*/ */
if(get_config('system','thread_allow')) { if(get_config('system','thread_allow') && $a->theme_thread_allow) {
$item_result['flatten'] = false; $item_result['flatten'] = false;
$item_result['threaded'] = true; $item_result['threaded'] = true;
} }

2
js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

312
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1431\n" "Project-Id-Version: 3.0.1432\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-08-10 10:00-0700\n" "POT-Creation-Date: 2012-08-11 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -56,7 +56,7 @@ msgstr ""
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
#: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:354 #: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:354
#: ../../include/items.php:3814 ../../index.php:315 #: ../../include/items.php:3815 ../../index.php:315
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -172,7 +172,7 @@ msgstr ""
#: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/theme.php:757
#: ../../view/theme/diabook/config.php:190 #: ../../view/theme/diabook/config.php:190
#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
#: ../../include/conversation.php:525 #: ../../include/conversation.php:538
msgid "Submit" msgid "Submit"
msgstr "" msgstr ""
@ -232,7 +232,7 @@ msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131 #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
#: ../../include/nav.php:52 ../../boot.php:1645 #: ../../include/nav.php:52 ../../boot.php:1646
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -287,8 +287,8 @@ msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:432 ../../mod/directory.php:132 #: ../../mod/events.php:432 ../../mod/directory.php:132
#: ../../include/event.php:40 ../../include/bb2diaspora.php:447 #: ../../include/event.php:40 ../../include/bb2diaspora.php:455
#: ../../boot.php:1197 #: ../../boot.php:1198
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -370,7 +370,7 @@ msgstr ""
msgid "No" msgid "No"
msgstr "" msgstr ""
#: ../../mod/photos.php:46 ../../boot.php:1638 #: ../../mod/photos.php:46 ../../boot.php:1639
msgid "Photo Albums" msgid "Photo Albums"
msgstr "" msgstr ""
@ -424,7 +424,7 @@ msgstr ""
#: ../../mod/photos.php:572 ../../mod/like.php:145 ../../mod/tagger.php:70 #: ../../mod/photos.php:572 ../../mod/like.php:145 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163 #: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1366 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1366
#: ../../include/diaspora.php:1793 ../../include/conversation.php:114 #: ../../include/diaspora.php:1824 ../../include/conversation.php:114
#: ../../include/conversation.php:230 #: ../../include/conversation.php:230
msgid "photo" msgid "photo"
msgstr "" msgstr ""
@ -524,7 +524,7 @@ msgid "Use as profile photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:1171 ../../mod/content.php:601 #: ../../mod/photos.php:1171 ../../mod/content.php:601
#: ../../include/conversation.php:365 #: ../../include/conversation.php:381
msgid "Private Message" msgid "Private Message"
msgstr "" msgstr ""
@ -565,49 +565,49 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "" msgstr ""
#: ../../mod/photos.php:1303 ../../mod/content.php:665 #: ../../mod/photos.php:1303 ../../mod/content.php:665
#: ../../include/conversation.php:500 #: ../../include/conversation.php:513
msgid "I like this (toggle)" msgid "I like this (toggle)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1304 ../../mod/content.php:666 #: ../../mod/photos.php:1304 ../../mod/content.php:666
#: ../../include/conversation.php:501 #: ../../include/conversation.php:514
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1305 ../../include/conversation.php:1121 #: ../../mod/photos.php:1305 ../../include/conversation.php:1138
msgid "Share" msgid "Share"
msgstr "" msgstr ""
#: ../../mod/photos.php:1306 ../../mod/editpost.php:112 #: ../../mod/photos.php:1306 ../../mod/editpost.php:112
#: ../../mod/content.php:482 ../../mod/content.php:843 #: ../../mod/content.php:482 ../../mod/content.php:843
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:479 ../../include/conversation.php:590 #: ../../mod/message.php:479 ../../include/conversation.php:603
#: ../../include/conversation.php:821 ../../include/conversation.php:1140 #: ../../include/conversation.php:834 ../../include/conversation.php:1157
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
#: ../../mod/photos.php:1322 ../../mod/photos.php:1363 #: ../../mod/photos.php:1322 ../../mod/photos.php:1363
#: ../../mod/photos.php:1395 ../../mod/content.php:688 #: ../../mod/photos.php:1395 ../../mod/content.php:688
#: ../../include/conversation.php:522 #: ../../include/conversation.php:535
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: ../../mod/photos.php:1324 ../../mod/photos.php:1365 #: ../../mod/photos.php:1324 ../../mod/photos.php:1365
#: ../../mod/photos.php:1397 ../../mod/content.php:690 #: ../../mod/photos.php:1397 ../../mod/content.php:690
#: ../../include/conversation.php:524 ../../boot.php:580 #: ../../include/conversation.php:537 ../../boot.php:581
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
#: ../../mod/photos.php:1326 ../../mod/editpost.php:133 #: ../../mod/photos.php:1326 ../../mod/editpost.php:133
#: ../../mod/content.php:700 ../../include/conversation.php:534 #: ../../mod/content.php:700 ../../include/conversation.php:547
#: ../../include/conversation.php:1158 #: ../../include/conversation.php:1175
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: ../../mod/photos.php:1426 ../../mod/content.php:439 #: ../../mod/photos.php:1426 ../../mod/content.php:439
#: ../../mod/content.php:721 ../../mod/settings.php:600 #: ../../mod/content.php:721 ../../mod/settings.php:600
#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:671 #: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:671
#: ../../include/conversation.php:379 ../../include/conversation.php:778 #: ../../include/conversation.php:395 ../../include/conversation.php:791
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
@ -673,28 +673,28 @@ msgstr ""
msgid "Edit post" msgid "Edit post"
msgstr "" msgstr ""
#: ../../mod/editpost.php:88 ../../include/conversation.php:1107 #: ../../mod/editpost.php:88 ../../include/conversation.php:1124
msgid "Post to Email" msgid "Post to Email"
msgstr "" msgstr ""
#: ../../mod/editpost.php:103 ../../mod/content.php:708 #: ../../mod/editpost.php:103 ../../mod/content.php:708
#: ../../mod/settings.php:599 ../../include/conversation.php:370 #: ../../mod/settings.php:599 ../../include/conversation.php:386
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:476 #: ../../mod/message.php:291 ../../mod/message.php:476
#: ../../include/conversation.php:1122 #: ../../include/conversation.php:1139
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
#: ../../mod/editpost.php:105 ../../include/conversation.php:1124 #: ../../mod/editpost.php:105 ../../include/conversation.php:1141
msgid "Attach file" msgid "Attach file"
msgstr "" msgstr ""
#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:477 #: ../../mod/message.php:292 ../../mod/message.php:477
#: ../../include/conversation.php:1126 #: ../../include/conversation.php:1143
msgid "Insert web link" msgid "Insert web link"
msgstr "" msgstr ""
@ -710,35 +710,35 @@ msgstr ""
msgid "Insert Vorbis [.ogg] audio" msgid "Insert Vorbis [.ogg] audio"
msgstr "" msgstr ""
#: ../../mod/editpost.php:110 ../../include/conversation.php:1132 #: ../../mod/editpost.php:110 ../../include/conversation.php:1149
msgid "Set your location" msgid "Set your location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:111 ../../include/conversation.php:1134 #: ../../mod/editpost.php:111 ../../include/conversation.php:1151
msgid "Clear browser location" msgid "Clear browser location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:113 ../../include/conversation.php:1141 #: ../../mod/editpost.php:113 ../../include/conversation.php:1158
msgid "Permission settings" msgid "Permission settings"
msgstr "" msgstr ""
#: ../../mod/editpost.php:121 ../../include/conversation.php:1150 #: ../../mod/editpost.php:121 ../../include/conversation.php:1167
msgid "CC: email addresses" msgid "CC: email addresses"
msgstr "" msgstr ""
#: ../../mod/editpost.php:122 ../../include/conversation.php:1151 #: ../../mod/editpost.php:122 ../../include/conversation.php:1168
msgid "Public post" msgid "Public post"
msgstr "" msgstr ""
#: ../../mod/editpost.php:125 ../../include/conversation.php:1137 #: ../../mod/editpost.php:125 ../../include/conversation.php:1154
msgid "Set title" msgid "Set title"
msgstr "" msgstr ""
#: ../../mod/editpost.php:127 ../../include/conversation.php:1139 #: ../../mod/editpost.php:127 ../../include/conversation.php:1156
msgid "Categories (comma-separated list)" msgid "Categories (comma-separated list)"
msgstr "" msgstr ""
#: ../../mod/editpost.php:128 ../../include/conversation.php:1153 #: ../../mod/editpost.php:128 ../../include/conversation.php:1170
msgid "Example: bob@example.com, mary@example.com" msgid "Example: bob@example.com, mary@example.com"
msgstr "" msgstr ""
@ -859,7 +859,7 @@ msgstr ""
msgid "Confirm" msgid "Confirm"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3205 #: ../../mod/dfrn_request.php:715 ../../include/items.php:3206
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "" msgstr ""
@ -1185,7 +1185,7 @@ msgid ""
msgstr "" msgstr ""
#: ../../mod/localtime.php:12 ../../include/event.php:11 #: ../../mod/localtime.php:12 ../../include/event.php:11
#: ../../include/bb2diaspora.php:425 #: ../../include/bb2diaspora.php:433
msgid "l F d, Y \\@ g:i A" msgid "l F d, Y \\@ g:i A"
msgstr "" msgstr ""
@ -1251,7 +1251,7 @@ msgid "is interested in:"
msgstr "" msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59 #: ../../mod/match.php:58 ../../mod/suggest.php:59
#: ../../include/contact_widgets.php:9 ../../boot.php:1141 #: ../../include/contact_widgets.php:9 ../../boot.php:1142
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1280,28 +1280,28 @@ msgid "Group: "
msgstr "" msgstr ""
#: ../../mod/content.php:438 ../../mod/content.php:720 #: ../../mod/content.php:438 ../../mod/content.php:720
#: ../../include/conversation.php:378 ../../include/conversation.php:777 #: ../../include/conversation.php:394 ../../include/conversation.php:790
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: ../../mod/content.php:455 ../../mod/content.php:813 #: ../../mod/content.php:455 ../../mod/content.php:813
#: ../../mod/content.php:814 ../../include/conversation.php:560 #: ../../mod/content.php:814 ../../include/conversation.php:573
#: ../../include/conversation.php:561 ../../include/conversation.php:794 #: ../../include/conversation.php:574 ../../include/conversation.php:807
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "" msgstr ""
#: ../../mod/content.php:465 ../../mod/content.php:825 #: ../../mod/content.php:465 ../../mod/content.php:825
#: ../../include/conversation.php:572 ../../include/conversation.php:804 #: ../../include/conversation.php:585 ../../include/conversation.php:817
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
#: ../../mod/content.php:480 ../../include/conversation.php:819 #: ../../mod/content.php:480 ../../include/conversation.php:832
msgid "View in context" msgid "View in context"
msgstr "" msgstr ""
#: ../../mod/content.php:586 ../../include/conversation.php:599 #: ../../mod/content.php:586 ../../include/conversation.php:612
#, php-format #, php-format
msgid "%d comment" msgid "%d comment"
msgid_plural "%d comments" msgid_plural "%d comments"
@ -1310,92 +1310,92 @@ msgstr[1] ""
#: ../../mod/content.php:587 ../../addon/page/page.php:76 #: ../../mod/content.php:587 ../../addon/page/page.php:76
#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
#: ../../include/contact_widgets.php:188 ../../include/conversation.php:600 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:613
#: ../../boot.php:581 #: ../../boot.php:582
msgid "show more" msgid "show more"
msgstr "" msgstr ""
#: ../../mod/content.php:665 ../../include/conversation.php:500 #: ../../mod/content.php:665 ../../include/conversation.php:513
msgid "like" msgid "like"
msgstr "" msgstr ""
#: ../../mod/content.php:666 ../../include/conversation.php:501 #: ../../mod/content.php:666 ../../include/conversation.php:514
msgid "dislike" msgid "dislike"
msgstr "" msgstr ""
#: ../../mod/content.php:668 ../../include/conversation.php:503 #: ../../mod/content.php:668 ../../include/conversation.php:516
msgid "Share this" msgid "Share this"
msgstr "" msgstr ""
#: ../../mod/content.php:668 ../../include/conversation.php:503 #: ../../mod/content.php:668 ../../include/conversation.php:516
msgid "share" msgid "share"
msgstr "" msgstr ""
#: ../../mod/content.php:692 ../../include/conversation.php:526 #: ../../mod/content.php:692 ../../include/conversation.php:539
msgid "Bold" msgid "Bold"
msgstr "" msgstr ""
#: ../../mod/content.php:693 ../../include/conversation.php:527 #: ../../mod/content.php:693 ../../include/conversation.php:540
msgid "Italic" msgid "Italic"
msgstr "" msgstr ""
#: ../../mod/content.php:694 ../../include/conversation.php:528 #: ../../mod/content.php:694 ../../include/conversation.php:541
msgid "Underline" msgid "Underline"
msgstr "" msgstr ""
#: ../../mod/content.php:695 ../../include/conversation.php:529 #: ../../mod/content.php:695 ../../include/conversation.php:542
msgid "Quote" msgid "Quote"
msgstr "" msgstr ""
#: ../../mod/content.php:696 ../../include/conversation.php:530 #: ../../mod/content.php:696 ../../include/conversation.php:543
msgid "Code" msgid "Code"
msgstr "" msgstr ""
#: ../../mod/content.php:697 ../../include/conversation.php:531 #: ../../mod/content.php:697 ../../include/conversation.php:544
msgid "Image" msgid "Image"
msgstr "" msgstr ""
#: ../../mod/content.php:698 ../../include/conversation.php:532 #: ../../mod/content.php:698 ../../include/conversation.php:545
msgid "Link" msgid "Link"
msgstr "" msgstr ""
#: ../../mod/content.php:699 ../../include/conversation.php:533 #: ../../mod/content.php:699 ../../include/conversation.php:546
msgid "Video" msgid "Video"
msgstr "" msgstr ""
#: ../../mod/content.php:733 ../../include/conversation.php:471 #: ../../mod/content.php:733 ../../include/conversation.php:484
msgid "add star" msgid "add star"
msgstr "" msgstr ""
#: ../../mod/content.php:734 ../../include/conversation.php:472 #: ../../mod/content.php:734 ../../include/conversation.php:485
msgid "remove star" msgid "remove star"
msgstr "" msgstr ""
#: ../../mod/content.php:735 ../../include/conversation.php:473 #: ../../mod/content.php:735 ../../include/conversation.php:486
msgid "toggle star status" msgid "toggle star status"
msgstr "" msgstr ""
#: ../../mod/content.php:738 ../../include/conversation.php:476 #: ../../mod/content.php:738 ../../include/conversation.php:489
msgid "starred" msgid "starred"
msgstr "" msgstr ""
#: ../../mod/content.php:739 ../../include/conversation.php:477 #: ../../mod/content.php:739 ../../include/conversation.php:490
msgid "add tag" msgid "add tag"
msgstr "" msgstr ""
#: ../../mod/content.php:743 ../../include/conversation.php:382 #: ../../mod/content.php:743 ../../include/conversation.php:398
msgid "save to folder" msgid "save to folder"
msgstr "" msgstr ""
#: ../../mod/content.php:815 ../../include/conversation.php:562 #: ../../mod/content.php:815 ../../include/conversation.php:575
msgid "to" msgid "to"
msgstr "" msgstr ""
#: ../../mod/content.php:816 ../../include/conversation.php:563 #: ../../mod/content.php:816 ../../include/conversation.php:576
msgid "Wall-to-Wall" msgid "Wall-to-Wall"
msgstr "" msgstr ""
#: ../../mod/content.php:817 ../../include/conversation.php:564 #: ../../mod/content.php:817 ../../include/conversation.php:577
msgid "via Wall-To-Wall:" msgid "via Wall-To-Wall:"
msgstr "" msgstr ""
@ -1913,8 +1913,8 @@ msgstr ""
#: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:702
#: ../../addon/facebook/facebook.php:1200 #: ../../addon/facebook/facebook.php:1200
#: ../../addon/public_server/public_server.php:62 #: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3214 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3215
#: ../../boot.php:790 #: ../../boot.php:791
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -1924,7 +1924,7 @@ msgid ""
"Password reset failed." "Password reset failed."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:83 ../../boot.php:923 #: ../../mod/lostpass.php:83 ../../boot.php:924
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
@ -2592,7 +2592,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1652 #: ../../mod/notes.php:44 ../../boot.php:1653
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2635,7 +2635,7 @@ msgstr ""
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250 #: ../../mod/message.php:242 ../../mod/message.php:250
#: ../../include/conversation.php:1058 ../../include/conversation.php:1075 #: ../../include/conversation.php:1075 ../../include/conversation.php:1092
msgid "Please enter a link URL:" msgid "Please enter a link URL:"
msgstr "" msgstr ""
@ -2845,7 +2845,7 @@ msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
#: ../../include/nav.php:50 ../../boot.php:1628 #: ../../include/nav.php:50 ../../boot.php:1629
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -2949,7 +2949,7 @@ msgstr ""
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" msgstr ""
#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:889 #: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:890
msgid "Register" msgid "Register"
msgstr "" msgstr ""
@ -2962,7 +2962,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167 #: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:565 #: ../../view/theme/diabook/theme.php:565
#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1793 #: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824
#: ../../include/conversation.php:109 ../../include/conversation.php:118 #: ../../include/conversation.php:109 ../../include/conversation.php:118
#: ../../include/conversation.php:225 ../../include/conversation.php:234 #: ../../include/conversation.php:225 ../../include/conversation.php:234
msgid "status" msgid "status"
@ -2970,7 +2970,7 @@ msgstr ""
#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598
#: ../../addon/communityhome/communityhome.php:172 #: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1809 #: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840
#: ../../include/conversation.php:126 #: ../../include/conversation.php:126
#, php-format #, php-format
msgid "%1$s likes %2$s's %3$s" msgid "%1$s likes %2$s's %3$s"
@ -2983,7 +2983,7 @@ msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:708 ../../mod/admin.php:907 ../../mod/display.php:29 #: ../../mod/admin.php:708 ../../mod/admin.php:907 ../../mod/display.php:29
#: ../../mod/display.php:135 ../../include/items.php:3692 #: ../../mod/display.php:135 ../../include/items.php:3693
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -2992,7 +2992,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
#: ../../include/nav.php:51 ../../boot.php:1635 #: ../../include/nav.php:51 ../../boot.php:1636
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -3811,7 +3811,7 @@ msgstr ""
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:21 ../../boot.php:1054 #: ../../mod/profile.php:21 ../../boot.php:1055
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
@ -4206,28 +4206,28 @@ msgstr ""
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:673 ../../boot.php:1163 #: ../../mod/profiles.php:673 ../../boot.php:1164
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:674 ../../boot.php:1164 #: ../../mod/profiles.php:674 ../../boot.php:1165
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:685 ../../boot.php:1174 #: ../../mod/profiles.php:685 ../../boot.php:1175
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:687 ../../boot.php:1177 #: ../../mod/profiles.php:687 ../../boot.php:1178
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:688 ../../boot.php:1178 #: ../../mod/profiles.php:688 ../../boot.php:1179
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
#: ../../mod/filer.php:29 ../../include/conversation.php:1062 #: ../../mod/filer.php:29 ../../include/conversation.php:1079
#: ../../include/conversation.php:1079 #: ../../include/conversation.php:1096
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "" msgstr ""
@ -4351,17 +4351,17 @@ msgid "Gender: "
msgstr "" msgstr ""
#: ../../mod/directory.php:134 ../../include/profile_advanced.php:17 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
#: ../../boot.php:1199 #: ../../boot.php:1200
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
#: ../../mod/directory.php:136 ../../include/profile_advanced.php:37 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
#: ../../boot.php:1202 #: ../../boot.php:1203
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../mod/directory.php:138 ../../include/profile_advanced.php:48 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
#: ../../boot.php:1204 #: ../../boot.php:1205
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -4492,7 +4492,7 @@ msgstr ""
msgid "Unable to set contact photo." msgid "Unable to set contact photo."
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:577 #: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608
#: ../../include/conversation.php:162 #: ../../include/conversation.php:162
#, php-format #, php-format
msgid "%1$s is now friends with %2$s" msgid "%1$s is now friends with %2$s"
@ -5119,7 +5119,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/communityhome.php:34
#: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:28
#: ../../addon/communityhome/twillingham/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:34
#: ../../include/nav.php:64 ../../boot.php:910 #: ../../include/nav.php:64 ../../boot.php:911
msgid "Login" msgid "Login"
msgstr "" msgstr ""
@ -5580,7 +5580,7 @@ msgstr ""
#: ../../addon/dav/main.php:246 ../../addon/dav/main.php:247 #: ../../addon/dav/main.php:246 ../../addon/dav/main.php:247
#: ../../include/delivery.php:463 ../../include/enotify.php:26 #: ../../include/delivery.php:463 ../../include/enotify.php:26
#: ../../include/notifier.php:685 #: ../../include/notifier.php:710
msgid "noreply" msgid "noreply"
msgstr "" msgstr ""
@ -7305,15 +7305,15 @@ msgstr ""
msgid "Ask me" msgid "Ask me"
msgstr "" msgstr ""
#: ../../include/event.php:20 ../../include/bb2diaspora.php:431 #: ../../include/event.php:20 ../../include/bb2diaspora.php:439
msgid "Starts:" msgid "Starts:"
msgstr "" msgstr ""
#: ../../include/event.php:30 ../../include/bb2diaspora.php:439 #: ../../include/event.php:30 ../../include/bb2diaspora.php:447
msgid "Finishes:" msgid "Finishes:"
msgstr "" msgstr ""
#: ../../include/delivery.php:456 ../../include/notifier.php:678 #: ../../include/delivery.php:456 ../../include/notifier.php:703
msgid "(no subject)" msgid "(no subject)"
msgstr "" msgstr ""
@ -7500,11 +7500,11 @@ msgstr ""
msgid "Item filed" msgid "Item filed"
msgstr "" msgstr ""
#: ../../include/diaspora.php:660 #: ../../include/diaspora.php:691
msgid "Sharing notification from Diaspora network" msgid "Sharing notification from Diaspora network"
msgstr "" msgstr ""
#: ../../include/diaspora.php:2177 #: ../../include/diaspora.php:2202
msgid "Attachments:" msgid "Attachments:"
msgstr "" msgstr ""
@ -7555,7 +7555,7 @@ msgstr ""
msgid "Contacts not in any group" msgid "Contacts not in any group"
msgstr "" msgstr ""
#: ../../include/nav.php:46 ../../boot.php:909 #: ../../include/nav.php:46 ../../boot.php:910
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -7563,7 +7563,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1621 #: ../../include/nav.php:49 ../../boot.php:1622
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -7643,11 +7643,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1157 #: ../../include/nav.php:138 ../../boot.php:1158
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1157 #: ../../include/nav.php:138 ../../boot.php:1158
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -8068,15 +8068,15 @@ msgstr ""
msgid "following" msgid "following"
msgstr "" msgstr ""
#: ../../include/items.php:3212 #: ../../include/items.php:3213
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "" msgstr ""
#: ../../include/items.php:3212 #: ../../include/items.php:3213
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "" msgstr ""
#: ../../include/items.php:3881 #: ../../include/items.php:3882
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""
@ -8170,34 +8170,34 @@ msgstr ""
msgid "stopped following" msgid "stopped following"
msgstr "" msgstr ""
#: ../../include/Contact.php:220 ../../include/conversation.php:959 #: ../../include/Contact.php:220 ../../include/conversation.php:976
msgid "Poke" msgid "Poke"
msgstr "" msgstr ""
#: ../../include/Contact.php:221 ../../include/conversation.php:953 #: ../../include/Contact.php:221 ../../include/conversation.php:970
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: ../../include/Contact.php:222 ../../include/conversation.php:954 #: ../../include/Contact.php:222 ../../include/conversation.php:971
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: ../../include/Contact.php:223 ../../include/conversation.php:955 #: ../../include/Contact.php:223 ../../include/conversation.php:972
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: ../../include/Contact.php:224 ../../include/Contact.php:237 #: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/conversation.php:956 #: ../../include/conversation.php:973
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: ../../include/Contact.php:225 ../../include/Contact.php:237 #: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/conversation.php:957 #: ../../include/conversation.php:974
msgid "Edit Contact" msgid "Edit Contact"
msgstr "" msgstr ""
#: ../../include/Contact.php:226 ../../include/Contact.php:237 #: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/conversation.php:958 #: ../../include/conversation.php:975
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
@ -8215,106 +8215,106 @@ msgstr ""
msgid "%1$s marked %2$s's %3$s as favorite" msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "" msgstr ""
#: ../../include/conversation.php:859 #: ../../include/conversation.php:876
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "" msgstr ""
#: ../../include/conversation.php:1017 #: ../../include/conversation.php:1034
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1017 #: ../../include/conversation.php:1034
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1021 #: ../../include/conversation.php:1038
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> like this." msgid "<span %1$s>%2$d people</span> like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1023 #: ../../include/conversation.php:1040
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't like this." msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1029 #: ../../include/conversation.php:1046
msgid "and" msgid "and"
msgstr "" msgstr ""
#: ../../include/conversation.php:1032 #: ../../include/conversation.php:1049
#, php-format #, php-format
msgid ", and %d other people" msgid ", and %d other people"
msgstr "" msgstr ""
#: ../../include/conversation.php:1033 #: ../../include/conversation.php:1050
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1033 #: ../../include/conversation.php:1050
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1057 ../../include/conversation.php:1074 #: ../../include/conversation.php:1074 ../../include/conversation.php:1091
msgid "Visible to <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "" msgstr ""
#: ../../include/conversation.php:1059 ../../include/conversation.php:1076 #: ../../include/conversation.php:1076 ../../include/conversation.php:1093
msgid "Please enter a video link/URL:" msgid "Please enter a video link/URL:"
msgstr "" msgstr ""
#: ../../include/conversation.php:1060 ../../include/conversation.php:1077 #: ../../include/conversation.php:1077 ../../include/conversation.php:1094
msgid "Please enter an audio link/URL:" msgid "Please enter an audio link/URL:"
msgstr "" msgstr ""
#: ../../include/conversation.php:1061 ../../include/conversation.php:1078 #: ../../include/conversation.php:1078 ../../include/conversation.php:1095
msgid "Tag term:" msgid "Tag term:"
msgstr "" msgstr ""
#: ../../include/conversation.php:1063 ../../include/conversation.php:1080 #: ../../include/conversation.php:1080 ../../include/conversation.php:1097
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "" msgstr ""
#: ../../include/conversation.php:1123 #: ../../include/conversation.php:1140
msgid "upload photo" msgid "upload photo"
msgstr "" msgstr ""
#: ../../include/conversation.php:1125 #: ../../include/conversation.php:1142
msgid "attach file" msgid "attach file"
msgstr "" msgstr ""
#: ../../include/conversation.php:1127 #: ../../include/conversation.php:1144
msgid "web link" msgid "web link"
msgstr "" msgstr ""
#: ../../include/conversation.php:1128 #: ../../include/conversation.php:1145
msgid "Insert video link" msgid "Insert video link"
msgstr "" msgstr ""
#: ../../include/conversation.php:1129 #: ../../include/conversation.php:1146
msgid "video link" msgid "video link"
msgstr "" msgstr ""
#: ../../include/conversation.php:1130 #: ../../include/conversation.php:1147
msgid "Insert audio link" msgid "Insert audio link"
msgstr "" msgstr ""
#: ../../include/conversation.php:1131 #: ../../include/conversation.php:1148
msgid "audio link" msgid "audio link"
msgstr "" msgstr ""
#: ../../include/conversation.php:1133 #: ../../include/conversation.php:1150
msgid "set location" msgid "set location"
msgstr "" msgstr ""
#: ../../include/conversation.php:1135 #: ../../include/conversation.php:1152
msgid "clear location" msgid "clear location"
msgstr "" msgstr ""
#: ../../include/conversation.php:1142 #: ../../include/conversation.php:1159
msgid "permissions" msgid "permissions"
msgstr "" msgstr ""
@ -8330,96 +8330,96 @@ msgstr ""
msgid "This action is not available under your subscription plan." msgid "This action is not available under your subscription plan."
msgstr "" msgstr ""
#: ../../boot.php:579 #: ../../boot.php:580
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:582 #: ../../boot.php:583
msgid "show fewer" msgid "show fewer"
msgstr "" msgstr ""
#: ../../boot.php:785 #: ../../boot.php:786
#, php-format #, php-format
msgid "Update %s failed. See error logs." msgid "Update %s failed. See error logs."
msgstr "" msgstr ""
#: ../../boot.php:787 #: ../../boot.php:788
#, php-format #, php-format
msgid "Update Error at %s" msgid "Update Error at %s"
msgstr "" msgstr ""
#: ../../boot.php:888 #: ../../boot.php:889
msgid "Create a New Account" msgid "Create a New Account"
msgstr "" msgstr ""
#: ../../boot.php:912 #: ../../boot.php:913
msgid "Nickname or Email address: " msgid "Nickname or Email address: "
msgstr "" msgstr ""
#: ../../boot.php:913 #: ../../boot.php:914
msgid "Password: " msgid "Password: "
msgstr "" msgstr ""
#: ../../boot.php:916 #: ../../boot.php:917
msgid "Or login using OpenID: " msgid "Or login using OpenID: "
msgstr "" msgstr ""
#: ../../boot.php:922 #: ../../boot.php:923
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:1089 #: ../../boot.php:1090
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1149 #: ../../boot.php:1150
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1271 ../../boot.php:1357 #: ../../boot.php:1272 ../../boot.php:1358
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1272 ../../boot.php:1358 #: ../../boot.php:1273 ../../boot.php:1359
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1317 ../../boot.php:1398 #: ../../boot.php:1318 ../../boot.php:1399
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1329 #: ../../boot.php:1330
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1330 #: ../../boot.php:1331
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1391 #: ../../boot.php:1392
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: ../../boot.php:1409 #: ../../boot.php:1410
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1410 #: ../../boot.php:1411
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""
#: ../../boot.php:1624 #: ../../boot.php:1625
msgid "Status Messages and Posts" msgid "Status Messages and Posts"
msgstr "" msgstr ""
#: ../../boot.php:1631 #: ../../boot.php:1632
msgid "Profile Details" msgid "Profile Details"
msgstr "" msgstr ""
#: ../../boot.php:1648 #: ../../boot.php:1649
msgid "Events and Calendar" msgid "Events and Calendar"
msgstr "" msgstr ""
#: ../../boot.php:1655 #: ../../boot.php:1656
msgid "Only You Can See This" msgid "Only You Can See This"
msgstr "" msgstr ""

4
view/theme/duepuntozero/style.css
View file

@ -939,6 +939,10 @@ input#dfrn-url {
margin-left: 50px; margin-left: 50px;
} }
.tread-end-wrapper {
margin-left: 50px;
}
.wall-item-content-wrapper.comment { .wall-item-content-wrapper.comment {
# margin-left: 50px; # margin-left: 50px;
background: #EEEEEE; background: #EEEEEE;

2
view/theme/frost-mobile/TODO
View file

@ -26,4 +26,4 @@ Photo album display?
- Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items) - Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items)
- Sometimes, when "Permission denied", wrong login page is shown

1
view/theme/frost-mobile/admin_site.tpl
View file

@ -35,6 +35,7 @@
{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

6
view/theme/frost-mobile/comment_item.tpl
View file

@ -10,8 +10,10 @@
}); });
</script>--> </script>-->
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;" > <div class="comment-wwedit-wrapper $indent" 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;" > <form class="comment-edit-form $indent" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;" >
<!-- <span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
<form class="comment-edit-form" style="display: none;" 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="type" value="$type" />
<input type="hidden" name="source" value="$sourceapp" /> <input type="hidden" name="source" value="$sourceapp" />
<input type="hidden" name="profile_uid" value="$profile_uid" /> <input type="hidden" name="profile_uid" value="$profile_uid" />

194
view/theme/frost-mobile/js/fk.autocomplete.js Normal file
View file

@ -0,0 +1,194 @@
/**
* Friendica people autocomplete
*
* require jQuery, jquery.textareas
*/
function ACPopup(elm,backend_url){
this.idsel=-1;
this.element = elm;
this.searchText="";
this.ready=true;
this.kp_timer = false;
this.url = backend_url;
var w = 530;
var h = 130;
if(typeof elm.editorId == "undefined") {
style = $j(elm).offset();
w = $j(elm).width();
h = $j(elm).height();
}
else {
var container = elm.getContainer();
if(typeof container != "undefined") {
style = $j(container).offset();
w = $j(container).width();
h = $j(container).height();
}
}
style.top=style.top+h;
style.width = w;
style.position = 'absolute';
/* style['max-height'] = '150px';
style.border = '1px solid red';
style.background = '#cccccc';
style.overflow = 'auto';
style['z-index'] = '100000';
*/
style.display = 'none';
this.cont = $j("<div class='acpopup'></div>");
this.cont.css(style);
$j("body").append(this.cont);
}
ACPopup.prototype.close = function(){
$j(this.cont).remove();
this.ready=false;
}
ACPopup.prototype.search = function(text){
var that = this;
this.searchText=text;
if (this.kp_timer) clearTimeout(this.kp_timer);
this.kp_timer = setTimeout( function(){that._search();}, 500);
}
ACPopup.prototype._search = function(){
console.log("_search");
var that = this;
var postdata = {
start:0,
count:100,
search:this.searchText,
type:'c',
}
$j.ajax({
type:'POST',
url: this.url,
data: postdata,
dataType: 'json',
success:function(data){
that.cont.html("");
if (data.tot>0){
that.cont.show();
$j(data.items).each(function(){
html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick)
that.add(html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link);
});
} else {
that.cont.hide();
}
}
});
}
ACPopup.prototype.add = function(label, value){
var that=this;
var elm = $j("<div class='acpopupitem' title='"+value+"'>"+label+"</div>");
elm.click(function(e){
t = $j(this).attr('title').replace(new RegExp(' \- .*'),'');
if(typeof(that.element.container) === "undefined") {
el=$j(that.element);
sel = el.getSelection();
sel.start = sel.start- that.searchText.length;
el.setSelection(sel.start,sel.end).replaceSelectedText(t+' ').collapseSelection(false);
that.close();
}
else {
txt = tinyMCE.activeEditor.getContent();
// alert(that.searchText + ':' + t);
newtxt = txt.replace(that.searchText,t+' ');
tinyMCE.activeEditor.setContent(newtxt);
tinyMCE.activeEditor.focus();
that.close();
}
});
$j(this.cont).append(elm);
}
ACPopup.prototype.onkey = function(event){
if (event.keyCode == '13') {
if(this.idsel>-1) {
this.cont.children()[this.idsel].click();
event.preventDefault();
}
else
this.close();
}
if (event.keyCode == '38') { //cursor up
cmax = this.cont.children().size()-1;
this.idsel--;
if (this.idsel<0) this.idsel=cmax;
event.preventDefault();
}
if (event.keyCode == '40' || event.keyCode == '9') { //cursor down
cmax = this.cont.children().size()-1;
this.idsel++;
if (this.idsel>cmax) this.idsel=0;
event.preventDefault();
}
if (event.keyCode == '38' || event.keyCode == '40' || event.keyCode == '9') {
this.cont.children().removeClass('selected');
$j(this.cont.children()[this.idsel]).addClass('selected');
}
if (event.keyCode == '27') { //ESC
this.close();
}
}
function ContactAutocomplete(element,backend_url){
this.pattern=/@([^ \n]+)$/;
this.popup=null;
var that = this;
$j(element).unbind('keydown');
$j(element).unbind('keyup');
$j(element).keydown(function(event){
if (that.popup!==null) that.popup.onkey(event);
});
$j(element).keyup(function(event){
cpos = $j(this).getSelection();
if (cpos.start==cpos.end){
match = $j(this).val().substring(0,cpos.start).match(that.pattern);
if (match!==null){
if (that.popup===null){
that.popup = new ACPopup(this, backend_url);
}
if (that.popup.ready && match[1]!==that.popup.searchText) that.popup.search(match[1]);
if (!that.popup.ready) that.popup=null;
} else {
if (that.popup!==null) {that.popup.close(); that.popup=null;}
}
}
});
}
/**
* jQuery plugin 'contact_autocomplete'
*/
(function( $ ){
$j.fn.contact_autocomplete = function(backend_url) {
this.each(function(){
new ContactAutocomplete(this, backend_url);
});
};
})( jQuery );

2
view/theme/frost-mobile/js/main.js
View file

@ -297,7 +297,7 @@
// add a new thread // add a new thread
$j('.tread-wrapper',data).each(function() { $j('.toplevel_item',data).each(function() {
var ident = $j(this).attr('id'); var ident = $j(this).attr('id');
if($j('#' + ident).length == 0 && profile_page == 1) { if($j('#' + ident).length == 0 && profile_page == 1) {

2
view/theme/frost-mobile/js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

9
view/theme/frost-mobile/js/theme.js
View file

@ -544,6 +544,15 @@ function showHideComments(id) {
} }
} }
/*function showHideCommentBox(id) {
if( $j('#comment-edit-form-' + id).is(':visible')) {
$j('#comment-edit-form-' + id).hide();
}
else {
$j('#comment-edit-form-' + id).show();
}
}*/
/*function deleteCheckedItems() { /*function deleteCheckedItems() {
var checkedstr = ''; var checkedstr = '';

16
view/theme/frost-mobile/style.css
View file

@ -1422,6 +1422,13 @@ input#dfrn-url {
margin-right: 10px; margin-right: 10px;
} }
.comment-wwedit-wrapper.comment {
margin-left: 40px;
margin-right: 40px;
border-radius: 10px;
}
.comment-edit-photo { .comment-edit-photo {
margin-top: 15px; margin-top: 15px;
margin-left: 10px; margin-left: 10px;
@ -1461,6 +1468,15 @@ input#dfrn-url {
margin-left: 20px; margin-left: 20px;
} }
.comment .comment-edit-text-empty {
width: 120px;
}
.comment .comment-edit-text-full {
margin-left: 10px;
width: 210px;
}
.comment-edit-text-end { .comment-edit-text-end {
clear: both; clear: both;
} }

3
view/theme/frost-mobile/theme.php
View file

@ -4,7 +4,7 @@
* Name: Frost--mobile version * Name: Frost--mobile version
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.5 * Version: Version 0.2.6
* Author: Zach P <windforest@f.shmuz.in> * Author: Zach P <windforest@f.shmuz.in>
* Maintainer: Zach P <windforest@f.shmuz.in> * Maintainer: Zach P <windforest@f.shmuz.in>
*/ */
@ -26,5 +26,6 @@ function frost_mobile_init(&$a) {
$a->sourcename = 'Friendica mobile web'; $a->sourcename = 'Friendica mobile web';
$a->videowidth = 250; $a->videowidth = 250;
$a->videoheight = 200; $a->videoheight = 200;
$a->theme_thread_allow = false;
} }

106
view/theme/frost-mobile/wall_thread.tpl Normal file
View file

@ -0,0 +1,106 @@
{{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>
</div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}}
{{if $item.comment_lastcollapsed}}</div>{{endif}}
<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
<a name="$item.id" ></a>
<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >-->
<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" 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)">-->
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id">
<a href="$item.profile_url" target="redir" 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 class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
$item.item_photo_menu
</ul>
</div>-->
</div>
<!--<div class="wall-item-photo-end"></div>-->
<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
{{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
</div>
</div>
<!--<div class="wall-item-author">-->
<a href="$item.profile_url" target="redir" 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>-->
<br />
<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='body-tag tag'>$tag</span>
{{ endfor }}
<!-- </div>-->
</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$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 }}
<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="wall-item-links-wrapper icon remote-link$item.sparkle"></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 }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></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="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" 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 }}
<!--<div class="wall-item-delete-end"></div>-->
</div>
</div>
<!--<div class="wall-item-wrapper-end"></div>-->
<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
{{ if $item.threaded }}
{{ if $item.comment }}
<!--<div class="wall-item-comment-wrapper $item.indent" >-->
$item.comment
<!--</div>-->
{{ endif }}
{{ endif }}
<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->
<!--</div>-->
{{ for $item.children as $item }}
{{ inc $item.template }}{{ endinc }}
{{ endfor }}
{{ if $item.flatten }}
<!--<div class="wall-item-comment-wrapper" >-->
$item.comment
<!--</div>-->
{{ endif }}
</div>

2
view/theme/frost-mobile/wallwall_item.tpl
View file

@ -68,7 +68,7 @@
{{ endif }} {{ endif }}
<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >--> <!--<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="wall-item-delete-wrapper 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="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
<!--</div>--> <!--</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 class="wall-item-delete-end"></div>-->

109
view/theme/frost-mobile/wallwall_thread.tpl Normal file
View file

@ -0,0 +1,109 @@
{{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>
</div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}}
{{if $item.comment_lastcollapsed}}</div>{{endif}}
<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
<a name="$item.id" ></a>
<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->
<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
</div>
<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
<!--<div class="wall-item-photo-wrapper wwfrom" 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)">-->
<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id">
<a href="$item.profile_url" target="redir" 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 class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
$item.item_photo_menu
</ul>
</div>-->
</div>
<!--<div class="wall-item-photo-end"></div>-->
<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
{{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
</div>
</div>
<!--<div class="wall-item-author">-->
<a href="$item.profile_url" target="redir" 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> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
<!--</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='body-tag tag'>$tag</span>
{{ endfor }}
<!--</div>-->
</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$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 }}
<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="wall-item-links-wrapper icon remote-link$item.sparkle"></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 }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></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="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" 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 }}
<!--<div class="wall-item-delete-end"></div>-->
</div>
</div>
<!--<div class="wall-item-wrapper-end"></div>-->
<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
{{ if $item.threaded }}
{{ if $item.comment }}
<!--<div class="wall-item-comment-wrapper $item.indent" >-->
$item.comment
<!--</div>-->
{{ endif }}
{{ endif }}
<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->
<!--</div>-->
{{ for $item.children as $item }}
{{ inc $item.template }}{{ endinc }}
{{ endfor }}
{{ if $item.flatten }}
<!--<div class="wall-item-comment-wrapper" >-->
$item.comment
<!--</div>-->
{{ endif }}
</div>

7
view/theme/frost/TODO
View file

@ -6,4 +6,9 @@ Check TinyMCE optimization
"Profiles" page is wonky "Profiles" page is wonky
Settings, admin, photos upload don't look beautiful Settings, admin, photos upload don't look beautiful
Threading:
- indentation
- top-level "show more" looks bad
- need some visual way to tie sub-comments to their parent comments
- need a way to change styles if the system allows threading or not
- just don't allow?

1
view/theme/frost/admin_site.tpl
View file

@ -35,6 +35,7 @@
{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

6
view/theme/frost/comment_item.tpl
View file

@ -10,8 +10,10 @@
}); });
</script>--> </script>-->
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> <div class="comment-wwedit-wrapper $indent" 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;"> <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
<!-- <span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
<form class="comment-edit-form" style="display: none;" 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="type" value="$type" />
<input type="hidden" name="profile_uid" value="$profile_uid" /> <input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="parent" value="$parent" /> <input type="hidden" name="parent" value="$parent" />
@ -23,7 +25,7 @@
<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
<!-- </div>--> <!-- </div>-->
<!--<div class="comment-edit-photo-end"></div>--> <!--<div class="comment-edit-photo-end"></div>-->
<ul class="comment-edit-bb-$id"> <ul class="comment-edit-bb" id="comment-edit-bb-$id">
<li><a class="editicon boldbb shadow" <li><a class="editicon boldbb shadow"
style="cursor: pointer;" title="$edbold" style="cursor: pointer;" title="$edbold"
onclick="insertFormatting('$comment','b', $id);"></a></li> onclick="insertFormatting('$comment','b', $id);"></a></li>

2
view/theme/frost/js/main.js
View file

@ -290,7 +290,7 @@
// add a new thread // add a new thread
$j('.tread-wrapper',data).each(function() { $j('.toplevel_item',data).each(function() {
var ident = $j(this).attr('id'); var ident = $j(this).attr('id');
if($j('#' + ident).length == 0 && profile_page == 1) { if($j('#' + ident).length == 0 && profile_page == 1) {

2
view/theme/frost/js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

13
view/theme/frost/js/theme.js
View file

@ -522,10 +522,10 @@ function insertFormatting(comment,BBcode,id) {
} }
function cmtBbOpen(id) { function cmtBbOpen(id) {
$j(".comment-edit-bb-" + id).show(); $j("#comment-edit-bb-" + id).show();
} }
function cmtBbClose(id) { function cmtBbClose(id) {
$j(".comment-edit-bb-" + id).hide(); $j("#comment-edit-bb-" + id).hide();
} }
function confirmDelete() { return confirm(window.delItem); } function confirmDelete() { return confirm(window.delItem); }
@ -594,6 +594,15 @@ function showHideComments(id) {
} }
} }
/*function showHideCommentBox(id) {
if( $j('#comment-edit-form-' + id).is(':visible')) {
$j('#comment-edit-form-' + id).hide();
}
else {
$j('#comment-edit-form-' + id).show();
}
}*/
function enableOnUser(){ function enableOnUser(){

2
view/theme/frost/js/theme.min.js vendored
View file

File diff suppressed because one or more lines are too long

32
view/theme/frost/style.css
View file

@ -1363,6 +1363,12 @@ input#dfrn-url {
margin-left: 50px; margin-left: 50px;
} }
.comment-wwedit-wrapper.comment {
width: 300px;
margin-left: 150px;
border-radius: 10px;
}
.comment-edit-photo { .comment-edit-photo {
margin-top: 10px; margin-top: 10px;
margin-left: 10px; margin-left: 10px;
@ -1373,6 +1379,9 @@ input#dfrn-url {
.comment-edit-photo img { .comment-edit-photo img {
width: 25px; width: 25px;
} }
.comment .comment-edit-photo {
width: 50px;
}
.comment-edit-text-empty, .comment-edit-text-full { .comment-edit-text-empty, .comment-edit-text-full {
float: left; float: left;
margin-top: 10px; margin-top: 10px;
@ -1398,6 +1407,16 @@ input#dfrn-url {
overflow: auto; overflow: auto;
} }
.comment .comment-edit-text-empty {
height: 1.5em;
width: 150px;
}
.comment .comment-edit-text-full {
margin-left: 10px;
width: 275px;
}
.comment-edit-text-end { .comment-edit-text-end {
clear: both; clear: both;
} }
@ -1405,6 +1424,9 @@ input#dfrn-url {
.comment-edit-submit { .comment-edit-submit {
margin: 10px 0px 10px 110px; margin: 10px 0px 10px 110px;
} }
.comment .comment-edit-submit {
margin-left: 30px;
}
#profile-jot-plugin-wrapper, #profile-jot-plugin-wrapper,
#profile-jot-submit-wrapper { #profile-jot-submit-wrapper {
@ -3514,13 +3536,19 @@ aside input[type='text'] {
} }
.icon.dim { opacity: 0.3;filter:alpha(opacity=30); } .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
[class^="comment-edit-bb"] { /*[class^="comment-edit-bb"] {*/
.comment-edit-bb {
list-style: none; list-style: none;
display: none; display: none;
margin: 0px 0 -5px 60px; margin: 0px 0 -5px 60px;
width: 75%; width: 75%;
} }
[class^="comment-edit-bb"] > li { .comment .comment-edit-bb {
width: 300px;
margin: 0px;
}
/*[class^="comment-edit-bb"] > li {*/
.comment-edit-bb > li {
display: inline-block; display: inline-block;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
visibility: none; visibility: none;

2
view/theme/frost/theme.php
View file

@ -4,7 +4,7 @@
* Name: Frost * Name: Frost
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.3 * Version: Version 0.2.4
* Author: Zach P <windforest@f.shmuz.in> * Author: Zach P <windforest@f.shmuz.in>
* Maintainer: Zach P <windforest@f.shmuz.in> * Maintainer: Zach P <windforest@f.shmuz.in>
*/ */

103
view/theme/frost/wall_thread.tpl Normal file
View file

@ -0,0 +1,103 @@
{{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>
</div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}}
{{if $item.comment_lastcollapsed}}</div>{{endif}}
<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
<a name="$item.id" ></a>
<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >-->
<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" 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" target="redir" 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 class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
$item.item_photo_menu
</ul>
<!--</div>-->
</div>
<!--<div class="wall-item-photo-end"></div>-->
<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
{{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
</div>
</div>
<!--<div class="wall-item-author">-->
<a href="$item.profile_url" target="redir" 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 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='body-tag tag'>$tag</span>
{{ endfor }}
<!-- </div>-->
</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$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 }}
<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="wall-item-links-wrapper icon remote-link$item.sparkle"></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 }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></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="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" 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 }}
<!--<div class="wall-item-delete-end"></div>-->
</div>
</div>
<!--<div class="wall-item-wrapper-end"></div>-->
<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
{{ if $item.threaded }}
{{ if $item.comment }}
<!--<div class="wall-item-comment-wrapper $item.indent" >-->
$item.comment
<!--</div>-->
{{ endif }}
{{ endif }}
<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->
<!--</div>-->
{{ for $item.children as $item }}
{{ inc $item.template }}{{ endinc }}
{{ endfor }}
{{ if $item.flatten }}
<!--<div class="wall-item-comment-wrapper" >-->
$item.comment
<!--</div>-->
{{ endif }}
</div>

4
view/theme/frost/wallwall_item.tpl
View file

@ -22,7 +22,7 @@
</div> </div>
<!--<div class="wall-item-photo-end"></div>--> <!--<div class="wall-item-photo-end"></div>-->
<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" > <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
{{ 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> {{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
{{ else }}<div class="wall-item-lock"></div>{{ endif }} {{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div> <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
</div> </div>
@ -67,7 +67,7 @@
{{ endif }} {{ endif }}
<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >--> <!--<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="wall-item-delete-wrapper 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="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
<!--</div>--> <!--</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 class="wall-item-delete-end"></div>-->

108
view/theme/frost/wallwall_thread.tpl Normal file
View file

@ -0,0 +1,108 @@
{{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>
</div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}}
{{if $item.comment_lastcollapsed}}</div>{{endif}}
<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
<a name="$item.id" ></a>
<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->
<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
</div>
<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
<div class="wall-item-photo-wrapper wwfrom" 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" target="redir" 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 class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
$item.item_photo_menu
</ul>
<!-- </div>-->
</div>
<!--<div class="wall-item-photo-end"></div>-->
<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
{{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
{{ else }}<div class="wall-item-lock"></div>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
</div>
</div>
<!--<div class="wall-item-author">-->
<a href="$item.profile_url" target="redir" 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> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
<div class="wall-item-ago" id="wall-item-ago-$item.id">$item.ago</div>
<!--</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='body-tag tag'>$tag</span>
{{ endfor }}
<!--</div>-->
</div>
</div>
<div class="wall-item-tools" id="wall-item-tools-$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 }}
<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="wall-item-links-wrapper icon remote-link$item.sparkle"></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 }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></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="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" 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 }}
<!--<div class="wall-item-delete-end"></div>-->
</div>
</div>
<!--<div class="wall-item-wrapper-end"></div>-->
<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
{{ if $item.threaded }}
{{ if $item.comment }}
<!--<div class="wall-item-comment-wrapper $item.indent" >-->
$item.comment
<!--</div>-->
{{ endif }}
{{ endif }}
<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->
<!--</div>-->
{{ for $item.children as $item }}
{{ inc $item.template }}{{ endinc }}
{{ endfor }}
{{ if $item.flatten }}
<!--<div class="wall-item-comment-wrapper" >-->
$item.comment
<!--</div>-->
{{ endif }}
</div>

1
view/wall_thread.tpl
View file

@ -100,4 +100,3 @@
{{ endif }} {{ endif }}
</div> </div>
{{if $item.comment_lastcollapsed}}</div>{{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}}