diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | doc/api_posting.bb | 5 | ||||
| -rw-r--r-- | images/hubzilla-banner.png | bin | 0 -> 13011 bytes | |||
| -rw-r--r-- | util/hmessages.po | 667 | ||||
| -rw-r--r-- | util/messages.po | 4 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/css/conversation.css | 14 | ||||
| -rw-r--r-- | view/css/mod_directory.css | 3 | ||||
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 35 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 46 | ||||
| -rwxr-xr-x | view/tpl/conv_list.tpl | 46 |
13 files changed, 417 insertions, 414 deletions
@@ -1,3 +1,4 @@ + Hubzilla - Community Server =========================== @@ -5,8 +6,6 @@ Hubzilla - Community Server Help us redefine the web - using integrated and united community websites. -------------------------------------------------------------------------- - - **What are Hubs?** Hubs are independent general-purpose websites that not only connect with their associated members and viewers, but also connect together to exchange personal communications and other information with each other. diff --git a/doc/api_posting.bb b/doc/api_posting.bb index fa9558268..c708ad143 100644 --- a/doc/api_posting.bb +++ b/doc/api_posting.bb @@ -4,19 +4,20 @@ The API allows you to post to the red# by HTTP POST request. Below you see an ex [code]curl -ssl -u [color=blue]$E-Mail[/color]:[color=blue]$Password[/color] -d "[color=blue]$Parameters[/color]" [url][observer=1][observer.baseurl][/observer][observer=0]example.com[/observer]/api/statuses/update [/url][/code] -[table][tr][td]$E-Mail:[/td][td]The E-Mail Adress you use to login[/td][/tr] +[table][tr][td]$E-Mail:[/td][td]The E-Mail Address you use to login, or the channel nickname (without the hostname)[/td][/tr] [tr][td]$Password:[/td][td]The Password you use to login[/td][/tr] [tr][td]$Parameters:[/td][td]That's the interesting part, here you insert the content you want to send using the following parameters:[/td][/tr][/table] [ul] [*]title: the title of the posting -[*]channel: the channel you want to post to +[*]channel: the channel you want to post to (do not use this parameter with HTTP Basic auth) [*]category: a comma-seperated list of categories for the posting [*]status: the content of the posting, formatted with BBCode OR [*]htmlstatus:the content of the posting, formatted in HTML. [/ul] +To post to a specific channel, replace the email address with the channel nickname. If you supply the channel parameter, it has to match the "email", but is superfluous anyway. Instead of calling [observer=1][observer.baseurl][/observer][observer=0]example.com[/observer]/api/statuses/update which returns a json (you could also add .json on the end to clarify) output, you can use [observer.baseurl]/api/statuses/update.xml to get an xml formatted return. diff --git a/images/hubzilla-banner.png b/images/hubzilla-banner.png Binary files differnew file mode 100644 index 000000000..055a2a19e --- /dev/null +++ b/images/hubzilla-banner.png diff --git a/util/hmessages.po b/util/hmessages.po index 8a877b695..a6768b8a5 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-10-01.1172\n" +"Project-Id-Version: 2015-10-06.1177\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-02 00:03-0700\n" +"POT-Creation-Date: 2015-10-09 00:03-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" @@ -319,14 +319,13 @@ msgstr "" #: ../../mod/new_channel.php:99 ../../mod/notifications.php:66 #: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/events.php:256 #: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351 -#: ../../mod/message.php:16 ../../mod/webpages.php:69 +#: ../../mod/mail.php:114 ../../mod/message.php:16 ../../mod/webpages.php:69 #: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76 #: ../../mod/service_limits.php:7 ../../mod/sources.php:66 -#: ../../mod/regmod.php:17 ../../mod/mail.php:114 ../../mod/thing.php:271 -#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/invite.php:13 -#: ../../mod/invite.php:104 ../../mod/viewsrc.php:14 -#: ../../mod/settings.php:565 ../../mod/manage.php:6 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/connections.php:29 +#: ../../mod/regmod.php:17 ../../mod/thing.php:271 ../../mod/thing.php:291 +#: ../../mod/thing.php:328 ../../mod/invite.php:13 ../../mod/invite.php:104 +#: ../../mod/viewsrc.php:14 ../../mod/settings.php:565 ../../mod/manage.php:6 +#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/connections.php:29 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87 #: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86 #: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125 @@ -773,16 +772,16 @@ msgstr "" #: ../../mod/admin.php:1266 ../../mod/admin.php:1351 ../../mod/appman.php:99 #: ../../mod/pdledit.php:58 ../../mod/photos.php:598 ../../mod/photos.php:969 #: ../../mod/photos.php:1009 ../../mod/photos.php:1127 -#: ../../mod/events.php:534 ../../mod/events.php:710 ../../mod/sources.php:104 -#: ../../mod/sources.php:138 ../../mod/mail.php:380 ../../mod/import.php:511 -#: ../../mod/thing.php:313 ../../mod/thing.php:359 ../../mod/invite.php:142 -#: ../../mod/settings.php:583 ../../mod/settings.php:695 -#: ../../mod/settings.php:723 ../../mod/settings.php:746 -#: ../../mod/settings.php:831 ../../mod/settings.php:1020 -#: ../../mod/xchan.php:11 ../../mod/group.php:81 ../../mod/connect.php:93 -#: ../../mod/locs.php:108 ../../mod/setup.php:331 ../../mod/setup.php:371 -#: ../../mod/profiles.php:667 ../../mod/import_items.php:122 -#: ../../view/theme/redbasic/php/config.php:99 +#: ../../mod/events.php:534 ../../mod/events.php:710 ../../mod/mail.php:359 +#: ../../mod/sources.php:104 ../../mod/sources.php:138 +#: ../../mod/import.php:511 ../../mod/thing.php:313 ../../mod/thing.php:359 +#: ../../mod/invite.php:142 ../../mod/settings.php:583 +#: ../../mod/settings.php:695 ../../mod/settings.php:723 +#: ../../mod/settings.php:746 ../../mod/settings.php:831 +#: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81 +#: ../../mod/connect.php:93 ../../mod/locs.php:108 ../../mod/setup.php:331 +#: ../../mod/setup.php:371 ../../mod/profiles.php:667 +#: ../../mod/import_items.php:122 ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" @@ -1307,9 +1306,8 @@ msgstr "" #: ../../include/conversation.php:739 ../../include/conversation.php:1212 #: ../../include/ItemObject.php:366 ../../mod/editpost.php:130 -#: ../../mod/editblock.php:150 ../../mod/photos.php:990 ../../mod/mail.php:249 -#: ../../mod/mail.php:381 ../../mod/editlayout.php:148 -#: ../../mod/editwebpage.php:190 +#: ../../mod/editblock.php:150 ../../mod/photos.php:990 +#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190 msgid "Please wait" msgstr "" @@ -1412,7 +1410,7 @@ msgid "Visible to <strong>everybody</strong>" msgstr "" #: ../../include/conversation.php:1144 ../../mod/mail.php:182 -#: ../../mod/mail.php:311 +#: ../../mod/mail.php:296 msgid "Please enter a link URL:" msgstr "" @@ -1437,7 +1435,7 @@ msgid "Where are you right now?" msgstr "" #: ../../include/conversation.php:1150 ../../mod/editpost.php:54 -#: ../../mod/mail.php:183 ../../mod/mail.php:312 +#: ../../mod/mail.php:183 ../../mod/mail.php:297 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" @@ -1494,8 +1492,8 @@ msgid "Code" msgstr "" #: ../../include/conversation.php:1189 ../../mod/editpost.php:119 -#: ../../mod/editblock.php:142 ../../mod/mail.php:246 ../../mod/mail.php:377 -#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:182 +#: ../../mod/editblock.php:142 ../../mod/editlayout.php:140 +#: ../../mod/editwebpage.php:182 msgid "Upload photo" msgstr "" @@ -1504,7 +1502,7 @@ msgid "upload photo" msgstr "" #: ../../include/conversation.php:1191 ../../mod/editpost.php:120 -#: ../../mod/editblock.php:143 ../../mod/mail.php:247 ../../mod/mail.php:378 +#: ../../mod/editblock.php:143 ../../mod/mail.php:228 ../../mod/mail.php:357 #: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183 msgid "Attach file" msgstr "" @@ -1514,7 +1512,7 @@ msgid "attach file" msgstr "" #: ../../include/conversation.php:1193 ../../mod/editpost.php:121 -#: ../../mod/editblock.php:144 ../../mod/mail.php:248 ../../mod/mail.php:379 +#: ../../mod/editblock.php:144 ../../mod/mail.php:229 ../../mod/mail.php:358 #: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184 msgid "Insert web link" msgstr "" @@ -1597,13 +1595,13 @@ msgid "Example: bob@example.com, mary@example.com" msgstr "" #: ../../include/conversation.php:1237 ../../mod/editpost.php:156 -#: ../../mod/editblock.php:176 ../../mod/mail.php:253 ../../mod/mail.php:384 +#: ../../mod/editblock.php:176 ../../mod/mail.php:233 ../../mod/mail.php:362 #: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217 msgid "Set expiration date" msgstr "" #: ../../include/conversation.php:1239 ../../include/ItemObject.php:686 -#: ../../mod/editpost.php:158 ../../mod/mail.php:255 ../../mod/mail.php:386 +#: ../../mod/editpost.php:158 ../../mod/mail.php:235 ../../mod/mail.php:364 msgid "Encrypt text" msgstr "" @@ -1817,205 +1815,27 @@ msgstr "" msgid "Upload New Photos" msgstr "" -#: ../../include/enotify.php:57 ../../include/network.php:1613 +#: ../../include/network.php:635 +msgid "view full size" +msgstr "" + +#: ../../include/network.php:1613 ../../include/enotify.php:57 msgid "$Projectname Notification" msgstr "" -#: ../../include/enotify.php:58 ../../include/network.php:1614 +#: ../../include/network.php:1614 ../../include/enotify.php:58 msgid "$projectname" msgstr "" -#: ../../include/enotify.php:60 ../../include/network.php:1616 +#: ../../include/network.php:1616 ../../include/enotify.php:60 msgid "Thank You," msgstr "" -#: ../../include/enotify.php:62 ../../include/network.php:1618 +#: ../../include/network.php:1618 ../../include/enotify.php:62 #, php-format msgid "%s Administrator" msgstr "" -#: ../../include/enotify.php:96 -#, php-format -msgid "%s <!item_type!>" -msgstr "" - -#: ../../include/enotify.php:100 -#, php-format -msgid "[Red:Notify] New mail received at %s" -msgstr "" - -#: ../../include/enotify.php:102 -#, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." -msgstr "" - -#: ../../include/enotify.php:103 -#, php-format -msgid "%1$s sent you %2$s." -msgstr "" - -#: ../../include/enotify.php:103 -msgid "a private message" -msgstr "" - -#: ../../include/enotify.php:104 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." -msgstr "" - -#: ../../include/enotify.php:158 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" -msgstr "" - -#: ../../include/enotify.php:166 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" -msgstr "" - -#: ../../include/enotify.php:175 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" -msgstr "" - -#: ../../include/enotify.php:186 -#, php-format -msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" -msgstr "" - -#: ../../include/enotify.php:187 -#, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." -msgstr "" - -#: ../../include/enotify.php:190 ../../include/enotify.php:205 -#: ../../include/enotify.php:231 ../../include/enotify.php:249 -#: ../../include/enotify.php:263 -#, php-format -msgid "Please visit %s to view and/or reply to the conversation." -msgstr "" - -#: ../../include/enotify.php:196 -#, php-format -msgid "[Red:Notify] %s posted to your profile wall" -msgstr "" - -#: ../../include/enotify.php:198 -#, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" -msgstr "" - -#: ../../include/enotify.php:200 -#, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" -msgstr "" - -#: ../../include/enotify.php:224 -#, php-format -msgid "[Red:Notify] %s tagged you" -msgstr "" - -#: ../../include/enotify.php:225 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" -msgstr "" - -#: ../../include/enotify.php:226 -#, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." -msgstr "" - -#: ../../include/enotify.php:238 -#, php-format -msgid "[Red:Notify] %1$s poked you" -msgstr "" - -#: ../../include/enotify.php:239 -#, php-format -msgid "%1$s, %2$s poked you at %3$s" -msgstr "" - -#: ../../include/enotify.php:240 -#, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." -msgstr "" - -#: ../../include/enotify.php:256 -#, php-format -msgid "[Red:Notify] %s tagged your post" -msgstr "" - -#: ../../include/enotify.php:257 -#, php-format -msgid "%1$s, %2$s tagged your post at %3$s" -msgstr "" - -#: ../../include/enotify.php:258 -#, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" -msgstr "" - -#: ../../include/enotify.php:270 -msgid "[Red:Notify] Introduction received" -msgstr "" - -#: ../../include/enotify.php:271 -#, php-format -msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" -msgstr "" - -#: ../../include/enotify.php:272 -#, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." -msgstr "" - -#: ../../include/enotify.php:276 ../../include/enotify.php:295 -#, php-format -msgid "You may visit their profile at %s" -msgstr "" - -#: ../../include/enotify.php:278 -#, php-format -msgid "Please visit %s to approve or reject the connection request." -msgstr "" - -#: ../../include/enotify.php:285 -msgid "[Red:Notify] Friend suggestion received" -msgstr "" - -#: ../../include/enotify.php:286 -#, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" -msgstr "" - -#: ../../include/enotify.php:287 -#, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." -msgstr "" - -#: ../../include/enotify.php:293 -msgid "Name:" -msgstr "" - -#: ../../include/enotify.php:294 -msgid "Photo:" -msgstr "" - -#: ../../include/enotify.php:297 -#, php-format -msgid "Please visit %s to approve or reject the suggestion." -msgstr "" - -#: ../../include/enotify.php:511 -msgid "[Red:Notify]" -msgstr "" - -#: ../../include/network.php:635 -msgid "view full size" -msgstr "" - #: ../../include/network.php:1660 ../../include/account.php:316 #: ../../include/account.php:343 ../../include/account.php:403 msgid "Administrator" @@ -2913,6 +2733,184 @@ msgstr "" msgid "Connection not found." msgstr "" +#: ../../include/enotify.php:96 +#, php-format +msgid "%s <!item_type!>" +msgstr "" + +#: ../../include/enotify.php:100 +#, php-format +msgid "[Hubzilla:Notify] New mail received at %s" +msgstr "" + +#: ../../include/enotify.php:102 +#, php-format +msgid "%1$s, %2$s sent you a new private message at %3$s." +msgstr "" + +#: ../../include/enotify.php:103 +#, php-format +msgid "%1$s sent you %2$s." +msgstr "" + +#: ../../include/enotify.php:103 +msgid "a private message" +msgstr "" + +#: ../../include/enotify.php:104 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." +msgstr "" + +#: ../../include/enotify.php:158 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" +msgstr "" + +#: ../../include/enotify.php:166 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" +msgstr "" + +#: ../../include/enotify.php:175 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" +msgstr "" + +#: ../../include/enotify.php:186 +#, php-format +msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s" +msgstr "" + +#: ../../include/enotify.php:187 +#, php-format +msgid "%1$s, %2$s commented on an item/conversation you have been following." +msgstr "" + +#: ../../include/enotify.php:190 ../../include/enotify.php:205 +#: ../../include/enotify.php:231 ../../include/enotify.php:249 +#: ../../include/enotify.php:263 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." +msgstr "" + +#: ../../include/enotify.php:196 +#, php-format +msgid "[Hubzilla:Notify] %s posted to your profile wall" +msgstr "" + +#: ../../include/enotify.php:198 +#, php-format +msgid "%1$s, %2$s posted to your profile wall at %3$s" +msgstr "" + +#: ../../include/enotify.php:200 +#, php-format +msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" +msgstr "" + +#: ../../include/enotify.php:224 +#, php-format +msgid "[Hubzilla:Notify] %s tagged you" +msgstr "" + +#: ../../include/enotify.php:225 +#, php-format +msgid "%1$s, %2$s tagged you at %3$s" +msgstr "" + +#: ../../include/enotify.php:226 +#, php-format +msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +msgstr "" + +#: ../../include/enotify.php:238 +#, php-format +msgid "[Hubzilla:Notify] %1$s poked you" +msgstr "" + +#: ../../include/enotify.php:239 +#, php-format +msgid "%1$s, %2$s poked you at %3$s" +msgstr "" + +#: ../../include/enotify.php:240 +#, php-format +msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +msgstr "" + +#: ../../include/enotify.php:256 +#, php-format +msgid "[Hubzilla:Notify] %s tagged your post" +msgstr "" + +#: ../../include/enotify.php:257 +#, php-format +msgid "%1$s, %2$s tagged your post at %3$s" +msgstr "" + +#: ../../include/enotify.php:258 +#, php-format +msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +msgstr "" + +#: ../../include/enotify.php:270 +msgid "[Hubzilla:Notify] Introduction received" +msgstr "" + +#: ../../include/enotify.php:271 +#, php-format +msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" +msgstr "" + +#: ../../include/enotify.php:272 +#, php-format +msgid "" +"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." +msgstr "" + +#: ../../include/enotify.php:276 ../../include/enotify.php:295 +#, php-format +msgid "You may visit their profile at %s" +msgstr "" + +#: ../../include/enotify.php:278 +#, php-format +msgid "Please visit %s to approve or reject the connection request." +msgstr "" + +#: ../../include/enotify.php:285 +msgid "[Hubzilla:Notify] Friend suggestion received" +msgstr "" + +#: ../../include/enotify.php:286 +#, php-format +msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +msgstr "" + +#: ../../include/enotify.php:287 +#, php-format +msgid "" +"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." +msgstr "" + +#: ../../include/enotify.php:293 +msgid "Name:" +msgstr "" + +#: ../../include/enotify.php:294 +msgid "Photo:" +msgstr "" + +#: ../../include/enotify.php:297 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." +msgstr "" + +#: ../../include/enotify.php:511 +msgid "[Hubzilla:Notify]" +msgstr "" + #: ../../include/bb2diaspora.php:373 msgid "Attachments:" msgstr "" @@ -3770,153 +3768,149 @@ msgid "Private Mail Menu" msgstr "" #: ../../include/widgets.php:569 -msgid "Check Mail" -msgstr "" - -#: ../../include/widgets.php:575 msgid "Combined View" msgstr "" -#: ../../include/widgets.php:580 ../../include/nav.php:191 +#: ../../include/widgets.php:574 ../../include/nav.php:191 msgid "Inbox" msgstr "" -#: ../../include/widgets.php:585 ../../include/nav.php:192 +#: ../../include/widgets.php:579 ../../include/nav.php:192 msgid "Outbox" msgstr "" -#: ../../include/widgets.php:590 ../../include/nav.php:193 +#: ../../include/widgets.php:584 ../../include/nav.php:193 msgid "New Message" msgstr "" -#: ../../include/widgets.php:609 ../../include/widgets.php:621 +#: ../../include/widgets.php:603 ../../include/widgets.php:615 msgid "Conversations" msgstr "" -#: ../../include/widgets.php:613 +#: ../../include/widgets.php:607 msgid "Received Messages" msgstr "" -#: ../../include/widgets.php:617 +#: ../../include/widgets.php:611 msgid "Sent Messages" msgstr "" -#: ../../include/widgets.php:631 +#: ../../include/widgets.php:625 msgid "No messages." msgstr "" -#: ../../include/widgets.php:649 +#: ../../include/widgets.php:643 msgid "Delete conversation" msgstr "" -#: ../../include/widgets.php:651 +#: ../../include/widgets.php:645 msgid "D, d M Y - g:i A" msgstr "" -#: ../../include/widgets.php:740 +#: ../../include/widgets.php:734 msgid "Chat Rooms" msgstr "" -#: ../../include/widgets.php:760 +#: ../../include/widgets.php:754 msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/widgets.php:780 +#: ../../include/widgets.php:774 msgid "Suggested Chatrooms" msgstr "" -#: ../../include/widgets.php:907 ../../include/widgets.php:965 +#: ../../include/widgets.php:901 ../../include/widgets.php:959 msgid "photo/image" msgstr "" -#: ../../include/widgets.php:1060 ../../include/widgets.php:1062 +#: ../../include/widgets.php:1054 ../../include/widgets.php:1056 msgid "Rate Me" msgstr "" -#: ../../include/widgets.php:1066 +#: ../../include/widgets.php:1060 msgid "View Ratings" msgstr "" -#: ../../include/widgets.php:1077 +#: ../../include/widgets.php:1071 msgid "Public Hubs" msgstr "" -#: ../../include/widgets.php:1125 +#: ../../include/widgets.php:1119 msgid "Forums" msgstr "" -#: ../../include/widgets.php:1152 +#: ../../include/widgets.php:1146 msgid "Tasks" msgstr "" -#: ../../include/widgets.php:1161 +#: ../../include/widgets.php:1155 msgid "Documentation" msgstr "" -#: ../../include/widgets.php:1163 +#: ../../include/widgets.php:1157 msgid "Project/Site Information" msgstr "" -#: ../../include/widgets.php:1164 +#: ../../include/widgets.php:1158 msgid "For Members" msgstr "" -#: ../../include/widgets.php:1165 +#: ../../include/widgets.php:1159 msgid "For Administrators" msgstr "" -#: ../../include/widgets.php:1166 +#: ../../include/widgets.php:1160 msgid "For Developers" msgstr "" -#: ../../include/widgets.php:1191 ../../mod/admin.php:410 +#: ../../include/widgets.php:1185 ../../mod/admin.php:410 msgid "Site" msgstr "" -#: ../../include/widgets.php:1192 +#: ../../include/widgets.php:1186 msgid "Accounts" msgstr "" -#: ../../include/widgets.php:1193 ../../mod/admin.php:939 +#: ../../include/widgets.php:1187 ../../mod/admin.php:939 msgid "Channels" msgstr "" -#: ../../include/widgets.php:1194 ../../mod/admin.php:1031 +#: ../../include/widgets.php:1188 ../../mod/admin.php:1031 #: ../../mod/admin.php:1071 msgid "Plugins" msgstr "" -#: ../../include/widgets.php:1195 ../../mod/admin.php:1231 +#: ../../include/widgets.php:1189 ../../mod/admin.php:1231 #: ../../mod/admin.php:1265 msgid "Themes" msgstr "" -#: ../../include/widgets.php:1196 +#: ../../include/widgets.php:1190 msgid "Inspect queue" msgstr "" -#: ../../include/widgets.php:1197 +#: ../../include/widgets.php:1191 msgid "Profile Config" msgstr "" -#: ../../include/widgets.php:1198 +#: ../../include/widgets.php:1192 msgid "DB updates" msgstr "" -#: ../../include/widgets.php:1216 ../../include/widgets.php:1222 +#: ../../include/widgets.php:1210 ../../include/widgets.php:1216 #: ../../mod/admin.php:1350 msgid "Logs" msgstr "" -#: ../../include/widgets.php:1220 ../../include/nav.php:210 +#: ../../include/widgets.php:1214 ../../include/nav.php:210 msgid "Admin" msgstr "" -#: ../../include/widgets.php:1221 +#: ../../include/widgets.php:1215 msgid "Plugin Features" msgstr "" -#: ../../include/widgets.php:1223 +#: ../../include/widgets.php:1217 msgid "User registrations waiting for confirmation" msgstr "" @@ -6836,6 +6830,93 @@ msgstr "" msgid "Description: " msgstr "" +#: ../../mod/mail.php:33 +msgid "Unable to lookup recipient." +msgstr "" + +#: ../../mod/mail.php:41 +msgid "Unable to communicate with requested channel." +msgstr "" + +#: ../../mod/mail.php:48 +msgid "Cannot verify requested channel." +msgstr "" + +#: ../../mod/mail.php:74 +msgid "Selected channel has private message restrictions. Send failed." +msgstr "" + +#: ../../mod/mail.php:128 +msgid "Messages" +msgstr "" + +#: ../../mod/mail.php:155 +msgid "Message recalled." +msgstr "" + +#: ../../mod/mail.php:168 +msgid "Conversation removed." +msgstr "" + +#: ../../mod/mail.php:211 +msgid "Requested channel is not in this network" +msgstr "" + +#: ../../mod/mail.php:219 +msgid "Send Private Message" +msgstr "" + +#: ../../mod/mail.php:220 ../../mod/mail.php:349 +msgid "To:" +msgstr "" + +#: ../../mod/mail.php:223 ../../mod/mail.php:351 +msgid "Subject:" +msgstr "" + +#: ../../mod/mail.php:226 ../../mod/invite.php:131 +msgid "Your message:" +msgstr "" + +#: ../../mod/mail.php:230 +msgid "Send" +msgstr "" + +#: ../../mod/mail.php:321 +msgid "Delete message" +msgstr "" + +#: ../../mod/mail.php:322 +msgid "Delivery report" +msgstr "" + +#: ../../mod/mail.php:323 +msgid "Recall message" +msgstr "" + +#: ../../mod/mail.php:325 +msgid "Message has been recalled." +msgstr "" + +#: ../../mod/mail.php:342 +msgid "Delete Conversation" +msgstr "" + +#: ../../mod/mail.php:344 +msgid "" +"No secure communications available. You <strong>may</strong> be able to " +"respond from the sender's profile page." +msgstr "" + +#: ../../mod/mail.php:348 +msgid "Send Reply" +msgstr "" + +#: ../../mod/mail.php:353 +#, php-format +msgid "Your message for %s (%s):" +msgstr "" + #: ../../mod/webpages.php:191 msgid "Page Title" msgstr "" @@ -7070,84 +7151,6 @@ msgstr "" msgid "Authenticate" msgstr "" -#: ../../mod/mail.php:33 -msgid "Unable to lookup recipient." -msgstr "" - -#: ../../mod/mail.php:41 -msgid "Unable to communicate with requested channel." -msgstr "" - -#: ../../mod/mail.php:48 -msgid "Cannot verify requested channel." -msgstr "" - -#: ../../mod/mail.php:74 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "" - -#: ../../mod/mail.php:128 -msgid "Messages" -msgstr "" - -#: ../../mod/mail.php:155 -msgid "Message recalled." -msgstr "" - -#: ../../mod/mail.php:168 -msgid "Conversation removed." -msgstr "" - -#: ../../mod/mail.php:233 -msgid "Send Private Message" -msgstr "" - -#: ../../mod/mail.php:234 ../../mod/mail.php:368 -msgid "To:" -msgstr "" - -#: ../../mod/mail.php:239 ../../mod/mail.php:370 -msgid "Subject:" -msgstr "" - -#: ../../mod/mail.php:243 ../../mod/mail.php:373 ../../mod/invite.php:131 -msgid "Your message:" -msgstr "" - -#: ../../mod/mail.php:250 -msgid "Send" -msgstr "" - -#: ../../mod/mail.php:336 -msgid "Delete message" -msgstr "" - -#: ../../mod/mail.php:337 -msgid "Delivery report" -msgstr "" - -#: ../../mod/mail.php:338 -msgid "Recall message" -msgstr "" - -#: ../../mod/mail.php:340 -msgid "Message has been recalled." -msgstr "" - -#: ../../mod/mail.php:361 -msgid "Delete Conversation" -msgstr "" - -#: ../../mod/mail.php:363 -msgid "" -"No secure communications available. You <strong>may</strong> be able to " -"respond from the sender's profile page." -msgstr "" - -#: ../../mod/mail.php:367 -msgid "Send Reply" -msgstr "" - #: ../../mod/siteinfo.php:111 #, php-format msgid "Version %s" diff --git a/util/messages.po b/util/messages.po index 07c6e08fa..947acab5b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-10-02.1173\n" +"Project-Id-Version: 2015-10-09.1180\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-02 00:04-0700\n" +"POT-Creation-Date: 2015-10-09 00:04-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" diff --git a/version.inc b/version.inc index caa48ad45..8393f73a4 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-10-06.1177 +2015-10-11.1182 diff --git a/view/css/conversation.css b/view/css/conversation.css index e409cf4cf..9b659ea9f 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -83,15 +83,6 @@ code { margin-right: 10px; } -.wall-item-photo-wrapper { - margin-top: 0px; - margin-bottom: 20px; -} - -.comment .wall-item-photo-wrapper { - margin-bottom: 15px; -} - .wall-item-wrapper { margin-left:10px; } @@ -171,11 +162,6 @@ a.wall-item-name-link { margin-top: 10px; } -.wall-item-tools { - width: 100%; - margin-top: 10px; -} - .item-tool { cursor: pointer; } diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css index 8e55ac3be..5a2b8d443 100644 --- a/view/css/mod_directory.css +++ b/view/css/mod_directory.css @@ -29,3 +29,6 @@ margin-top: -2px; } +.directory-collapse { + overflow: auto; +} diff --git a/view/js/main.js b/view/js/main.js index 34d6bf475..14d9dcd2f 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -616,7 +616,7 @@ function updateConvItems(mode,data) { function collapseHeight() { $(".wall-item-content, .directory-collapse").each(function() { - var orgHeight = $(this).height(); + var orgHeight = $(this).outerHeight(true); if(orgHeight > divmore_height + 10) { if(! $(this).hasClass('divmore')) { $(this).readmore({ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b51fea6cf..59b928ee9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -129,7 +129,7 @@ pre code { code { font-size: 1em; - padding: 5px; + padding: 1em; border: 1px solid #ccc; background: #ccc; color: #000; @@ -1432,7 +1432,10 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { .profile-match-connect { margin-top: 5px; } .reshared-content { margin-left: 20px; } -.shared_header img { margin-right: 10px; } +.shared_header img { + border-radius: $radiuspx; + margin-right: 10px; +} .tag1 { font-size : 0.9em !important; @@ -1635,39 +1638,39 @@ img.mail-conv-sender-photo { /* conversation */ -.wall-item-title { - font-size: $font_size; +.wall-item-head { + padding: 10px 10px 0px 10px; } -.hide-comments-outer, -.thread-wrapper .wall-item-comment-wrapper, -.wall-item-content-wrapper.comment { - margin-left: $comment_indent; +.wall-item-content { + padding: 1em 10px; +} + +.wall-item-tools { + padding: 0px 10px 10px 10px; +} + + +.wall-item-title { + font-size: $font_size; } .wall-item-content-wrapper { background-color: $item_colour; - padding: 10px; border-top-right-radius: $radiuspx; border-top-left-radius: $radiuspx; } .wall-item-content-wrapper.comment { background-color: $comment_item_colour; - border-color: $comment_border_colour; - border-style: solid; - border-width: 0px 0px 0px 3px; - border-radius: 0px; - padding: 7px 10px 7px 7px; } .hide-comments-outer { background-color: $comment_item_colour; - border-color: $comment_border_colour; border-top-color: #ccc; border-style: solid; border-top-style: dashed; - border-width: 1px 0px 0px 3px; + border-width: 1px 0px 0px 0px; text-align: center; border-radius: 0px; } diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 4f5b69beb..cdc9de489 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -16,8 +16,8 @@ {{include file="field_colorinput.tpl" field=$background_image}} {{include file="field_colorinput.tpl" field=$item_colour}} {{include file="field_colorinput.tpl" field=$comment_item_colour}} - {{include file="field_colorinput.tpl" field=$comment_border_colour}} - {{include file="field_input.tpl" field=$comment_indent}} + {{*include file="field_colorinput.tpl" field=$comment_border_colour*}} + {{*include file="field_input.tpl" field=$comment_indent*}} {{include file="field_input.tpl" field=$body_font_size}} {{include file="field_input.tpl" field=$font_size}} {{include file="field_colorinput.tpl" field=$font_colour}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index dc8064f1a..a9661d9b5 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -8,30 +8,32 @@ <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}}" style="clear:both;"> - <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > - <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> - <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}}" alt="{{$item.name}}" /></a> + <div class="wall-item-head"> + <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > + <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> + <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}}" alt="{{$item.name}}" /></a> + </div> + <div class="wall-item-photo-end" style="clear:both"></div> </div> - <div class="wall-item-photo-end" style="clear:both"></div> - </div> - {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> - <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> - </div> - {{/if}} - {{if $item.lock}} - <div class="wall-item-lock dropdown"> - <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> - </div> - {{/if}} - <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>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" 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>{{/if}} - </div> - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> - {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + {{if $item.title}} + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> + </div> + {{/if}} + {{if $item.lock}} + <div class="wall-item-lock dropdown"> + <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + </div> + {{/if}} + <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>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" 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>{{/if}} + </div> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> + {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + </div> + <div class="clear"></div> </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> - <div class="wall-item-title-end"></div> <div class="wall-item-body" id="wall-item-body-{{$item.id}}" > {{$item.body}} {{if $item.tags}} @@ -52,6 +54,7 @@ </div> {{/if}} </div> + <div class="clear"></div> </div> <div class="wall-item-tools"> <div class="wall-item-tools-right btn-group pull-right"> @@ -167,6 +170,7 @@ {{/foreach}} </div> {{/if}} + <div class="clear"></div> </div> <div class="clear"></div> </div> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 5487d5937..b10f50c13 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -8,30 +8,32 @@ <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}}" style="clear:both;"> - <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > - <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> - <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}}" alt="{{$item.name}}" /></a> + <div class="wall-item-head"> + <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > + <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> + <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}}" alt="{{$item.name}}" /></a> + </div> + <div class="wall-item-photo-end" style="clear:both"></div> </div> - <div class="wall-item-photo-end" style="clear:both"></div> - </div> - {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> - <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> - </div> - {{/if}} - {{if $item.lock}} - <div class="wall-item-lock dropdown"> - <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> - </div> - {{/if}} - <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>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" 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>{{/if}} - </div> - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> - {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + {{if $item.title}} + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> + </div> + {{/if}} + {{if $item.lock}} + <div class="wall-item-lock dropdown"> + <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + </div> + {{/if}} + <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>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" 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>{{/if}} + </div> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> + {{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i> {{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + </div> + <div class="clear"></div> </div> <div class="wall-item-content conv-list-mode" id="wall-item-content-{{$item.id}}"> - <div class="wall-item-title-end"></div> <div class="wall-item-body wall-item-listbody" id="wall-item-body-{{$item.id}}" > {{$item.body}} {{if $item.tags}} @@ -52,6 +54,7 @@ </div> {{/if}} </div> + <div class="clear"></div> </div> <div class="wall-item-tools"> <div class="wall-item-tools-right btn-group pull-right"> @@ -176,6 +179,7 @@ {{/foreach}} {{/if}} </div> + <div class="clear"></div> </div> <div class="clear"></div> </div> |
