Merge remote branch 'upstream/master'
This commit is contained in:
zottel
commit
041f74dc77
3
boot.php
3
boot.php
|
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1311' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1313' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1138 );
|
||||
|
||||
|
|
@ -936,6 +936,7 @@ if(! function_exists('profile_load')) {
|
|||
}
|
||||
|
||||
if(($r === false) || (! count($r))) {
|
||||
logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
|
||||
notice( t('Requested profile is not available.') . EOL );
|
||||
$a->error = 404;
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ function contact_photo_menu($contact) {
|
|||
$o = "";
|
||||
foreach($menu as $k=>$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";
|
||||
else
|
||||
$o .= "<li><a href=\"$v\">$k</a></li>\n";
|
||||
|
|
|
|||
180
include/api.php
180
include/api.php
|
|
@ -121,6 +121,7 @@
|
|||
if (strpos($a->query_string, ".json")>0) $type="json";
|
||||
if (strpos($a->query_string, ".rss")>0) $type="rss";
|
||||
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);
|
||||
if ($r===false) return;
|
||||
|
|
@ -144,6 +145,12 @@
|
|||
header ("Content-Type: application/atom+xml");
|
||||
return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
|
||||
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();
|
||||
|
|
@ -737,6 +744,13 @@
|
|||
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']." Home Timeline";
|
||||
$as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
|
||||
return($as);
|
||||
break;
|
||||
}
|
||||
|
||||
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/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 "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']." Mentions";
|
||||
$as['link']['url'] = $a->get_baseurl()."/";
|
||||
return($as);
|
||||
break;
|
||||
}
|
||||
|
||||
return api_apply_template("timeline", $type, $data);
|
||||
|
|
@ -1035,6 +1135,70 @@
|
|||
|
||||
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) {
|
||||
|
||||
|
|
@ -1069,8 +1233,17 @@
|
|||
$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(
|
||||
'text' => trim($item['title']." \n".html2plain(bbcode($item['body']), 0)),
|
||||
'text' => $statustext,
|
||||
'truncated' => False,
|
||||
'created_at'=> api_date($item['created']),
|
||||
'in_reply_to_status_id' => $in_reply_to_status_id,
|
||||
|
|
@ -1081,8 +1254,8 @@
|
|||
'geo' => '',
|
||||
'favorited' => $item['starred'] ? true : false,
|
||||
'user' => $status_user ,
|
||||
'statusnet_html' => bbcode($item['body']),
|
||||
'statusnet_conversation_id' => 0,
|
||||
'statusnet_html' => trim(bbcode($item['body'])),
|
||||
'statusnet_conversation_id' => $item['parent'],
|
||||
);
|
||||
|
||||
// Seesmic doesn't like the following content
|
||||
|
|
@ -1449,7 +1622,6 @@ Not implemented by now:
|
|||
favorites
|
||||
favorites/create
|
||||
favorites/destroy
|
||||
statuses/public_timeline
|
||||
statuses/retweets_of_me
|
||||
friendships/create
|
||||
friendships/destroy
|
||||
|
|
|
|||
|
|
@ -559,10 +559,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
}
|
||||
}
|
||||
|
||||
$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
|
||||
? array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"))
|
||||
: False);
|
||||
|
||||
if(local_user() && link_compare($a->contact['url'],$item['author-link']))
|
||||
$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
|
||||
else
|
||||
$edpost = false;
|
||||
|
||||
$drop = '';
|
||||
$dropping = false;
|
||||
|
|
@ -626,10 +626,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
else
|
||||
$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']) : '');
|
||||
$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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -261,5 +261,3 @@ function dbesc_array(&$arr) {
|
|||
array_walk($arr,'dbesc_array_cb');
|
||||
}
|
||||
}}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
|
|||
//node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\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, 'td', array(), "\t", "");
|
||||
|
|
|
|||
|
|
@ -2229,6 +2229,34 @@ function local_delivery($importer,$data) {
|
|||
$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
|
||||
|
||||
// if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
|
||||
|
|
|
|||
|
|
@ -759,7 +759,7 @@ function item_post(&$a) {
|
|||
}
|
||||
else {
|
||||
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 );
|
||||
// NOTREACHED
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,30 @@ require_once('include/security.php');
|
|||
|
||||
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) {
|
||||
case 4:
|
||||
$person = $a->argv[3];
|
||||
|
|
@ -27,6 +51,7 @@ function photo_init(&$a) {
|
|||
|
||||
if(isset($type)) {
|
||||
|
||||
|
||||
/**
|
||||
* 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')) {
|
||||
header_remove('Pragma');
|
||||
header_remove('pragma');
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ function profile_init(&$a) {
|
|||
goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
|
||||
}
|
||||
else {
|
||||
logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
|
||||
notice( t('Requested profile is not available.') . EOL );
|
||||
$a->error = 404;
|
||||
return;
|
||||
|
|
|
|||
212
util/messages.po
212
util/messages.po
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 2.3.1311\n"
|
||||
"Project-Id-Version: 2.3.1313\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"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -55,8 +55,8 @@ msgstr ""
|
|||
#: ../../mod/profiles.php:7 ../../mod/profiles.php:329
|
||||
#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
|
||||
#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
|
||||
#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3132
|
||||
#: ../../index.php:305
|
||||
#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3142
|
||||
#: ../../index.php:309
|
||||
msgid "Permission denied."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -157,7 +157,12 @@ msgstr ""
|
|||
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
|
||||
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
|
||||
#: ../../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"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -169,11 +174,11 @@ msgstr ""
|
|||
msgid "Help"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/help.php:38 ../../index.php:224
|
||||
#: ../../mod/help.php:38 ../../index.php:228
|
||||
msgid "Not Found"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/help.php:41 ../../index.php:227
|
||||
#: ../../mod/help.php:41 ../../index.php:231
|
||||
msgid "Page not found."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -217,9 +222,9 @@ msgstr ""
|
|||
|
||||
#: ../../mod/events.php:296 ../../view/theme/diabook-red/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
|
||||
#: ../../boot.php:1470
|
||||
#: ../../boot.php:1471
|
||||
msgid "Events"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -269,7 +274,7 @@ msgid "Description:"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:395 ../../include/event.php:37
|
||||
#: ../../include/bb2diaspora.php:260 ../../boot.php:1082
|
||||
#: ../../include/bb2diaspora.php:260 ../../boot.php:1083
|
||||
msgid "Location:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -353,7 +358,7 @@ msgstr ""
|
|||
#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Contact Photos"
|
||||
msgstr ""
|
||||
|
|
@ -379,7 +384,7 @@ msgstr ""
|
|||
#: ../../addon/communityhome/communityhome.php:111
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Profile Photos"
|
||||
msgstr ""
|
||||
|
|
@ -404,7 +409,7 @@ msgstr ""
|
|||
#: ../../addon/communityhome/communityhome.php:163
|
||||
#: ../../view/theme/diabook-red/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
|
||||
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
|
||||
#: ../../include/conversation.php:126
|
||||
|
|
@ -582,7 +587,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/community.php:30 ../../view/theme/diabook-red/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
|
||||
msgid "Community"
|
||||
msgstr ""
|
||||
|
|
@ -813,7 +818,7 @@ msgstr ""
|
|||
msgid "Confirm"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_request.php:628 ../../include/items.php:2652
|
||||
#: ../../mod/dfrn_request.php:628 ../../include/items.php:2662
|
||||
msgid "[Name Withheld]"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1176,7 +1181,7 @@ msgid "is interested in:"
|
|||
msgstr ""
|
||||
|
||||
#: ../../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"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1226,7 +1231,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/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
|
||||
#: ../../include/nav.php:115
|
||||
msgid "Home"
|
||||
|
|
@ -1606,7 +1611,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/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
|
||||
msgid "Contacts"
|
||||
msgstr ""
|
||||
|
|
@ -1642,7 +1647,7 @@ msgstr ""
|
|||
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
|
||||
#: ../../addon/facebook/facebook.php:622
|
||||
#: ../../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"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2269,7 +2274,7 @@ msgstr ""
|
|||
msgid "Invalid contact."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/notes.php:44 ../../boot.php:1475
|
||||
#: ../../mod/notes.php:44 ../../boot.php:1476
|
||||
msgid "Personal Notes"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2476,7 +2481,7 @@ msgstr ""
|
|||
msgid "Group name changed."
|
||||
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"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2518,10 +2523,10 @@ msgstr ""
|
|||
|
||||
#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/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/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"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2709,7 +2714,7 @@ msgstr ""
|
|||
#: ../../view/theme/diabook-red/theme.php:89
|
||||
#: ../../view/theme/diabook-blue/theme.php:80
|
||||
#: ../../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:90
|
||||
#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
|
||||
|
|
@ -2722,7 +2727,7 @@ msgstr ""
|
|||
#: ../../addon/communityhome/communityhome.php:172
|
||||
#: ../../view/theme/diabook-red/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
|
||||
#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
|
||||
#, php-format
|
||||
|
|
@ -2736,7 +2741,7 @@ msgstr ""
|
|||
|
||||
#: ../../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/display.php:142 ../../include/items.php:3044
|
||||
#: ../../mod/display.php:142 ../../include/items.php:3054
|
||||
msgid "Item not found."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3431,15 +3436,15 @@ msgstr ""
|
|||
msgid "FTP Password"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profile.php:20 ../../boot.php:939
|
||||
#: ../../mod/profile.php:21 ../../boot.php:940
|
||||
msgid "Requested profile is not available."
|
||||
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."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profile.php:144
|
||||
#: ../../mod/profile.php:145
|
||||
msgid "Tips for New Members"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3820,23 +3825,23 @@ msgstr ""
|
|||
msgid "Edit/Manage Profiles"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:585 ../../boot.php:1048
|
||||
#: ../../mod/profiles.php:585 ../../boot.php:1049
|
||||
msgid "Change profile photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:586 ../../boot.php:1049
|
||||
#: ../../mod/profiles.php:586 ../../boot.php:1050
|
||||
msgid "Create New Profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:597 ../../boot.php:1059
|
||||
#: ../../mod/profiles.php:597 ../../boot.php:1060
|
||||
msgid "Profile Image"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:599 ../../boot.php:1062
|
||||
#: ../../mod/profiles.php:599 ../../boot.php:1063
|
||||
msgid "visible to everybody"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:600 ../../boot.php:1063
|
||||
#: ../../mod/profiles.php:600 ../../boot.php:1064
|
||||
msgid "Edit visibility"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3890,7 +3895,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/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
|
||||
#: ../../include/contact_widgets.php:34
|
||||
msgid "Friend Suggestions"
|
||||
|
|
@ -3908,7 +3913,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/directory.php:47 ../../view/theme/diabook-red/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
|
||||
msgid "Global Directory"
|
||||
msgstr ""
|
||||
|
|
@ -4443,7 +4448,7 @@ msgstr ""
|
|||
#: ../../addon/communityhome/communityhome.php:155
|
||||
#: ../../view/theme/diabook-red/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
|
||||
#: ../../include/conversation.php:45 ../../include/conversation.php:118
|
||||
msgid "event"
|
||||
|
|
@ -5323,42 +5328,42 @@ msgstr ""
|
|||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Last users"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Last likes"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Last photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Find Friends"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Local Directory"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
#: ../../include/contact_widgets.php:35
|
||||
msgid "Similar Interests"
|
||||
|
|
@ -5366,7 +5371,7 @@ msgstr ""
|
|||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
#: ../../include/contact_widgets.php:37
|
||||
msgid "Invite Friends"
|
||||
|
|
@ -5376,8 +5381,8 @@ msgstr ""
|
|||
#: ../../view/theme/diabook-red/theme.php:246
|
||||
#: ../../view/theme/diabook-blue/theme.php:165
|
||||
#: ../../view/theme/diabook-blue/theme.php:246
|
||||
#: ../../view/theme/diabook/theme.php:170
|
||||
#: ../../view/theme/diabook/theme.php:254
|
||||
#: ../../view/theme/diabook/theme.php:172
|
||||
#: ../../view/theme/diabook/theme.php:256
|
||||
#: ../../view/theme/diabook-aerith/theme.php:166
|
||||
#: ../../view/theme/diabook-aerith/theme.php:247
|
||||
msgid "Community Pages"
|
||||
|
|
@ -5385,42 +5390,42 @@ msgstr ""
|
|||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Help or @NewHere ?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Connect Services"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "PostIt to Friendica"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Post to Friendica"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid " from anywhere by bookmarking this Link."
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
#: ../../include/nav.php:115
|
||||
msgid "Your posts and conversations"
|
||||
|
|
@ -5428,58 +5433,80 @@ msgstr ""
|
|||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Your profile page"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Your contacts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
#: ../../boot.php:1462
|
||||
#: ../../boot.php:1463
|
||||
msgid "Photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Your photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Your events"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Personal notes"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook-red/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
|
||||
msgid "Your personal photos"
|
||||
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/diabook-aerith/config.php:66
|
||||
msgid "Theme settings"
|
||||
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
|
||||
msgid "Alignment"
|
||||
msgstr ""
|
||||
|
|
@ -5496,7 +5523,7 @@ msgstr ""
|
|||
msgid "Color scheme"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_advanced.php:17 ../../boot.php:1084
|
||||
#: ../../include/profile_advanced.php:17 ../../boot.php:1085
|
||||
msgid "Gender:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5509,7 +5536,7 @@ msgid "j F"
|
|||
msgstr ""
|
||||
|
||||
#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
|
||||
#: ../../include/items.php:1392
|
||||
#: ../../include/items.php:1402
|
||||
msgid "Birthday:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5517,11 +5544,11 @@ msgstr ""
|
|||
msgid "Age:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_advanced.php:37 ../../boot.php:1087
|
||||
#: ../../include/profile_advanced.php:37 ../../boot.php:1088
|
||||
msgid "Status:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_advanced.php:45 ../../boot.php:1089
|
||||
#: ../../include/profile_advanced.php:45 ../../boot.php:1090
|
||||
msgid "Homepage:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5769,6 +5796,14 @@ msgstr ""
|
|||
msgid "Unavailable"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Has crush"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Infatuated"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Dating"
|
||||
msgstr ""
|
||||
|
|
@ -5801,6 +5836,10 @@ msgstr ""
|
|||
msgid "Married"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Imaginarily married"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Partners"
|
||||
msgstr ""
|
||||
|
|
@ -5809,12 +5848,16 @@ msgstr ""
|
|||
msgid "Cohabiting"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Common law"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Happy"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Not Looking"
|
||||
msgid "Not looking"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
|
|
@ -5837,6 +5880,10 @@ msgstr ""
|
|||
msgid "Divorced"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Imaginarily divorced"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Widowed"
|
||||
msgstr ""
|
||||
|
|
@ -5846,7 +5893,7 @@ msgid "Uncertain"
|
|||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
msgid "Complicated"
|
||||
msgid "It's complicated"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_selectors.php:33
|
||||
|
|
@ -6093,7 +6140,7 @@ msgstr ""
|
|||
msgid "End this session"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:49 ../../boot.php:1452
|
||||
#: ../../include/nav.php:49 ../../boot.php:1453
|
||||
msgid "Status"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -6173,11 +6220,11 @@ msgstr ""
|
|||
msgid "Manage other pages"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:138 ../../boot.php:1042
|
||||
#: ../../include/nav.php:138 ../../boot.php:1043
|
||||
msgid "Profiles"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:138 ../../boot.php:1042
|
||||
#: ../../include/nav.php:138 ../../boot.php:1043
|
||||
msgid "Manage/edit profiles"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -6564,11 +6611,11 @@ msgstr ""
|
|||
msgid "Please visit %s to approve or reject the suggestion."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/items.php:2659
|
||||
#: ../../include/items.php:2669
|
||||
msgid "A new person is sharing with you at "
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/items.php:2659
|
||||
#: ../../include/items.php:2669
|
||||
msgid "You have a new follower at "
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -6616,7 +6663,8 @@ msgstr ""
|
|||
msgid "Network Posts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:149 ../../include/conversation.php:817
|
||||
#: ../../include/Contact.php:149 ../../include/Contact.php:161
|
||||
#: ../../include/conversation.php:817
|
||||
msgid "Edit Contact"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -6843,42 +6891,42 @@ msgstr ""
|
|||
msgid "Forgot your password?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:974
|
||||
#: ../../boot.php:975
|
||||
msgid "Edit profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1034
|
||||
#: ../../boot.php:1035
|
||||
msgid "Message"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1150 ../../boot.php:1222
|
||||
#: ../../boot.php:1151 ../../boot.php:1223
|
||||
msgid "g A l F d"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1151 ../../boot.php:1223
|
||||
#: ../../boot.php:1152 ../../boot.php:1224
|
||||
msgid "F d"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1176
|
||||
#: ../../boot.php:1177
|
||||
msgid "Birthday Reminders"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1177
|
||||
#: ../../boot.php:1178
|
||||
msgid "Birthdays this week:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1200 ../../boot.php:1265
|
||||
#: ../../boot.php:1201 ../../boot.php:1266
|
||||
msgid "[today]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1246
|
||||
#: ../../boot.php:1247
|
||||
msgid "Event Reminders"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1247
|
||||
#: ../../boot.php:1248
|
||||
msgid "Events this week:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1259
|
||||
#: ../../boot.php:1260
|
||||
msgid "[No description]"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -1,22 +1,20 @@
|
|||
<statuses type="array">
|
||||
{{ for $statuses as $status }}
|
||||
<status>
|
||||
<created_at>$status.created_at</created_at>
|
||||
<id>$status.id</id>
|
||||
<text>$status.text</text>
|
||||
<statusnet_html>$status.statusnet_html</statusnet_html>
|
||||
<source>$status.source</source>
|
||||
<truncated>$status.truncated</truncated>
|
||||
<url>$status.url</url>
|
||||
<in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
|
||||
<in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
|
||||
<favorited>$status.favorited</favorited>
|
||||
<in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
|
||||
<geo>$status.geo</geo>
|
||||
<coordinates>$status.coordinates</coordinates>
|
||||
<place>$status.place</place>
|
||||
<contributors>$status.contributors</contributors>
|
||||
{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}
|
||||
</status>
|
||||
{{ endfor }}
|
||||
</statuses>
|
||||
<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
|
||||
{{ for $statuses as $status }} <status>
|
||||
<text>$status.text</text>
|
||||
<truncated>$status.truncated</truncated>
|
||||
<created_at>$status.created_at</created_at>
|
||||
<in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
|
||||
<source>$status.source</source>
|
||||
<id>$status.id</id>
|
||||
<in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
|
||||
<in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
|
||||
<geo>$status.geo</geo>
|
||||
<favorited>$status.favorited</favorited>
|
||||
{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} <statusnet:html>$status.statusnet_html</statusnet:html>
|
||||
<statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id>
|
||||
<url>$status.url</url>
|
||||
<coordinates>$status.coordinates</coordinates>
|
||||
<place>$status.place</place>
|
||||
<contributors>$status.contributors</contributors>
|
||||
</status>
|
||||
{{ endfor }}</statuses>
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
<user>
|
||||
<id>$user.id</id>
|
||||
<name>$user.name</name>
|
||||
<screen_name>$user.screen_name</screen_name>
|
||||
<location>$user.location</location>
|
||||
<description>$user.description</description>
|
||||
<profile_image_url>$user.profile_image_url</profile_image_url>
|
||||
<url>$user.url</url>
|
||||
<protected>$user.protected</protected>
|
||||
<followers_count>$user.followers_count</followers_count>
|
||||
<profile_background_color>$user.profile_background_color</profile_background_color>
|
||||
<profile_text_color>$user.profile_text_color</profile_text_color>
|
||||
<profile_link_color>$user.profile_link_color</profile_link_color>
|
||||
<profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
|
||||
<profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
|
||||
<friends_count>$user.friends_count</friends_count>
|
||||
<created_at>$user.created_at</created_at>
|
||||
<favourites_count>$user.favourites_count</favourites_count>
|
||||
<utc_offset>$user.utc_offset</utc_offset>
|
||||
<time_zone>$user.time_zone</time_zone>
|
||||
<profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
|
||||
<profile_background_tile>$user.profile_background_tile</profile_background_tile>
|
||||
<profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
|
||||
<notifications>$user.notifications</notifications>
|
||||
<geo_enabled>$user.geo_enabled</geo_enabled>
|
||||
<verified>$user.verified</verified>
|
||||
<following>$user.following</following>
|
||||
<statuses_count>$user.statuses_count</statuses_count>
|
||||
<lang>$user.lang</lang>
|
||||
<contributors_enabled>$user.contributors_enabled</contributors_enabled>
|
||||
<status>{{ if $user.status }}
|
||||
<user>
|
||||
<id>$user.id</id>
|
||||
<name>$user.name</name>
|
||||
<screen_name>$user.screen_name</screen_name>
|
||||
<location>$user.location</location>
|
||||
<description>$user.description</description>
|
||||
<profile_image_url>$user.profile_image_url</profile_image_url>
|
||||
<url>$user.url</url>
|
||||
<protected>$user.protected</protected>
|
||||
<followers_count>$user.followers_count</followers_count>
|
||||
<friends_count>$user.friends_count</friends_count>
|
||||
<created_at>$user.created_at</created_at>
|
||||
<favourites_count>$user.favourites_count</favourites_count>
|
||||
<utc_offset>$user.utc_offset</utc_offset>
|
||||
<time_zone>$user.time_zone</time_zone>
|
||||
<statuses_count>$user.statuses_count</statuses_count>
|
||||
<following>$user.following</following>
|
||||
<profile_background_color>$user.profile_background_color</profile_background_color>
|
||||
<profile_text_color>$user.profile_text_color</profile_text_color>
|
||||
<profile_link_color>$user.profile_link_color</profile_link_color>
|
||||
<profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
|
||||
<profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
|
||||
<profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
|
||||
<profile_background_tile>$user.profile_background_tile</profile_background_tile>
|
||||
<profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
|
||||
<notifications>$user.notifications</notifications>
|
||||
<geo_enabled>$user.geo_enabled</geo_enabled>
|
||||
<verified>$user.verified</verified>
|
||||
<lang>$user.lang</lang>
|
||||
<contributors_enabled>$user.contributors_enabled</contributors_enabled>
|
||||
<status>{{ if $user.status }}
|
||||
<created_at>$user.status.created_at</created_at>
|
||||
<id>$user.status.id</id>
|
||||
<text>$user.status.text</text>
|
||||
|
|
@ -43,4 +43,4 @@
|
|||
<place>$user.status.place</place>
|
||||
<contributors>$user.status.contributors</contributors>
|
||||
{{ endif }}</status>
|
||||
</user>
|
||||
</user>
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ $a->strings["Post to Email"] = "An E-Mail senden";
|
|||
$a->strings["Edit"] = "Bearbeiten";
|
||||
$a->strings["Upload photo"] = "Foto hochladen";
|
||||
$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 Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen";
|
||||
$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen";
|
||||
|
|
|
|||
|
|
@ -2229,6 +2229,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -2203,6 +2203,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -1230,6 +1230,9 @@ aside #likes a:hover{
|
|||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
margin-top: 20px;
|
||||
}
|
||||
.group_selected {
|
||||
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
|
||||
float: left;
|
||||
|
|
@ -1245,7 +1248,7 @@ aside #likes a:hover{
|
|||
.icon.text_add {
|
||||
background-image: url("../../../images/icons/16/add.png");
|
||||
float: right;
|
||||
opacity: 0.1;
|
||||
opacity: 0.2;
|
||||
margin-right: 14px;
|
||||
}
|
||||
.icon.text_add:hover {
|
||||
|
|
@ -1262,7 +1265,7 @@ transition: all 0.2s ease-in-out;
|
|||
}
|
||||
.icon.text_edit {
|
||||
background-image: url("../../../images/icons/10/edit.png");
|
||||
opacity: 0.1;
|
||||
opacity: 0.2;
|
||||
margin-top: 6px;
|
||||
float: right;
|
||||
height: 10px;
|
||||
|
|
@ -2487,6 +2490,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -2190,6 +2190,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -2170,6 +2170,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -1190,6 +1190,9 @@ aside #side-peoplefind-url {
|
|||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
margin-top: 20px;
|
||||
}
|
||||
.group_selected {
|
||||
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
|
||||
float: left;
|
||||
|
|
@ -1205,7 +1208,7 @@ aside #side-peoplefind-url {
|
|||
.icon.text_add {
|
||||
background-image: url("../../../images/icons/16/add.png");
|
||||
float: right;
|
||||
opacity: 0.1;
|
||||
opacity: 0.2;
|
||||
margin-right: 14px;
|
||||
}
|
||||
.icon.text_add:hover {
|
||||
|
|
@ -1222,7 +1225,7 @@ transition: all 0.2s ease-in-out;
|
|||
}
|
||||
.icon.text_edit {
|
||||
background-image: url("../../../images/icons/10/edit.png");
|
||||
opacity: 0.1;
|
||||
opacity: 0.2;
|
||||
margin-top: 6px;
|
||||
float: right;
|
||||
height: 10px;
|
||||
|
|
@ -2444,6 +2447,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -2226,6 +2226,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -2184,6 +2184,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -1219,6 +1219,9 @@ aside #side-peoplefind-url {
|
|||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
margin-top: 20px;
|
||||
}
|
||||
.group_selected {
|
||||
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
|
||||
float: left;
|
||||
|
|
@ -1234,7 +1237,7 @@ aside #side-peoplefind-url {
|
|||
.icon.text_add {
|
||||
background-image: url("../../../images/icons/16/add.png");
|
||||
float: right;
|
||||
opacity: 0.1;
|
||||
opacity: 0.2;
|
||||
margin-right: 14px;
|
||||
}
|
||||
.icon.text_add:hover {
|
||||
|
|
@ -1251,7 +1254,7 @@ transition: all 0.2s ease-in-out;
|
|||
}
|
||||
.icon.text_edit {
|
||||
background-image: url("../../../images/icons/10/edit.png");
|
||||
opacity: 0.1;
|
||||
opacity: 0.2;
|
||||
margin-top: 6px;
|
||||
float: right;
|
||||
height: 10px;
|
||||
|
|
@ -2472,6 +2475,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -20,3 +20,7 @@ Example
|
|||
$(function() {
|
||||
$( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
|
||||
});
|
||||
|
||||
_______________________________________________________________________________________________
|
||||
|
||||
http://javascriptly.com/examples/jquery-grab-bag/autogrow-textarea.html
|
||||
|
|
|
|||
|
|
@ -396,7 +396,7 @@
|
|||
/* global */
|
||||
body {
|
||||
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 15px;
|
||||
font-size: 13px;
|
||||
background-color: #ffffff;
|
||||
color: #2d2d2d;
|
||||
margin: 50px auto auto;
|
||||
|
|
@ -958,8 +958,8 @@ ul.menu-popup .empty {
|
|||
aside {
|
||||
display: table-cell;
|
||||
vertical-align: top;
|
||||
width: 170px;
|
||||
padding: 0px 10px 0px 0px;
|
||||
width: 180px;
|
||||
padding: 0px 5px 0px 0px;
|
||||
border-right: 1px solid #D2D2D2;
|
||||
float: left;
|
||||
/* background: #F1F1F1; */
|
||||
|
|
@ -1924,7 +1924,7 @@ transition: all 0.2s ease-in-out;
|
|||
ul.tabs {
|
||||
list-style-type: none;
|
||||
padding-bottom: 10px;
|
||||
font-size: 15px;
|
||||
font-size: 13px;
|
||||
width: 805px;
|
||||
}
|
||||
ul.tabs li {
|
||||
|
|
@ -2169,6 +2169,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -2157,6 +2157,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@
|
|||
/* global */
|
||||
body {
|
||||
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 15px;
|
||||
font-size: 13px;
|
||||
background-color: #ffffff;
|
||||
color: #2d2d2d;
|
||||
margin: 50px auto auto;
|
||||
|
|
@ -939,8 +939,8 @@ ul.menu-popup .empty {
|
|||
aside {
|
||||
display: table-cell;
|
||||
vertical-align: top;
|
||||
width: 170px;
|
||||
padding: 0px 10px 0px 0px;
|
||||
width: 180px;
|
||||
padding: 0px 5px 0px 0px;
|
||||
border-right: 1px solid #D2D2D2;
|
||||
float: left;
|
||||
/* background: #F1F1F1; */
|
||||
|
|
@ -1901,7 +1901,7 @@ transition: all 0.2s ease-in-out;
|
|||
ul.tabs {
|
||||
list-style-type: none;
|
||||
padding-bottom: 10px;
|
||||
font-size: 15px;
|
||||
font-size: 13px;
|
||||
width: 805px;
|
||||
}
|
||||
ul.tabs li {
|
||||
|
|
@ -2151,6 +2151,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -2140,6 +2140,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -423,7 +423,7 @@
|
|||
/* global */
|
||||
body {
|
||||
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 15px;
|
||||
font-size: 13px;
|
||||
background-color: #ffffff;
|
||||
color: #2d2d2d;
|
||||
margin: 50px auto auto;
|
||||
|
|
@ -1082,8 +1082,8 @@ ul.menu-popup .empty {
|
|||
aside {
|
||||
display: table-cell;
|
||||
vertical-align: top;
|
||||
width: 170px;
|
||||
padding: 0px 10px 0px 0px;
|
||||
width: 180px;
|
||||
padding: 0px 5px 0px 0px;
|
||||
border-right: 1px solid #D2D2D2;
|
||||
float: left;
|
||||
/* background: #F1F1F1; */
|
||||
|
|
@ -1185,6 +1185,9 @@ aside #side-peoplefind-url {
|
|||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
margin-top: 20px;
|
||||
}
|
||||
/* widget */
|
||||
.widget {
|
||||
margin-bottom: 2em;
|
||||
|
|
@ -1261,7 +1264,7 @@ aside #side-peoplefind-url {
|
|||
.icon.text_add {
|
||||
background-image: url("../../../images/icons/16/add.png");
|
||||
float: right;
|
||||
opacity: 0.1;
|
||||
opacity: 0.2;
|
||||
margin-right: 14px;
|
||||
}
|
||||
.icon.text_add:hover {
|
||||
|
|
@ -1278,7 +1281,7 @@ transition: all 0.2s ease-in-out;
|
|||
}
|
||||
.icon.text_edit {
|
||||
background-image: url("../../../images/icons/10/edit.png");
|
||||
opacity: 0.1;
|
||||
opacity: 0.2;
|
||||
margin-top: 6px;
|
||||
float: right;
|
||||
height: 10px;
|
||||
|
|
@ -2124,7 +2127,7 @@ body .pageheader{
|
|||
ul.tabs {
|
||||
list-style-type: none;
|
||||
padding-bottom: 10px;
|
||||
font-size: 15px;
|
||||
font-size: 13px;
|
||||
width: 805px;
|
||||
}
|
||||
ul.tabs li {
|
||||
|
|
@ -2417,6 +2420,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -1182,6 +1182,9 @@ aside #side-peoplefind-url {
|
|||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
#login-submit-wrapper{
|
||||
margin-top: 20px;
|
||||
}
|
||||
/* widget */
|
||||
.widget {
|
||||
margin-bottom: 2em;
|
||||
|
|
@ -1256,7 +1259,7 @@ aside #side-peoplefind-url {
|
|||
.icon.text_add {
|
||||
background-image: url("../../../images/icons/16/add.png");
|
||||
float: right;
|
||||
opacity: 0.1;
|
||||
opacity: 0.2;
|
||||
margin-right: 14px;
|
||||
}
|
||||
.icon.text_add:hover {
|
||||
|
|
@ -1273,7 +1276,7 @@ transition: all 0.2s ease-in-out;
|
|||
}
|
||||
.icon.text_edit {
|
||||
background-image: url("../../../images/icons/10/edit.png");
|
||||
opacity: 0.1;
|
||||
opacity: 0.2;
|
||||
margin-top: 6px;
|
||||
float: right;
|
||||
height: 10px;
|
||||
|
|
@ -2406,6 +2409,9 @@ box-shadow: 1px 1px 5px 0;
|
|||
#group-separator,
|
||||
#prof-separator { display: none;}
|
||||
*/
|
||||
#prof-members-end{
|
||||
clear: both;
|
||||
}
|
||||
|
||||
#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
Loading…
Reference in New Issue
Block a user