friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 

* remotes/upstream/master:
  diabook-theme: small fix
  diabook-theme: twitter-box-update at right_aside
  diabook-theme: can now set the twitter search term in theme-settings & small fixes
  consolidate item deletion so we can fix orphaned categories and file_as tags.
  DE: new email templates translated
  workaround to clean up orphaned filetags
  only show remove category to item owner
  Option to set theme width added. Minor layout changes

* master:
This commit is contained in:
Simon L'nu 2012-05-05 20:08:19 -04:00
parent 250bf57e1e e1ab3a93cc
commit 0c4099966a
17 changed files with 4358 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1331' ); define ( 'FRIENDICA_VERSION', '2.3.1332' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1143 ); define ( 'DB_UPDATE_VERSION', 1143 );

59
include/items.php
View File

@ -3029,32 +3029,7 @@ function item_expire($uid,$days) {
if($expire_items==0 && $item['type']!='note') if($expire_items==0 && $item['type']!='note')
continue; continue;
drop_item($item['id'],false);
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($item['id'])
);
$r = q("DELETE FROM item_id where iid in (select id from item where parent = %d) and uid = %d",
intval($item['id']),
intval($uid)
);
$r = q("DELETE FROM sign where iid in (select id from item where parent = %d) and uid = %d",
intval($item['id']),
intval($uid)
);
// kill the kids
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($item['parent-uri']),
intval($item['uid'])
);
} }
proc_run('php',"include/notifier.php","expire","$uid"); proc_run('php',"include/notifier.php","expire","$uid");
@ -3116,6 +3091,25 @@ function drop_item($id,$interactive = true) {
intval($item['id']) intval($item['id'])
); );
// clean up categories and tags so they don't end up as orphans
$matches = false;
$cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],true);
}
}
$matches = false;
$cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],false);
}
}
// If item is a link to a photo resource, nuke all the associated photos // If item is a link to a photo resource, nuke all the associated photos
// (visitors will not have photo resources) // (visitors will not have photo resources)
// This only applies to photos uploaded from the photos page. Photos inserted into a post do not // This only applies to photos uploaded from the photos page. Photos inserted into a post do not
@ -3139,6 +3133,17 @@ function drop_item($id,$interactive = true) {
// ignore the result // ignore the result
} }
// clean up item_id and sign meta-data tables
$r = q("DELETE FROM item_id where iid in (select id from item where parent = %d and uid = %d)",
intval($item['id']),
intval($item['uid'])
);
$r = q("DELETE FROM sign where iid in (select id from item where parent = %d and uid = %d)",
intval($item['id']),
intval($item['uid'])
);
// If it's the parent of a comment thread, kill all the kids // If it's the parent of a comment thread, kill all the kids
@ -3171,7 +3176,7 @@ function drop_item($id,$interactive = true) {
} }
} }
$drop_id = intval($item['id']); $drop_id = intval($item['id']);
// send the notification upstream/downstream as the case may be // send the notification upstream/downstream as the case may be
if(! $interactive) if(! $interactive)

5
include/text.php
View File

@ -930,7 +930,8 @@ function prepare_body($item,$attach = false) {
foreach($matches as $mtch) { foreach($matches as $mtch) {
if(strlen($x)) if(strlen($x))
$x .= ','; $x .= ',';
$x .= xmlify(file_tag_decode($mtch[1])) . ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>'; $x .= xmlify(file_tag_decode($mtch[1]))
. ((local_user() == $item['uid']) ? ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>' : '');
} }
if(strlen($x)) if(strlen($x))
$s .= '<div class="categorytags"><span>' . t('Categories:') . ' </span>' . $x . '</div>'; $s .= '<div class="categorytags"><span>' . t('Categories:') . ' </span>' . $x . '</div>';
@ -1490,7 +1491,7 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
intval($uid) intval($uid)
); );
$r = q("select file from item where uid = %d " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')), $r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
intval($uid) intval($uid)
); );

321
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1331\n" "Project-Id-Version: 2.3.1332\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-05-03 17:20-0700\n" "POT-Creation-Date: 2012-05-04 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"
@ -51,12 +51,11 @@ msgstr ""
#: ../../mod/profile_photo.php:163 ../../mod/message.php:38 #: ../../mod/profile_photo.php:163 ../../mod/message.php:38
#: ../../mod/message.php:90 ../../mod/allfriends.php:9 #: ../../mod/message.php:90 ../../mod/allfriends.php:9
#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138 #: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7
#: ../../mod/profiles.php:7 ../../mod/profiles.php:365 #: ../../mod/profiles.php:365 ../../mod/delegate.php:6
#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:485
#: ../../addon/facebook/facebook.php:485 ../../include/items.php:3187 #: ../../include/items.php:3187 ../../index.php:306
#: ../../index.php:306
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -86,7 +85,7 @@ msgid "Return to contact editor"
msgstr "" msgstr ""
#: ../../mod/crepair.php:148 ../../mod/settings.php:541 #: ../../mod/crepair.php:148 ../../mod/settings.php:541
#: ../../mod/settings.php:567 ../../mod/admin.php:638 ../../mod/admin.php:647 #: ../../mod/settings.php:567 ../../mod/admin.php:640 ../../mod/admin.php:649
msgid "Name" msgid "Name"
msgstr "" msgstr ""
@ -130,9 +129,9 @@ msgstr ""
#: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/localtime.php:45 ../../mod/contacts.php:322
#: ../../mod/settings.php:539 ../../mod/settings.php:685 #: ../../mod/settings.php:539 ../../mod/settings.php:685
#: ../../mod/settings.php:746 ../../mod/settings.php:940 #: ../../mod/settings.php:746 ../../mod/settings.php:940
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:400 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:402
#: ../../mod/admin.php:635 ../../mod/admin.php:771 ../../mod/admin.php:970 #: ../../mod/admin.php:637 ../../mod/admin.php:773 ../../mod/admin.php:972
#: ../../mod/admin.php:1057 ../../mod/profiles.php:534 #: ../../mod/admin.php:1059 ../../mod/profiles.php:534
#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:575 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:575
#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
@ -555,7 +554,7 @@ msgid "Preview"
msgstr "" msgstr ""
#: ../../mod/photos.php:1331 ../../mod/settings.php:602 #: ../../mod/photos.php:1331 ../../mod/settings.php:602
#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:642 #: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:644
#: ../../include/conversation.php:318 ../../include/conversation.php:584 #: ../../include/conversation.php:318 ../../include/conversation.php:584
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
@ -1263,7 +1262,7 @@ msgid "if applicable"
msgstr "" msgstr ""
#: ../../mod/notifications.php:157 ../../mod/notifications.php:204 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
#: ../../mod/admin.php:640 #: ../../mod/admin.php:642
msgid "Approve" msgid "Approve"
msgstr "" msgstr ""
@ -1452,7 +1451,7 @@ msgstr ""
msgid "Network type: %s" msgid "Network type: %s"
msgstr "" msgstr ""
#: ../../mod/contacts.php:280 #: ../../mod/contacts.php:280 ../../include/contact_widgets.php:183
#, php-format #, php-format
msgid "%d contact in common" msgid "%d contact in common"
msgid_plural "%d contacts in common" msgid_plural "%d contacts in common"
@ -1464,12 +1463,12 @@ msgid "View all contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 #: ../../mod/contacts.php:290 ../../mod/contacts.php:347
#: ../../mod/admin.php:644 #: ../../mod/admin.php:646
msgid "Unblock" msgid "Unblock"
msgstr "" msgstr ""
#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 #: ../../mod/contacts.php:290 ../../mod/contacts.php:347
#: ../../mod/admin.php:643 #: ../../mod/admin.php:645
msgid "Block" msgid "Block"
msgstr "" msgstr ""
@ -1562,7 +1561,7 @@ msgstr ""
msgid "Update public posts" msgid "Update public posts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:344 ../../mod/admin.php:1115 #: ../../mod/contacts.php:344 ../../mod/admin.php:1117
msgid "Update now" msgid "Update now"
msgstr "" msgstr ""
@ -1774,7 +1773,7 @@ msgstr ""
msgid "Remove account" msgid "Remove account"
msgstr "" msgstr ""
#: ../../mod/settings.php:88 ../../mod/admin.php:730 ../../mod/admin.php:935 #: ../../mod/settings.php:88 ../../mod/admin.php:732 ../../mod/admin.php:937
#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
@ -2001,7 +2000,7 @@ msgstr ""
msgid "Don't show emoticons" msgid "Don't show emoticons"
msgstr "" msgstr ""
#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:616 #: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:618
msgid "Normal Account" msgid "Normal Account"
msgstr "" msgstr ""
@ -2009,7 +2008,7 @@ msgstr ""
msgid "This account is a normal personal profile" msgid "This account is a normal personal profile"
msgstr "" msgstr ""
#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:617 #: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:619
msgid "Soapbox Account" msgid "Soapbox Account"
msgstr "" msgstr ""
@ -2017,7 +2016,7 @@ msgstr ""
msgid "Automatically approve all connection/friend requests as read-only fans" msgid "Automatically approve all connection/friend requests as read-only fans"
msgstr "" msgstr ""
#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:618 #: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:620
msgid "Community/Celebrity Account" msgid "Community/Celebrity Account"
msgstr "" msgstr ""
@ -2025,7 +2024,7 @@ msgstr ""
msgid "Automatically approve all connection/friend requests as read-write fans" msgid "Automatically approve all connection/friend requests as read-write fans"
msgstr "" msgstr ""
#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:619 #: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:621
msgid "Automatic Friend Account" msgid "Automatic Friend Account"
msgstr "" msgstr ""
@ -2751,7 +2750,7 @@ msgstr ""
msgid "Your invitation ID: " msgid "Your invitation ID: "
msgstr "" msgstr ""
#: ../../mod/register.php:553 ../../mod/admin.php:401 #: ../../mod/register.php:553 ../../mod/admin.php:403
msgid "Registration" msgid "Registration"
msgstr "" msgstr ""
@ -2807,7 +2806,7 @@ msgid "%1$s doesn't like %2$s's %3$s"
msgstr "" msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156
#: ../../mod/admin.php:679 ../../mod/admin.php:878 ../../mod/display.php:37 #: ../../mod/admin.php:681 ../../mod/admin.php:880 ../../mod/display.php:37
#: ../../mod/display.php:142 ../../include/items.php:3099 #: ../../mod/display.php:142 ../../include/items.php:3099
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -3038,19 +3037,19 @@ msgstr ""
msgid "Theme settings updated." msgid "Theme settings updated."
msgstr "" msgstr ""
#: ../../mod/admin.php:96 ../../mod/admin.php:399 #: ../../mod/admin.php:96 ../../mod/admin.php:401
msgid "Site" msgid "Site"
msgstr "" msgstr ""
#: ../../mod/admin.php:97 ../../mod/admin.php:634 ../../mod/admin.php:646 #: ../../mod/admin.php:97 ../../mod/admin.php:636 ../../mod/admin.php:648
msgid "Users" msgid "Users"
msgstr "" msgstr ""
#: ../../mod/admin.php:98 ../../mod/admin.php:728 ../../mod/admin.php:770 #: ../../mod/admin.php:98 ../../mod/admin.php:730 ../../mod/admin.php:772
msgid "Plugins" msgid "Plugins"
msgstr "" msgstr ""
#: ../../mod/admin.php:99 ../../mod/admin.php:933 ../../mod/admin.php:969 #: ../../mod/admin.php:99 ../../mod/admin.php:935 ../../mod/admin.php:971
msgid "Themes" msgid "Themes"
msgstr "" msgstr ""
@ -3062,7 +3061,7 @@ msgstr ""
msgid "Software Update" msgid "Software Update"
msgstr "" msgstr ""
#: ../../mod/admin.php:115 ../../mod/admin.php:1056 #: ../../mod/admin.php:115 ../../mod/admin.php:1058
msgid "Logs" msgid "Logs"
msgstr "" msgstr ""
@ -3070,9 +3069,9 @@ msgstr ""
msgid "User registrations waiting for confirmation" msgid "User registrations waiting for confirmation"
msgstr "" msgstr ""
#: ../../mod/admin.php:195 ../../mod/admin.php:398 ../../mod/admin.php:633 #: ../../mod/admin.php:195 ../../mod/admin.php:400 ../../mod/admin.php:635
#: ../../mod/admin.php:727 ../../mod/admin.php:769 ../../mod/admin.php:932 #: ../../mod/admin.php:729 ../../mod/admin.php:771 ../../mod/admin.php:934
#: ../../mod/admin.php:968 ../../mod/admin.php:1055 #: ../../mod/admin.php:970 ../../mod/admin.php:1057
msgid "Administration" msgid "Administration"
msgstr "" msgstr ""
@ -3096,483 +3095,493 @@ msgstr ""
msgid "Active plugins" msgid "Active plugins"
msgstr "" msgstr ""
#: ../../mod/admin.php:337 #: ../../mod/admin.php:339
msgid "Site settings updated." msgid "Site settings updated."
msgstr "" msgstr ""
#: ../../mod/admin.php:385 #: ../../mod/admin.php:387
msgid "Closed" msgid "Closed"
msgstr "" msgstr ""
#: ../../mod/admin.php:386 #: ../../mod/admin.php:388
msgid "Requires approval" msgid "Requires approval"
msgstr "" msgstr ""
#: ../../mod/admin.php:387 #: ../../mod/admin.php:389
msgid "Open" msgid "Open"
msgstr "" msgstr ""
#: ../../mod/admin.php:391 #: ../../mod/admin.php:393
msgid "No SSL policy, links will track page SSL state" msgid "No SSL policy, links will track page SSL state"
msgstr "" msgstr ""
#: ../../mod/admin.php:392 #: ../../mod/admin.php:394
msgid "Force all links to use SSL" msgid "Force all links to use SSL"
msgstr "" msgstr ""
#: ../../mod/admin.php:393 #: ../../mod/admin.php:395
msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgid "Self-signed certificate, use SSL for local links only (discouraged)"
msgstr "" msgstr ""
#: ../../mod/admin.php:402 #: ../../mod/admin.php:404
msgid "File upload" msgid "File upload"
msgstr "" msgstr ""
#: ../../mod/admin.php:403 #: ../../mod/admin.php:405
msgid "Policies" msgid "Policies"
msgstr "" msgstr ""
#: ../../mod/admin.php:404 #: ../../mod/admin.php:406
msgid "Advanced" msgid "Advanced"
msgstr "" msgstr ""
#: ../../mod/admin.php:408 ../../addon/statusnet/statusnet.php:544 #: ../../mod/admin.php:410 ../../addon/statusnet/statusnet.php:544
msgid "Site name" msgid "Site name"
msgstr "" msgstr ""
#: ../../mod/admin.php:409 #: ../../mod/admin.php:411
msgid "Banner/Logo" msgid "Banner/Logo"
msgstr "" msgstr ""
#: ../../mod/admin.php:410 #: ../../mod/admin.php:412
msgid "System language" msgid "System language"
msgstr "" msgstr ""
#: ../../mod/admin.php:411 #: ../../mod/admin.php:413
msgid "System theme" msgid "System theme"
msgstr "" msgstr ""
#: ../../mod/admin.php:411 #: ../../mod/admin.php:413
msgid "" msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' " "Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>" "id='cnftheme'>change theme settings</a>"
msgstr "" msgstr ""
#: ../../mod/admin.php:412 #: ../../mod/admin.php:414
msgid "SSL link policy" msgid "SSL link policy"
msgstr "" msgstr ""
#: ../../mod/admin.php:412 #: ../../mod/admin.php:414
msgid "Determines whether generated links should be forced to use SSL" msgid "Determines whether generated links should be forced to use SSL"
msgstr "" msgstr ""
#: ../../mod/admin.php:413 #: ../../mod/admin.php:415
msgid "Maximum image size" msgid "Maximum image size"
msgstr "" msgstr ""
#: ../../mod/admin.php:413 #: ../../mod/admin.php:415
msgid "" msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no " "Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits." "limits."
msgstr "" msgstr ""
#: ../../mod/admin.php:415 #: ../../mod/admin.php:417
msgid "Register policy" msgid "Register policy"
msgstr "" msgstr ""
#: ../../mod/admin.php:416 #: ../../mod/admin.php:418
msgid "Register text" msgid "Register text"
msgstr "" msgstr ""
#: ../../mod/admin.php:416 #: ../../mod/admin.php:418
msgid "Will be displayed prominently on the registration page." msgid "Will be displayed prominently on the registration page."
msgstr "" msgstr ""
#: ../../mod/admin.php:417 #: ../../mod/admin.php:419
msgid "Accounts abandoned after x days" msgid "Accounts abandoned after x days"
msgstr "" msgstr ""
#: ../../mod/admin.php:417 #: ../../mod/admin.php:419
msgid "" msgid ""
"Will not waste system resources polling external sites for abandonded " "Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit." "accounts. Enter 0 for no time limit."
msgstr "" msgstr ""
#: ../../mod/admin.php:418 #: ../../mod/admin.php:420
msgid "Allowed friend domains" msgid "Allowed friend domains"
msgstr "" msgstr ""
#: ../../mod/admin.php:418 #: ../../mod/admin.php:420
msgid "" msgid ""
"Comma separated list of domains which are allowed to establish friendships " "Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains" "with this site. Wildcards are accepted. Empty to allow any domains"
msgstr "" msgstr ""
#: ../../mod/admin.php:419 #: ../../mod/admin.php:421
msgid "Allowed email domains" msgid "Allowed email domains"
msgstr "" msgstr ""
#: ../../mod/admin.php:419 #: ../../mod/admin.php:421
msgid "" msgid ""
"Comma separated list of domains which are allowed in email addresses for " "Comma separated list of domains which are allowed in email addresses for "
"registrations to this site. Wildcards are accepted. Empty to allow any " "registrations to this site. Wildcards are accepted. Empty to allow any "
"domains" "domains"
msgstr "" msgstr ""
#: ../../mod/admin.php:420 #: ../../mod/admin.php:422
msgid "Block public" msgid "Block public"
msgstr "" msgstr ""
#: ../../mod/admin.php:420 #: ../../mod/admin.php:422
msgid "" msgid ""
"Check to block public access to all otherwise public personal pages on this " "Check to block public access to all otherwise public personal pages on this "
"site unless you are currently logged in." "site unless you are currently logged in."
msgstr "" msgstr ""
#: ../../mod/admin.php:421 #: ../../mod/admin.php:423
msgid "Force publish" msgid "Force publish"
msgstr "" msgstr ""
#: ../../mod/admin.php:421 #: ../../mod/admin.php:423
msgid "" msgid ""
"Check to force all profiles on this site to be listed in the site directory." "Check to force all profiles on this site to be listed in the site directory."
msgstr "" msgstr ""
#: ../../mod/admin.php:422 #: ../../mod/admin.php:424
msgid "Global directory update URL" msgid "Global directory update URL"
msgstr "" msgstr ""
#: ../../mod/admin.php:422 #: ../../mod/admin.php:424
msgid "" msgid ""
"URL to update the global directory. If this is not set, the global directory " "URL to update the global directory. If this is not set, the global directory "
"is completely unavailable to the application." "is completely unavailable to the application."
msgstr "" msgstr ""
#: ../../mod/admin.php:424 #: ../../mod/admin.php:426
msgid "Block multiple registrations" msgid "Block multiple registrations"
msgstr "" msgstr ""
#: ../../mod/admin.php:424 #: ../../mod/admin.php:426
msgid "Disallow users to register additional accounts for use as pages." msgid "Disallow users to register additional accounts for use as pages."
msgstr "" msgstr ""
#: ../../mod/admin.php:425 #: ../../mod/admin.php:427
msgid "OpenID support" msgid "OpenID support"
msgstr "" msgstr ""
#: ../../mod/admin.php:425 #: ../../mod/admin.php:427
msgid "OpenID support for registration and logins." msgid "OpenID support for registration and logins."
msgstr "" msgstr ""
#: ../../mod/admin.php:426 #: ../../mod/admin.php:428
msgid "Fullname check" msgid "Fullname check"
msgstr "" msgstr ""
#: ../../mod/admin.php:426 #: ../../mod/admin.php:428
msgid "" msgid ""
"Force users to register with a space between firstname and lastname in Full " "Force users to register with a space between firstname and lastname in Full "
"name, as an antispam measure" "name, as an antispam measure"
msgstr "" msgstr ""
#: ../../mod/admin.php:427 #: ../../mod/admin.php:429
msgid "UTF-8 Regular expressions" msgid "UTF-8 Regular expressions"
msgstr "" msgstr ""
#: ../../mod/admin.php:427 #: ../../mod/admin.php:429
msgid "Use PHP UTF8 regular expressions" msgid "Use PHP UTF8 regular expressions"
msgstr "" msgstr ""
#: ../../mod/admin.php:428 #: ../../mod/admin.php:430
msgid "Show Community Page" msgid "Show Community Page"
msgstr "" msgstr ""
#: ../../mod/admin.php:428 #: ../../mod/admin.php:430
msgid "" msgid ""
"Display a Community page showing all recent public postings on this site." "Display a Community page showing all recent public postings on this site."
msgstr "" msgstr ""
#: ../../mod/admin.php:429 #: ../../mod/admin.php:431
msgid "Enable OStatus support" msgid "Enable OStatus support"
msgstr "" msgstr ""
#: ../../mod/admin.php:429 #: ../../mod/admin.php:431
msgid "" msgid ""
"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
"communications in OStatus are public, so privacy warnings will be " "communications in OStatus are public, so privacy warnings will be "
"occasionally displayed." "occasionally displayed."
msgstr "" msgstr ""
#: ../../mod/admin.php:430 #: ../../mod/admin.php:432
msgid "Enable Diaspora support" msgid "Enable Diaspora support"
msgstr "" msgstr ""
#: ../../mod/admin.php:430 #: ../../mod/admin.php:432
msgid "Provide built-in Diaspora network compatibility." msgid "Provide built-in Diaspora network compatibility."
msgstr "" msgstr ""
#: ../../mod/admin.php:431 #: ../../mod/admin.php:433
msgid "Only allow Friendica contacts" msgid "Only allow Friendica contacts"
msgstr "" msgstr ""
#: ../../mod/admin.php:431 #: ../../mod/admin.php:433
msgid "" msgid ""
"All contacts must use Friendica protocols. All other built-in communication " "All contacts must use Friendica protocols. All other built-in communication "
"protocols disabled." "protocols disabled."
msgstr "" msgstr ""
#: ../../mod/admin.php:432 #: ../../mod/admin.php:434
msgid "Verify SSL" msgid "Verify SSL"
msgstr "" msgstr ""
#: ../../mod/admin.php:432 #: ../../mod/admin.php:434
msgid "" msgid ""
"If you wish, you can turn on strict certificate checking. This will mean you " "If you wish, you can turn on strict certificate checking. This will mean you "
"cannot connect (at all) to self-signed SSL sites." "cannot connect (at all) to self-signed SSL sites."
msgstr "" msgstr ""
#: ../../mod/admin.php:433 #: ../../mod/admin.php:435
msgid "Proxy user" msgid "Proxy user"
msgstr "" msgstr ""
#: ../../mod/admin.php:434 #: ../../mod/admin.php:436
msgid "Proxy URL" msgid "Proxy URL"
msgstr "" msgstr ""
#: ../../mod/admin.php:435 #: ../../mod/admin.php:437
msgid "Network timeout" msgid "Network timeout"
msgstr "" msgstr ""
#: ../../mod/admin.php:435 #: ../../mod/admin.php:437
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr "" msgstr ""
#: ../../mod/admin.php:436 #: ../../mod/admin.php:438
msgid "Delivery interval" msgid "Delivery interval"
msgstr "" msgstr ""
#: ../../mod/admin.php:436 #: ../../mod/admin.php:438
msgid "" msgid ""
"Delay background delivery processes by this many seconds to reduce system " "Delay background delivery processes by this many seconds to reduce system "
"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
"for large dedicated servers." "for large dedicated servers."
msgstr "" msgstr ""
#: ../../mod/admin.php:451 #: ../../mod/admin.php:439
msgid "Maximum Load Average"
msgstr ""
#: ../../mod/admin.php:439
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr ""
#: ../../mod/admin.php:453
msgid "Update has been marked successful" msgid "Update has been marked successful"
msgstr "" msgstr ""
#: ../../mod/admin.php:461 #: ../../mod/admin.php:463
#, php-format #, php-format
msgid "Executing %s failed. Check system logs." msgid "Executing %s failed. Check system logs."
msgstr "" msgstr ""
#: ../../mod/admin.php:464 #: ../../mod/admin.php:466
#, php-format #, php-format
msgid "Update %s was successfully applied." msgid "Update %s was successfully applied."
msgstr "" msgstr ""
#: ../../mod/admin.php:468 #: ../../mod/admin.php:470
#, php-format #, php-format
msgid "Update %s did not return a status. Unknown if it succeeded." msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr "" msgstr ""
#: ../../mod/admin.php:471 #: ../../mod/admin.php:473
#, php-format #, php-format
msgid "Update function %s could not be found." msgid "Update function %s could not be found."
msgstr "" msgstr ""
#: ../../mod/admin.php:486 #: ../../mod/admin.php:488
msgid "No failed updates." msgid "No failed updates."
msgstr "" msgstr ""
#: ../../mod/admin.php:490 #: ../../mod/admin.php:492
msgid "Failed Updates" msgid "Failed Updates"
msgstr "" msgstr ""
#: ../../mod/admin.php:491 #: ../../mod/admin.php:493
msgid "" msgid ""
"This does not include updates prior to 1139, which did not return a status." "This does not include updates prior to 1139, which did not return a status."
msgstr "" msgstr ""
#: ../../mod/admin.php:492 #: ../../mod/admin.php:494
msgid "Mark success (if update was manually applied)" msgid "Mark success (if update was manually applied)"
msgstr "" msgstr ""
#: ../../mod/admin.php:493 #: ../../mod/admin.php:495
msgid "Attempt to execute this update step automatically" msgid "Attempt to execute this update step automatically"
msgstr "" msgstr ""
#: ../../mod/admin.php:518 #: ../../mod/admin.php:520
#, php-format #, php-format
msgid "%s user blocked/unblocked" msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked" msgid_plural "%s users blocked/unblocked"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../mod/admin.php:525 #: ../../mod/admin.php:527
#, php-format #, php-format
msgid "%s user deleted" msgid "%s user deleted"
msgid_plural "%s users deleted" msgid_plural "%s users deleted"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../mod/admin.php:564 #: ../../mod/admin.php:566
#, php-format #, php-format
msgid "User '%s' deleted" msgid "User '%s' deleted"
msgstr "" msgstr ""
#: ../../mod/admin.php:572 #: ../../mod/admin.php:574
#, php-format #, php-format
msgid "User '%s' unblocked" msgid "User '%s' unblocked"
msgstr "" msgstr ""
#: ../../mod/admin.php:572 #: ../../mod/admin.php:574
#, php-format #, php-format
msgid "User '%s' blocked" msgid "User '%s' blocked"
msgstr "" msgstr ""
#: ../../mod/admin.php:636 #: ../../mod/admin.php:638
msgid "select all" msgid "select all"
msgstr "" msgstr ""
#: ../../mod/admin.php:637 #: ../../mod/admin.php:639
msgid "User registrations waiting for confirm" msgid "User registrations waiting for confirm"
msgstr "" msgstr ""
#: ../../mod/admin.php:638 #: ../../mod/admin.php:640
msgid "Request date" msgid "Request date"
msgstr "" msgstr ""
#: ../../mod/admin.php:638 ../../mod/admin.php:647 #: ../../mod/admin.php:640 ../../mod/admin.php:649
#: ../../include/contact_selectors.php:79 #: ../../include/contact_selectors.php:79
msgid "Email" msgid "Email"
msgstr "" msgstr ""
#: ../../mod/admin.php:639 #: ../../mod/admin.php:641
msgid "No registrations." msgid "No registrations."
msgstr "" msgstr ""
#: ../../mod/admin.php:641 #: ../../mod/admin.php:643
msgid "Deny" msgid "Deny"
msgstr "" msgstr ""
#: ../../mod/admin.php:647 #: ../../mod/admin.php:649
msgid "Register date" msgid "Register date"
msgstr "" msgstr ""
#: ../../mod/admin.php:647 #: ../../mod/admin.php:649
msgid "Last login" msgid "Last login"
msgstr "" msgstr ""
#: ../../mod/admin.php:647 #: ../../mod/admin.php:649
msgid "Last item" msgid "Last item"
msgstr "" msgstr ""
#: ../../mod/admin.php:647 #: ../../mod/admin.php:649
msgid "Account" msgid "Account"
msgstr "" msgstr ""
#: ../../mod/admin.php:649 #: ../../mod/admin.php:651
msgid "" msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on " "Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?" "this site will be permanently deleted!\\n\\nAre you sure?"
msgstr "" msgstr ""
#: ../../mod/admin.php:650 #: ../../mod/admin.php:652
msgid "" msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this " "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?" "site will be permanently deleted!\\n\\nAre you sure?"
msgstr "" msgstr ""
#: ../../mod/admin.php:691 #: ../../mod/admin.php:693
#, php-format #, php-format
msgid "Plugin %s disabled." msgid "Plugin %s disabled."
msgstr "" msgstr ""
#: ../../mod/admin.php:695 #: ../../mod/admin.php:697
#, php-format #, php-format
msgid "Plugin %s enabled." msgid "Plugin %s enabled."
msgstr "" msgstr ""
#: ../../mod/admin.php:705 ../../mod/admin.php:903 #: ../../mod/admin.php:707 ../../mod/admin.php:905
msgid "Disable" msgid "Disable"
msgstr "" msgstr ""
#: ../../mod/admin.php:707 ../../mod/admin.php:905 #: ../../mod/admin.php:709 ../../mod/admin.php:907
msgid "Enable" msgid "Enable"
msgstr "" msgstr ""
#: ../../mod/admin.php:729 ../../mod/admin.php:934 #: ../../mod/admin.php:731 ../../mod/admin.php:936
msgid "Toggle" msgid "Toggle"
msgstr "" msgstr ""
#: ../../mod/admin.php:737 ../../mod/admin.php:944 #: ../../mod/admin.php:739 ../../mod/admin.php:946
msgid "Author: " msgid "Author: "
msgstr "" msgstr ""
#: ../../mod/admin.php:738 ../../mod/admin.php:945 #: ../../mod/admin.php:740 ../../mod/admin.php:947
msgid "Maintainer: " msgid "Maintainer: "
msgstr "" msgstr ""
#: ../../mod/admin.php:867 #: ../../mod/admin.php:869
msgid "No themes found." msgid "No themes found."
msgstr "" msgstr ""
#: ../../mod/admin.php:926 #: ../../mod/admin.php:928
msgid "Screenshot" msgid "Screenshot"
msgstr "" msgstr ""
#: ../../mod/admin.php:974 #: ../../mod/admin.php:976
msgid "[Experimental]" msgid "[Experimental]"
msgstr "" msgstr ""
#: ../../mod/admin.php:975 #: ../../mod/admin.php:977
msgid "[Unsupported]" msgid "[Unsupported]"
msgstr "" msgstr ""
#: ../../mod/admin.php:1002 #: ../../mod/admin.php:1004
msgid "Log settings updated." msgid "Log settings updated."
msgstr "" msgstr ""
#: ../../mod/admin.php:1058 #: ../../mod/admin.php:1060
msgid "Clear" msgid "Clear"
msgstr "" msgstr ""
#: ../../mod/admin.php:1064 #: ../../mod/admin.php:1066
msgid "Debugging" msgid "Debugging"
msgstr "" msgstr ""
#: ../../mod/admin.php:1065 #: ../../mod/admin.php:1067
msgid "Log file" msgid "Log file"
msgstr "" msgstr ""
#: ../../mod/admin.php:1065 #: ../../mod/admin.php:1067
msgid "" msgid ""
"Must be writable by web server. Relative to your Friendica top-level " "Must be writable by web server. Relative to your Friendica top-level "
"directory." "directory."
msgstr "" msgstr ""
#: ../../mod/admin.php:1066 #: ../../mod/admin.php:1068
msgid "Log level" msgid "Log level"
msgstr "" msgstr ""
#: ../../mod/admin.php:1116 #: ../../mod/admin.php:1118
msgid "Close" msgid "Close"
msgstr "" msgstr ""
#: ../../mod/admin.php:1122 #: ../../mod/admin.php:1124
msgid "FTP Host" msgid "FTP Host"
msgstr "" msgstr ""
#: ../../mod/admin.php:1123 #: ../../mod/admin.php:1125
msgid "FTP Path" msgid "FTP Path"
msgstr "" msgstr ""
#: ../../mod/admin.php:1124 #: ../../mod/admin.php:1126
msgid "FTP User" msgid "FTP User"
msgstr "" msgstr ""
#: ../../mod/admin.php:1125 #: ../../mod/admin.php:1127
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
@ -3696,12 +3705,12 @@ msgstr ""
msgid "following" msgid "following"
msgstr "" msgstr ""
#: ../../mod/common.php:34 #: ../../mod/common.php:42
msgid "Common Friends" msgid "Common Friends"
msgstr "" msgstr ""
#: ../../mod/common.php:42 #: ../../mod/common.php:78
msgid "No friends in common." msgid "No contacts in common."
msgstr "" msgstr ""
#: ../../mod/display.php:135 #: ../../mod/display.php:135
@ -4585,7 +4594,8 @@ msgid "Forums"
msgstr "" msgstr ""
#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
#: ../../include/conversation.php:466 ../../boot.php:507 #: ../../include/contact_widgets.php:187 ../../include/conversation.php:466
#: ../../boot.php:507
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -6035,11 +6045,11 @@ msgstr ""
msgid "Finishes:" msgid "Finishes:"
msgstr "" msgstr ""
#: ../../include/delivery.php:434 ../../include/notifier.php:652 #: ../../include/delivery.php:445 ../../include/notifier.php:652
msgid "(no subject)" msgid "(no subject)"
msgstr "" msgstr ""
#: ../../include/delivery.php:441 ../../include/enotify.php:23 #: ../../include/delivery.php:452 ../../include/enotify.php:23
#: ../../include/notifier.php:659 #: ../../include/notifier.php:659
msgid "noreply" msgid "noreply"
msgstr "" msgstr ""
@ -6155,18 +6165,18 @@ msgstr ""
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: ../../include/text.php:936 #: ../../include/text.php:933 ../../include/text.php:948
msgid "Categories:"
msgstr ""
#: ../../include/text.php:948
msgid "remove" msgid "remove"
msgstr "" msgstr ""
#: ../../include/text.php:948 #: ../../include/text.php:933 ../../include/text.php:948
msgid "[remove]" msgid "[remove]"
msgstr "" msgstr ""
#: ../../include/text.php:936
msgid "Categories:"
msgstr ""
#: ../../include/text.php:951 #: ../../include/text.php:951
msgid "Filed under:" msgid "Filed under:"
msgstr "" msgstr ""
@ -6426,13 +6436,6 @@ msgstr ""
msgid "Categories" msgid "Categories"
msgstr "" msgstr ""
#: ../../include/contact_widgets.php:183
#, php-format
msgid "%d friend in common"
msgid_plural "%d friends in common"
msgstr[0] ""
msgstr[1] ""
#: ../../include/auth.php:29 #: ../../include/auth.php:29
msgid "Logged out." msgid "Logged out."
msgstr "" msgstr ""

36
view/de/lostpass_eml.tpl
View File

@ -1,32 +1,32 @@
Liebe/r $username, Hallo $[username],
wir haben gerade eine Anfrage erhalten dein Passwort auf $sitename zu ändern. Auf $[sitename] wurde eine Anfrage zum Zurücksetzen deines
Um diese Anfrage zu bestätigen folge bitte dem Bestätigungslink oder kopiere Passworts empfangen. Um diese zu bestätigen folge bitte dem Link
ihn in die Adresszeile deines Browsers. weiter unten oder kopiere ihn in die Adressleiste deines Browsers.
Solltest du KEINE Änderungsanfrage gestellt haben ignoriere diese EMail einfach Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE
und folge dem angegebenen Link UNTER KEINEN UMSTÄNDEN. bitte diese Mail und den Link.
Dein Passwort wird nicht geändert wenn du die Anfrage nicht bestätigst. Dein Passwort wird nicht geändert werden solange wir nicht überprüfen
konnten, dass du die Anfrage gestellt hast.
Folge diesem Link zur Verifizierung der Anfrage: Folge diesem Link um deine Identität zu verifizieren:
$reset_link $[reset_link]
Anschließend wirst du eine EMail erhalten die dein neues Passwort enthält. Du wirst eine weitere Email erhalten mit dem neuen Passwort.
Du kannst dein Passwort jederzeit in den Einstellungen deines Accounts ändern Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern.
nachdem du angemeldet bist.
Die Anmelde Daten sind die Folgenden: Die Login-Details sind die folgenden:
Adresse der Seite: $siteurl Adresse der Seite: $[siteurl]
Anmelde Name: $email Login Name: $[email]
Mit freundlichen Grüßen, Grüße,
$sitename Administrator $[sitename] Administrator

19
view/de/update_fail_eml.tpl
View File

@ -1,12 +1,11 @@
Hey, Hi,
Ich bin's, $sitename. ich bin $sitename.
Die Friendica-Entwickler haben gerade Update $update freigegeben, Die friendica Entwickler haben jüngst Update $update veröffentlicht,
aber als ich es installieren wollte, ist irgendetwas schief gegangen. aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen.
Das sollte schnell repariert werden und alleine schaffe ich es nicht. Das sollte schnellst möglichst behoben werden und ich kann das nicht alleine machen.
Wende dich bitte an einen Friendica-Entwickler, wenn du mir nicht selbst helfen kannst. Bitte wende dich an einen friendica Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte unbrauchbar sein.
Meine Datenbank könnte ziemlich durcheinander sein.
Die Fehlermeldung ist '$error'. Die Fehlermeldung lautet '$error'.
Tut mir leid, Tut mir Leid!
dein Friendica Server unter $siteurl Deine friendica Instanz auf $siteurl

20
view/theme/cleanzero/config.php
View File

@ -12,8 +12,9 @@ function theme_content(&$a){
$resize = get_pconfig(local_user(), 'cleanzero', 'resize' ); $resize = get_pconfig(local_user(), 'cleanzero', 'resize' );
$color = get_pconfig(local_user(), 'cleanzero', 'color' ); $color = get_pconfig(local_user(), 'cleanzero', 'color' );
$font_size = get_pconfig(local_user(), 'cleanzero', 'font_size' ); $font_size = get_pconfig(local_user(), 'cleanzero', 'font_size' );
$theme_width= get_pconfig(local_user(), 'cleanzero', 'theme_width' );
return cleanzero_form($a,$color,$font_size,$resize); return cleanzero_form($a,$color,$font_size,$resize,$theme_width);
} }
function theme_post(&$a){ function theme_post(&$a){
@ -24,6 +25,7 @@ function theme_post(&$a){
set_pconfig(local_user(), 'cleanzero', 'resize', $_POST['cleanzero_resize']); set_pconfig(local_user(), 'cleanzero', 'resize', $_POST['cleanzero_resize']);
set_pconfig(local_user(), 'cleanzero', 'color', $_POST['cleanzero_color']); set_pconfig(local_user(), 'cleanzero', 'color', $_POST['cleanzero_color']);
set_pconfig(local_user(), 'cleanzero', 'font_size', $_POST['cleanzero_font_size']); set_pconfig(local_user(), 'cleanzero', 'font_size', $_POST['cleanzero_font_size']);
set_pconfig(local_user(), 'cleanzero', 'theme_width', $_POST['cleanzero_theme_width']);
} }
} }
@ -32,8 +34,8 @@ function theme_admin(&$a){
$resize = get_config('cleanzero', 'resize' ); $resize = get_config('cleanzero', 'resize' );
$color = get_config('cleanzero', 'color' ); $color = get_config('cleanzero', 'color' );
$font_size = get_config('cleanzero', 'font_size' ); $font_size = get_config('cleanzero', 'font_size' );
$theme_width= get_config('cleanzero', 'theme_width' );
return cleanzero_form($a,$color,$font_size,$resize); return cleanzero_form($a,$color,$font_size,$resize,$theme_width);
} }
function theme_admin_post(&$a){ function theme_admin_post(&$a){
@ -41,11 +43,13 @@ function theme_admin_post(&$a){
set_config('cleanzero', 'resize', $_POST['cleanzero_resize']); set_config('cleanzero', 'resize', $_POST['cleanzero_resize']);
set_config('cleanzero', 'color', $_POST['cleanzero_color']); set_config('cleanzero', 'color', $_POST['cleanzero_color']);
set_config('cleanzero', 'font_size', $_POST['cleanzero_font_size']); set_config('cleanzero', 'font_size', $_POST['cleanzero_font_size']);
set_config('cleanzero', 'theme_width', $_POST['cleanzero_theme_width']);
} }
} }
function cleanzero_form(&$a, $color,$font_size,$resize){ function cleanzero_form(&$a, $color,$font_size,$resize,$theme_width){
$colors = array( $colors = array(
"cleanzero"=>"cleanzero", "cleanzero"=>"cleanzero",
"cleanzero-green"=>"green", "cleanzero-green"=>"green",
@ -65,7 +69,12 @@ function cleanzero_form(&$a, $color,$font_size,$resize){
"250"=>"3 (250px)", "250"=>"3 (250px)",
"150"=>"4 (150px)", "150"=>"4 (150px)",
); );
$theme_widths =array (
"standard"=>"standard",
"narrow"=>"narrow",
"wide"=>"wide",
);
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$o .= replace_macros($t, array( $o .= replace_macros($t, array(
'$submit' => t('Submit'), '$submit' => t('Submit'),
@ -73,6 +82,7 @@ function cleanzero_form(&$a, $color,$font_size,$resize){
'$title' => t("Theme settings"), '$title' => t("Theme settings"),
'$resize' => array('cleanzero_resize',t ('Set resize level for images in posts and comments (width and height)'),$resize,'',$resizes), '$resize' => array('cleanzero_resize',t ('Set resize level for images in posts and comments (width and height)'),$resize,'',$resizes),
'$font_size' => array('cleanzero_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), '$font_size' => array('cleanzero_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
'$theme_width' => array('cleanzero_theme_width', t('Set theme width'), $theme_width, '', $theme_widths),
'$color' => array('cleanzero_color', t('Color scheme'), $color, '', $colors), '$color' => array('cleanzero_color', t('Color scheme'), $color, '', $colors),
)); ));
return $o; return $o;

73
view/theme/cleanzero/style.php
View File

@ -1,21 +1,24 @@
<?php <?php
$color=false; $color=false;
$cleanzero_font_size=false; $cleanzero_font_size=false;
$cleanzero_theme_width=false;
$site_color = get_config("cleanzero","color"); $site_color = get_config("cleanzero","color");
$site_cleanzero_font_size = get_config("cleanzero", "font_size" ); $site_cleanzero_font_size = get_config("cleanzero", "font_size" );
$site_cleanzero_theme_width = get_config("cleanzero", "theme_width");
if (local_user()) { if (local_user()) {
$color = get_pconfig(local_user(), "cleanzero","color"); $color = get_pconfig(local_user(), "cleanzero","color");
$cleanzero_font_size = get_pconfig(local_user(), "cleanzero", "font_size"); $cleanzero_font_size = get_pconfig(local_user(), "cleanzero", "font_size");
$cleanzero_theme_width = get_pconfig(local_user(), "cleanzero", "theme_width");
} }
if ($color===false) $color=$site_color; if ($color===false) $color=$site_color;
if ($color===false) $color="cleanzero"; if ($color===false) $color="cleanzero";
if ($cleanzero_font_size===false) $cleanzero_font_size=$site_cleanzero_font_size; if ($cleanzero_font_size===false) $cleanzero_font_size=$site_cleanzero_font_size;
if ($cleanzero_theme_width===false) $cleanzero_theme_width=$site_cleanzero_theme_width;
if ($cleanzero_theme_width===false) $cleanzero_theme_width="standard";
if (file_exists("$THEMEPATH/$color/style.css")){ if (file_exists("$THEMEPATH/$color/style.css")){
@ -68,4 +71,70 @@
} }
"; ";
} }
if ($cleanzero_theme_width === "standard") {
echo "
section {
margin: 0px 10%;
margin-right:10%;
}
aside {
margin-left: 10%;
}
nav {
margin-left: 10%;
margin-right: 10%;
}
nav #site-location {
right: 10%;
}
";
}
if ($cleanzero_theme_width === "narrow") {
echo "
section {
margin: 0px 15%;
margin-right:15%;
}
aside {
margin-left: 15%;
}
nav {
margin-left: 15%;
margin-right: 15%;
}
nav #site-location {
right: 15%;
}
";
}
if ($cleanzero_theme_width === "wide") {
echo "
section {
margin: 0px 5%;
margin-right:5%;
}
aside {
margin-left: 5%;
}
nav {
margin-left: 5%;
margin-right: 5%;
}
nav #site-location {
right: 5%;
}
";
}

2
view/theme/cleanzero/theme_settings.tpl
View File

@ -1,7 +1,7 @@
{{inc field_select.tpl with $field=$color}}{{endinc}} {{inc field_select.tpl with $field=$color}}{{endinc}}
{{inc field_select.tpl with $field=$font_size}}{{endinc}} {{inc field_select.tpl with $field=$font_size}}{{endinc}}
{{inc field_select.tpl with $field=$resize}}{{endinc}} {{inc field_select.tpl with $field=$resize}}{{endinc}}
{{inc field_select.tpl with $field=$theme_width}}{{endinc}}
<div class="settings-submit-wrapper"> <div class="settings-submit-wrapper">

40
view/theme/diabook/communityhome.tpl
View File

@ -8,10 +8,9 @@
<div>$page</div> <div>$page</div>
{{ endif }} {{ endif }}
<div id="close_profiles"> <div id="close_profiles">
{{ if $comunity_profilest_title }} {{ if $comunity_profilest_title }}
<h3>$comunity_profilest_title<a id="close_comunity_profiles_icon" onClick="close_profiles()" class="icon close_box" title="close"></a></h3> <h3>$comunity_profilest_title<a id="close_comunity_profiles_icon" onClick="close_profiles()" class="icon close_box" title="$close"></a></h3>
<div id='lastusers-wrapper' class='items-wrapper'> <div id='lastusers-wrapper' class='items-wrapper'>
{{ for $comunity_profiles_items as $i }} {{ for $comunity_profiles_items as $i }}
$i $i
@ -22,7 +21,7 @@
<div id="close_helpers"> <div id="close_helpers">
{{ if $helpers }} {{ if $helpers }}
<h3>$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3> <h3>$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="$close"></a></h3>
<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br> <a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br> <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br> <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@ -32,7 +31,7 @@
<div id="close_services"> <div id="close_services">
{{ if $con_services }} {{ if $con_services }}
<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3> <h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="$close"></a></h3>
<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;"> <div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a> <a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a> <a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
@ -48,7 +47,7 @@
<div id="close_friends" style="margin-bottom:53px;"> <div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }} {{ if $nv }}
<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3> <h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="$close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br> <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br> <a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br> <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
@ -60,7 +59,7 @@ $nv.search
<div id="close_lastusers"> <div id="close_lastusers">
{{ if $lastusers_title }} {{ if $lastusers_title }}
<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3> <h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="$close"></a></h3>
<div id='lastusers-wrapper' class='items-wrapper'> <div id='lastusers-wrapper' class='items-wrapper'>
{{ for $lastusers_items as $i }} {{ for $lastusers_items as $i }}
$i $i
@ -80,7 +79,7 @@ $nv.search
<div id="close_lastphotos"> <div id="close_lastphotos">
{{ if $photos_title }} {{ if $photos_title }}
<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()" class="icon close_box" title="close"></a></h3> <h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()" class="icon close_box" title="$close"></a></h3>
<div id='ra-photos-wrapper' class='items-wrapper'> <div id='ra-photos-wrapper' class='items-wrapper'>
{{ for $photos_items as $i }} {{ for $photos_items as $i }}
$i $i
@ -91,7 +90,7 @@ $nv.search
<div id="close_lastlikes"> <div id="close_lastlikes">
{{ if $like_title }} {{ if $like_title }}
<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3> <h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="$close"></a></h3>
<ul id='likes'> <ul id='likes'>
{{ for $like_items as $i }} {{ for $like_items as $i }}
<li id='ra-photos-wrapper'>$i</li> <li id='ra-photos-wrapper'>$i</li>
@ -100,6 +99,31 @@ $nv.search
{{ endif }} {{ endif }}
</div> </div>
<div id="close_twitter">
<h3 style="height:1.17em">$twitter.title.1<a id="close_twitter_icon" onClick="close_twitter()" class="icon close_box" title="$close"></a></h3>
<div id="twitter"> <div id="twitter">
</div> </div>
<div id="twittersettings" style="display:none;">
<form id="twittersettings-form" action="network" method="post" autocomplete="off">
{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
<div class="settings-submit-wrapper">
<input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
</div>
</form>
</div>
</div>
<div id="close_mapquery">
{{ if $mapquery }}
<h3>$mapquery.title.1<a id="close_mapquery_icon" onClick="close_mapquery()" class="icon close_box" title="$close"></a></h3>
<div id="map" style="height:170px;width:170px;margin-top:3px;margin-bottom:1px;">
</div>
<div style="font-size:9px;">Data CC-By-SA by <a href="http://openstreetmap.org/">OpenStreetMap</a></div>
<div id="#mapcontrol" style="display:none;" class="lightbox">
hallo welt
<div id="map2" style="height:370px;width:370px;margin-top:3px;margin-bottom:1px;">
</div>
</div>
{{ endif }}
</div>
</div> </div>

11
view/theme/diabook/config.php
View File

@ -13,8 +13,9 @@ function theme_content(&$a){
$line_height = get_pconfig(local_user(), 'diabook', 'line_height' ); $line_height = get_pconfig(local_user(), 'diabook', 'line_height' );
$resolution = get_pconfig(local_user(), 'diabook', 'resolution' ); $resolution = get_pconfig(local_user(), 'diabook', 'resolution' );
$color = get_pconfig(local_user(), 'diabook', 'color' ); $color = get_pconfig(local_user(), 'diabook', 'color' );
$TSearchTerm = get_pconfig(local_user(), 'diabook', 'TSearchTerm' );
return diabook_form($a,$font_size, $line_height, $resolution, $color); return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm);
} }
function theme_post(&$a){ function theme_post(&$a){
@ -26,6 +27,7 @@ function theme_post(&$a){
set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']); set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']);
set_pconfig(local_user(), 'diabook', 'resolution', $_POST['diabook_resolution']); set_pconfig(local_user(), 'diabook', 'resolution', $_POST['diabook_resolution']);
set_pconfig(local_user(), 'diabook', 'color', $_POST['diabook_color']); set_pconfig(local_user(), 'diabook', 'color', $_POST['diabook_color']);
set_pconfig(local_user(), 'diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']);
} }
} }
@ -35,8 +37,9 @@ function theme_admin(&$a){
$line_height = get_config('diabook', 'line_height' ); $line_height = get_config('diabook', 'line_height' );
$resolution = get_config('diabook', 'resolution' ); $resolution = get_config('diabook', 'resolution' );
$color = get_config('diabook', 'color' ); $color = get_config('diabook', 'color' );
$TSearchTerm = get_config('diabook', 'TSearchTerm' );
return diabook_form($a,$font_size, $line_height, $resolution, $color); return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm);
} }
function theme_admin_post(&$a){ function theme_admin_post(&$a){
@ -45,11 +48,12 @@ function theme_admin_post(&$a){
set_config('diabook', 'line_height', $_POST['diabook_line_height']); set_config('diabook', 'line_height', $_POST['diabook_line_height']);
set_config('diabook', 'resolution', $_POST['diabook_resolution']); set_config('diabook', 'resolution', $_POST['diabook_resolution']);
set_config('diabook', 'color', $_POST['diabook_color']); set_config('diabook', 'color', $_POST['diabook_color']);
set_config('diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']);
} }
} }
function diabook_form(&$a, $font_size, $line_height, $resolution, $color){ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSearchTerm){
$line_heights = array( $line_heights = array(
"1.3"=>"1.3", "1.3"=>"1.3",
"---"=>"---", "---"=>"---",
@ -95,6 +99,7 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color){
'$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), '$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
'$resolution' => array('diabook_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), '$resolution' => array('diabook_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),
'$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors), '$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors),
'$TSearchTerm' => array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm),
)); ));
return $o; return $o;
} }

2885
view/theme/diabook/js/OpenLayers.js Normal file
View File

File diff suppressed because one or more lines are too long

1028
view/theme/diabook/js/jquery.mapquery.core.js Normal file
View File

File diff suppressed because it is too large Load Diff

4
view/theme/diabook/js/jquery.twitter.search.js
View File

@ -31,7 +31,7 @@
opts.title = opts.term; opts.title = opts.term;
opts.title = opts.title || ''; opts.title = opts.title || '';
text = opts.titleLink ? ('<a href="'+ opts.titleLink +'">'+ opts.title + '</a>') : ('<span>' + opts.title +'<a id="close_friends_icon" onClick="close_twitter()" class="icon close_box" title="close"></a>'+ '</span>'); text = opts.titleLink ? ('<a href="'+ opts.titleLink +'">'+ opts.title + '</a>') : ('<span>' + opts.title +'</span>');
$text = $(text); $text = $(text);
if (opts.titleLink) if (opts.titleLink)
$text.css(opts.css['titleLink']); $text.css(opts.css['titleLink']);
@ -210,7 +210,7 @@
loading: { padding: '20px', textAlign: 'center', color: '#888' }, loading: { padding: '20px', textAlign: 'center', color: '#888' },
text: {}, text: {},
time: { fontSize: 'smaller', color: '#888' }, time: { fontSize: 'smaller', color: '#888' },
title: { 'border-bottom': '1px solid #D2D2D2', 'padding-top': '5px', 'padding-bottom': '0px', 'padding-left': '9px', 'margin-bottom': '0px', 'margin-top': '30px' , 'display': 'block', 'font-size': '1.17em', 'font-weight': 'bold'}, title: { 'display': 'none'},
titleLink: { textDecoration: 'none', color: '#3B5998' }, titleLink: { textDecoration: 'none', color: '#3B5998' },
user: { fontWeight: 'bold' } user: { fontWeight: 'bold' }
} }

2
view/theme/diabook/oembed_video.tpl
View File

@ -1,4 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe();javascript:$(this).parent().css("height", "370px"); return false;' style='float:left; margin: 1em; position: relative;'> <a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe();javascript:$(this).parent().css("height", "450px"); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' > <img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a> </a>

111
view/theme/diabook/theme.php
View File

@ -48,7 +48,7 @@ if ($color=="pink") $color_path = "/diabook-pink/";
if ($color=="green") $color_path = "/diabook-green/"; if ($color=="green") $color_path = "/diabook-green/";
if ($color=="dark") $color_path = "/diabook-dark/"; if ($color=="dark") $color_path = "/diabook-dark/";
//profile_side at networkpages //profile_side at networkpages
if ($a->argv[0] === "network" && local_user()){ if ($a->argv[0] === "network" && local_user()){
@ -80,9 +80,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
} }
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_mapquery'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
if($ccCookie != "9") { if($ccCookie != "10") {
// COMMUNITY // COMMUNITY
diabook_community_info(); diabook_community_info();
@ -96,7 +96,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
//right_aside at profile pages //right_aside at profile pages
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
if($ccCookie != "9") { if($ccCookie != "10") {
// COMMUNITY // COMMUNITY
diabook_community_info(); diabook_community_info();
@ -128,36 +128,74 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS); $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS);
} }
//load jquery.mapquery.js
$_COOKIE['close_mapquery'] = "1";
if($_COOKIE['close_mapquery'] != "1") {
$mapqueryJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.core.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mapqueryJS);
$openlayersJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/OpenLayers.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $openlayersJS);
$qlayersJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.mqLayerControl.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mqlayersJS);
}
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script> <script>
$(function() { $(function() {
$("a.lightbox").fancybox(); // Select all links with lightbox class $("a.lightbox").fancybox(); // Select all links with lightbox class
$("a.#twittersettings-link").fancybox({onClosed: function() { $("#twittersettings").attr("style","display: none;");}} );
}); });
$(window).load(function() { $(window).load(function() {
var footer_top = $(document).height() - 30; var footer_top = $(document).height() - 30;
$("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;"); $("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
}); });
</script>'; </script>';
//check if mapquerybox is active and print
$_COOKIE['close_mapquery'] = "1";
if($_COOKIE['close_mapquery'] != "1") {
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$("#map").mapQuery({
layers:[{ //add layers to your map; you need to define at least one to be able to see anything on the map
type:"osm" //add a layer of the type osm (OpenStreetMap)
}]
});
$("#map2").mapQuery({
layers:[{ //add layers to your map; you need to define at least one to be able to see anything on the map
type:"osm" //add a layer of the type osm (OpenStreetMap)
}]
});
});
</script>';
}
//check if twitterbox is active and print //check if twitterbox is active and print
if($_COOKIE['close_twitter'] != "1") { if($_COOKIE['close_twitter'] != "1") {
$TSearchTerm=false;
$site_TSearchTerm = get_config("diabook", "TSearchTerm" );
$TSearchTerm = get_pconfig(local_user(), "diabook", "TSearchTerm");
if ($TSearchTerm===false) $TSearchTerm=$site_TSearchTerm;
if ($TSearchTerm===false) $TSearchTerm="friendica";
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script> <script>
$(function() { $(function() {
$("#twitter").twitterSearch({ $("#twitter").twitterSearch({
term: "friendica", term: "'.$TSearchTerm.'",
animInSpeed: 250, animInSpeed: 250,
bird: false, bird: false,
avatar: false, avatar: false,
colorExterior: "#fff", colorExterior: "#fff",
title: "Last Tweets",
timeout: 10000 }); timeout: 10000 });
}); });
function open_twittersettings() {
$("div#twittersettings").attr("style","display: block;");
};
</script>';} </script>';}
//check if community_home-plugin is activated and change css //check if community_home-plugin is activated and change css
@ -187,6 +225,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
<script> <script>
function restore_boxes(){ function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" }); $.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_mapquery","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" }); $.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_profiles","2", { expires: 365, path: "/" }); $.cookie("close_profiles","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" }); $.cookie("close_services","2", { expires: 365, path: "/" });
@ -219,6 +258,11 @@ if ($color=="dark") $color_path = "/diabook-dark/";
document.getElementById( "close_pages" ).style.display = "none"; document.getElementById( "close_pages" ).style.display = "none";
}; };
if($.cookie("close_mapquery") == "1")
{
document.getElementById( "close_mapquery" ).style.display = "none";
};
if($.cookie("close_profiles") == "1") if($.cookie("close_profiles") == "1")
{ {
document.getElementById( "close_profiles" ).style.display = "none"; document.getElementById( "close_profiles" ).style.display = "none";
@ -241,7 +285,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
if($.cookie("close_twitter") == "1") if($.cookie("close_twitter") == "1")
{ {
document.getElementById( "twitter" ).style.display = "none"; document.getElementById( "close_twitter" ).style.display = "none";
}; };
if($.cookie("close_lastusers") == "1") if($.cookie("close_lastusers") == "1")
@ -265,6 +309,11 @@ if ($color=="dark") $color_path = "/diabook-dark/";
document.getElementById( "close_pages" ).style.display = "none"; document.getElementById( "close_pages" ).style.display = "none";
$.cookie("close_pages","1", { expires: 365, path: "/" }); $.cookie("close_pages","1", { expires: 365, path: "/" });
}; };
function close_mapquery(){
document.getElementById( "close_mapquery" ).style.display = "none";
$.cookie("close_mapquery","1", { expires: 365, path: "/" });
};
function close_profiles(){ function close_profiles(){
document.getElementById( "close_profiles" ).style.display = "none"; document.getElementById( "close_profiles" ).style.display = "none";
@ -287,7 +336,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}; };
function close_twitter(){ function close_twitter(){
document.getElementById( "twitter" ).style.display = "none"; document.getElementById( "close_twitter" ).style.display = "none";
$.cookie("close_twitter","1", { expires: 365, path: "/" }); $.cookie("close_twitter","1", { expires: 365, path: "/" });
}; };
@ -509,6 +558,15 @@ if ($color=="dark") $color_path = "/diabook-dark/";
}} }}
//END Community Page //END Community Page
//mapquery
$_COOKIE['close_mapquery'] = "1";
if($_COOKIE['close_mapquery'] != "1") {
$mapquery = array();
$mapquery['title'] = Array("", t('Earth View'), "", "");
$aside['$mapquery'] = $mapquery;
}
//end mapquery
//helpers //helpers
if($_COOKIE['close_helpers'] != "1") { if($_COOKIE['close_helpers'] != "1") {
$helpers = array(); $helpers = array();
@ -523,6 +581,23 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$aside['$con_services'] = $con_services; $aside['$con_services'] = $con_services;
} }
//end connectable services //end connectable services
//twitter
if($_COOKIE['close_twitter'] != "1") {
$twitter = array();
$twitter['title'] = Array("", "<a id='twittersettings-link' href='#twittersettings' style='text-decoration:none;' onclick='open_twittersettings(); return false;'>".t('Last Tweets')."</a>", "", "");
$aside['$twitter'] = $twitter;
$TSearchTerm = get_pconfig(local_user(), 'diabook', 'TSearchTerm' );
$aside['$submit'] = t('Submit');
$aside['$TSearchTerm'] = array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm);
$baseurl = $a->get_baseurl();
$aside['$baseurl'] = $baseurl;
if (isset($_POST['diabook-settings-submit'])){
set_pconfig(local_user(), 'diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']);
}
}
//end twitter
$close = t('Close');
$aside['$close'] = $close;
//get_baseurl //get_baseurl
$url = $a->get_baseurl($ssl_state); $url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url; $aside['$url'] = $url;
@ -542,14 +617,4 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$a->page['footer'] = $a->page['footer'].replace_macros($tpl, $bottom); $a->page['footer'] = $a->page['footer'].replace_macros($tpl, $bottom);
} }

2
view/theme/diabook/theme_settings.tpl
View File

@ -6,6 +6,8 @@
{{inc field_select.tpl with $field=$resolution}}{{endinc}} {{inc field_select.tpl with $field=$resolution}}{{endinc}}
{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
<div class="field select"> <div class="field select">
<a onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a> <a onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a>
</div> </div>