clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote branch 'upstream/master'

This commit is contained in:
zottel 2012-04-16 13:53:05 +02:00
parent a2c4ce7487 fd2f7dd6ae
commit 041f74dc77
31 changed files with 524 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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.1311' ); define ( 'FRIENDICA_VERSION', '2.3.1313' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 ); define ( 'DB_UPDATE_VERSION', 1138 );
@ -936,6 +936,7 @@ if(! function_exists('profile_load')) {
} }
if(($r === false) || (! count($r))) { if(($r === false) || (! count($r))) {
logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
notice( t('Requested profile is not available.') . EOL ); notice( t('Requested profile is not available.') . EOL );
$a->error = 404; $a->error = 404;
return; return;

2
include/Contact.php
View File

@ -158,7 +158,7 @@ function contact_photo_menu($contact) {
$o = ""; $o = "";
foreach($menu as $k=>$v){ foreach($menu as $k=>$v){
if ($v!="") { if ($v!="") {
if(($k !== t("Network Posts")) && ($k !== t("Send PM"))) if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact')))
$o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n"; $o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n";
else else
$o .= "<li><a href=\"$v\">$k</a></li>\n"; $o .= "<li><a href=\"$v\">$k</a></li>\n";

180
include/api.php
View File

@ -121,6 +121,7 @@
if (strpos($a->query_string, ".json")>0) $type="json"; if (strpos($a->query_string, ".json")>0) $type="json";
if (strpos($a->query_string, ".rss")>0) $type="rss"; if (strpos($a->query_string, ".rss")>0) $type="rss";
if (strpos($a->query_string, ".atom")>0) $type="atom"; if (strpos($a->query_string, ".atom")>0) $type="atom";
if (strpos($a->query_string, ".as")>0) $type="as";
$r = call_user_func($info['func'], $a, $type); $r = call_user_func($info['func'], $a, $type);
if ($r===false) return; if ($r===false) return;
@ -144,6 +145,12 @@
header ("Content-Type: application/atom+xml"); header ("Content-Type: application/atom+xml");
return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r; return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
break; break;
case "as":
//header ("Content-Type: application/json");
//foreach($r as $rr)
// return json_encode($rr);
return json_encode($r);
break;
} }
//echo "<pre>"; var_dump($r); die(); //echo "<pre>"; var_dump($r); die();
@ -737,6 +744,13 @@
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra($a, $data, $user_info);
break;
case "as":
$as = api_format_as($a, $ret, $user_info);
$as['title'] = $a->config['sitename']." Home Timeline";
$as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
return($as);
break;
} }
return api_apply_template("timeline", $type, $data); return api_apply_template("timeline", $type, $data);
@ -744,6 +758,85 @@
api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true); api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true); api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
function api_statuses_public_timeline(&$a, $type){
if (local_user()===false) return false;
$user_info = api_get_user($a);
// get last newtork messages
// params
$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
if ($page<0) $page=0;
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$start = $page*$count;
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
if ($max_id > 0)
$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
/*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
FROM `item`, `contact`
WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`>%d
ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($since_id),
intval($start), intval($count)
);*/
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
`user`.`nickname`, `user`.`hidewall`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`>%d
ORDER BY `received` DESC LIMIT %d, %d ",
intval($since_id),
intval($start),
intval($count));
$ret = api_format_items($r,$user_info);
$data = array('$statuses' => $ret);
switch($type){
case "atom":
case "rss":
$data = api_rss_extra($a, $data, $user_info);
break;
case "as":
$as = api_format_as($a, $ret, $user_info);
$as['title'] = $a->config['sitename']." Public Timeline";
$as['link']['url'] = $a->get_baseurl()."/";
return($as);
break;
}
return api_apply_template("timeline", $type, $data);
}
api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true);
/** /**
* *
*/ */
@ -917,6 +1010,13 @@
case "atom": case "atom":
case "rss": case "rss":
$data = api_rss_extra($a, $data, $user_info); $data = api_rss_extra($a, $data, $user_info);
break;
case "as":
$as = api_format_as($a, $ret, $user_info);
$as["title"] = $a->config['sitename']." Mentions";
$as['link']['url'] = $a->get_baseurl()."/";
return($as);
break;
} }
return api_apply_template("timeline", $type, $data); return api_apply_template("timeline", $type, $data);
@ -1035,6 +1135,70 @@
api_register_func('api/favorites','api_favorites', true); api_register_func('api/favorites','api_favorites', true);
function api_format_as($a, $ret, $user_info) {
$as = array();
$as['title'] = $a->config['sitename']." Public Timeline";
$items = array();
foreach ($ret as $item) {
$singleitem["actor"]["displayName"] = $item["user"]["name"];
$singleitem["actor"]["id"] = $item["user"]["contact_url"];
$avatar[0]["url"] = $item["user"]["profile_image_url"];
$avatar[0]["rel"] = "avatar";
$avatar[0]["type"] = "";
$avatar[0]["width"] = 96;
$avatar[0]["height"] = 96;
$avatar[1]["url"] = $item["user"]["profile_image_url"];
$avatar[1]["rel"] = "avatar";
$avatar[1]["type"] = "";
$avatar[1]["width"] = 48;
$avatar[1]["height"] = 48;
$avatar[2]["url"] = $item["user"]["profile_image_url"];
$avatar[2]["rel"] = "avatar";
$avatar[2]["type"] = "";
$avatar[2]["width"] = 24;
$avatar[2]["height"] = 24;
$singleitem["actor"]["avatarLinks"] = $avatar;
$singleitem["actor"]["image"]["url"] = $item["user"]["profile_image_url"];
$singleitem["actor"]["image"]["rel"] = "avatar";
$singleitem["actor"]["image"]["type"] = "";
$singleitem["actor"]["image"]["width"] = 96;
$singleitem["actor"]["image"]["height"] = 96;
$singleitem["actor"]["type"] = "person";
$singleitem["actor"]["url"] = $item["person"]["contact_url"];
$singleitem["actor"]["statusnet:profile_info"]["local_id"] = $item["user"]["id"];
$singleitem["actor"]["statusnet:profile_info"]["following"] = $item["user"]["following"] ? "true" : "false";
$singleitem["actor"]["statusnet:profile_info"]["blocking"] = "false";
$singleitem["actor"]["contact"]["preferredUsername"] = $item["user"]["screen_name"];
$singleitem["actor"]["contact"]["displayName"] = $item["user"]["name"];
$singleitem["actor"]["contact"]["addresses"] = "";
$singleitem["body"] = $item["text"];
$singleitem["object"]["displayName"] = $item["text"];
$singleitem["object"]["id"] = $item["url"];
$singleitem["object"]["type"] = "note";
$singleitem["object"]["url"] = $item["url"];
//$singleitem["context"] =;
$singleitem["postedTime"] = date("c", strtotime($item["published"]));
$singleitem["provider"]["objectType"] = "service";
$singleitem["provider"]["displayName"] = "Test";
$singleitem["provider"]["url"] = "http://test.tld";
$singleitem["title"] = $item["text"];
$singleitem["verb"] = "post";
$singleitem["statusnet:notice_info"]["local_id"] = $item["id"];
$singleitem["statusnet:notice_info"]["source"] = $item["source"];
$singleitem["statusnet:notice_info"]["favorite"] = "false";
$singleitem["statusnet:notice_info"]["repeated"] = "false";
//$singleitem["original"] = $item;
$items[] = $singleitem;
}
$as['items'] = $items;
$as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
$as['link']['rel'] = "alternate";
$as['link']['type'] = "text/html";
return($as);
}
function api_format_items($r,$user_info) { function api_format_items($r,$user_info) {
@ -1069,8 +1233,17 @@
$in_reply_to_status_id = 0; $in_reply_to_status_id = 0;
} }
// Workaround for ostatus messages where the title is identically to the body
$statusbody = trim(html2plain(bbcode($item['body']), 0));
$statustitle = trim($item['title']);
if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
$statustext = trim($statusbody);
else
$statustext = trim($statustitle."\n\n".$statusbody);
$status = array( $status = array(
'text' => trim($item['title']." \n".html2plain(bbcode($item['body']), 0)), 'text' => $statustext,
'truncated' => False, 'truncated' => False,
'created_at'=> api_date($item['created']), 'created_at'=> api_date($item['created']),
'in_reply_to_status_id' => $in_reply_to_status_id, 'in_reply_to_status_id' => $in_reply_to_status_id,
@ -1081,8 +1254,8 @@
'geo' => '', 'geo' => '',
'favorited' => $item['starred'] ? true : false, 'favorited' => $item['starred'] ? true : false,
'user' => $status_user , 'user' => $status_user ,
'statusnet_html' => bbcode($item['body']), 'statusnet_html' => trim(bbcode($item['body'])),
'statusnet_conversation_id' => 0, 'statusnet_conversation_id' => $item['parent'],
); );
// Seesmic doesn't like the following content // Seesmic doesn't like the following content
@ -1449,7 +1622,6 @@ Not implemented by now:
favorites favorites
favorites/create favorites/create
favorites/destroy favorites/destroy
statuses/public_timeline
statuses/retweets_of_me statuses/retweets_of_me
friendships/create friendships/create
friendships/destroy friendships/destroy

13
include/conversation.php
View File

@ -559,10 +559,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
} }
} }
$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes')) if(local_user() && link_compare($a->contact['url'],$item['author-link']))
? array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")) $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
: False); else
$edpost = false;
$drop = ''; $drop = '';
$dropping = false; $dropping = false;
@ -626,10 +626,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
else else
$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb); $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
$like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : ''); $like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : ''); $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
@ -1089,4 +1085,3 @@ function render_location_google($item) {
} }
return $location; return $location;
} }

4
include/dba.php
View File

@ -260,6 +260,4 @@ function dbesc_array(&$arr) {
if(is_array($arr) && count($arr)) { if(is_array($arr) && count($arr)) {
array_walk($arr,'dbesc_array_cb'); array_walk($arr,'dbesc_array_cb');
} }
}} }}

2
include/html2plain.php
View File

@ -157,7 +157,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
//node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\n"); //node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\n");
node2bbcode($doc, 'li', array(), "\n* ", "\n"); node2bbcode($doc, 'li', array(), "\n* ", "\n");
node2bbcode($doc, 'hr', array(), str_repeat("-", 70), ""); node2bbcode($doc, 'hr', array(), "\n".str_repeat("-", 70)."\n", "");
node2bbcode($doc, 'tr', array(), "\n", ""); node2bbcode($doc, 'tr', array(), "\n", "");
node2bbcode($doc, 'td', array(), "\t", ""); node2bbcode($doc, 'td', array(), "\t", "");

28
include/items.php
View File

@ -2229,6 +2229,34 @@ function local_delivery($importer,$data) {
$datarray = get_atom_elements($feed,$item); $datarray = get_atom_elements($feed,$item);
$r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id),
intval($importer['importer_uid'])
);
// Update content if 'updated' changes
if(count($r)) {
$iid = $r[0]['id'];
if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
logger('received updated comment' , LOGGER_DEBUG);
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($datarray['title']),
dbesc($datarray['body']),
dbesc($datarray['tag']),
dbesc(datetime_convert('UTC','UTC',$datarray['edited'])),
dbesc($item_id),
intval($importer['importer_uid'])
);
proc_run('php',"include/notifier.php","comment-import",$iid);
}
continue;
}
// TODO: make this next part work against both delivery threads of a community post // TODO: make this next part work against both delivery threads of a community post
// if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) { // if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {

2
mod/item.php
View File

@ -759,7 +759,7 @@ function item_post(&$a) {
} }
else { else {
logger('mod_item: unable to retrieve post that was just stored.'); logger('mod_item: unable to retrieve post that was just stored.');
notify( t('System error. Post not saved.')); notice( t('System error. Post not saved.') . EOL);
goaway($a->get_baseurl() . "/" . $return_path ); goaway($a->get_baseurl() . "/" . $return_path );
// NOTREACHED // NOTREACHED
} }

29
mod/photo.php
View File

@ -4,6 +4,30 @@ require_once('include/security.php');
function photo_init(&$a) { function photo_init(&$a) {
// To-Do:
// - checking with realpath
// - checking permissions
/*
$cache = get_config('system','itemcache');
if (($cache != '') and is_dir($cache)) {
$cachefile = $cache."/".$a->argc."-".$a->argv[1]."-".$a->argv[2]."-".$a->argv[3];
if (file_exists($cachefile)) {
$data = file_get_contents($cachefile);
if(function_exists('header_remove')) {
header_remove('Pragma');
header_remove('pragma');
}
header("Content-type: image/jpeg");
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
header("Cache-Control: max-age=" . (3600*24));
echo $data;
killme();
// NOTREACHED
}
}*/
switch($a->argc) { switch($a->argc) {
case 4: case 4:
$person = $a->argv[3]; $person = $a->argv[3];
@ -27,6 +51,7 @@ function photo_init(&$a) {
if(isset($type)) { if(isset($type)) {
/** /**
* Profile photos * Profile photos
*/ */
@ -144,6 +169,10 @@ function photo_init(&$a) {
} }
} }
// Writing in cachefile
if ($cachefile != '')
file_put_contents($cachefile, $data);
if(function_exists('header_remove')) { if(function_exists('header_remove')) {
header_remove('Pragma'); header_remove('Pragma');
header_remove('pragma'); header_remove('pragma');

1
mod/profile.php
View File

@ -17,6 +17,7 @@ function profile_init(&$a) {
goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']); goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
} }
else { else {
logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
notice( t('Requested profile is not available.') . EOL ); notice( t('Requested profile is not available.') . EOL );
$a->error = 404; $a->error = 404;
return; return;

212
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1311\n" "Project-Id-Version: 2.3.1313\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-13 10:00-0700\n" "POT-Creation-Date: 2012-04-15 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"
@ -55,8 +55,8 @@ msgstr ""
#: ../../mod/profiles.php:7 ../../mod/profiles.php:329 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329
#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3132 #: ../../addon/facebook/facebook.php:461 ../../include/items.php:3142
#: ../../index.php:305 #: ../../index.php:309
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -157,7 +157,12 @@ msgstr ""
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:90 #: ../../addon/posterous/posterous.php:90
#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 #: ../../view/theme/diabook-red/config.php:64
#: ../../view/theme/diabook-blue/config.php:64
#: ../../view/theme/diabook/config.php:76
#: ../../view/theme/quattro/config.php:52
#: ../../view/theme/diabook-aerith/config.php:64
#: ../../include/conversation.php:555
msgid "Submit" msgid "Submit"
msgstr "" msgstr ""
@ -169,11 +174,11 @@ msgstr ""
msgid "Help" msgid "Help"
msgstr "" msgstr ""
#: ../../mod/help.php:38 ../../index.php:224 #: ../../mod/help.php:38 ../../index.php:228
msgid "Not Found" msgid "Not Found"
msgstr "" msgstr ""
#: ../../mod/help.php:41 ../../index.php:227 #: ../../mod/help.php:41 ../../index.php:231
msgid "Page not found." msgid "Page not found."
msgstr "" msgstr ""
@ -217,9 +222,9 @@ msgstr ""
#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243 #: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243
#: ../../view/theme/diabook-blue/theme.php:243 #: ../../view/theme/diabook-blue/theme.php:243
#: ../../view/theme/diabook/theme.php:251 #: ../../view/theme/diabook/theme.php:253
#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52 #: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
#: ../../boot.php:1470 #: ../../boot.php:1471
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -269,7 +274,7 @@ msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:395 ../../include/event.php:37 #: ../../mod/events.php:395 ../../include/event.php:37
#: ../../include/bb2diaspora.php:260 ../../boot.php:1082 #: ../../include/bb2diaspora.php:260 ../../boot.php:1083
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -353,7 +358,7 @@ msgstr ""
#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110 #: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook-red/theme.php:113 #: ../../view/theme/diabook-red/theme.php:113
#: ../../view/theme/diabook-blue/theme.php:113 #: ../../view/theme/diabook-blue/theme.php:113
#: ../../view/theme/diabook/theme.php:117 #: ../../view/theme/diabook/theme.php:119
#: ../../view/theme/diabook-aerith/theme.php:114 #: ../../view/theme/diabook-aerith/theme.php:114
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
@ -379,7 +384,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:111 #: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook-red/theme.php:114 #: ../../view/theme/diabook-red/theme.php:114
#: ../../view/theme/diabook-blue/theme.php:114 #: ../../view/theme/diabook-blue/theme.php:114
#: ../../view/theme/diabook/theme.php:118 #: ../../view/theme/diabook/theme.php:120
#: ../../view/theme/diabook-aerith/theme.php:115 #: ../../view/theme/diabook-aerith/theme.php:115
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
@ -404,7 +409,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:163 #: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook-red/theme.php:85 #: ../../view/theme/diabook-red/theme.php:85
#: ../../view/theme/diabook-blue/theme.php:85 #: ../../view/theme/diabook-blue/theme.php:85
#: ../../view/theme/diabook/theme.php:89 #: ../../view/theme/diabook/theme.php:91
#: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304 #: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126 #: ../../include/conversation.php:126
@ -582,7 +587,7 @@ msgstr ""
#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245 #: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245
#: ../../view/theme/diabook-blue/theme.php:245 #: ../../view/theme/diabook-blue/theme.php:245
#: ../../view/theme/diabook/theme.php:253 #: ../../view/theme/diabook/theme.php:255
#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101 #: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101
msgid "Community" msgid "Community"
msgstr "" msgstr ""
@ -813,7 +818,7 @@ msgstr ""
msgid "Confirm" msgid "Confirm"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:628 ../../include/items.php:2652 #: ../../mod/dfrn_request.php:628 ../../include/items.php:2662
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "" msgstr ""
@ -1176,7 +1181,7 @@ msgid "is interested in:"
msgstr "" msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59 #: ../../mod/match.php:58 ../../mod/suggest.php:59
#: ../../include/contact_widgets.php:9 ../../boot.php:1026 #: ../../include/contact_widgets.php:9 ../../boot.php:1027
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1226,7 +1231,7 @@ msgstr ""
#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239 #: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239
#: ../../view/theme/diabook-blue/theme.php:239 #: ../../view/theme/diabook-blue/theme.php:239
#: ../../view/theme/diabook/theme.php:247 #: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77 #: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77
#: ../../include/nav.php:115 #: ../../include/nav.php:115
msgid "Home" msgid "Home"
@ -1606,7 +1611,7 @@ msgstr ""
#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241 #: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241
#: ../../view/theme/diabook-blue/theme.php:241 #: ../../view/theme/diabook-blue/theme.php:241
#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139 #: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -1642,7 +1647,7 @@ msgstr ""
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
#: ../../addon/facebook/facebook.php:622 #: ../../addon/facebook/facebook.php:622
#: ../../addon/facebook/facebook.php:1076 #: ../../addon/facebook/facebook.php:1076
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2661 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2671
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -2269,7 +2274,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1475 #: ../../mod/notes.php:44 ../../boot.php:1476
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2476,7 +2481,7 @@ msgstr ""
msgid "Group name changed." msgid "Group name changed."
msgstr "" msgstr ""
#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:304 #: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
msgid "Permission denied" msgid "Permission denied"
msgstr "" msgstr ""
@ -2518,10 +2523,10 @@ msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240 #: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240
#: ../../view/theme/diabook-blue/theme.php:240 #: ../../view/theme/diabook-blue/theme.php:240
#: ../../view/theme/diabook/theme.php:248 #: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook-aerith/theme.php:241 #: ../../view/theme/diabook-aerith/theme.php:241
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
#: ../../include/nav.php:50 ../../boot.php:1457 #: ../../include/nav.php:50 ../../boot.php:1458
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -2709,7 +2714,7 @@ msgstr ""
#: ../../view/theme/diabook-red/theme.php:89 #: ../../view/theme/diabook-red/theme.php:89
#: ../../view/theme/diabook-blue/theme.php:80 #: ../../view/theme/diabook-blue/theme.php:80
#: ../../view/theme/diabook-blue/theme.php:89 #: ../../view/theme/diabook-blue/theme.php:89
#: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/theme.php:86 ../../view/theme/diabook/theme.php:95
#: ../../view/theme/diabook-aerith/theme.php:81 #: ../../view/theme/diabook-aerith/theme.php:81
#: ../../view/theme/diabook-aerith/theme.php:90 #: ../../view/theme/diabook-aerith/theme.php:90
#: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48
@ -2722,7 +2727,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:172 #: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook-red/theme.php:94 #: ../../view/theme/diabook-red/theme.php:94
#: ../../view/theme/diabook-blue/theme.php:94 #: ../../view/theme/diabook-blue/theme.php:94
#: ../../view/theme/diabook/theme.php:98 #: ../../view/theme/diabook/theme.php:100
#: ../../view/theme/diabook-aerith/theme.php:95 #: ../../view/theme/diabook-aerith/theme.php:95
#: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65
#, php-format #, php-format
@ -2736,7 +2741,7 @@ msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37 #: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
#: ../../mod/display.php:142 ../../include/items.php:3044 #: ../../mod/display.php:142 ../../include/items.php:3054
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -3431,15 +3436,15 @@ msgstr ""
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:20 ../../boot.php:939 #: ../../mod/profile.php:21 ../../boot.php:940
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
#: ../../mod/profile.php:123 ../../mod/display.php:75 #: ../../mod/profile.php:124 ../../mod/display.php:75
msgid "Access to this profile has been restricted." msgid "Access to this profile has been restricted."
msgstr "" msgstr ""
#: ../../mod/profile.php:144 #: ../../mod/profile.php:145
msgid "Tips for New Members" msgid "Tips for New Members"
msgstr "" msgstr ""
@ -3820,23 +3825,23 @@ msgstr ""
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:585 ../../boot.php:1048 #: ../../mod/profiles.php:585 ../../boot.php:1049
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:586 ../../boot.php:1049 #: ../../mod/profiles.php:586 ../../boot.php:1050
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:597 ../../boot.php:1059 #: ../../mod/profiles.php:597 ../../boot.php:1060
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:599 ../../boot.php:1062 #: ../../mod/profiles.php:599 ../../boot.php:1063
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:600 ../../boot.php:1063 #: ../../mod/profiles.php:600 ../../boot.php:1064
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
@ -3890,7 +3895,7 @@ msgstr ""
#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149 #: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149
#: ../../view/theme/diabook-blue/theme.php:149 #: ../../view/theme/diabook-blue/theme.php:149
#: ../../view/theme/diabook/theme.php:153 #: ../../view/theme/diabook/theme.php:155
#: ../../view/theme/diabook-aerith/theme.php:150 #: ../../view/theme/diabook-aerith/theme.php:150
#: ../../include/contact_widgets.php:34 #: ../../include/contact_widgets.php:34
msgid "Friend Suggestions" msgid "Friend Suggestions"
@ -3908,7 +3913,7 @@ msgstr ""
#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147 #: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147
#: ../../view/theme/diabook-blue/theme.php:147 #: ../../view/theme/diabook-blue/theme.php:147
#: ../../view/theme/diabook/theme.php:151 #: ../../view/theme/diabook/theme.php:153
#: ../../view/theme/diabook-aerith/theme.php:148 #: ../../view/theme/diabook-aerith/theme.php:148
msgid "Global Directory" msgid "Global Directory"
msgstr "" msgstr ""
@ -4443,7 +4448,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:155 #: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook-red/theme.php:77 #: ../../view/theme/diabook-red/theme.php:77
#: ../../view/theme/diabook-blue/theme.php:77 #: ../../view/theme/diabook-blue/theme.php:77
#: ../../view/theme/diabook/theme.php:81 #: ../../view/theme/diabook/theme.php:83
#: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302 #: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302
#: ../../include/conversation.php:45 ../../include/conversation.php:118 #: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event" msgid "event"
@ -5323,42 +5328,42 @@ msgstr ""
#: ../../view/theme/diabook-red/theme.php:26 #: ../../view/theme/diabook-red/theme.php:26
#: ../../view/theme/diabook-blue/theme.php:26 #: ../../view/theme/diabook-blue/theme.php:26
#: ../../view/theme/diabook/theme.php:30 #: ../../view/theme/diabook/theme.php:32
#: ../../view/theme/diabook-aerith/theme.php:27 #: ../../view/theme/diabook-aerith/theme.php:27
msgid "Last users" msgid "Last users"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:55 #: ../../view/theme/diabook-red/theme.php:55
#: ../../view/theme/diabook-blue/theme.php:55 #: ../../view/theme/diabook-blue/theme.php:55
#: ../../view/theme/diabook/theme.php:59 #: ../../view/theme/diabook/theme.php:61
#: ../../view/theme/diabook-aerith/theme.php:56 #: ../../view/theme/diabook-aerith/theme.php:56
msgid "Last likes" msgid "Last likes"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:100 #: ../../view/theme/diabook-red/theme.php:100
#: ../../view/theme/diabook-blue/theme.php:100 #: ../../view/theme/diabook-blue/theme.php:100
#: ../../view/theme/diabook/theme.php:104 #: ../../view/theme/diabook/theme.php:106
#: ../../view/theme/diabook-aerith/theme.php:101 #: ../../view/theme/diabook-aerith/theme.php:101
msgid "Last photos" msgid "Last photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:145 #: ../../view/theme/diabook-red/theme.php:145
#: ../../view/theme/diabook-blue/theme.php:145 #: ../../view/theme/diabook-blue/theme.php:145
#: ../../view/theme/diabook/theme.php:149 #: ../../view/theme/diabook/theme.php:151
#: ../../view/theme/diabook-aerith/theme.php:146 #: ../../view/theme/diabook-aerith/theme.php:146
msgid "Find Friends" msgid "Find Friends"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:146 #: ../../view/theme/diabook-red/theme.php:146
#: ../../view/theme/diabook-blue/theme.php:146 #: ../../view/theme/diabook-blue/theme.php:146
#: ../../view/theme/diabook/theme.php:150 #: ../../view/theme/diabook/theme.php:152
#: ../../view/theme/diabook-aerith/theme.php:147 #: ../../view/theme/diabook-aerith/theme.php:147
msgid "Local Directory" msgid "Local Directory"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:148 #: ../../view/theme/diabook-red/theme.php:148
#: ../../view/theme/diabook-blue/theme.php:148 #: ../../view/theme/diabook-blue/theme.php:148
#: ../../view/theme/diabook/theme.php:152 #: ../../view/theme/diabook/theme.php:154
#: ../../view/theme/diabook-aerith/theme.php:149 #: ../../view/theme/diabook-aerith/theme.php:149
#: ../../include/contact_widgets.php:35 #: ../../include/contact_widgets.php:35
msgid "Similar Interests" msgid "Similar Interests"
@ -5366,7 +5371,7 @@ msgstr ""
#: ../../view/theme/diabook-red/theme.php:150 #: ../../view/theme/diabook-red/theme.php:150
#: ../../view/theme/diabook-blue/theme.php:150 #: ../../view/theme/diabook-blue/theme.php:150
#: ../../view/theme/diabook/theme.php:154 #: ../../view/theme/diabook/theme.php:156
#: ../../view/theme/diabook-aerith/theme.php:151 #: ../../view/theme/diabook-aerith/theme.php:151
#: ../../include/contact_widgets.php:37 #: ../../include/contact_widgets.php:37
msgid "Invite Friends" msgid "Invite Friends"
@ -5376,8 +5381,8 @@ msgstr ""
#: ../../view/theme/diabook-red/theme.php:246 #: ../../view/theme/diabook-red/theme.php:246
#: ../../view/theme/diabook-blue/theme.php:165 #: ../../view/theme/diabook-blue/theme.php:165
#: ../../view/theme/diabook-blue/theme.php:246 #: ../../view/theme/diabook-blue/theme.php:246
#: ../../view/theme/diabook/theme.php:170 #: ../../view/theme/diabook/theme.php:172
#: ../../view/theme/diabook/theme.php:254 #: ../../view/theme/diabook/theme.php:256
#: ../../view/theme/diabook-aerith/theme.php:166 #: ../../view/theme/diabook-aerith/theme.php:166
#: ../../view/theme/diabook-aerith/theme.php:247 #: ../../view/theme/diabook-aerith/theme.php:247
msgid "Community Pages" msgid "Community Pages"
@ -5385,42 +5390,42 @@ msgstr ""
#: ../../view/theme/diabook-red/theme.php:198 #: ../../view/theme/diabook-red/theme.php:198
#: ../../view/theme/diabook-blue/theme.php:198 #: ../../view/theme/diabook-blue/theme.php:198
#: ../../view/theme/diabook/theme.php:203 #: ../../view/theme/diabook/theme.php:205
#: ../../view/theme/diabook-aerith/theme.php:199 #: ../../view/theme/diabook-aerith/theme.php:199
msgid "Help or @NewHere ?" msgid "Help or @NewHere ?"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:204 #: ../../view/theme/diabook-red/theme.php:204
#: ../../view/theme/diabook-blue/theme.php:204 #: ../../view/theme/diabook-blue/theme.php:204
#: ../../view/theme/diabook/theme.php:209 #: ../../view/theme/diabook/theme.php:211
#: ../../view/theme/diabook-aerith/theme.php:205 #: ../../view/theme/diabook-aerith/theme.php:205
msgid "Connect Services" msgid "Connect Services"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:210 #: ../../view/theme/diabook-red/theme.php:210
#: ../../view/theme/diabook-blue/theme.php:210 #: ../../view/theme/diabook-blue/theme.php:210
#: ../../view/theme/diabook/theme.php:215 #: ../../view/theme/diabook/theme.php:217
#: ../../view/theme/diabook-aerith/theme.php:211 #: ../../view/theme/diabook-aerith/theme.php:211
msgid "PostIt to Friendica" msgid "PostIt to Friendica"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:210 #: ../../view/theme/diabook-red/theme.php:210
#: ../../view/theme/diabook-blue/theme.php:210 #: ../../view/theme/diabook-blue/theme.php:210
#: ../../view/theme/diabook/theme.php:215 #: ../../view/theme/diabook/theme.php:217
#: ../../view/theme/diabook-aerith/theme.php:211 #: ../../view/theme/diabook-aerith/theme.php:211
msgid "Post to Friendica" msgid "Post to Friendica"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:211 #: ../../view/theme/diabook-red/theme.php:211
#: ../../view/theme/diabook-blue/theme.php:211 #: ../../view/theme/diabook-blue/theme.php:211
#: ../../view/theme/diabook/theme.php:216 #: ../../view/theme/diabook/theme.php:218
#: ../../view/theme/diabook-aerith/theme.php:212 #: ../../view/theme/diabook-aerith/theme.php:212
msgid " from anywhere by bookmarking this Link." msgid " from anywhere by bookmarking this Link."
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:239 #: ../../view/theme/diabook-red/theme.php:239
#: ../../view/theme/diabook-blue/theme.php:239 #: ../../view/theme/diabook-blue/theme.php:239
#: ../../view/theme/diabook/theme.php:247 #: ../../view/theme/diabook/theme.php:249
#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49 #: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49
#: ../../include/nav.php:115 #: ../../include/nav.php:115
msgid "Your posts and conversations" msgid "Your posts and conversations"
@ -5428,58 +5433,80 @@ msgstr ""
#: ../../view/theme/diabook-red/theme.php:240 #: ../../view/theme/diabook-red/theme.php:240
#: ../../view/theme/diabook-blue/theme.php:240 #: ../../view/theme/diabook-blue/theme.php:240
#: ../../view/theme/diabook/theme.php:248 #: ../../view/theme/diabook/theme.php:250
#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50 #: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50
msgid "Your profile page" msgid "Your profile page"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:241 #: ../../view/theme/diabook-red/theme.php:241
#: ../../view/theme/diabook-blue/theme.php:241 #: ../../view/theme/diabook-blue/theme.php:241
#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook/theme.php:251
#: ../../view/theme/diabook-aerith/theme.php:242 #: ../../view/theme/diabook-aerith/theme.php:242
msgid "Your contacts" msgid "Your contacts"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:242 #: ../../view/theme/diabook-red/theme.php:242
#: ../../view/theme/diabook-blue/theme.php:242 #: ../../view/theme/diabook-blue/theme.php:242
#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook/theme.php:252
#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51 #: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
#: ../../boot.php:1462 #: ../../boot.php:1463
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:242 #: ../../view/theme/diabook-red/theme.php:242
#: ../../view/theme/diabook-blue/theme.php:242 #: ../../view/theme/diabook-blue/theme.php:242
#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook/theme.php:252
#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51 #: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
msgid "Your photos" msgid "Your photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:243 #: ../../view/theme/diabook-red/theme.php:243
#: ../../view/theme/diabook-blue/theme.php:243 #: ../../view/theme/diabook-blue/theme.php:243
#: ../../view/theme/diabook/theme.php:251 #: ../../view/theme/diabook/theme.php:253
#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52 #: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
msgid "Your events" msgid "Your events"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:244 #: ../../view/theme/diabook-red/theme.php:244
#: ../../view/theme/diabook-blue/theme.php:244 #: ../../view/theme/diabook-blue/theme.php:244
#: ../../view/theme/diabook/theme.php:252 #: ../../view/theme/diabook/theme.php:254
#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53 #: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
msgid "Personal notes" msgid "Personal notes"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/theme.php:244 #: ../../view/theme/diabook-red/theme.php:244
#: ../../view/theme/diabook-blue/theme.php:244 #: ../../view/theme/diabook-blue/theme.php:244
#: ../../view/theme/diabook/theme.php:252 #: ../../view/theme/diabook/theme.php:254
#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53 #: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
msgid "Your personal photos" msgid "Your personal photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/config.php:66
#: ../../view/theme/diabook-blue/config.php:66
#: ../../view/theme/diabook/config.php:78
#: ../../view/theme/quattro/config.php:54 #: ../../view/theme/quattro/config.php:54
#: ../../view/theme/diabook-aerith/config.php:66
msgid "Theme settings" msgid "Theme settings"
msgstr "" msgstr ""
#: ../../view/theme/diabook-red/config.php:67
#: ../../view/theme/diabook-blue/config.php:67
#: ../../view/theme/diabook/config.php:79
#: ../../view/theme/diabook-aerith/config.php:67
msgid "Set font-size for posts and comments"
msgstr ""
#: ../../view/theme/diabook-red/config.php:68
#: ../../view/theme/diabook-blue/config.php:68
#: ../../view/theme/diabook/config.php:80
#: ../../view/theme/diabook-aerith/config.php:68
msgid "Set line-height for posts and comments"
msgstr ""
#: ../../view/theme/diabook/config.php:81
msgid "Set resolution for middle column"
msgstr ""
#: ../../view/theme/quattro/config.php:55 #: ../../view/theme/quattro/config.php:55
msgid "Alignment" msgid "Alignment"
msgstr "" msgstr ""
@ -5496,7 +5523,7 @@ msgstr ""
msgid "Color scheme" msgid "Color scheme"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:17 ../../boot.php:1084 #: ../../include/profile_advanced.php:17 ../../boot.php:1085
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
@ -5509,7 +5536,7 @@ msgid "j F"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
#: ../../include/items.php:1392 #: ../../include/items.php:1402
msgid "Birthday:" msgid "Birthday:"
msgstr "" msgstr ""
@ -5517,11 +5544,11 @@ msgstr ""
msgid "Age:" msgid "Age:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:37 ../../boot.php:1087 #: ../../include/profile_advanced.php:37 ../../boot.php:1088
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:45 ../../boot.php:1089 #: ../../include/profile_advanced.php:45 ../../boot.php:1090
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -5769,6 +5796,14 @@ msgstr ""
msgid "Unavailable" msgid "Unavailable"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Has crush"
msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Infatuated"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Dating" msgid "Dating"
msgstr "" msgstr ""
@ -5801,6 +5836,10 @@ msgstr ""
msgid "Married" msgid "Married"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Imaginarily married"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Partners" msgid "Partners"
msgstr "" msgstr ""
@ -5809,12 +5848,16 @@ msgstr ""
msgid "Cohabiting" msgid "Cohabiting"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Common law"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Happy" msgid "Happy"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Not Looking" msgid "Not looking"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
@ -5837,6 +5880,10 @@ msgstr ""
msgid "Divorced" msgid "Divorced"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33
msgid "Imaginarily divorced"
msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Widowed" msgid "Widowed"
msgstr "" msgstr ""
@ -5846,7 +5893,7 @@ msgid "Uncertain"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
msgid "Complicated" msgid "It's complicated"
msgstr "" msgstr ""
#: ../../include/profile_selectors.php:33 #: ../../include/profile_selectors.php:33
@ -6093,7 +6140,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1452 #: ../../include/nav.php:49 ../../boot.php:1453
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -6173,11 +6220,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1042 #: ../../include/nav.php:138 ../../boot.php:1043
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1042 #: ../../include/nav.php:138 ../../boot.php:1043
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -6564,11 +6611,11 @@ msgstr ""
msgid "Please visit %s to approve or reject the suggestion." msgid "Please visit %s to approve or reject the suggestion."
msgstr "" msgstr ""
#: ../../include/items.php:2659 #: ../../include/items.php:2669
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "" msgstr ""
#: ../../include/items.php:2659 #: ../../include/items.php:2669
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "" msgstr ""
@ -6616,7 +6663,8 @@ msgstr ""
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: ../../include/Contact.php:149 ../../include/conversation.php:817 #: ../../include/Contact.php:149 ../../include/Contact.php:161
#: ../../include/conversation.php:817
msgid "Edit Contact" msgid "Edit Contact"
msgstr "" msgstr ""
@ -6843,42 +6891,42 @@ msgstr ""
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:974 #: ../../boot.php:975
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1034 #: ../../boot.php:1035
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1150 ../../boot.php:1222 #: ../../boot.php:1151 ../../boot.php:1223
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1151 ../../boot.php:1223 #: ../../boot.php:1152 ../../boot.php:1224
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1176 #: ../../boot.php:1177
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1177 #: ../../boot.php:1178
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1200 ../../boot.php:1265 #: ../../boot.php:1201 ../../boot.php:1266
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1246 #: ../../boot.php:1247
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1247 #: ../../boot.php:1248
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""
#: ../../boot.php:1259 #: ../../boot.php:1260
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""

42
view/api_timeline_xml.tpl
View File

@ -1,22 +1,20 @@
<statuses type="array"> <statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
{{ for $statuses as $status }} {{ for $statuses as $status }} <status>
<status> <text>$status.text</text>
<created_at>$status.created_at</created_at> <truncated>$status.truncated</truncated>
<id>$status.id</id> <created_at>$status.created_at</created_at>
<text>$status.text</text> <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
<statusnet_html>$status.statusnet_html</statusnet_html> <source>$status.source</source>
<source>$status.source</source> <id>$status.id</id>
<truncated>$status.truncated</truncated> <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
<url>$status.url</url> <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
<in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id> <geo>$status.geo</geo>
<in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id> <favorited>$status.favorited</favorited>
<favorited>$status.favorited</favorited> {{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} <statusnet:html>$status.statusnet_html</statusnet:html>
<in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name> <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id>
<geo>$status.geo</geo> <url>$status.url</url>
<coordinates>$status.coordinates</coordinates> <coordinates>$status.coordinates</coordinates>
<place>$status.place</place> <place>$status.place</place>
<contributors>$status.contributors</contributors> <contributors>$status.contributors</contributors>
{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} </status>
</status> {{ endfor }}</statuses>
{{ endfor }}
</statuses>

64
view/api_user_xml.tpl
View File

@ -1,34 +1,34 @@
<user> <user>
<id>$user.id</id> <id>$user.id</id>
<name>$user.name</name> <name>$user.name</name>
<screen_name>$user.screen_name</screen_name> <screen_name>$user.screen_name</screen_name>
<location>$user.location</location> <location>$user.location</location>
<description>$user.description</description> <description>$user.description</description>
<profile_image_url>$user.profile_image_url</profile_image_url> <profile_image_url>$user.profile_image_url</profile_image_url>
<url>$user.url</url> <url>$user.url</url>
<protected>$user.protected</protected> <protected>$user.protected</protected>
<followers_count>$user.followers_count</followers_count> <followers_count>$user.followers_count</followers_count>
<profile_background_color>$user.profile_background_color</profile_background_color> <friends_count>$user.friends_count</friends_count>
<profile_text_color>$user.profile_text_color</profile_text_color> <created_at>$user.created_at</created_at>
<profile_link_color>$user.profile_link_color</profile_link_color> <favourites_count>$user.favourites_count</favourites_count>
<profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color> <utc_offset>$user.utc_offset</utc_offset>
<profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color> <time_zone>$user.time_zone</time_zone>
<friends_count>$user.friends_count</friends_count> <statuses_count>$user.statuses_count</statuses_count>
<created_at>$user.created_at</created_at> <following>$user.following</following>
<favourites_count>$user.favourites_count</favourites_count> <profile_background_color>$user.profile_background_color</profile_background_color>
<utc_offset>$user.utc_offset</utc_offset> <profile_text_color>$user.profile_text_color</profile_text_color>
<time_zone>$user.time_zone</time_zone> <profile_link_color>$user.profile_link_color</profile_link_color>
<profile_background_image_url>$user.profile_background_image_url</profile_background_image_url> <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
<profile_background_tile>$user.profile_background_tile</profile_background_tile> <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
<profile_use_background_image>$user.profile_use_background_image</profile_use_background_image> <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
<notifications>$user.notifications</notifications> <profile_background_tile>$user.profile_background_tile</profile_background_tile>
<geo_enabled>$user.geo_enabled</geo_enabled> <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
<verified>$user.verified</verified> <notifications>$user.notifications</notifications>
<following>$user.following</following> <geo_enabled>$user.geo_enabled</geo_enabled>
<statuses_count>$user.statuses_count</statuses_count> <verified>$user.verified</verified>
<lang>$user.lang</lang> <lang>$user.lang</lang>
<contributors_enabled>$user.contributors_enabled</contributors_enabled> <contributors_enabled>$user.contributors_enabled</contributors_enabled>
<status>{{ if $user.status }} <status>{{ if $user.status }}
<created_at>$user.status.created_at</created_at> <created_at>$user.status.created_at</created_at>
<id>$user.status.id</id> <id>$user.status.id</id>
<text>$user.status.text</text> <text>$user.status.text</text>
@ -43,4 +43,4 @@
<place>$user.status.place</place> <place>$user.status.place</place>
<contributors>$user.status.contributors</contributors> <contributors>$user.status.contributors</contributors>
{{ endif }}</status> {{ endif }}</status>
</user> </user>

2
view/de/strings.php
View File

@ -128,7 +128,7 @@ $a->strings["Post to Email"] = "An E-Mail senden";
$a->strings["Edit"] = "Bearbeiten"; $a->strings["Edit"] = "Bearbeiten";
$a->strings["Upload photo"] = "Foto hochladen"; $a->strings["Upload photo"] = "Foto hochladen";
$a->strings["Attach file"] = "Datei anhängen"; $a->strings["Attach file"] = "Datei anhängen";
$a->strings["Insert web link"] = "eine Kontaktanfrage"; $a->strings["Insert web link"] = "einen Weblink einfügen";
$a->strings["Insert YouTube video"] = "YouTube-Video einfügen"; $a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen"; $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen";
$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen"; $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen";

3
view/theme/diabook-aerith/style-network.css
View File

@ -2229,6 +2229,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

3
view/theme/diabook-aerith/style-profile.css
View File

@ -2203,6 +2203,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

10
view/theme/diabook-aerith/style.css
View File

@ -1230,6 +1230,9 @@ aside #likes a:hover{
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
#login-submit-wrapper{
margin-top: 20px;
}
.group_selected { .group_selected {
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
float: left; float: left;
@ -1245,7 +1248,7 @@ aside #likes a:hover{
.icon.text_add { .icon.text_add {
background-image: url("../../../images/icons/16/add.png"); background-image: url("../../../images/icons/16/add.png");
float: right; float: right;
opacity: 0.1; opacity: 0.2;
margin-right: 14px; margin-right: 14px;
} }
.icon.text_add:hover { .icon.text_add:hover {
@ -1262,7 +1265,7 @@ transition: all 0.2s ease-in-out;
} }
.icon.text_edit { .icon.text_edit {
background-image: url("../../../images/icons/10/edit.png"); background-image: url("../../../images/icons/10/edit.png");
opacity: 0.1; opacity: 0.2;
margin-top: 6px; margin-top: 6px;
float: right; float: right;
height: 10px; height: 10px;
@ -2487,6 +2490,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

3
view/theme/diabook-blue/style-network.css
View File

@ -2190,6 +2190,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

3
view/theme/diabook-blue/style-profile.css
View File

@ -2170,6 +2170,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

10
view/theme/diabook-blue/style.css
View File

@ -1190,6 +1190,9 @@ aside #side-peoplefind-url {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
#login-submit-wrapper{
margin-top: 20px;
}
.group_selected { .group_selected {
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
float: left; float: left;
@ -1205,7 +1208,7 @@ aside #side-peoplefind-url {
.icon.text_add { .icon.text_add {
background-image: url("../../../images/icons/16/add.png"); background-image: url("../../../images/icons/16/add.png");
float: right; float: right;
opacity: 0.1; opacity: 0.2;
margin-right: 14px; margin-right: 14px;
} }
.icon.text_add:hover { .icon.text_add:hover {
@ -1222,7 +1225,7 @@ transition: all 0.2s ease-in-out;
} }
.icon.text_edit { .icon.text_edit {
background-image: url("../../../images/icons/10/edit.png"); background-image: url("../../../images/icons/10/edit.png");
opacity: 0.1; opacity: 0.2;
margin-top: 6px; margin-top: 6px;
float: right; float: right;
height: 10px; height: 10px;
@ -2444,6 +2447,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

3
view/theme/diabook-red/style-network.css
View File

@ -2226,6 +2226,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

3
view/theme/diabook-red/style-profile.css
View File

@ -2184,6 +2184,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

10
view/theme/diabook-red/style.css
View File

@ -1219,6 +1219,9 @@ aside #side-peoplefind-url {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
#login-submit-wrapper{
margin-top: 20px;
}
.group_selected { .group_selected {
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
float: left; float: left;
@ -1234,7 +1237,7 @@ aside #side-peoplefind-url {
.icon.text_add { .icon.text_add {
background-image: url("../../../images/icons/16/add.png"); background-image: url("../../../images/icons/16/add.png");
float: right; float: right;
opacity: 0.1; opacity: 0.2;
margin-right: 14px; margin-right: 14px;
} }
.icon.text_add:hover { .icon.text_add:hover {
@ -1251,7 +1254,7 @@ transition: all 0.2s ease-in-out;
} }
.icon.text_edit { .icon.text_edit {
background-image: url("../../../images/icons/10/edit.png"); background-image: url("../../../images/icons/10/edit.png");
opacity: 0.1; opacity: 0.2;
margin-top: 6px; margin-top: 6px;
float: right; float: right;
height: 10px; height: 10px;
@ -2472,6 +2475,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

6
view/theme/diabook/js/README
View File

@ -19,4 +19,8 @@ An integer representing the maximum width for the image.
Example Example
$(function() { $(function() {
$( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
}); });
_______________________________________________________________________________________________
http://javascriptly.com/examples/jquery-grab-bag/autogrow-textarea.html

11
view/theme/diabook/style-network-wide.css
View File

@ -396,7 +396,7 @@
/* global */ /* global */
body { body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 15px; font-size: 13px;
background-color: #ffffff; background-color: #ffffff;
color: #2d2d2d; color: #2d2d2d;
margin: 50px auto auto; margin: 50px auto auto;
@ -958,8 +958,8 @@ ul.menu-popup .empty {
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 170px; width: 180px;
padding: 0px 10px 0px 0px; padding: 0px 5px 0px 0px;
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
@ -1924,7 +1924,7 @@ transition: all 0.2s ease-in-out;
ul.tabs { ul.tabs {
list-style-type: none; list-style-type: none;
padding-bottom: 10px; padding-bottom: 10px;
font-size: 15px; font-size: 13px;
width: 805px; width: 805px;
} }
ul.tabs li { ul.tabs li {
@ -2169,6 +2169,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

3
view/theme/diabook/style-network.css
View File

@ -2157,6 +2157,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

11
view/theme/diabook/style-profile-wide.css
View File

@ -395,7 +395,7 @@
/* global */ /* global */
body { body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 15px; font-size: 13px;
background-color: #ffffff; background-color: #ffffff;
color: #2d2d2d; color: #2d2d2d;
margin: 50px auto auto; margin: 50px auto auto;
@ -939,8 +939,8 @@ ul.menu-popup .empty {
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 170px; width: 180px;
padding: 0px 10px 0px 0px; padding: 0px 5px 0px 0px;
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
@ -1901,7 +1901,7 @@ transition: all 0.2s ease-in-out;
ul.tabs { ul.tabs {
list-style-type: none; list-style-type: none;
padding-bottom: 10px; padding-bottom: 10px;
font-size: 15px; font-size: 13px;
width: 805px; width: 805px;
} }
ul.tabs li { ul.tabs li {
@ -2151,6 +2151,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

3
view/theme/diabook/style-profile.css
View File

@ -2140,6 +2140,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

18
view/theme/diabook/style-wide.css
View File

@ -423,7 +423,7 @@
/* global */ /* global */
body { body {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 15px; font-size: 13px;
background-color: #ffffff; background-color: #ffffff;
color: #2d2d2d; color: #2d2d2d;
margin: 50px auto auto; margin: 50px auto auto;
@ -1082,8 +1082,8 @@ ul.menu-popup .empty {
aside { aside {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
width: 170px; width: 180px;
padding: 0px 10px 0px 0px; padding: 0px 5px 0px 0px;
border-right: 1px solid #D2D2D2; border-right: 1px solid #D2D2D2;
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
@ -1185,6 +1185,9 @@ aside #side-peoplefind-url {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
#login-submit-wrapper{
margin-top: 20px;
}
/* widget */ /* widget */
.widget { .widget {
margin-bottom: 2em; margin-bottom: 2em;
@ -1261,7 +1264,7 @@ aside #side-peoplefind-url {
.icon.text_add { .icon.text_add {
background-image: url("../../../images/icons/16/add.png"); background-image: url("../../../images/icons/16/add.png");
float: right; float: right;
opacity: 0.1; opacity: 0.2;
margin-right: 14px; margin-right: 14px;
} }
.icon.text_add:hover { .icon.text_add:hover {
@ -1278,7 +1281,7 @@ transition: all 0.2s ease-in-out;
} }
.icon.text_edit { .icon.text_edit {
background-image: url("../../../images/icons/10/edit.png"); background-image: url("../../../images/icons/10/edit.png");
opacity: 0.1; opacity: 0.2;
margin-top: 6px; margin-top: 6px;
float: right; float: right;
height: 10px; height: 10px;
@ -2124,7 +2127,7 @@ body .pageheader{
ul.tabs { ul.tabs {
list-style-type: none; list-style-type: none;
padding-bottom: 10px; padding-bottom: 10px;
font-size: 15px; font-size: 13px;
width: 805px; width: 805px;
} }
ul.tabs li { ul.tabs li {
@ -2417,6 +2420,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

10
view/theme/diabook/style.css
View File

@ -1182,6 +1182,9 @@ aside #side-peoplefind-url {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
#login-submit-wrapper{
margin-top: 20px;
}
/* widget */ /* widget */
.widget { .widget {
margin-bottom: 2em; margin-bottom: 2em;
@ -1256,7 +1259,7 @@ aside #side-peoplefind-url {
.icon.text_add { .icon.text_add {
background-image: url("../../../images/icons/16/add.png"); background-image: url("../../../images/icons/16/add.png");
float: right; float: right;
opacity: 0.1; opacity: 0.2;
margin-right: 14px; margin-right: 14px;
} }
.icon.text_add:hover { .icon.text_add:hover {
@ -1273,7 +1276,7 @@ transition: all 0.2s ease-in-out;
} }
.icon.text_edit { .icon.text_edit {
background-image: url("../../../images/icons/10/edit.png"); background-image: url("../../../images/icons/10/edit.png");
opacity: 0.1; opacity: 0.2;
margin-top: 6px; margin-top: 6px;
float: right; float: right;
height: 10px; height: 10px;
@ -2406,6 +2409,9 @@ box-shadow: 1px 1px 5px 0;
#group-separator, #group-separator,
#prof-separator { display: none;} #prof-separator { display: none;}
*/ */
#prof-members-end{
clear: both;
}
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
margin-bottom: 10px; margin-bottom: 10px;

10
view/theme/duepuntozero/lang_selector.tpl Normal file
View File

@ -0,0 +1,10 @@
<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
<div id="language-selector" style="display: none;" >
<form action="#" method="post" >
<select name="system_language" onchange="this.form.submit();" >
{{ for $langs.0 as $v=>$l }}
<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
{{ endfor }}
</select>
</form>
</div>