Merge branch 'master' of git://github.com/friendica/friendica

pull/380/head
Vasudev Kamath 2012-04-27 22:43:26 +05:30
commit 214ec91a3f
425 changed files with 14504 additions and 23377 deletions

View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1319' );
define ( 'FRIENDICA_VERSION', '2.3.1324' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1138 );
@ -1174,11 +1174,7 @@ if(! function_exists('get_birthdays')) {
}
$classtoday = $istoday ? ' birthday-today ' : '';
if($total) {
$o .= '<div id="birthday-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>';
$o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>';
$o .= '<div id="birthday-title-end"></div>';
foreach($r as $rr) {
foreach($r as &$rr) {
if(! strlen($rr['name']))
continue;
@ -1196,15 +1192,24 @@ if(! function_exists('get_birthdays')) {
$url = $a->get_baseurl() . '/redir/' . $rr['cid'];
}
$o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="birthday-link$sparkle" target="redir" href="'
. $url . '">' . $rr['name'] . '</a> '
. day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . t('[today]') : '')
. '</div>' ;
$rr['link'] = $url;
$rr['title'] = $rr['name'];
$rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . t('[today]') : '');
$rr['startime'] = Null;
$rr['today'] = $today;
}
$o .= '</div></div>';
}
}
return $o;
$tpl = get_markup_template("birthdays_reminder.tpl");
return replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$classtoday' => $classtoday,
'$count' => $total,
'$event_reminders' => t('Birthday Reminders'),
'$event_title' => t('Birthdays this week:'),
'$events' => $r,
));
}
}
@ -1215,7 +1220,6 @@ if(! function_exists('get_events')) {
require_once('include/bbcode.php');
$a = get_app();
$o = '';
if(! local_user())
return $o;
@ -1242,18 +1246,15 @@ if(! function_exists('get_events')) {
if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
$istoday = true;
}
$classtoday = (($istoday) ? ' event-today ' : '');
$classtoday = (($istoday) ? 'event-today' : '');
$o .= '<div id="event-notice" class="birthday-notice fakelink' . $classtoday . '" onclick=openClose(\'event-wrapper\'); >' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '</div>';
$o .= '<div id="event-wrapper" style="display: none;" ><div id="event-title">' . t('Events this week:') . '</div>';
$o .= '<div id="event-title-end"></div>';
foreach($r as $rr) {
foreach($r as &$rr) {
if($rr['adjust'])
$md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m\#\l\i\n\k\-j');
$md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m');
else
$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m\#\l\i\n\k\-j');
$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m');
$md .= "/#link-".$rr['id'];
$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
if(! $title)
@ -1261,15 +1262,24 @@ if(! function_exists('get_events')) {
$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
$o .= '<div class="event-list" id="event-' . $rr['eid'] . '"></a> <a href="events/' . $md . '">' . $title . '</a>'
. day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '')
. '</div>' ;
$rr['link'] = $md;
$rr['title'] = $title;
$rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '');
$rr['startime'] = $strt;
$rr['today'] = $today;
}
$o .= '</div></div>';
}
return $o;
$tpl = get_markup_template("events_reminder.tpl");
return replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$classtoday' => $classtoday,
'$count' => count($r),
'$event_reminders' => t('Event Reminders'),
'$event_title' => t('Events this week:'),
'$events' => $r,
));
}
}

View File

@ -69,7 +69,7 @@ $a->config['system']['rino_encrypt'] = true;
// allowed themes (change this from admin panel after installation)
$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr,diabook,diabook-blue';
$a->config['system']['allowed_themes'] = 'dispy,quattro,vier,darkzero,duepuntozero,greenzero,purplezero,slackr,diabook';
// default system theme

View File

@ -73,6 +73,49 @@ function contact_remove($id) {
}
// sends an unfriend message. Does not remove the contact
function terminate_friendship($user,$self,$contact) {
$a = get_app();
require_once('include/datetime.php');
if($contact['network'] === NETWORK_OSTATUS) {
$slap = replace_macros(get_markup_template('follow_slap.tpl'), array(
'$name' => $user['username'],
'$profile_page' => $a->get_baseurl() . '/profile/' . $user['nickname'],
'$photo' => $self['photo'],
'$thumb' => $self['thumb'],
'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(),
'$title' => '',
'$type' => 'text',
'$content' => t('stopped following'),
'$nick' => $user['nickname'],
'$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
'$ostat_follow' => '' // '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
));
if((x($contact,'notify')) && (strlen($contact['notify']))) {
require_once('include/salmon.php');
slapper($user,$contact['notify'],$slap);
}
}
elseif($contact['network'] === NETWORK_DIASPORA) {
require_once('include/diaspora.php');
diaspora_unshare($user,$contact);
}
elseif($contact['network'] === NETWORK_DFRN) {
require_once('include/items.php');
dfrn_deliver($user,$contact,'placeholder', 1);
}
}
// Contact has refused to recognise us as a friend. We will start a countdown.
// If they still don't recognise us in 32 days, the relationship is over,
// and we won't waste any more time trying to communicate with them.

View File

@ -567,8 +567,17 @@
$_REQUEST['profile_uid'] = local_user();
if(requestdata('parent'))
$_REQUEST['type'] = 'net-comment';
else
else {
$_REQUEST['type'] = 'wall';
if(x($_FILES,'media')) {
// upload the image if we have one
$_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
require_once('mod/wall_upload.php');
$media = wall_upload_post($a);
if(strlen($media)>0)
$_REQUEST['body'] .= "\n\n".$media;
}
}
// set this so that the item_post() function is quiet and doesn't redirect or emit json

View File

@ -298,6 +298,9 @@ function bbcode($Text,$preserve_nl = false) {
$Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim',$Text);
$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim',$Text);
$Text = preg_replace('/\[\&amp\;([#a-z0-9]+)\;\]/','&$1;',$Text);
// fix any escaped ampersands that may have been converted into links
$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
if(strlen($saved_image))

View File

@ -553,6 +553,14 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
'$myphoto' => $a->contact['thumb'],
'$comment' => t('Comment'),
'$submit' => t('Submit'),
'$edbold' => t('Bold'),
'$editalic' => t('Italic'),
'$eduline' => t('Underline'),
'$edquote' => t('Quote'),
'$edcode' => t('Code'),
'$edimg' => t('Image'),
'$edurl' => t('Link'),
'$edvideo' => t('Video'),
'$preview' => t('Preview'),
'$ww' => (($mode === 'network') ? $commentww : '')
));

View File

@ -706,10 +706,10 @@ function diaspora_post($importer,$xml) {
continue;
$basetag = str_replace('_',' ',substr($tag,1));
$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
if(strlen($str_tags))
$str_tags .= ',';
$str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
$str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
continue;
}
}
@ -872,10 +872,10 @@ function diaspora_reshare($importer,$xml) {
$basetag = str_replace('_',' ',substr($tag,1));
$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
if(strlen($str_tags))
$str_tags .= ',';
$str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
$str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
continue;
}
}
@ -1113,10 +1113,10 @@ function diaspora_comment($importer,$xml,$msg) {
$basetag = str_replace('_',' ',substr($tag,1));
$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
if(strlen($str_tags))
$str_tags .= ',';
$str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
$str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
continue;
}
}
@ -1172,7 +1172,7 @@ function diaspora_comment($importer,$xml,$msg) {
proc_run('php','include/notifier.php','comment',$message_id);
}
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ",
dbesc($parent_item['uri']),
intval($importer['uid'])
);

View File

@ -83,7 +83,7 @@ function collecturls($message) {
$urls = array();
foreach ($result as $treffer) {
// A list of some links that should be ignored
$list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "mailto:", "/u/", "/node/",
$list = array("/user/", "/tag/", "/group/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
"//facebook.com/profile.php?id=", "//plus.google.com/");
foreach ($list as $listitem)
if (strpos($treffer[1], $listitem) !== false)

View File

@ -2479,7 +2479,7 @@ function local_delivery($importer,$data) {
if(!x($datarray['type']) || $datarray['type'] != 'activity') {
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
dbesc($parent_uri),
intval($importer['importer_uid'])
);

View File

@ -38,6 +38,22 @@ function acl_init(&$a){
intval(local_user())
);
$contact_count = (int)$r[0]['c'];
}
elseif ($type == 'm') {
// autocomplete for Private Messages
$r = q("SELECT COUNT(`id`) AS c FROM `contact`
WHERE `uid` = %d AND `self` = 0
AND `blocked` = 0 AND `pending` = 0
AND `network` IN ('%s','%s','%s') $sql_extra2" ,
intval(local_user()),
dbesc(NETWORK_DFRN),
dbesc(NETWORK_ZOT),
dbesc(NETWORK_DIASPORA)
);
$contact_count = (int)$r[0]['c'];
} else {
$contact_count = 0;
}
@ -83,6 +99,23 @@ function acl_init(&$a){
ORDER BY `name` ASC ",
intval(local_user())
);
}
elseif($type == 'm') {
$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0
AND `network` IN ('%s','%s','%s')
$sql_extra2
ORDER BY `name` ASC ",
intval(local_user()),
dbesc(NETWORK_DFRN),
dbesc(NETWORK_ZOT),
dbesc(NETWORK_DIASPORA)
);
}
else
$r = array();
if(count($r)) {
foreach($r as $g){
$contacts[] = array(
"type" => "c",
@ -93,11 +126,9 @@ function acl_init(&$a){
"link" => $g['url'],
"nick" => ($g['attag']) ? $g['attag'] : $g['nick'],
);
}
}
}
$items = array_merge($groups, $contacts);
$o = array(

View File

@ -144,7 +144,7 @@ function contacts_content(&$a) {
goaway($a->get_baseurl(true) . '/contacts');
return; // NOTREACHED
}
if($cmd === 'update') {
// pull feed and consume it, which should subscribe to the hub.
@ -184,38 +184,9 @@ function contacts_content(&$a) {
if($cmd === 'drop') {
// create an unfollow slap
require_once('include/Contact.php');
if($orig_record[0]['network'] === NETWORK_OSTATUS) {
$tpl = get_markup_template('follow_slap.tpl');
$slap = replace_macros($tpl, array(
'$name' => $a->user['username'],
'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
'$photo' => $a->contact['photo'],
'$thumb' => $a->contact['thumb'],
'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(),
'$title' => '',
'$type' => 'text',
'$content' => t('stopped following'),
'$nick' => $a->user['nickname'],
'$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
'$ostat_follow' => '' // '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
));
if((x($orig_record[0],'notify')) && (strlen($orig_record[0]['notify']))) {
require_once('include/salmon.php');
slapper($a->user,$orig_record[0]['notify'],$slap);
}
}
elseif($orig_record[0]['network'] === NETWORK_DIASPORA) {
require_once('include/diaspora.php');
diaspora_unshare($a->user,$orig_record[0]);
}
elseif($orig_record[0]['network'] === NETWORK_DFRN) {
require_once('include/items.php');
dfrn_deliver($a->user,$orig_record[0],'placeholder', 1);
}
terminate_friendship($a->user,$a->contact,$orig_record[0]);
contact_remove($orig_record[0]['id']);
info( t('Contact has been removed.') . EOL );

View File

@ -314,7 +314,7 @@ function dfrn_request_post(&$a) {
if($email_follow) {
if(! strpos($url,'@')) {
if(! validate_email($url)) {
notice( t('Invalid email address.') . EOL);
return;
}
@ -346,11 +346,71 @@ function dfrn_request_post(&$a) {
}
}
$r = q("insert into contact ( uid, created, addr, name, nick, url, nurl, poll, notify, blocked, pending, network, rel )
values( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d ) ",
intval($uid),
dbesc(datetime_convert()),
dbesc($addr),
dbesc($name),
dbesc($nick),
dbesc($url),
dbesc($nurl),
dbesc($poll),
dbesc($notify),
intval($blocked),
intval($pending),
dbesc($network),
intval($rel)
);
$r = q("select id from contact where poll = '%s' and uid = %d limit 1",
dbesc($poll),
intval($uid)
);
if(count($r)) {
$contact_id = $r[0]['id'];
$photo = avatar_img($addr);
$r = q("UPDATE `contact` SET
`photo` = '%s',
`thumb` = '%s',
`micro` = '%s',
`name-date` = '%s',
`uri-date` = '%s',
`avatar-date` = '%s',
`hidden` = 0,
WHERE `id` = %d LIMIT 1
",
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($contact_id)
);
}
// contact is created. Now create an introduction
$hash = random_string();
$r = q("insert into intro ( uid, `contact-id`, knowyou, note, hash, datetime, blocked )
values( %d , %d, %d, '%s', '%s', '%s', %d ) ",
intval($uid),
intval($contact_id),
((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
dbesc(notags(trim($_POST['dfrn-request-message']))),
dbesc($hash),
dbesc(datetime_convert()),
1
);
// Next send an email verify form to the requestor.
}
else {
// Canonicalise email-style profile locator

View File

@ -872,7 +872,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
//base tag has the tags name only
$basetag = str_replace('_',' ',substr($tag,1));
//create text for link
$newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
$newtag = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
//replace tag by the link
$body = str_replace($tag, $newtag, $body);

View File

@ -313,6 +313,29 @@ function message_content(&$a) {
$from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id'];
$sparkle = ' sparkle';
}
$Text = $message['body'];
$saved_image = '';
$img_start = strpos($Text,'[img]data:');
$img_end = strpos($Text,'[/img]');
if($img_start !== false && $img_end !== false && $img_end > $img_start) {
$start_fragment = substr($Text,0,$img_start);
$img_start += strlen('[img]');
$saved_image = substr($Text,$img_start,$img_end - $img_start);
$end_fragment = substr($Text,$img_end + strlen('[/img]'));
$Text = $start_fragment . '[!#saved_image#!]' . $end_fragment;
$search = '/\[url\=(.*?)\]\[!#saved_image#!\]\[\/url\]' . '/is';
$replace = '[url=' . z_path() . '/redir/' . $message['contact-id']
. '?f=1&url=' . '$1' . '][!#saved_image#!][/url]' ;
$Text = preg_replace($search,$replace,$Text);
if(strlen($saved_image))
$message['body'] = str_replace('[!#saved_image#!]', '[img]' . $saved_image . '[/img]',$Text);
}
$mails[] = array(
'id' => $message['id'],
'from_name' => template_escape($message['from-name']),

View File

@ -134,6 +134,8 @@ function ping_init(&$a) {
function xmlize($href, $name, $url, $photo, $date, $seen, $message){
$data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
call_hooks('ping_xmlize', $data);
$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>';
return sprintf ( $notsxml,
xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)

View File

@ -87,11 +87,26 @@ function search_content(&$a) {
else
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
$tag = false;
if(x($_GET,'tag')) {
$tag = true;
$search = ((x($_GET,'tag')) ? notags(trim(rawurldecode($_GET['tag']))) : '');
}
$o .= search($search,'search-box','/search',((local_user()) ? true : false));
if(! $search)
return $o;
if($tag)
$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", dbesc('\\]' . preg_quote($search) . '\\['));
else
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
// Here is the way permissions work in the search module...
// Only public posts can be shown
// OR your own posts if you are a logged in member
@ -103,10 +118,8 @@ function search_content(&$a) {
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0)
OR `item`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) group by `item`.`uri` ",
intval(local_user()),
dbesc(preg_quote($search)),
dbesc('\\]' . preg_quote($search) . '\\[')
$sql_extra group by `item`.`uri` ",
intval(local_user())
);
if(count($r))
@ -127,18 +140,19 @@ function search_content(&$a) {
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 )
OR `item`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )
$sql_extra
group by `item`.`uri`
ORDER BY `received` DESC LIMIT %d , %d ",
intval(local_user()),
dbesc(preg_quote($search)),
dbesc('\\]' . preg_quote($search) . '\\['),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
$o .= '<h2>Search results for: ' . $search . '</h2>';
if($tag)
$o .= '<h2>Items tagged with: ' . $search . '</h2>';
else
$o .= '<h2>Search results for: ' . $search . '</h2>';
$o .= conversation($a,$r,'search',false);

View File

@ -75,6 +75,11 @@ EOT;
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'selected' => ''
),
array(
'label' => t('Remove account'),
'url' => $a->get_baseurl(true) . '/removeme',
'selected' => ''
)
);
@ -696,8 +701,8 @@ function settings_content(&$a) {
$allowed_themes_raw = explode(',',$allowed_themes_str);
$allowed_themes = array();
if(count($allowed_themes_raw))
foreach($allowed_themes_raw as $x)
if(strlen(trim($x)))
foreach($allowed_themes_raw as $x)
if(strlen(trim($x)) && is_dir("view/theme/$x"))
$allowed_themes[] = trim($x);

View File

@ -86,7 +86,7 @@ function tagger_content(&$a) {
</target>
EOT;
$tagid = $a->get_baseurl() . '/search?search=' . $term;
$tagid = $a->get_baseurl() . '/search?tag=' . $term;
$objtype = ACTIVITY_OBJ_TAGTERM;
$obj = <<< EOT
@ -105,7 +105,7 @@ EOT;
if(! isset($bodyverb))
return;
$termlink = html_entity_decode('&#x2317;') . '[url=' . $a->get_baseurl() . '/search?search=' . urlencode($term) . ']'. $term . '[/url]';
$termlink = html_entity_decode('&#x2317;') . '[url=' . $a->get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
$arr = array();
@ -161,7 +161,7 @@ EOT;
if((! $blocktags) && (! stristr($item['tag'], ']' . $term . '[' ))) {
q("update item set tag = '%s' where id = %d limit 1",
dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?search=' . $term . ']'. $term . '[/url]'),
dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
intval($item['id'])
);
}
@ -177,7 +177,7 @@ EOT;
);
if(count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) {
q("update item set tag = '%s' where id = %d limit 1",
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?search=' . $term . ']'. $term . '[/url]'),
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
intval($r[0]['id'])
);
}

View File

@ -5,19 +5,26 @@ require_once('Photo.php');
function wall_upload_post(&$a) {
if($a->argc > 1) {
$nick = $a->argv[1];
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! count($r))
return;
if(! x($_FILES,'media')) {
$nick = $a->argv[1];
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! count($r))
return;
}
else {
$user_info = api_get_user($a);
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($user_info['screen_name'])
);
}
}
else
return;
$can_post = false;
$visitor = 0;
@ -47,12 +54,19 @@ function wall_upload_post(&$a) {
killme();
}
if(! x($_FILES,'userfile'))
if(! x($_FILES,'userfile') && ! x($_FILES,'media'))
killme();
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
if(x($_FILES,'userfile')) {
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
}
elseif(x($_FILES,'media')) {
$src = $_FILES['media']['tmp_name'];
$filename = basename($_FILES['media']['name']);
$filesize = intval($_FILES['media']['size']);
}
$maximagesize = get_config('system','maximagesize');

View File

@ -67,7 +67,10 @@ class AutonameTest extends PHPUnit_Framework_TestCase {
$autoname2=autoname(1);
$this->assertEquals(1, count($autoname2));
$this->assertFalse($autoname1==$autoname2);
// The following test is problematic, with only 26 possibilities
// generating the same thing twice happens often aka
// birthday paradox
// $this->assertFalse($autoname1==$autoname2);
}
}

View File

@ -202,8 +202,8 @@ class GetTagsTest extends PHPUnit_Framework_TestCase {
}
$this->assertEquals("cid:15", $inform);
$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?search=test%20case]test case[/url]", $str_tags);
$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?search=test%20case]test case[/url]", $text);
$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags);
$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text);
}

File diff suppressed because it is too large Load Diff

View File

@ -33,6 +33,8 @@
$files = glob($dir . '/*.php');
foreach($files as $file) {
echo $file . "\n";
if(stristr($file,'jappixmini/proxy.php'))
continue;
include_once($file);
}
}

View File

@ -0,0 +1,10 @@
{{ if $count }}
<div id="birthday-notice" class="birthday-notice fakelink $classtoday" onclick="openClose('birthday-wrapper');">$event_reminders ($count)</div>
<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">$event_title</div>
<div id="birthday-title-end"></div>
{{ for $events as $event }}
<div class="birthday-list" id="birthday-$event.id"></a> <a href="$event.link">$event.title</a> $event.date </div>
{{ endfor }}
</div></div>
{{ endif }}

View File

@ -1,7 +1,7 @@
<div id="contact-block">
<h4 class="contact-block-h4">$contacts</h4>
{{ if $micropro }}
<a class="allcontact-link" href="contacts/$nickname">$viewcontacts</a>
<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
<div class='contact-block-content'>
{{ for $micropro as $m }}
$m

View File

@ -1,22 +1,22 @@
Liebe/r $username,
Hallo $[username],
großartige Neuigkeiten... '$fn' von '$dfrn_url' hat deine Kontaktaufnahme auf
'$sitename' bestätigt.
Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat
deine Kontaktanfrage auf '$[sitename]' bestätigt.
Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Fotos und
EMail ohne Einschränkungen austauschen.
Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
ohne einschränkungen austauschen.
Bitte rufe deine 'Kontakte' Seite auf $sitename auf um du Änderungen an
dieser Freundschaft vorzunehmen.
Rufe deine 'Kontakte' Seite auf $[sitename] auf wenn du
Änderungen an diesem Kontakt vornehmen willst.
$siteurl
$[siteurl]
[Du könntest zum Beispiel ein neue Profil anlegen mit Informationen die nicht
für die Allgemeinheit bestimmt sind, die du aber gerne mit '$fn' teilen
möchtest].
[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthällt
die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben].
Mit freundlichen Grüßen
$sitename Administrator
Beste Grüße,
$[sitename] Administrator

View File

@ -1,18 +1,22 @@
Liebe/r $username,
Hallo $[username],
'$fn' von '$dfrn_url' hat deine Kontaktanfrage auf '$sitename' bestätigt.
'$[fn]' auf '$[dfrn_url]' wurde akzeptiert
Deine Verbindungsanfrage auf '$[sitename]'.
'$fn' hat sich dazu entschlossen dich als "Fan" mit eingeschränkten
Kommunikationsmöglichkeiten zu akzeptieren. Dies umfasst private Nachrichten
und einige Profilaktivitäten. Sollte dies eine Prominenten oder
Gemeinschaftsseite sein, wurden diese Einstellungen automatisch vorgenommen.
'$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was ein
paar Formen der Kommunikation einschränkt - wie das schreiben von privaten Nachrichten und einige Profil
Interaktionen. Wenn das ein Promi-Konto oder eine Forum-Seite ist, werden die Einstellungen
automatisch angewendet.
'$fn' kann sich in Zukunft dazu entschließen eure Beziehung in eine beidseitige
Freundschaft oder freizügigere Beziehung zu erweitern.
'$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende
Beziehung in der Zukunft erweitert wird.
Ab sofort wirst du Statusmitteilungen von '$fn' erhalten, die auf deiner
'Netzwerkseite' erscheinen werden.
Du empfängst jetzt die öffentlichen Beiträge von '$[fn]',
welche auf der "Netzwerk" Seite erscheinen werden
Mit freundlichen Grüßen,
$sitename Administrator
$[siteurl]
Beste Grüße,
$[sitename] Administrator

File diff suppressed because it is too large Load Diff

View File

@ -1,20 +1,20 @@
Liebe/r $username,
dein Passwort wurde wie gewünscht geändert. Bitte hebe diese Informationen
für deine Unterlagen auf (oder ändere das Passwort augenblicklich in etwas
das du dir merken kannst).
Hallo $[username],
Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese
Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort
in etwas, was du dir merken kannst).
Deine Anmeldedaten sind die Folgenden:
Deine Login Daten wurden wie folgt geändert:
Adresse der Seite: $siteurl
Anmelde Name: $email
Passwort: $new_password
Adresse der Seite: $[siteurl]
Login Name: $[email]
Passwort: $[new_password]
Du kannst diesen Passwort auf der "Einstellungen" Seite deines Accounts
ändern nachdem du angemeldet bits.
Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist.
Viele Grüße,
$sitename Administrator
Beste Grüße,
$[sitename] Administrator

View File

@ -1,19 +1,34 @@
Liebe/r $username,
danke für die Registrierung bei $sitename. Dein neuer Account wurde angelegt.
Die Anmeldedetails sind die Folgenden.
Adresse der Seite: $siteurl
Anmelde Name: $email
Passwort: $password
Du kannst dein Passwort auf der "Einstellungen" Seite deines Accounts ändern
nachdem du dich angemeldet hast.
Nimm dir bitte ein paar Augenblicke Zeit um die anderen Einstellungen deines
Accounts zu bearbeiten.
Vielen Dank und Willkommen auf $sitename.
Mit freundlichem Gruß,
$sitename Administrator
Hallo $[username],
Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt.
Die Login Details sind die folgenden:
Adresse der Seite: $[siteurl]
Login Name: $[email]
Passwort: $[password]
Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern
nachdem du dich eingeloggt hast.
Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen.
Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen
(auf der "Profile" Seite) damit andere Leute dich einfacher finden können.
Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto,
ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und
natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest
dann das.
Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig.
Wenn Du hier neu bist und keinen kennst, wird man Dir helfen
ein paar neue und interessante Freunde zu finden.
Danke dir und willkommen auf $[sitename].
Beste Grüße,
$[sitename] Administrator

View File

@ -1,21 +1,25 @@
Ein neuer Nutzer hat sich auf $sitename registriert. Diese Registration
benötigt noch deine Zustimmung.
Die Anmeldedetails sind Folgende:
Kompletter Name: $username
Adresse der Seite: $siteurl
Anmelde Name: $email
Eine Neuanmeldung auf $[sitename] benötigt
deine Aufmerksamkeit.
Um dieser Anmeldung zuzustimmen folge bitte diesem Link:
Die Login-Einzelheiten sind die folgenden:
$siteurl/regmod/allow/$hash
Kompletter Name: $[username]
Adresse der Seite: $[siteurl]
Login Name: $[email]
Um die Anfrage abzulehen und den Account zu entfernen folge diesem Link:
Um die Anfrage zu bestätigen besuche bitte:
$siteurl/regmod/deny/$hash
Besten Dank!
$[siteurl]/regmod/allow/$[hash]
Um die Anfrage abzulehnen und den Account zu löschen besuche bitte:
$[siteurl]/regmod/deny/$[hash]
Danke!

View File

@ -1,14 +1,17 @@
Liebe/r $myname,
Hallo $[myname],
du hast gerade eine Kontaktanfrage von '$requestor' auf $sitename erhalten.
du hast eine Kontaktanfrage von '$[requestor]' auf $[sitename]
Du kannst dir das Profil unter $url ansehen.
erhalten.
Bitte melde dich auf deiner Seite an um die komplette Vorstellung anzusehen
und bestätige oder ignoriere die Anfrage.
Du kannst sein/ihr Profil unter $[url] finden.
$siteurl
Bitte melde dich an um die komplette Vorstellung einzusehen
und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
Schöne Grüße,
$sitename Administrator
$[siteurl]
Beste Grüße,
$[sitename] Administrator

View File

@ -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 Link 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";
@ -156,7 +156,7 @@ $a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spa
$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
$a->strings["Invalid locator"] = "Ungültiger Locator";
$a->strings["Invalid email address."] = "Ungültige E-Mail Adresse.";
$a->strings["This account has not been configured for email. Request failed."] = "";
$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für Email konfiguriert. Anfrage fehlgeschlagen.";
$a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden.";
$a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist.";
@ -223,7 +223,7 @@ $a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul";
$a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul";
$a->strings["mysqli PHP module"] = "PHP: mysqli-Modul";
$a->strings["mb_string PHP module"] = "PHP: mb_string-Modul";
$a->strings["Apace mod_rewrite module"] = "Apache: mod_rewrite-Modul";
$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.";
$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt ist aber nicht installiert.";
$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert.";
@ -474,9 +474,9 @@ $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträg
$a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:";
$a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
$a->strings["By default post a status message when:"] = "";
$a->strings["By default post a status message when:"] = "Standardmäßig eine Status-Nachricht posten wenn:";
$a->strings["accepting a friend request"] = "akzeptieren einer Freundschaftsanfrage";
$a->strings["making an <em>interesting</em> profile change"] = "";
$a->strings["making an <em>interesting</em> profile change"] = "<em>interessante</em> Änderungen am Profil gemacht werden";
$a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:";
$a->strings["You receive an introduction"] = "- du eine Kontaktanfrage erhältst";
$a->strings["Your introductions are confirmed"] = "- eine deiner Kontaktanfragen akzeptiert wurde";
@ -603,6 +603,8 @@ $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht";
$a->strings["Item not found."] = "Beitrag nicht gefunden.";
$a->strings["Access denied."] = "Zugriff verweigert.";
$a->strings["Photos"] = "Bilder";
$a->strings["Files"] = "Dateien";
$a->strings["Account approved."] = "Account freigegeben.";
$a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen";
$a->strings["Please login."] = "Bitte melde dich an.";
@ -679,7 +681,7 @@ $a->strings["Site name"] = "Seitenname";
$a->strings["Banner/Logo"] = "Banner/Logo";
$a->strings["System language"] = "Systemsprache";
$a->strings["System theme"] = "Systemweites Thema";
$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "";
$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
$a->strings["SSL link policy"] = "Regeln für SSL Links";
$a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
$a->strings["Maximum image size"] = "Maximale Größe von Bildern";
@ -688,7 +690,7 @@ $a->strings["Register policy"] = "Registrierungsmethode";
$a->strings["Register text"] = "Registrierungstext";
$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
$a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt";
$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
$a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
$a->strings["Allowed email domains"] = "Erlaubte Domains für Emails";
@ -779,7 +781,7 @@ $a->strings["{0} is now friends with %s"] = "{0} ist jetzt mit %s befreundet";
$a->strings["{0} posted"] = "{0} hat etwas veröffentlicht";
$a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen";
$a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt";
$a->strings["Contacts who are not members of a group"] = "";
$a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner Gruppe zugewiesen sind";
$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
$a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
@ -801,19 +803,19 @@ $a->strings["No installed applications."] = "Keine Applikationen installiert.";
$a->strings["Search This Site"] = "Diese Seite durchsuchen";
$a->strings["Profile not found."] = "Profil nicht gefunden.";
$a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
$a->strings["Marital Status"] = "";
$a->strings["Romantic Partner"] = "";
$a->strings["Work/Employment"] = "";
$a->strings["Marital Status"] = "Familienstand";
$a->strings["Romantic Partner"] = "Romanze";
$a->strings["Work/Employment"] = "Arbeit / Beschäftigung";
$a->strings["Religion"] = "Religion";
$a->strings["Political Views"] = "Politische Ansichten";
$a->strings["Gender"] = "Geschlecht";
$a->strings["Sexual Preference"] = "Sexuelle Vorlieben";
$a->strings["Homepage"] = "Webseite";
$a->strings["Interests"] = "Interessen";
$a->strings["Location"] = "";
$a->strings["Location"] = "Wohnort";
$a->strings["Profile updated."] = "Profil aktualisiert.";
$a->strings["public profile"] = "";
$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
$a->strings["public profile"] = "öffentliches Profil";
$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s.";
$a->strings["Profile deleted."] = "Profil gelöscht.";
$a->strings["Profile-"] = "Profil-";
$a->strings["New profile created."] = "Neues Profil angelegt.";
@ -941,7 +943,7 @@ $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen"
$a->strings["Facebook API Key"] = "Facebook API Schlüssel";
$a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>";
$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden).";
$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren.";
$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint korrekt zu funktionieren.";
$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange.";
$a->strings["App-ID / API-Key"] = "App-ID / API-Key";
$a->strings["Application secret"] = "Anwendungs-Geheimnis";
@ -1088,19 +1090,19 @@ $a->strings["The URL for the javascript file that should be included to use Math
$a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
$a->strings["Editplain Settings"] = "Editplain Einstellungen";
$a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren";
$a->strings["generic profile image"] = "";
$a->strings["random geometric pattern"] = "";
$a->strings["monster face"] = "";
$a->strings["computer generated face"] = "";
$a->strings["retro arcade style face"] = "";
$a->strings["generic profile image"] = "allgemeines Profilbild";
$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster";
$a->strings["monster face"] = "Monstergesicht";
$a->strings["computer generated face"] = "Computergesicht";
$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht";
$a->strings["Default avatar image"] = "Standard Profilbild ";
$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
$a->strings["Rating of images"] = "";
$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
$a->strings["Gravatar settings updated."] = "";
$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Wähle das Standardgesicht, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach.";
$a->strings["Rating of images"] = "Bildbewertung";
$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach.";
$a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert.";
$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen.";
$a->strings["Your Friendica test account is about to expire."] = "Dein Friendica Test Konto wird bald verfallen.";
$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hallo %1\$s,\n\ndein Test-Konto auf %2\$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir eine feste Friendica-Site für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Sites findest du auf http://dir.friendica.com/siteinfo. Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica Projektseite werfen: http://friendica.com";
$a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
$a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert.";
$a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten.";
@ -1184,18 +1186,18 @@ $a->strings["Send #tag links to Twitter"] = "#Tags nach Twitter senden";
$a->strings["Consumer key"] = "Consumer Key";
$a->strings["Consumer secret"] = "Consumer Secret";
$a->strings["IRC Settings"] = "IRC Einstellungen";
$a->strings["Channel(s) to auto connect (comma separated)"] = "";
$a->strings["Popular Channels (comma separated)"] = "";
$a->strings["Channel(s) to auto connect (comma separated)"] = "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)";
$a->strings["Popular Channels (comma separated)"] = "Beliebte Kanäle (mit Komma getrennt)";
$a->strings["IRC settings saved."] = "IRC Einstellungen gespeichert.";
$a->strings["IRC Chatroom"] = "IRC Chatraum";
$a->strings["Popular Channels"] = "Beliebte Räume";
$a->strings["Post to blogger"] = "";
$a->strings["Blogger Post Settings"] = "";
$a->strings["Enable Blogger Post Plugin"] = "";
$a->strings["Blogger username"] = "";
$a->strings["Blogger password"] = "";
$a->strings["Blogger API URL"] = "";
$a->strings["Post to Blogger by default"] = "";
$a->strings["Post to blogger"] = "Auf Blogger posten";
$a->strings["Blogger Post Settings"] = "Einstellungen zum posten auf Blogger";
$a->strings["Enable Blogger Post Plugin"] = "Blogger-Post-Plugin aktivieren";
$a->strings["Blogger username"] = "Blogger-Benutzername";
$a->strings["Blogger password"] = "Blogger-Passwort";
$a->strings["Blogger API URL"] = "Blogger-API-URL";
$a->strings["Post to Blogger by default"] = "Standardmäßig auf Blogger posten";
$a->strings["Post to Posterous"] = "Nach Posterous senden";
$a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen";
$a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren";
@ -1212,21 +1214,18 @@ $a->strings["Invite Friends"] = "Freunde einladen";
$a->strings["Community Pages"] = "Foren";
$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
$a->strings["Connect Services"] = "Verbinde Dienste";
$a->strings["PostIt to Friendica"] = "Bei Friendica posten";
$a->strings["Post to Friendica"] = "Wenn du diesen Link";
$a->strings[" from anywhere by bookmarking this Link."] = " zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
$a->strings["Your profile page"] = "Deine Profilseite";
$a->strings["Your contacts"] = "Deine Kontakte";
$a->strings["Photos"] = "Bilder";
$a->strings["Your photos"] = "Deine Fotos";
$a->strings["Your events"] = "Deine Ereignisse";
$a->strings["Personal notes"] = "Persönliche Notizen";
$a->strings["Your personal photos"] = "Deine privaten Fotos";
$a->strings["Theme settings"] = "Themen Einstellungen";
$a->strings["Set font-size for posts and comments"] = "";
$a->strings["Set line-height for posts and comments"] = "";
$a->strings["Set resolution for middle column"] = "";
$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen";
$a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen";
$a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen";
$a->strings["Set color scheme"] = "Wähle Farbschema";
$a->strings["Alignment"] = "Ausrichtung";
$a->strings["Left"] = "Links";
$a->strings["Center"] = "Mitte";
@ -1299,8 +1298,8 @@ $a->strings["Single"] = "Single";
$a->strings["Lonely"] = "Einsam";
$a->strings["Available"] = "Verfügbar";
$a->strings["Unavailable"] = "Nicht verfügbar";
$a->strings["Has crush"] = "";
$a->strings["Infatuated"] = "";
$a->strings["Has crush"] = "verknallt";
$a->strings["Infatuated"] = "verliebt";
$a->strings["Dating"] = "Dating";
$a->strings["Unfaithful"] = "Untreu";
$a->strings["Sex Addict"] = "Sexbesessen";
@ -1309,10 +1308,10 @@ $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen";
$a->strings["Casual"] = "Casual";
$a->strings["Engaged"] = "Verlobt";
$a->strings["Married"] = "Verheiratet";
$a->strings["Imaginarily married"] = "";
$a->strings["Imaginarily married"] = "imaginär verheiratet";
$a->strings["Partners"] = "Partner";
$a->strings["Cohabiting"] = "zusammenlebend";
$a->strings["Common law"] = "";
$a->strings["Common law"] = "wilde Ehe";
$a->strings["Happy"] = "Glücklich";
$a->strings["Not looking"] = "Nicht auf der Suche";
$a->strings["Swinger"] = "Swinger";
@ -1320,7 +1319,7 @@ $a->strings["Betrayed"] = "Betrogen";
$a->strings["Separated"] = "Getrennt";
$a->strings["Unstable"] = "Unstabil";
$a->strings["Divorced"] = "Geschieden";
$a->strings["Imaginarily divorced"] = "";
$a->strings["Imaginarily divorced"] = "imaginär geschieden";
$a->strings["Widowed"] = "Verwitwet";
$a->strings["Uncertain"] = "Unsicher";
$a->strings["It's complicated"] = "Ist kompliziert";
@ -1383,7 +1382,7 @@ $a->strings["edit"] = "bearbeiten";
$a->strings["Groups"] = "Gruppen";
$a->strings["Edit group"] = "Gruppe bearbeiten";
$a->strings["Create a new group"] = "Neue Gruppe erstellen";
$a->strings["Contacts not in any group"] = "";
$a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe";
$a->strings["Logout"] = "Abmelden";
$a->strings["End this session"] = "Diese Sitzung beenden";
$a->strings["Status"] = "Status";
@ -1505,7 +1504,7 @@ $a->strings["link"] = "Verweis";
$a->strings["Welcome "] = "Willkommen ";
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
$a->strings["Welcome back "] = "Willkommen zurück ";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
$a->strings["View Status"] = "Pinnwand anschauen";
$a->strings["View Profile"] = "Profil anschauen";
$a->strings["View Photos"] = "Bilder anschauen";

View File

@ -0,0 +1,14 @@
Kara $[myname],
Vi havas novan abonanton ĉe $[sitename] - '$[requestor]'.
Vi povas viziti ilian profilon ĉe $[url].
Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton.
$[siteurl]
Salutoj,
[$sitename] administranto

View File

@ -0,0 +1,22 @@
Kara $[username],
Boegaj novaĵoj.... '$[fn]' ĉe '$[dfrn_url]' aprobis
vian kontaktpeton ĉe '$[sitename]'.
Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn
senkatene.
Bonvolu viziti vian 'Kontaktoj' paĝon ĉe $[sitename] se vi volas
ŝangi la rilaton.
$[siteurl]
[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne
haveblas al la komuna publiko - kaj rajtigi '$[fn]' al ĝi]'
Salutoj,
$[sitename] administranto

View File

@ -0,0 +1,22 @@
Kara $[username],
'$[fn]' ĉe '$[dfrn_url]' akceptis
vian kontaktpeton ĉe '$[sitename]'.
'$[fn]' elektis vin kiel "admiranto", kio malpermesas
kelkajn komunikilojn - ekzemple privataj mesaĝoj kaj kelkaj profilrilataj
agoj. Se tio estas konto de komunumo aŭ de eminentulo, tiaj agordoj
aŭtomate aktiviĝis.
'$[fn]' eblas konverti la rilaton al ambaŭdirekta rilato
aŭ apliki pli da permesoj.
Vi ekricevos publikajn afiŝojn de '$[fn]',
kiuj aperos sur via 'Reto' paĝo ĉe
$[siteurl]
Salutoj,
$[sitename] administranto

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,20 @@
Kara $[username],
Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun
informon (aŭ tuj ŝanĝu vian pasvorton al
iu kiun vi povas memori).
Jen viaj legitimaĵoj:
Retejo:»$[siteurl]
Salutnomo:»$[email]
Pasvorto:»$[new_password]
Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita.
Salutoj,
$[sitename] administranto

View File

@ -0,0 +1,34 @@
Kara $[username],
Dankon pro via registrado ĉe $[sitename]. Vian konton estas kreita.
Jen viaj legitimaĵoj:
Retejo:»$[siteurl]
Salutnomo:»$[email]
Pasvorto:»$[password]
Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas
ensalutita.
Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn.
Eble vi volas aldoni kelkajn bazajn informojn al via profilo
(ĉe la paĝo "Profiloj"), tial vi troveblas al aliaj uzantoj.
Ni rekomendas agordi vian plenan noman, aldoni profilbildon,
kaj aldojo kelkajn ŝlosilvortojn (tre utila por trovi novajn amikojn) - kaj
eble en kiu lando vi loĝas, se vi ne volas pli specifa
ol tio.
Ni tute respektas vian privatecon, kaj neniu de tiuj agordoj necesas.
Se vi novas kaj ne konas iun ĉi tie, ili eble helpas
vin trovi novajn kaj interesajn amikojn.
Dankon kaj bonvenon ĉe $[sitename].
Salutoj,
$[sitename] administranto

View File

@ -0,0 +1,25 @@
Nova peto por registrado atendas ĉe $[sitename]
kaj bezonas vian aprobon.
Jen la detaloj de la peto:
Plena Nomo:»$[username]
Retejo:»$[siteurl]
Salutnomo:»$[email]
Aprobonte la peton, bonvolu klaki tiun ligilon:
$[siteurl]/regmod/allow/$[hash]
Malaprobonte kaj forviŝonte la konton, bonvolu klaki:
$[siteurl]/regmod/deny/$[hash]
Dankon!

View File

@ -0,0 +1,17 @@
Kara $[myname],
Vi ĵus ricevis kontaktpeton ĉe $[sitename]
de '$[requestor]'.
Vi eblas viziti la profilon de la petanto ĉe $[url].
Bonvolu ensaluti en la retejo por vidi la plenan prezenton
kaj aprobi aŭ ignori/nuligi la peton.
$[siteurl]
Salutoj,
$[sitename] administranto

View File

@ -223,7 +223,7 @@ $a->strings["GD graphics PHP module"] = "PHP modulo GD";
$a->strings["OpenSSL PHP module"] = "PHP modulo OpenSSL";
$a->strings["mysqli PHP module"] = "PHP modulo mysqli";
$a->strings["mb_string PHP module"] = "PHP modulo mb_string";
$a->strings["Apace mod_rewrite module"] = "Apache modulo mod_rewrite";
$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite modulo";
$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Eraro: La modulo mod_rewrite en la Apache retservilo estas bezonata sed ne instalita.";
$a->strings["Error: libCURL PHP module required but not installed."] = "Eraro: La modulo libCURL en PHP estas bezonata sed ne instalita.";
$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Eraro: La modulo GD en PHP kun subteno por JPEG estas bezonata sed ne instalita.";
@ -367,12 +367,12 @@ $a->strings["Forgot your Password?"] = "Ĉu vi forgesis vian pasvorton?";
$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Entajpu vian retpoŝtadreson kaj sendu por pasvorta riparado. Poste, bonvolu legi vian retpoŝton por trovi pliajn instrukciojn.";
$a->strings["Nickname or Email: "] = "Salutnomo aŭ retpoŝtadreso: ";
$a->strings["Reset"] = "Repari";
$a->strings["Account settings"] = "Kontoagordoj";
$a->strings["Display settings"] = "Ekranagordoj";
$a->strings["Connector settings"] = "Konektiloagordoj";
$a->strings["Plugin settings"] = "Agordoj pri kromprogramoj";
$a->strings["Account settings"] = "Konto";
$a->strings["Display settings"] = "Ekrano";
$a->strings["Connector settings"] = "Konektiloj";
$a->strings["Plugin settings"] = "Kromprogramoj";
$a->strings["Connected apps"] = "Konektitaj programoj";
$a->strings["Export personal data"] = "Eksporti personan datumaron";
$a->strings["Export personal data"] = "Eksporto";
$a->strings["Settings"] = "Agordoj";
$a->strings["Missing some important data!"] = "Mankas importantaj datumoj!";
$a->strings["Update"] = "Ĝisdatigi";
@ -426,10 +426,10 @@ $a->strings["Update browser every xx seconds"] = "Ĝisdatigu retesplorilon ĉiu
$a->strings["Minimum of 10 seconds, no maximum"] = "Minimume 10 sekundoj, sen maksimumo";
$a->strings["Number of items to display on the network page:"] = "Kvanto da elementoj kiuj estos montrata ĉe la reto paĝo.";
$a->strings["Maximum of 100 items"] = "Maksimume 100 eroj";
$a->strings["Don't show emoticons"] = "Ne montru ridetulojn.";
$a->strings["Don't show emoticons"] = "Ne montru ridetulojn";
$a->strings["Normal Account"] = "Normala konto";
$a->strings["This account is a normal personal profile"] = "Tiu konto estas normala persona profilo";
$a->strings["Soapbox Account"] = "Konto ĉe Soapbox";
$a->strings["Soapbox Account"] = "Soapbox Konto";
$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel nurlegaj admirantoj";
$a->strings["Community/Celebrity Account"] = "Komunuma/eminentula Konto";
$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel admirantoj kapable legi kaj skribi";
@ -447,7 +447,7 @@ $a->strings["Allow us to suggest you as a potential friend to new members?"] = "
$a->strings["Permit unknown people to send you private mail?"] = "Permesigi nekonatulojn sendi retpoŝton al vi?";
$a->strings["Profile is <strong>not published</strong>."] = "Profilo <strong>ne estas publika</strong>.";
$a->strings["or"] = "";
$a->strings["Your Identity Address is"] = "Via identeco adreso estas";
$a->strings["Your Identity Address is"] = "Via identeca adreso estas";
$a->strings["Automatically expire posts after this many days:"] = "Automatike senvalidigi afiŝojn post tiom da tagoj:";
$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Se malplena, afiŝoj neniam senvalidiĝos. Senvalidigitajn afiŝon estos forviŝata";
$a->strings["Advanced expiration settings"] = "Detalaj agordoj rilate al senvalidiĝo";
@ -603,6 +603,8 @@ $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s ŝatas la %3\$s de %2\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s malŝatas la %3\$s de %2\$s";
$a->strings["Item not found."] = "Elemento ne estas trovita.";
$a->strings["Access denied."] = "Atingo nepermesita.";
$a->strings["Photos"] = "Bildoj";
$a->strings["Files"] = "Dosieroj";
$a->strings["Account approved."] = "Konto aprobita.";
$a->strings["Registration revoked for %s"] = "Registraĵo por %s senvalidigita.";
$a->strings["Please login."] = "Bonvolu ensaluti.";
@ -688,7 +690,7 @@ $a->strings["Register policy"] = "Interkonsento pri registrado";
$a->strings["Register text"] = "Interkonsento teksto";
$a->strings["Will be displayed prominently on the registration page."] = "Tio estos eminente montrata en la registro paĝo.";
$a->strings["Accounts abandoned after x days"] = "Kontoj forlasitaj post x tagoj";
$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo.";
$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo.";
$a->strings["Allowed friend domains"] = "Permesitaj amikaj domainoj";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Perkome disigita listo da domajnoj kiuj rajtas konstrui amikecojn kun ĉi tiu retejo. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn.";
$a->strings["Allowed email domains"] = "Permesitaj retpoŝtaj domajnoj";
@ -946,6 +948,7 @@ $a->strings["The correctness of the API Key could not be detected. Somthing stra
$a->strings["App-ID / API-Key"] = "Programo ID / API Ŝlosilo";
$a->strings["Application secret"] = "Programo sekreto";
$a->strings["Polling Interval (min. %1\$s minutes)"] = "Intervalo por la enketilo (poller intervalo, minimume %1\$s mintuoj) ";
$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Sinkronigi komentojn (vi ricevas ĉiujn komentojn de Facebook, sed la ŝargo de la sistemo iom kreskas)";
$a->strings["Real-Time Updates"] = "Realtempaj Ĝisdatigoj";
$a->strings["Real-Time Updates are activated."] = "Realtempaj Ĝisdatigoj estas ŝaltita";
$a->strings["Deactivate Real-Time Updates"] = "Malŝalti Realtempaj Ĝisdatigoj";
@ -959,6 +962,11 @@ $a->strings["Facebook post failed. Queued for retry."] = "Malsukcesis afiŝi ĉe
$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Via Facbook konekto iĝis nevalida. Bonvolu reaŭtentiĝi.";
$a->strings["Facebook connection became invalid"] = "Facebook konekto iĝis nevalida.";
$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Saluton %1\$s,\n\nla kontekto inter viaj kontoj ĉe %2\$s kaj Facebook malvalidiĝis. Tio kutime okazas post kiam via ŝangas vian pasvorton ĉe Facebook. Por reaktivigi la konekto, vi bezonas %3\$sreaŭtentiĝi la Facebook konektilon%4\$s.";
$a->strings["Lifetime of the cache (in hours)"] = "Vivodaŭro de kaŝmemoro (horoj)";
$a->strings["Cache Statistics"] = "Statistikoj pri kaŝmemoro";
$a->strings["Number of items"] = "Kvanto da eroj";
$a->strings["Size of the cache"] = "Grando de la kaŝmemoro";
$a->strings["Delete the whole cache"] = "Forviŝi la kaŝmemoron";
$a->strings["%d person likes this"] = array(
0 => "%d homo ŝatas tiun",
1 => "%d homoj ŝatas tiun",
@ -1049,7 +1057,7 @@ $a->strings["OEmbed settings updated"] = "Ĝisdatigis OEmbed agordojn";
$a->strings["Use OEmbed for YouTube videos"] = "Uzi OEmbed por YouTube videtoj";
$a->strings["URL to embed:"] = "Enigi la URL adreson:";
$a->strings["Impressum"] = "Kolofono";
$a->strings["Site Owner"] = "Proprietulo de la laĝo";
$a->strings["Site Owner"] = "Proprietulo de la paĝo";
$a->strings["Email Address"] = "Retpoŝta Adreso";
$a->strings["Postal Address"] = "Poŝta Adreso";
$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "La kolofono (impressum) kromprogramo bezonas agordojn!<br />Bonvolu aldoni minimume la <tt>owner</tt> variablon al via agorda dosiero. Por aliaj variabloj, bonvolu legi la README dosieron de la kromprogramo.";
@ -1212,13 +1220,9 @@ $a->strings["Invite Friends"] = "Inviti amikojn";
$a->strings["Community Pages"] = "Komunumaj paĝoj";
$a->strings["Help or @NewHere ?"] = "Helpu aŭ @NewHere ?";
$a->strings["Connect Services"] = "Konekti Servojn";
$a->strings["PostIt to Friendica"] = "PostIt al Friendica";
$a->strings["Post to Friendica"] = "Afiŝi al Friendica";
$a->strings[" from anywhere by bookmarking this Link."] = " de iu kun ĉi tio ligilo.";
$a->strings["Your posts and conversations"] = "Viaj afiŝoj kaj komunikadoj";
$a->strings["Your profile page"] = "Via profilo";
$a->strings["Your contacts"] = "Viaj kontaktoj";
$a->strings["Photos"] = "Bildoj";
$a->strings["Your photos"] = "Viaj bildoj";
$a->strings["Your events"] = "Viaj okazoj";
$a->strings["Personal notes"] = "Personaj notoj";
@ -1227,6 +1231,7 @@ $a->strings["Theme settings"] = "Agordoj pri la etoso";
$a->strings["Set font-size for posts and comments"] = "Agordi la tiparan grandon por afiŝoj kaj komentoj";
$a->strings["Set line-height for posts and comments"] = "Agordi la linigrandon por afiŝoj kaj komentoj";
$a->strings["Set resolution for middle column"] = "Agordi la distingivon por la meza kolumno";
$a->strings["Set color scheme"] = "Agordi Kolorskemon";
$a->strings["Alignment"] = "Ĝisrandigo";
$a->strings["Left"] = "Maldekstren";
$a->strings["Center"] = "Centren";
@ -1406,7 +1411,7 @@ $a->strings["Inbox"] = "Enirkesto";
$a->strings["Outbox"] = "Elirkesto";
$a->strings["Manage"] = "Administri";
$a->strings["Manage other pages"] = "Administri aliajn paĝojn";
$a->strings["Profiles"] = "Profiloj:";
$a->strings["Profiles"] = "Profiloj";
$a->strings["Manage/edit profiles"] = "Administri/redakti profilojn";
$a->strings["Manage/edit friends and contacts"] = "Administri/redakti amikojn kaj kontaktojn";
$a->strings["Admin"] = "Administrado";
@ -1456,8 +1461,8 @@ $a->strings["Image/photo"] = "Bildo";
$a->strings["Cannot locate DNS info for database server '%s'"] = "Ne trovis DNS informojn por datumbaza servilo '%s'.";
$a->strings["[no subject]"] = "[neniu temo]";
$a->strings["Visible to everybody"] = "Videbla al ĉiuj";
$a->strings["show"] = "montru";
$a->strings["don't show"] = "ne montru";
$a->strings["show"] = "montri";
$a->strings["don't show"] = "kaŝi";
$a->strings["Friendica Notification"] = "Friendica Atentigo";
$a->strings["Thank You,"] = "Dankon,";
$a->strings["%s Administrator"] = "%s Administranto";

View File

@ -3,8 +3,17 @@
src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
<script>
function showEvent(eventid) {
$.get(
'$baseurl/events/?id='+eventid,
function(data){
$.fancybox(data);
}
);
}
$(document).ready(function() {
$('#events-calendar').fullCalendar({
$('#events-calendar').fullCalendar({
events: '$baseurl/events/json/',
header: {
left: 'prev,next today',
@ -13,12 +22,7 @@
},
timeFormat: 'H(:mm)',
eventClick: function(calEvent, jsEvent, view) {
$.get(
'$baseurl/events/?id='+calEvent.id,
function(data){
$.fancybox(data);
}
);
showEvent(calEvent.id);
},
eventRender: function(event, element, view) {
@ -55,70 +59,81 @@
}
})
// center on date
var args=location.href.replace(baseurl,"").split("/");
if (args.length>=4) {
$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
}
// show event popup
var hash = location.hash.split("-")
if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
});
</script>
<script language="javascript" type="text/javascript"
src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
<script language="javascript" type="text/javascript">
tinyMCE.init({
theme : "advanced",
mode : "textareas",
plugins : "bbcode,paste",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
gecko_spellcheck : true,
paste_text_sticky : true,
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
});
}
});
$(document).ready(function() {
$('#event-share-checkbox').change(function() {
if ($('#event-share-checkbox').is(':checked')) {
$('#acl-wrapper').show();
}
else {
$('#acl-wrapper').hide();
}
}).trigger('change');
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
$('#jot-public').hide();
});
if(selstr == null) {
$('#jot-public').show();
tinyMCE.init({
theme : "advanced",
mode : "textareas",
plugins : "bbcode,paste",
theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "center",
theme_advanced_blockformats : "blockquote,code",
gecko_spellcheck : true,
paste_text_sticky : true,
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_br_newlines : true,
forced_root_block : '',
content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false,
setup : function(ed) {
ed.onInit.add(function(ed) {
ed.pasteAsPlainText = true;
});
}
}).trigger('change');
});
});
$(document).ready(function() {
$('#event-share-checkbox').change(function() {
if ($('#event-share-checkbox').is(':checked')) {
$('#acl-wrapper').show();
}
else {
$('#acl-wrapper').hide();
}
}).trigger('change');
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
$('#jot-public').hide();
});
if(selstr == null) {
$('#jot-public').show();
}
}).trigger('change');
});
</script>

10
view/events_reminder.tpl Normal file
View File

@ -0,0 +1,10 @@
{{ if $count }}
<div id="event-notice" class="birthday-notice fakelink $classtoday" onclick="openClose('event-wrapper');">$event_reminders ($count)</div>
<div id="event-wrapper" style="display: none;" ><div id="event-title">$event_title</div>
<div id="event-title-end"></div>
{{ for $events as $event }}
<div class="event-list" id="event-$event.id"></a> <a href="events/$event.link">$event.title</a> $event.date </div>
{{ endfor }}
</div></div>
{{ endif }}

View File

@ -79,6 +79,7 @@
ins = ins.replace('&amp;','&');
ins = ins.replace('&quot;','"');
$("#comment-edit-text-" + id).val(tmpStr + ins);
$(obj).val('');
}
function showHideComments(id) {

View File

@ -0,0 +1,127 @@
@import url('../greenzero/style.css');
body {background-image:none;
}
.wall-item-content-wrapper {
border-top: 1px solid #ccc;
//border-top:none;
border-left:none;
border-right:none;
border-radius:0px;
//border:none;
//background: #f8f8f8 !important;
}
.wall-item-content-wrapper.comment {
// background: #f8f8f8 !important;
// border-left: 1px solid #ccc;
border-top: 1px solid #ccc;
border-left:none;
border-right:none;
border-radius:0px;
}
.wall-item-tools {
// border-top: 1px solid #ccc;
// background: #f8f8f8 !important;
background: #ffffff !important;
}
.comment-edit-text-empty, .comment-edit-text-full {
border: 1px solid #ccc;
border-left: 1px solid #EEE;
background: #ffffff;
}
.comment-edit-wrapper, .comment-wwedit-wrapper {
// background: #ffffff; !important;
//background: #f8f8f8 !important;
}
section {
margin: 0px 10%;
margin-right:12%;
background-image:none;
}
aside {
margin-left: 10%;
background-image:none;
}
nav {
margin-left: 32px;
margin-right: 5%;
}
nav #site-location {
top: 80px;
right: 5%;
}
.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
border-radius: 3px;
-moz-border-radius: 3px;
}
.tabs { background-image:none;
}
.tab.active {
padding: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;
//background: #F8F8F8;
font-weight: bold;
}
.tab { margin-right: 1px ;
}
#group-sidebar {
margin-bottom: 10px;
border:none;
}
#nets-sidebar {
margin-bottom: 10px;
border:none;
}
#saved-search-list {
border:none;
}
blockquote {
//background-color: #f8f8f8;
border: 1px solid #ccc;
-moz-border-radius: 3px;
border-radius: 3px;
}
.widget {
border: none;
}
.wall-item-content {
max-height: 20000px;
overflow: none;
}
.nav-commlink, .nav-login-link {
margin-top: 67px;
height: 15px;
float:left;
padding: 6px 3px;
}
nav .nav-link {
//float: left;
}

View File

@ -0,0 +1,127 @@
@import url('../purplezero/style.css');
body {background-image:none;
}
.wall-item-content-wrapper {
border-top: 1px solid #ccc;
//border-top:none;
border-left:none;
border-right:none;
border-radius:0px;
//border:none;
//background: #f8f8f8 !important;
}
.wall-item-content-wrapper.comment {
// background: #f8f8f8 !important;
// border-left: 1px solid #ccc;
border-top: 1px solid #ccc;
border-left:none;
border-right:none;
border-radius:0px;
}
.wall-item-tools {
// border-top: 1px solid #ccc;
// background: #f8f8f8 !important;
background: #ffffff !important;
}
.comment-edit-text-empty, .comment-edit-text-full {
border: 1px solid #ccc;
border-left: 1px solid #EEE;
background: #ffffff;
}
.comment-edit-wrapper, .comment-wwedit-wrapper {
// background: #ffffff; !important;
// background: #f8f8f8 !important;
}
section {
margin: 0px 10%;
margin-right:12%;
background-image:none;
}
aside {
margin-left: 10%;
background-image:none;
}
nav {
margin-left: 32px;
margin-right: 5%;
}
nav #site-location {
top: 80px;
right: 5%;
}
.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
border-radius: 3px;
-moz-border-radius: 3px;
}
.tabs { background-image:none;
}
.tab.active {
padding: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;
// background: #F8F8F8;
font-weight: bold;
}
.tab { margin-right: 1px ;
}
#group-sidebar {
margin-bottom: 10px;
border:none;
}
#nets-sidebar {
margin-bottom: 10px;
border:none;
}
#saved-search-list {
border:none;
}
blockquote {
background-color: #f8f8f8;
border: 1px solid #ccc;
-moz-border-radius: 3px;
border-radius: 3px;
}
.widget {
border: none;
}
.wall-item-content {
max-height: 20000px;
overflow: none;
}
.nav-commlink, .nav-login-link {
margin-top: 67px;
height: 15px;
float:left;
padding: 6px 3px;
}
nav .nav-link {
//float: left;
}

View File

@ -0,0 +1,127 @@
@import url('../duepuntozero/style.css');
body {background-image:none;
}
.wall-item-content-wrapper {
border-top: 1px solid #ccc;
//border-top:none;
border-left:none;
border-right:none;
border-radius:0px;
//border:none;
//background: #f8f8f8 !important;
}
.wall-item-content-wrapper.comment {
background: #f8f8f8 !important;
// border-left: 1px solid #ccc;
border-top: 1px solid #ccc;
border-left:none;
border-right:none;
border-radius:0px;
}
.wall-item-tools {
// border-top: 1px solid #ccc;
// background: #f8f8f8 !important;
background: #ffffff !important;
}
.comment-edit-text-empty, .comment-edit-text-full {
border: 1px solid #ccc;
border-left: 1px solid #EEE;
background: #ffffff;
}
.comment-edit-wrapper, .comment-wwedit-wrapper {
// background: #ffffff; !important;
background: #f8f8f8 !important;
}
section {
margin: 0px 10%;
margin-right:12%;
background-image:none;
}
aside {
margin-left: 10%;
background-image:none;
}
nav {
margin-left: 32px;
margin-right: 5%;
}
nav #site-location {
top: 80px;
right: 5%;
}
.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
border-radius: 3px;
-moz-border-radius: 3px;
}
.tabs { background-image:none;
}
.tab.active {
padding: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;
background: #F8F8F8;
font-weight: bold;
}
.tab { margin-right: 1px ;
}
#group-sidebar {
margin-bottom: 10px;
border:none;
}
#nets-sidebar {
margin-bottom: 10px;
border:none;
}
#saved-search-list {
border:none;
}
blockquote {
background-color: #f8f8f8;
border: 1px solid #ccc;
-moz-border-radius: 3px;
border-radius: 3px;
}
.widget {
border: none;
}
.wall-item-content {
max-height: 20000px;
overflow: none;
}
.nav-commlink, .nav-login-link {
margin-top: 67px;
height: 15px;
float:left;
padding: 6px 3px;
}
nav .nav-link {
//float: left;
}

View File

@ -0,0 +1,79 @@
<?php
/**
* Theme settings
*/
function theme_content(&$a){
if(!local_user())
return;
$resize = get_pconfig(local_user(), 'cleanzero', 'resize' );
$color = get_pconfig(local_user(), 'cleanzero', 'color' );
$font_size = get_pconfig(local_user(), 'cleanzero', 'font_size' );
return cleanzero_form($a,$color,$font_size,$resize);
}
function theme_post(&$a){
if(! local_user())
return;
if (isset($_POST['cleanzero-settings-submit'])){
set_pconfig(local_user(), 'cleanzero', 'resize', $_POST['cleanzero_resize']);
set_pconfig(local_user(), 'cleanzero', 'color', $_POST['cleanzero_color']);
set_pconfig(local_user(), 'cleanzero', 'font_size', $_POST['cleanzero_font_size']);
}
}
function theme_admin(&$a){
$resize = get_config('cleanzero', 'resize' );
$color = get_config('cleanzero', 'color' );
$font_size = get_config('cleanzero', 'font_size' );
return cleanzero_form($a,$color,$font_size,$resize);
}
function theme_admin_post(&$a){
if (isset($_POST['cleanzero-settings-submit'])){
set_config('cleanzero', 'resize', $_POST['cleanzero_resize']);
set_config('cleanzero', 'color', $_POST['cleanzero_color']);
set_config('cleanzero', 'font_size', $_POST['cleanzero_font_size']);
}
}
function cleanzero_form(&$a, $color,$font_size,$resize){
$colors = array(
"cleanzero"=>"cleanzero",
"cleanzero-green"=>"green",
"cleanzero-purple"=>"purple"
);
$font_sizes = array(
'12'=>'12',
"---"=>"---",
"16"=>"16",
"14"=>"14",
'10'=>'10',
);
$resizes = array(
"0"=>"0 (no resizing)",
"600"=>"1 (600px)",
"300"=>"2 (300px)",
"250"=>"3 (250px)",
"150"=>"4 (150px)",
);
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(),
'$title' => t("Theme settings"),
'$resize' => array('cleanzero_resize',t ('Set resize level for images in posts and comments (width and height)'),$resize,'',$resizes),
'$font_size' => array('cleanzero_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
'$color' => array('cleanzero_color', t('Color scheme'), $color, '', $colors),
));
return $o;
}

View File

@ -0,0 +1,71 @@
<nav>
$langselector
<div id="site-location">$sitelocation</div>
{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
<span id="nav-link-wrapper" >
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
{{ if $nav.network }}
<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
<span id="net-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.home }}
<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.introductions }}
<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
<span id="intro-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.messages }}
<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
<span id="mail-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.notifications }}
<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
<span id="notify-update" class="nav-ajax-left"></span>
<ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
<li class="empty">$emptynotifications</li>
</ul>
{{ endif }}
{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
{{ if $nav.community }}
<a id="nav-community-link" class="nav-link $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
{{ endif }}
</span>
<span id="nav-end"></span>
<span id="banner">$banner</span>
</nav>
<ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
</ul>

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 KiB

View File

@ -0,0 +1,127 @@
@import url('../duepuntozero/style.css');
body {background-image:none;
}
.wall-item-content-wrapper {
border-top: 1px solid #ccc;
//border-top:none;
border-left:none;
border-right:none;
border-radius:0px;
//border:none;
//background: #f8f8f8 !important;
}
.wall-item-content-wrapper.comment {
background: #f8f8f8 !important;
// border-left: 1px solid #ccc;
border-top: 1px solid #ccc;
border-left:none;
border-right:none;
border-radius:0px;
}
.wall-item-tools {
// border-top: 1px solid #ccc;
// background: #f8f8f8 !important;
background: #ffffff !important;
}
.comment-edit-text-empty, .comment-edit-text-full {
border: 1px solid #ccc;
border-left: 1px solid #EEE;
background: #ffffff;
}
.comment-edit-wrapper, .comment-wwedit-wrapper {
// background: #ffffff; !important;
background: #f8f8f8 !important;
}
section {
margin: 0px 10%;
margin-right:12%;
background-image:none;
}
aside {
margin-left: 10%;
background-image:none;
}
nav {
margin-left: 32px;
margin-right: 5%;
}
nav #site-location {
top: 80px;
right: 5%;
}
.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
border-radius: 3px;
-moz-border-radius: 3px;
}
.tabs { background-image:none;
}
.tab.active {
padding: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;
background: #F8F8F8;
font-weight: bold;
}
.tab { margin-right: 1px ;
}
#group-sidebar {
margin-bottom: 10px;
border:none;
}
#nets-sidebar {
margin-bottom: 10px;
border:none;
}
#saved-search-list {
border:none;
}
blockquote {
background-color: #f8f8f8;
border: 1px solid #ccc;
-moz-border-radius: 3px;
border-radius: 3px;
}
.widget {
border: none;
}
.wall-item-content {
max-height: 20000px;
overflow: none;
}
.nav-commlink, .nav-login-link {
margin-top: 67px;
height: 15px;
float:left;
padding: 6px 3px;
}
nav .nav-link {
//float: left;
}

View File

@ -0,0 +1,71 @@
<?php
$color=false;
$cleanzero_font_size=false;
$site_color = get_config("cleanzero","color");
$site_cleanzero_font_size = get_config("cleanzero", "font_size" );
if (local_user()) {
$color = get_pconfig(local_user(), "cleanzero","color");
$cleanzero_font_size = get_pconfig(local_user(), "cleanzero", "font_size");
}
if ($color===false) $color=$site_color;
if ($color===false) $color="cleanzero";
if ($cleanzero_font_size===false) $cleanzero_font_size=$site_cleanzero_font_size;
if (file_exists("$THEMEPATH/$color/style.css")){
echo file_get_contents("$THEMEPATH/$color/style.css");
}
if($cleanzero_font_size == "16"){
echo "
.wall-item-content-wrapper {
font-size: 16px;
}
.wall-item-content-wrapper.comment {
font-size: 16px;
}
";
}
if($cleanzero_font_size == "14"){
echo "
.wall-item-content-wrapper {
font-size: 14px;
}
.wall-item-content-wrapper.comment {
font-size: 14px;
}
";
}
if($cleanzero_font_size == "12"){
echo "
.wall-item-content-wrapper {
font-size: 12px;
}
.wall-item-content-wrapper.comment {
font-size: 12px;
}
";
}
if($cleanzero_font_size == "10"){
echo "
.wall-item-content-wrapper {
font-size: 10px;
}
.wall-item-content-wrapper.comment {
font-size: 10px;
}
";
}

View File

@ -0,0 +1,114 @@
<?php
/*
* Name: cleanzero
* Description: Theme with clean design derived from the zero theme family. Including options to set color schemes, font sizes and resizing of images in posts
* Version:
* Author: Christian Vogeley (https://christian-vogeley.de/profile/christian)
*/
$a->theme_info = array(
'extends' => 'duepuntozero',
);
function cleanzero_init(&$a) {
$a->page['htmlhead'] .= <<< EOT
<script>
function insertFormatting(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
$("#comment-edit-text-" + id).val(tmpStr);
}
textarea = document.getElementById("comment-edit-text-" +id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
if (BBcode == "url"){
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url"){
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
function cmtBbOpen(id) {
$(".comment-edit-bb-" + id).show();
}
function cmtBbClose(comment, id) {
$(".comment-edit-bb-" + id).hide();
}
$(document).ready(function() {
$('.group-edit-icon').hover(
function() {
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() {
$(this).removeClass('icon'); $(this).addClass('iconspacer');}
);
$('.sidebar-group-element').hover(
function() {
id = $(this).attr('id');
$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
function() {
id = $(this).attr('id');
$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
);
$('.savedsearchdrop').hover(
function() {
$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
function() {
$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
);
$('.savedsearchterm').hover(
function() {
id = $(this).attr('id');
$('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
function() {
id = $(this).attr('id');
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
);
});
</script>
EOT;
// get resize configuration
$resize=false;
$site_resize = get_config('cleanzero', 'resize' );
if(local_user()) $resize = get_pconfig(local_user(), 'cleanzero', 'resize' );
if ($resize===false) $resize=$site_resize;
if ($resize===false) $resize=0;
if (intval($resize) > 0) {
//load jquery.ae.image.resize.js
$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/cleanzero/js/jquery.ae.image.resize.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
$a->page['htmlhead'] .= '
<script>
$(function() {
$(".wall-item-content-wrapper img").aeImageResize({height: '.$resize.', width: '.$resize.'});
});
</script>';}
}

View File

@ -1,10 +1,10 @@
{{inc field_select.tpl with $field=$color}}{{endinc}}
{{inc field_select.tpl with $field=$font_size}}{{endinc}}
{{inc field_select.tpl with $field=$resize}}{{endinc}}
{{inc field_select.tpl with $field=$line_height}}{{endinc}}
{{inc field_select.tpl with $field=$resolution}}{{endinc}}
<div class="settings-submit-wrapper">
<input type="submit" value="$submit" class="settings-submit" name="diabook-blue-settings-submit" />
<input type="submit" value="$submit" class="settings-submit" name="cleanzero-settings-submit" />
</div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@ -14,6 +14,42 @@ $a->theme_info = array(
function darkzero_NS_init(&$a) {
$a->page['htmlhead'] .= <<< EOT
<script>
function insertFormatting(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
$("#comment-edit-text-" + id).val(tmpStr);
}
textarea = document.getElementById("comment-edit-text-" +id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
if (BBcode == "url"){
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url"){
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
function cmtBbOpen(id) {
$(".comment-edit-bb-" + id).show();
}
function cmtBbClose(id) {
$(".comment-edit-bb-" + id).hide();
}
$(document).ready(function() {
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@ -15,6 +15,43 @@ $a->theme_info = array(
function darkzero_init(&$a) {
$a->page['htmlhead'] .= <<< EOT
<script>
function insertFormatting(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
$("#comment-edit-text-" + id).val(tmpStr);
}
textarea = document.getElementById("comment-edit-text-" +id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
if (BBcode == "url"){
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url"){
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
function cmtBbOpen(id) {
$(".comment-edit-bb-" + id).show();
}
function cmtBbClose(id) {
$(".comment-edit-bb-" + id).hide();
}
$(document).ready(function() {
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });

View File

@ -8,7 +8,7 @@
<h1>$title - $page</h1>
<form action="$baseurl/admin/site" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
{{ inc field_select.tpl with $field=$language }}{{ endinc }}

View File

@ -14,8 +14,7 @@
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>

View File

@ -11,15 +11,15 @@
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div>
<div class="comment-edit-photo-end"></div>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);" >$comment</textarea>
<div class="comment-edit-bb-$id" style="display:none;">
<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('img',$id);">img</a>
<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('url',$id);">url</a>
<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('video',$id);">video</a>
<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('u',$id);">u</a>
<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('i',$id);">i</a>
<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('b',$id);">b</a>
<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('quote',$id);">quote</a>
<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>
<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>
</div>
{{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >

View File

@ -1,88 +0,0 @@
<script>
function confirm_delete(uname){
return confirm( "$confirm_delete".format(uname));
}
function confirm_delete_multi(){
return confirm("$confirm_delete_multi");
}
function selectall(cls){
$("."+cls).attr('checked','checked');
return false;
}
</script>
<div id='adminpage'>
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>
<thead>
<tr>
{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
<th></th>
<th></th>
</tr>
</thead>
<tbody>
{{ for $pending as $u }}
<tr>
<td class="created">$u.created</td>
<td class="name">$u.name</td>
<td class="email">$u.email</td>
<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
<td class="tools">
<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
</td>
</tr>
{{ endfor }}
</tbody>
</table>
<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>
{{ else }}
<p>$no_pending</p>
{{ endif }}
<h3>$h_users</h3>
{{ if $users }}
<table id='users'>
<thead>
<tr>
<th></th>
{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
<th></th>
<th></th>
</tr>
</thead>
<tbody>
{{ for $users as $u }}
<tr>
<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
<td class='email'>$u.email</td>
<td class='register_date'>$u.register_date</td>
<td class='login_date'>$u.login_date</td>
<td class='lastitem_date'>$u.lastitem_date</td>
<td class='login_date'>$u.page-flags</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
<td class="tools" style="width:60px;">
<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
</td>
</tr>
{{ endfor }}
</tbody>
</table>
<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>
{{ else }}
NO USERS?!?
{{ endif }}
</form>
</div>

View File

@ -1,10 +0,0 @@
<div class="directory-item" id="directory-item-$id" >
<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" >
<div class="directory-photo" id="directory-photo-$id" >
<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
</a>
</div>
</div>
</div>

View File

@ -1,41 +0,0 @@
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
<input type="hidden" name="type" value="$type" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="parent" value="$parent" />
<input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="jsreload" value="$jsreload" />
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
<div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div>
<div class="comment-edit-photo-end"></div>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>
<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>
<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>
{{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option>
{{ for $qcomment as $qc }}
<option value="$qc">$qc</option>
{{ endfor }}
</select>
{{ endif }}
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
</div>
<div class="comment-edit-end"></div>
</form>
</div>

View File

@ -1,86 +0,0 @@
<div id="close_pages">
{{ if $page }}
<div>$page</div>
{{ endif }}
</div>
<div id="close_helpers">
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
{{ endif }}
</div>
<div id="close_services">
{{ if $lastusers_title }}
<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
</div>
{{ endif }}
</div>
<div id="close_friends" style="margin-bottom:53px;">
{{ if $nv }}
<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></h3>
<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
$nv.search
{{ endif }}
</div>
<div id="close_lastusers">
{{ if $lastusers_title }}
<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
<div id='lastusers-wrapper' class='items-wrapper'>
{{ for $lastusers_items as $i }}
$i
{{ endfor }}
</div>
{{ endif }}
</div>
{{ if $activeusers_title }}
<h3>$activeusers_title</h3>
<div class='items-wrapper'>
{{ for $activeusers_items as $i }}
$i
{{ endfor }}
</div>
{{ endif }}
<div id="close_lastphotos">
{{ if $photos_title }}
<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()" class="icon close_box" title="close"></a></h3>
<div id='ra-photos-wrapper' class='items-wrapper'>
{{ for $photos_items as $i }}
$i
{{ endfor }}
</div>
{{ endif }}
</div>
<div id="close_lastlikes">
{{ if $like_title }}
<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
<ul id='likes'>
{{ for $like_items as $i }}
<li id='ra-photos-wrapper'>$i</li>
{{ endfor }}
</ul>
{{ endif }}
</div>

View File

@ -1,84 +0,0 @@
<?php
/**
* Theme settings
*/
function theme_content(&$a){
if(!local_user())
return;
$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' );
$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' );
$resolution = get_pconfig(local_user(), 'diabook-aerith', 'resolution' );
return diabook_form($a,$font_size, $line_height,$resolution);
}
function theme_post(&$a){
if(! local_user())
return;
if (isset($_POST['diabook-aerith-settings-submit'])){
set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
set_pconfig(local_user(), 'diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);
}
}
function theme_admin(&$a){
$font_size = get_config('diabook-aerith', 'font_size' );
$line_height = get_config('diabook-aerith', 'line_height' );
$resolution = get_config('diabook-aerith', 'resolution' );
return diabook_form($a,$font_size, $line_height,$resolution);
}
function theme_admin_post(&$a){
if (isset($_POST['diabook-aerith-settings-submit'])){
set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
set_config('diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);
}
}
function diabook_form(&$a, $font_size, $line_height, $resolution){
$line_heights = array(
"1.3"=>"1.3",
"---"=>"---",
"1.5"=>"1.5",
"1.4"=>"1.4",
"1.2"=>"1.2",
"1.1"=>"1.1",
);
$font_sizes = array(
'13'=>'13',
"---"=>"---",
"15"=>"15",
'14'=>'14',
'13.5'=>'13.5',
'12.5'=>'12.5',
'12'=>'12',
);
$resolutions = array(
'normal'=>'normal',
'wide'=>'wide',
);
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(),
'$title' => t("Theme settings"),
'$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
'$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),
));
return $o;
}

View File

@ -1,25 +0,0 @@
<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
<div class="contact-entry-photo-wrapper" >
<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')"
onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
{{ if $contact.photo_menu }}
<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
<div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
<ul>
$contact.photo_menu
</ul>
</div>
{{ endif }}
</div>
</div>
<div class="contact-entry-photo-end" ></div>
<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
<div class="contact-entry-end" ></div>
</div>

View File

@ -1,11 +0,0 @@
<div class="directory-item" id="directory-item-$id" >
<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" >
<div class="directory-photo" id="directory-photo-$id" >
<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
</a>
</div>
</div>
<div class="contact-name" id="directory-name-$id">$name</div>
</div>

View File

@ -1,11 +0,0 @@
<div id="widget_$title">
{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
{{if $desc}}<div class="desc">$desc</div>{{endif}}
<ul class="rs_tabs">
{{ for $items as $item }}
<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
{{ endfor }}
</ul>
</div>

View File

@ -1,34 +0,0 @@
<div id="profile_side" >
<div class="">
<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
</div>
<div id="sidebar-group-list">
<ul class="menu-profile-side">
{{ for $groups as $group }}
<li class="menu-profile-list">
<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
<a href="$group.href" class="menu-profile-list-item">
$group.text
</a>
{{ if $group.edit }}
<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
{{ endif }}
{{ if $group.cid }}
<input type="checkbox"
class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action"
onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
{{ if $group.ismember }}checked="checked"{{ endif }}
/>
{{ endif }}
</li>
{{ endfor }}
</ul>
</div>
{{ if $ungrouped }}
<div id="sidebar-ungrouped">
<a href="nogroup">$ungrouped</a>
</div>
{{ endif }}
</div>

View File

@ -1,85 +0,0 @@
<div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div>
</div>
<div id="profile-jot-banner-end"></div>
<form id="profile-jot-form" action="$action" method="post" >
<input type="hidden" name="type" value="$ptyp" />
<input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="return" value="$return_path" />
<input type="hidden" name="location" id="jot-location" value="$defloc" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
<div id="character-counter" class="grey"></div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
<div id="profile-jot-submit-wrapper" class="jothidden">
<div id="profile-upload-wrapper" style="display: $visitor;" >
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
</div>
<div id="profile-attach-wrapper" style="display: $visitor;" >
<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
</div>
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
</div>
<div id="profile-video-wrapper" style="display: $visitor;" >
<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
</div>
<div id="profile-audio-wrapper" style="display: $visitor;" >
<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
</div>
<div id="profile-location-wrapper" style="display: $visitor;" >
<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
</div>
<div id="profile-nolocation-wrapper" style="display: none;" >
<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
</div>
<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
<span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
</div>
<div id="profile-jot-plugin-wrapper">
$jotplugins
</div>
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
</div>
<div id="profile-jot-perms-end"></div>
<div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
$acl
<hr style="clear:both"/>
<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
<div id="profile-jot-email-end"></div>
$jotnets
</div>
</div>
</form>
</div>
{{ if $content }}<script>initEditor();</script>{{ endif }}

View File

@ -1,22 +0,0 @@
jQuery Resize Plugin Demo
Version: v2.1.1
Author: Adeel Ejaz (http://adeelejaz.com/)
License: Dual licensed under MIT and GPL licenses.
Introduction
aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
Usage:
.aeImageResize( height, width )
height
An integer representing the maximum height for the image.
width
An integer representing the maximum width for the image.
Example
$(function() {
$( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
});

View File

@ -1,46 +0,0 @@
(function($) {
/*
* Auto-growing textareas; technique ripped from Facebook
*/
$.fn.autogrow = function(options) {
this.filter('textarea').each(function() {
var $this = $(this),
minHeight = $this.height(),
lineHeight = $this.css('lineHeight');
var shadow = $('<div></div>').css({
position: 'absolute',
top: -10000,
left: -10000,
width: $(this).width(),
fontSize: $this.css('fontSize'),
fontFamily: $this.css('fontFamily'),
lineHeight: $this.css('lineHeight'),
resize: 'none'
}).appendTo(document.body);
var update = function() {
var val = this.value.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/&/g, '&amp;')
.replace(/\n/g, '<br/>');
shadow.html(val);
$(this).css('height', Math.max(shadow.height() + 20, minHeight));
}
$(this).change(update).keyup(update).keydown(update);
update.apply(this);
});
return this;
}
})(jQuery);

View File

@ -1,47 +0,0 @@
/*!
* jQuery Cookie Plugin
* https://github.com/carhartl/jquery-cookie
*
* Copyright 2011, Klaus Hartl
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://www.opensource.org/licenses/mit-license.php
* http://www.opensource.org/licenses/GPL-2.0
*/
(function($) {
$.cookie = function(key, value, options) {
// key and at least value given, set cookie...
if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
options = $.extend({}, options);
if (value === null || value === undefined) {
options.expires = -1;
}
if (typeof options.expires === 'number') {
var days = options.expires, t = options.expires = new Date();
t.setDate(t.getDate() + days);
}
value = String(value);
return (document.cookie = [
encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
options.path ? '; path=' + options.path : '',
options.domain ? '; domain=' + options.domain : '',
options.secure ? '; secure' : ''
].join(''));
}
// key and possibly options given, get cookie...
options = value || {};
var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
var pairs = document.cookie.split('; ');
for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
}
return null;
};
})(jQuery);

View File

@ -1,33 +0,0 @@
<form action="$dest_url" method="post" >
<input type="hidden" name="auth-params" value="login" />
<div id="login_standard">
{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
</div>
{{ if $openid }}
<div id="login_openid">
{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
</div>
{{ endif }}
<div id="login-submit-wrapper" >
<input type="submit" name="submit" id="login-submit-button" value="$login" />
</div>
<div id="login-extra-links">
{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
</div>
{{ for $hiddens as $k=>$v }}
<input type="hidden" name="$k" value="$v" />
{{ endfor }}
</form>
<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>

View File

@ -1,60 +0,0 @@
<div class="wall-item-container $item.indent">
<div class="wall-item-item">
<div class="wall-item-info">
<div class="contact-photo-wrapper"
<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
</a>
</div>
</div>
<div class="wall-item-content">
$mail.body
</div>
</div>
<div class="wall-item-bottom">
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
</div>
</div>
<div class="wall-item-bottom">
<div class="">
</div>
<div class="wall-item-actions">
<div class="wall-item-actions-author">
<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
</div>
<div class="wall-item-actions-social">
</div>
<div class="wall-item-actions-tools">
<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
</div>
</div>
</div>
<div class="wall-item-bottom">
</div>
</div>
{#
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
</div>
<div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >$mail.from_name</div>
<div class="mail-conv-date">$mail.date</div>
<div class="mail-conv-subject">$mail.subject</div>
<div class="mail-conv-body">$mail.body</div>
<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
<div class="mail-conv-outside-wrapper-end"></div>
</div>
</div>
<hr class="mail-conv-break" />
#}

View File

@ -1,12 +0,0 @@
<div id="mail-display-subject">
<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
<a href="message/dropconv/$thread_id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a>
</div>
{{ for $mails as $mail }}
<div id="tread-wrapper-$mail.id" class="tread-wrapper">
{{ inc mail_conv.tpl }}{{endinc}}
</div>
{{ endfor }}
{{ inc prv_message.tpl }}{{ endinc }}

View File

@ -1,8 +0,0 @@
<div class="mail-list-wrapper">
<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
<span class="mail-from">$from_name</span>
<span class="mail-date">$date</span>
<span class="mail-count">$count</span>
<a href="message/dropconv/$id" onclick="return confirmDelete();" title="$delete" class="mail-delete icon s22 delete"></a>
</div>

View File

@ -1,10 +0,0 @@
<div id="message-sidebar" class="widget">
<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
<ul class="message-ul">
{{ for $tabs as $t }}
<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
{{ endfor }}
</ul>
</div>

View File

@ -1,190 +0,0 @@
<header>
<div id="site-location">$sitelocation</div>
<div id="banner">$banner</div>
</header>
<nav>
<ul>
{{ if $nav.network }}
<li id="nav-network-link" class="nav-menu-icon">
<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
<span class="icon notifications">Benachrichtigungen</span>
<span id="net-update" class="nav-notify"></span></a>
</li>
{{ endif }}
{{ if $nav.contacts }}
<li class="nav-menu-icon" id="nav-contacts-linkmenu">
<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
{{ endif }}
{{ if $nav.messages }}
<li id="nav-messages-linkmenu" class="nav-menu-icon">
<a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
<span class="icon messages">$nav.messages.1</span>
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>
</li>
{{ endif }}
{{ if $nav.notifications }}
<li id="nav-notifications-linkmenu" class="nav-menu-icon">
<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
<span class="icon notify">$nav.notifications.1</span>
<span id="notify-update" class="nav-notify"></span></a>
<ul id="nav-notifications-menu" class="menu-popup">
<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
<li class="empty">$emptynotifications</li>
</ul>
</li>
{{ endif }}
{{ if $nav.search}}
<li id="search-box">
<form method="get" action="$nav.search.0">
<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
</form>
</li>
{{ endif }}
<li style="width: 1%; height: 1px;float: right;"></li>
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
<ul id="nav-site-menu" class="menu-popup">
{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.settings }} <li><a class="$nav.search.2" onClick="restore_boxes()" title="Restore right-hand column" style="cursor: pointer;">Restore right-hand column</a></li>{{ endif }}
{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
</ul>
</li>
{{ if $nav.directory }}
<li id="nav-directory-link" class="nav-menu $sel.directory">
<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
</li>
{{ endif }}
{{ if $nav.apps }}
<li id="nav-apps-link" class="nav-menu $sel.apps">
<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
<ul id="nav-apps-menu" class="menu-popup">
{{ for $apps as $ap }}
<li>$ap</li>
{{ endfor }}
</ul>
</li>
{{ endif }}
{{ if $nav.home }}
<li id="nav-home-link" class="nav-menu $sel.home">
<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
<span id="home-update" class="nav-notify"></span></a>
</li>
{{ endif }}
{{ if $userinfo }}
<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
<ul id="nav-user-menu" class="menu-popup">
{{ for $nav.usermenu as $usermenu }}
<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
{{ endfor }}
{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}
</ul>
</li>
{{ endif }}
{{ if $nav.login }}
<li id="nav-home-link" class="nav-menu $sel.home">
<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
<li>
{{ endif }}
</ul>
</nav>
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
<ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
</ul>
{#
{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
<span id="nav-link-wrapper" >
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
{{ if $nav.notifications }}
<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
<span id="notify-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.messages }}
<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
<span id="mail-update" class="nav-ajax-left"></span>
{{ endif }}
{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
</span>
<span id="nav-end"></span>
<span id="banner">$banner</span>
#}

View File

@ -1,15 +0,0 @@
<div id="profile_side">
<h3 style="margin-left: 2px;">$title</h3>
<div id="nets-desc">$desc</div>
<ul class="menu-profile-side">
<li class="menu-profile-list">
<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>
<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
{{ for $nets as $net }}
<li class="menu-profile-list">
<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
{{ endfor }}
</ul>
</div>

View File

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

View File

@ -1,65 +0,0 @@
{{ if $indent }}{{ else }}
<div class="wall-item-decor">
<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
{{ endif }}
<div class="wall-item-photo-container $indent">
<div class="wall-item-item">
<div class="wall-item-info">
<div class="contact-photo-wrapper" >
<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
</a>
<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
$photo_menu
</ul>
</div>
</div>
<div class="wall-item-actions-author">
<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a>
<span class="wall-item-ago">-
{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
</span>
</div>
<div class="wall-item-content">
{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
$body
</div>
</div>
<div class="wall-item-bottom">
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>
<div class="wall-item-bottom" style="display: table-row;">
<div class="wall-item-actions">
</div>
<div class="wall-item-actions">
<div class="wall-item-actions-tools">
{{ if $drop.dropping }}
<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
{{ endif }}
{{ if $edpost }}
<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
{{ endif }}
</div>
</div>
</div>
<div class="wall-item-bottom">
</div>
</div>

View File

@ -1,35 +0,0 @@
<div id="live-display"></div>
<h3><a href="$album.0">$album.1</a></h3>
<div id="photo-edit-link-wrap">
{{ if $tools }}
<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-
<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
{{ endif }}
{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
</div>
<div id="photo-photo">
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
</div>
<div id="photo-photo-end"></div>
<div id="photo-caption" >$desc</div>
{{ if $tags }}
<div id="in-this-photo-text">$tags.0</div>
<div id="in-this-photo">$tags.1</div>
{{ endif }}
{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
{{ if $edit }}$edit{{ endif }}
<div style="margin-top:20px">
</div>
<div id="wall-photo-container">
$comments
</div>
$paginate

View File

@ -1,21 +0,0 @@
<div id="profile_side">
<div id="ps-usernameicon">
<a href="$ps.usermenu.status.0" title="$userinfo.name">
<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
</a>
<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
</div>
<ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
</ul>
</div>

View File

@ -1,64 +0,0 @@
<div class="vcard">
<div class="tool">
<div class="fn label">$profile.name</div>
{{ if $profile.edit }}
<div class="action">
<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
<ul id="profiles-menu" class="menu-popup">
{{ for $profile.menu.entries as $e }}
<li>
<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
</li>
{{ endfor }}
<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
<li><a href="profiles" >$profile.edit.3</a></li>
</ul>
</div>
{{ endif }}
</div>
<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
{{ if $location }}
<dl class="location"><dt class="location-label">$location</dt><br>
<dd class="adr">
{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
<span class="city-state-zip">
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
<span class="region">$profile.region</span>
<span class="postal-code">$profile.postal-code</span>
</span>
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
</dd>
</dl>
{{ endif }}
{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
{{ inc diaspora_vcard.tpl }}{{ endinc }}
<div id="profile-extra-links">
<ul>
{{ if $connect }}
<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
{{ endif }}
</ul>
</div>
</div>
$contact_block

View File

@ -1,20 +0,0 @@
<div id="profile_side">
<div id="ps-usernameicon">
<a href="$ps.usermenu.status.0" title="$userinfo.name">
<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
</a>
<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
</div>
<ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
</ul>
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 212 KiB

View File

@ -1,100 +0,0 @@
{{ if $item.indent }}{{ else }}
<div class="wall-item-decor">
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
<div class="wall-item-container $item.indent">
<div class="wall-item-item">
<div class="wall-item-info">
<div class="contact-photo-wrapper"
onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
</a>
<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
$item.item_photo_menu
</ul>
</div>
</div>
<div class="wall-item-actions-author">
<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
<span class="wall-item-ago">-
{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
</span>
</div>
<div class="wall-item-content">
{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
$item.body
</div>
</div>
<div class="wall-item-bottom">
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $item.tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>
<div class="wall-item-bottom">
<div class="">
</div>
<div class="wall-item-actions">
<div class="wall-item-actions-social">
{{ if $item.vote }}
<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
{{ endif }}
{{ if $item.vote.share }}
<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
{{ endif }}
{{ if $item.star }}
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
{{ endif }}
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
</div>
<div class="wall-item-actions-tools">
{{ if $item.drop.dropping }}
<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
{{ endif }}
{{ if $item.edpost }}
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
<div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">
<div class="wall-item-links"></div>
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
</div>
</div>
<div class="wall-item-comment-wrapper" >
$item.comment
</div>

View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1395,7 +1395,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1388,7 +1388,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1370,7 +1370,7 @@ transition: all 0.2s ease-in-out;
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
/*marker*/
.wall-item-container .wall-item-content img {

View File

@ -121,7 +121,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1362,7 +1362,7 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

View File

@ -150,7 +150,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1243,7 +1243,14 @@ aside #likes a:hover{
margin-right: 20px;
}
#login-submit-wrapper{
margin-bottom: 15px;
padding-top: 120px;
margin-bottom: 12px;
}
aside #login-submit-button{
margin-left: 0px!important;
}
aside #login-extra-links{
padding-top: 0px!important;
}
.group_selected {
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@ -1624,7 +1631,7 @@ body .pageheader{
max-width: 690px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

View File

@ -150,7 +150,7 @@
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
}
.video { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png");
display: block; width: 100%; height: 28px; background-repeat: no-repeat;
display: block; width: 100%; height: 140px; background-repeat: no-repeat;
}
.audio2 { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@ -1241,7 +1241,14 @@ aside #likes a:hover{
margin-right: 20px;
}
#login-submit-wrapper{
margin-bottom: 15px;
padding-top: 120px;
margin-bottom: 12px;
}
aside #login-submit-button{
margin-left: 0px!important;
}
aside #login-extra-links{
padding-top: 0px!important;
}
.group_selected {
background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@ -1616,7 +1623,7 @@ body .pageheader{
max-width: 720px;
word-wrap: break-word;
margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {

View File

@ -1,277 +0,0 @@
<?php
$line_height=false;
$diabook_font_size=false;
$resolution=false;
$site_line_height = get_config("diabook-aerith","line_height");
$site_diabook_font_size = get_config("diabook-aerith", "font_size" );
$site_resolution = get_config("diabook-aerith", "resolution" );
if (local_user()) {
$line_height = get_pconfig(local_user(), "diabook-aerith","line_height");
$diabook_font_size = get_pconfig(local_user(), "diabook-aerith", "font_size");
$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
}
if ($line_height===false) $line_height=$site_line_height;
if ($line_height===false) $line_height="1.3";
if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
if ($diabook_font_size===false) $diabook_font_size="13";
if ($resolution===false) $resolution=$site_resolution;
if ($resolution===false) $resolution="normal";
if($resolution == "normal") {
if (file_exists("$THEMEPATH/style.css")){
echo file_get_contents("$THEMEPATH/style.css");
}
if($diabook_font_size == "15"){
echo "
.wall-item-container .wall-item-content {
font-size: 15px;
}
.wall-item-photo-container .wall-item-content {
font-size: 15px;
}
";
}
if($diabook_font_size == "14"){
echo "
.wall-item-container .wall-item-content {
font-size: 14px;
}
.wall-item-photo-container .wall-item-content {
font-size: 14px;
}
";
}
if($diabook_font_size == "13.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 13.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13.5px;
}
";
}
if($diabook_font_size == "13"){
echo "
.wall-item-container .wall-item-content {
font-size: 13px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13px;
}
";
}
if($diabook_font_size == "12.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 12.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12.5px;
}
";
}
if($diabook_font_size == "12"){
echo "
.wall-item-container .wall-item-content {
font-size: 12px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12px;
}
";
}
if($line_height == "1.5"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.5;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.5;
}
";
}
if($line_height == "1.4"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.4;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.4;
}
";
}
if($line_height == "1.3"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.3;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.3;
}
";
}
if($line_height == "1.2"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.2;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.2;
}
";
}
if($line_height == "1.1"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.1;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.1;
}
";
}
}
if($resolution == "wide") {
if (file_exists("$THEMEPATH/style-wide.css")){
echo file_get_contents("$THEMEPATH/style-wide.css");
}
if($diabook_font_size == "15"){
echo "
.wall-item-container .wall-item-content {
font-size: 15px;
}
.wall-item-photo-container .wall-item-content {
font-size: 15px;
}
";
}
if($diabook_font_size == "14"){
echo "
.wall-item-container .wall-item-content {
font-size: 14px;
}
.wall-item-photo-container .wall-item-content {
font-size: 14px;
}
";
}
if($diabook_font_size == "13.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 13.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13.5px;
}
";
}
if($diabook_font_size == "13"){
echo "
.wall-item-container .wall-item-content {
font-size: 13px;
}
.wall-item-photo-container .wall-item-content {
font-size: 13px;
}
";
}
if($diabook_font_size == "12.5"){
echo "
.wall-item-container .wall-item-content {
font-size: 12.5px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12.5px;
}
";
}
if($diabook_font_size == "12"){
echo "
.wall-item-container .wall-item-content {
font-size: 12px;
}
.wall-item-photo-container .wall-item-content {
font-size: 12px;
}
";
}
if($line_height == "1.5"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.5;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.5;
}
";
}
if($line_height == "1.4"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.4;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.4;
}
";
}
if($line_height == "1.3"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.3;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.3;
}
";
}
if($line_height == "1.2"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.2;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.2;
}
";
}
if($line_height == "1.1"){
echo "
.wall-item-container .wall-item-content {
line-height: 1.1;
}
.wall-item-photo-container .wall-item-content {
line-height: 1.1;
}
";
}
}

View File

@ -1,488 +0,0 @@
<?php
/*
* Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.020)
* Author:
*/
//print diabook-version for debugging
$diabook_version = "Diabook-aerith (Version: 1.020)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
$cssFile = null;
$resolution=false;
$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
if ($resolution===false) $resolution="normal";
/**
* prints last community activity
*/
function diabook_aerith_community_info(){
$a = get_app();
// last 12 users
$aside['$lastusers_title'] = t('Last users');
$aside['$lastusers_items'] = array();
$sql_extra = "";
$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
$order = " ORDER BY `register_date` DESC ";
$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
0,
9
);
$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
if(count($r)) {
$photo = 'thumb';
foreach($r as $rr) {
$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
$entry = replace_macros($tpl,array(
'$id' => $rr['id'],
'$profile-link' => $profile_link,
'$photo' => $rr[$photo],
'$alt-text' => $rr['name'],
));
$aside['$lastusers_items'][] = $entry;
}
}
// last 10 liked items
$aside['$like_title'] = t('Last likes');
$aside['$like_items'] = array();
$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM
(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link`
FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri`
WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
GROUP BY `uri`
ORDER BY `T1`.`created` DESC
LIMIT 0,5",
$a->get_baseurl(),$a->get_baseurl()
);
foreach ($r as $rr) {
$author = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
$objauthor = '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
//var_dump($rr['verb'],$rr['object-type']); killme();
switch($rr['verb']){
case 'http://activitystrea.ms/schema/1.0/post':
switch ($rr['object-type']){
case 'http://activitystrea.ms/schema/1.0/event':
$post_type = t('event');
break;
default:
$post_type = t('status');
}
break;
default:
if ($rr['resource-id']){
$post_type = t('photo');
$m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
$rr['plink'] = $m[1];
} else {
$post_type = t('status');
}
}
$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
}
// last 12 photos
$aside['$photos_title'] = t('Last photos');
$aside['$photos_items'] = array();
$r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM
(SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo`
WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
`user`
WHERE `user`.`uid` = `photo`.`uid`
AND `user`.`blockwall`=0
AND `user`.`hidewall`=0
ORDER BY `photo`.`edited` DESC
LIMIT 0, 9",
dbesc(t('Contact Photos')),
dbesc(t('Profile Photos'))
);
if(count($r)) {
$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
foreach($r as $rr) {
$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
$photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
$entry = replace_macros($tpl,array(
'$id' => $rr['id'],
'$profile-link' => $photo_page,
'$photo' => $photo_url,
'$alt-text' => $rr['username']." : ".$rr['desc'],
));
$aside['$photos_items'][] = $entry;
}
}
//nav FIND FRIENDS
if(local_user()) {
$nv = array();
$nv['title'] = Array("", t('Find Friends'), "", "");
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
$nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
$nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
<span class="sbox_l"></span>
<span class="sbox">
<input type="text" name="search" size="13" maxlength="50">
</span>
<span class="sbox_r" id="srch_clear"></span>';
$aside['$nv'] = $nv;
};
//Community Page
if(local_user()) {
$page = '<div id="page-sidebar-right_aside" class="widget">
<div class="title tool">
<h3>'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
<div id="sidebar-page-list"><ul>';
$pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid'])
);
$pageD = array();
// Look if the profile is a community page
foreach($contacts as $contact) {
$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
};
$contacts = $pageD;
foreach($contacts as $contact) {
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
$contact["name"]."</a></li>";
}
$page .= '</ul></div></div>';
//if (sizeof($contacts) > 0)
$aside['$page'] = $page;
}
//END Community Page
//helpers
$helpers = array();
$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
$aside['$helpers'] = $helpers;
//end helpers
//connectable services
$con_services = array();
$con_services['title'] = Array("", t('Connect Services'), "", "");
$aside['$con_services'] = $con_services;
//end connectable services
//get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
$a->page['right_aside'] = replace_macros($tpl, $aside);
}
//profile_side at networkpages
if ($a->argv[0] === "network" && local_user()){
// USER MENU
if(local_user()) {
$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
$userinfo = array(
'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
'name' => $a->user['username'],
);
$ps = array('usermenu'=>array());
$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));
$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
$ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
$tpl = get_markup_template('profile_side.tpl');
$a->page['aside'] .= replace_macros($tpl, array(
'$userinfo' => $userinfo,
'$ps' => $ps,
));
}
$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
if($ccCookie != "7") {
// COMMUNITY
diabook_aerith_community_info();
// CUSTOM CSS
if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";}
if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network-wide.css";}
}
}
//right_aside at profile pages
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
if($ccCookie != "7") {
// COMMUNITY
diabook_aerith_community_info();
// CUSTOM CSS
if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";}
if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile-wide.css";}
}
}
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
//load jquery.cookie.js
$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
//load jquery.ae.image.resize.js
$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
//load jquery.autogrow-textarea.js
$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
//js scripts
//comment-edit-wrapper on photo_view
if ($a->argv[0].$a->argv[2] === "photos"."image"){
$a->page['htmlhead'] .= '
<script>
$(function(){
$(".comment-edit-form").css("display","table");
});
</script>';
}
$a->page['htmlhead'] .= '
<script>
$(function() {
$("a.lightbox").fancybox(); // Select all links with lightbox class
});
</script>';
$a->page['htmlhead'] .= '
<script type="text/javascript">
function tautogrow(id){
$("textarea#comment-edit-text-" +id).autogrow();
};
</script>';
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
var getQString = ifr_source.split("?");
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
});
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
</script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script>
$(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
});
</script>';
if($ccCookie != "7") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
if($.cookie("close_pages") == "1")
{
document.getElementById( "close_pages" ).style.display = "none";
};
if($.cookie("close_helpers") == "1")
{
document.getElementById( "close_helpers" ).style.display = "none";
};
if($.cookie("close_services") == "1")
{
document.getElementById( "close_services" ).style.display = "none";
};
if($.cookie("close_friends") == "1")
{
document.getElementById( "close_friends" ).style.display = "none";
};
if($.cookie("close_lastusers") == "1")
{
document.getElementById( "close_lastusers" ).style.display = "none";
};
if($.cookie("close_lastphotos") == "1")
{
document.getElementById( "close_lastphotos" ).style.display = "none";
};
if($.cookie("close_lastlikes") == "1")
{
document.getElementById( "close_lastlikes" ).style.display = "none";
};}
);
function close_pages(){
document.getElementById( "close_pages" ).style.display = "none";
$.cookie("close_pages","1", { expires: 365, path: "/" });
};
function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none";
$.cookie("close_helpers","1", { expires: 365, path: "/" });
};
function close_services(){
document.getElementById( "close_services" ).style.display = "none";
$.cookie("close_services","1", { expires: 365, path: "/" });
};
function close_friends(){
document.getElementById( "close_friends" ).style.display = "none";
$.cookie("close_friends","1", { expires: 365, path: "/" });
};
function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie("close_lastusers","1", { expires: 365, path: "/" });
};
function close_lastphotos(){
document.getElementById( "close_lastphotos" ).style.display = "none";
$.cookie("close_lastphotos","1", { expires: 365, path: "/" });
};
function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
</script>';}
$a->page['htmlhead'] .= '
<script>
function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
}
</script>';}
$a->page['htmlhead'] .= '
<script type="text/javascript">
function insertFormatting(comment,BBcode,id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
textarea = document.getElementById("comment-edit-text-" +id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
if (BBcode == "url"){
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
} else
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
if (BBcode == "url"){
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
} else
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
</script> ';

Some files were not shown because too many files have changed in this diff Show More