diff --git a/boot.php b/boot.php index 1dd52fe7f..d2758c643 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1320' ); +define ( 'FRIENDICA_VERSION', '2.3.1321' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); diff --git a/include/Contact.php b/include/Contact.php index 9ba1e8ae5..537850e00 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -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' => '' // 'http://ostatus.org/schema/1.0/unfollow' . "\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. diff --git a/include/bbcode.php b/include/bbcode.php index 3697f1fc5..85d310b75 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -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('/\[\&\;([#a-z0-9]+)\;\]/','&$1;',$Text); + // fix any escaped ampersands that may have been converted into links $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); if(strlen($saved_image)) diff --git a/include/diaspora.php b/include/diaspora.php index afd86957b..5069c1127 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -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; } } diff --git a/include/html2plain.php b/include/html2plain.php index 21261327d..839dd70a7 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -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) diff --git a/mod/acl.php b/mod/acl.php index fe353d1eb..c23ee1a67 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -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( diff --git a/mod/contacts.php b/mod/contacts.php index 9d29d4bd1..8670c0c80 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -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' => '' // 'http://ostatus.org/schema/1.0/unfollow' . "\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 ); diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 77a3124f7..79583ea18 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -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 diff --git a/mod/item.php b/mod/item.php index 642a6758a..1436f7ffc 100644 --- a/mod/item.php +++ b/mod/item.php @@ -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); diff --git a/mod/search.php b/mod/search.php index 4ca7db9bb..d467764b0 100644 --- a/mod/search.php +++ b/mod/search.php @@ -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 .= '

Search results for: ' . $search . '

'; + if($tag) + $o .= '

Items tagged with: ' . $search . '

'; + else + $o .= '

Search results for: ' . $search . '

'; $o .= conversation($a,$r,'search',false); diff --git a/mod/tagger.php b/mod/tagger.php index 3ff5d57aa..8ee499f5f 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -86,7 +86,7 @@ function tagger_content(&$a) { 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('⌗') . '[url=' . $a->get_baseurl() . '/search?search=' . urlencode($term) . ']'. $term . '[/url]'; + $termlink = html_entity_decode('⌗') . '[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']) ); } diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php index e5c6485de..40f016747 100644 --- a/tests/get_tags_test.php +++ b/tests/get_tags_test.php @@ -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); } diff --git a/util/messages.po b/util/messages.po index 76c74d7b1..43a02bea4 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1320\n" +"Project-Id-Version: 2.3.1321\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-22 10:00-0700\n" +"POT-Creation-Date: 2012-04-23 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +50,7 @@ msgstr "" #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 #: ../../mod/profile_photo.php:163 ../../mod/message.php:38 #: ../../mod/message.php:90 ../../mod/allfriends.php:9 -#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46 +#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 @@ -290,7 +290,7 @@ msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533 +#: ../../mod/dfrn_request.php:800 ../../mod/settings.php:533 #: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -334,7 +334,7 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:788 #: ../../mod/settings.php:844 ../../mod/settings.php:850 #: ../../mod/settings.php:858 ../../mod/settings.php:862 #: ../../mod/settings.php:867 ../../mod/settings.php:873 @@ -345,7 +345,7 @@ msgstr "" msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:789 #: ../../mod/settings.php:844 ../../mod/settings.php:850 #: ../../mod/settings.php:858 ../../mod/settings.php:862 #: ../../mod/settings.php:867 ../../mod/settings.php:873 @@ -445,17 +445,17 @@ msgid "Image file is empty." msgstr "" #: ../../mod/photos.php:653 ../../mod/profile_photo.php:124 -#: ../../mod/wall_upload.php:69 +#: ../../mod/wall_upload.php:83 msgid "Unable to process image." msgstr "" #: ../../mod/photos.php:673 ../../mod/profile_photo.php:257 -#: ../../mod/wall_upload.php:88 +#: ../../mod/wall_upload.php:102 msgid "Image upload failed." msgstr "" #: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17 +#: ../../mod/dfrn_request.php:719 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "" @@ -730,19 +730,19 @@ msgstr "" msgid "This introduction has already been accepted." msgstr "" -#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:427 +#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:475 msgid "Profile location is not valid or does not contain profile information." msgstr "" -#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:432 +#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:480 msgid "Warning: profile location has no identifiable owner name." msgstr "" -#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:434 +#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:482 msgid "Warning: profile location has no profile photo." msgstr "" -#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:437 +#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:485 #, php-format msgid "%d required parameter was not found at the given location" msgid_plural "%d required parameters were not found at the given location" @@ -786,128 +786,128 @@ msgstr "" msgid "This account has not been configured for email. Request failed." msgstr "" -#: ../../mod/dfrn_request.php:372 +#: ../../mod/dfrn_request.php:420 msgid "Unable to resolve your name at the provided location." msgstr "" -#: ../../mod/dfrn_request.php:385 +#: ../../mod/dfrn_request.php:433 msgid "You have already introduced yourself here." msgstr "" -#: ../../mod/dfrn_request.php:389 +#: ../../mod/dfrn_request.php:437 #, php-format msgid "Apparently you are already friends with %s." msgstr "" -#: ../../mod/dfrn_request.php:410 +#: ../../mod/dfrn_request.php:458 msgid "Invalid profile URL." msgstr "" -#: ../../mod/dfrn_request.php:416 ../../mod/follow.php:20 +#: ../../mod/dfrn_request.php:464 ../../mod/follow.php:20 msgid "Disallowed profile URL." msgstr "" -#: ../../mod/dfrn_request.php:485 ../../mod/contacts.php:102 +#: ../../mod/dfrn_request.php:533 ../../mod/contacts.php:102 msgid "Failed to update contact record." msgstr "" -#: ../../mod/dfrn_request.php:506 +#: ../../mod/dfrn_request.php:554 msgid "Your introduction has been sent." msgstr "" -#: ../../mod/dfrn_request.php:559 +#: ../../mod/dfrn_request.php:607 msgid "Please login to confirm introduction." msgstr "" -#: ../../mod/dfrn_request.php:573 +#: ../../mod/dfrn_request.php:621 msgid "" "Incorrect identity currently logged in. Please login to this profile." msgstr "" -#: ../../mod/dfrn_request.php:585 +#: ../../mod/dfrn_request.php:633 #, php-format msgid "Welcome home %s." msgstr "" -#: ../../mod/dfrn_request.php:586 +#: ../../mod/dfrn_request.php:634 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "" -#: ../../mod/dfrn_request.php:587 +#: ../../mod/dfrn_request.php:635 msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:628 ../../include/items.php:2691 +#: ../../mod/dfrn_request.php:676 ../../include/items.php:2691 msgid "[Name Withheld]" msgstr "" -#: ../../mod/dfrn_request.php:715 +#: ../../mod/dfrn_request.php:763 msgid "" "Please enter your 'Identity Address' from one of the following supported " "communications networks:" msgstr "" -#: ../../mod/dfrn_request.php:731 +#: ../../mod/dfrn_request.php:779 msgid "Connect as an email follower (Coming soon)" msgstr "" -#: ../../mod/dfrn_request.php:733 +#: ../../mod/dfrn_request.php:781 msgid "" "If you are not yet a member of the free social web, follow this link to find a public Friendica site " "and join us today." msgstr "" -#: ../../mod/dfrn_request.php:736 +#: ../../mod/dfrn_request.php:784 msgid "Friend/Connection Request" msgstr "" -#: ../../mod/dfrn_request.php:737 +#: ../../mod/dfrn_request.php:785 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "" -#: ../../mod/dfrn_request.php:738 +#: ../../mod/dfrn_request.php:786 msgid "Please answer the following:" msgstr "" -#: ../../mod/dfrn_request.php:739 +#: ../../mod/dfrn_request.php:787 #, php-format msgid "Does %s know you?" msgstr "" -#: ../../mod/dfrn_request.php:742 +#: ../../mod/dfrn_request.php:790 msgid "Add a personal note:" msgstr "" -#: ../../mod/dfrn_request.php:744 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:792 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "" -#: ../../mod/dfrn_request.php:745 +#: ../../mod/dfrn_request.php:793 msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629 +#: ../../mod/dfrn_request.php:794 ../../mod/settings.php:629 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" -#: ../../mod/dfrn_request.php:747 +#: ../../mod/dfrn_request.php:795 #, php-format msgid "" " - please do not use this form. Instead, enter %s into your Diaspora search " "bar." msgstr "" -#: ../../mod/dfrn_request.php:748 +#: ../../mod/dfrn_request.php:796 msgid "Your Identity Address:" msgstr "" -#: ../../mod/dfrn_request.php:751 +#: ../../mod/dfrn_request.php:799 msgid "Submit Request" msgstr "" @@ -1676,7 +1676,7 @@ msgstr "" #: ../../mod/register.php:388 ../../mod/register.php:442 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 #: ../../addon/facebook/facebook.php:650 -#: ../../addon/facebook/facebook.php:1136 +#: ../../addon/facebook/facebook.php:1139 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700 msgid "Administrator" msgstr "" @@ -2310,7 +2310,9 @@ msgid "Personal Notes" msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:715 ../../include/text.php:652 +#: ../../addon/facebook/facebook.php:717 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:147 +#: ../../include/text.php:652 msgid "Save" msgstr "" @@ -2742,7 +2744,7 @@ msgid "People Search" msgstr "" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1655 +#: ../../addon/facebook/facebook.php:1533 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/diabook-green/theme.php:83 @@ -2765,7 +2767,7 @@ msgstr "" msgid "status" msgstr "" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1537 #: ../../addon/communityhome/communityhome.php:172 #: ../../view/theme/diabook/diabook-green/theme.php:97 #: ../../view/theme/diabook/diabook-red/theme.php:96 @@ -2831,8 +2833,8 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:372 ../../mod/wall_upload.php:85 -#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101 +#: ../../mod/item.php:372 ../../mod/wall_upload.php:99 +#: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" @@ -2883,7 +2885,7 @@ msgstr "" msgid "Unable to process image" msgstr "" -#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:60 +#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:74 #, php-format msgid "Image exceeds size limit of %d" msgstr "" @@ -3509,48 +3511,48 @@ msgstr "" msgid "Tips for New Members" msgstr "" -#: ../../mod/ping.php:175 +#: ../../mod/ping.php:177 msgid "{0} wants to be your friend" msgstr "" -#: ../../mod/ping.php:180 +#: ../../mod/ping.php:182 msgid "{0} sent you a message" msgstr "" -#: ../../mod/ping.php:185 +#: ../../mod/ping.php:187 msgid "{0} requested registration" msgstr "" -#: ../../mod/ping.php:191 +#: ../../mod/ping.php:193 #, php-format msgid "{0} commented %s's post" msgstr "" -#: ../../mod/ping.php:196 +#: ../../mod/ping.php:198 #, php-format msgid "{0} liked %s's post" msgstr "" -#: ../../mod/ping.php:201 +#: ../../mod/ping.php:203 #, php-format msgid "{0} disliked %s's post" msgstr "" -#: ../../mod/ping.php:206 +#: ../../mod/ping.php:208 #, php-format msgid "{0} is now friends with %s" msgstr "" -#: ../../mod/ping.php:211 +#: ../../mod/ping.php:213 msgid "{0} posted" msgstr "" -#: ../../mod/ping.php:216 +#: ../../mod/ping.php:218 #, php-format msgid "{0} tagged %s's post with #%s" msgstr "" -#: ../../mod/ping.php:222 +#: ../../mod/ping.php:224 msgid "{0} mentioned you in a post" msgstr "" @@ -4262,93 +4264,99 @@ msgstr "" msgid "Facebook API Key" msgstr "" -#: ../../addon/facebook/facebook.php:700 +#: ../../addon/facebook/facebook.php:701 msgid "" "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.

" msgstr "" -#: ../../addon/facebook/facebook.php:705 +#: ../../addon/facebook/facebook.php:706 msgid "" "Error: the given API Key seems to be incorrect (the application access token " "could not be retrieved)." msgstr "" -#: ../../addon/facebook/facebook.php:707 +#: ../../addon/facebook/facebook.php:708 msgid "The given API Key seems to work correctly." msgstr "" -#: ../../addon/facebook/facebook.php:709 +#: ../../addon/facebook/facebook.php:710 msgid "" "The correctness of the API Key could not be detected. Somthing strange's " "going on." msgstr "" -#: ../../addon/facebook/facebook.php:712 +#: ../../addon/facebook/facebook.php:713 msgid "App-ID / API-Key" msgstr "" -#: ../../addon/facebook/facebook.php:713 +#: ../../addon/facebook/facebook.php:714 msgid "Application secret" msgstr "" -#: ../../addon/facebook/facebook.php:714 +#: ../../addon/facebook/facebook.php:715 #, php-format msgid "Polling Interval (min. %1$s minutes)" msgstr "" -#: ../../addon/facebook/facebook.php:718 +#: ../../addon/facebook/facebook.php:716 +msgid "" +"Synchronize comments (no comments on Facebook are missed, at the cost of " +"increased system load)" +msgstr "" + +#: ../../addon/facebook/facebook.php:720 msgid "Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:722 +#: ../../addon/facebook/facebook.php:724 msgid "Real-Time Updates are activated." msgstr "" -#: ../../addon/facebook/facebook.php:723 +#: ../../addon/facebook/facebook.php:725 msgid "Deactivate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:725 +#: ../../addon/facebook/facebook.php:727 msgid "Real-Time Updates not activated." msgstr "" -#: ../../addon/facebook/facebook.php:725 +#: ../../addon/facebook/facebook.php:727 msgid "Activate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:743 +#: ../../addon/facebook/facebook.php:746 msgid "The new values have been saved." msgstr "" -#: ../../addon/facebook/facebook.php:767 +#: ../../addon/facebook/facebook.php:770 msgid "Post to Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:865 +#: ../../addon/facebook/facebook.php:868 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:1085 +#: ../../addon/facebook/facebook.php:1088 msgid "View on Friendica" msgstr "" -#: ../../addon/facebook/facebook.php:1118 +#: ../../addon/facebook/facebook.php:1121 msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/facebook/facebook.php:1158 +#: ../../addon/facebook/facebook.php:1161 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "" -#: ../../addon/facebook/facebook.php:1159 +#: ../../addon/facebook/facebook.php:1162 msgid "Facebook connection became invalid" msgstr "" -#: ../../addon/facebook/facebook.php:1160 +#: ../../addon/facebook/facebook.php:1163 #, php-format msgid "" "Hi %1$s,\n" @@ -4358,6 +4366,26 @@ msgid "" "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." msgstr "" +#: ../../addon/privacy_image_cache/privacy_image_cache.php:144 +msgid "Lifetime of the cache (in hours)" +msgstr "" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:149 +msgid "Cache Statistics" +msgstr "" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:152 +msgid "Number of items" +msgstr "" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:154 +msgid "Size of the cache" +msgstr "" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:156 +msgid "Delete the whole cache" +msgstr "" + #: ../../addon/widgets/widget_like.php:58 #, php-format msgid "%d person likes this" @@ -6541,7 +6569,7 @@ msgstr "" msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:238 ../../include/bbcode.php:304 +#: ../../include/bbcode.php:238 ../../include/bbcode.php:307 msgid "Image/photo" msgstr "" diff --git a/util/typo.php b/util/typo.php index e20cce86a..7c275f3ca 100644 --- a/util/typo.php +++ b/util/typo.php @@ -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); } } diff --git a/view/de/messages.po b/view/de/messages.po index 1dff9bfce..8dc3ec615 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-04-21 10:00-0700\n" -"PO-Revision-Date: 2012-04-22 09:36+0000\n" -"Last-Translator: Fabian Dost \n" +"POT-Creation-Date: 2012-04-22 10:00-0700\n" +"PO-Revision-Date: 2012-04-23 18:48+0000\n" +"Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -170,8 +170,6 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:90 -#: ../../view/theme/diabook-red/config.php:76 -#: ../../view/theme/diabook-blue/config.php:76 #: ../../view/theme/diabook/diabook-green/config.php:76 #: ../../view/theme/diabook/diabook-red/config.php:76 #: ../../view/theme/diabook/diabook-blue/config.php:76 @@ -179,9 +177,7 @@ msgstr "Neues Foto von dieser URL" #: ../../view/theme/diabook/diabook-aerith/config.php:76 #: ../../view/theme/diabook/diabook-pink/config.php:76 #: ../../view/theme/diabook/config.php:91 -#: ../../view/theme/quattro/config.php:52 -#: ../../view/theme/diabook-aerith/config.php:76 -#: ../../include/conversation.php:555 +#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 msgid "Submit" msgstr "Senden" @@ -239,17 +235,15 @@ msgstr "Veranstaltung bearbeiten" msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:231 -#: ../../view/theme/diabook-blue/theme.php:231 +#: ../../mod/events.php:296 #: ../../view/theme/diabook/diabook-green/theme.php:233 #: ../../view/theme/diabook/diabook-red/theme.php:231 #: ../../view/theme/diabook/diabook-blue/theme.php:231 -#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook/diabook-dark/theme.php:233 #: ../../view/theme/diabook/diabook-aerith/theme.php:233 #: ../../view/theme/diabook/diabook-pink/theme.php:233 -#: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52 -#: ../../boot.php:1471 +#: ../../include/nav.php:52 ../../boot.php:1471 msgid "Events" msgstr "Veranstaltungen" @@ -381,8 +375,6 @@ msgstr "Fotoalben" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook-red/theme.php:115 -#: ../../view/theme/diabook-blue/theme.php:115 #: ../../view/theme/diabook/diabook-green/theme.php:116 #: ../../view/theme/diabook/diabook-red/theme.php:115 #: ../../view/theme/diabook/diabook-blue/theme.php:115 @@ -390,7 +382,6 @@ msgstr "Fotoalben" #: ../../view/theme/diabook/diabook-dark/theme.php:116 #: ../../view/theme/diabook/diabook-aerith/theme.php:116 #: ../../view/theme/diabook/diabook-pink/theme.php:116 -#: ../../view/theme/diabook-aerith/theme.php:116 msgid "Contact Photos" msgstr "Kontaktbilder" @@ -413,8 +404,6 @@ msgstr "Kontaktinformationen nicht verfügbar" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook-red/theme.php:116 -#: ../../view/theme/diabook-blue/theme.php:116 #: ../../view/theme/diabook/diabook-green/theme.php:117 #: ../../view/theme/diabook/diabook-red/theme.php:116 #: ../../view/theme/diabook/diabook-blue/theme.php:116 @@ -422,7 +411,6 @@ msgstr "Kontaktinformationen nicht verfügbar" #: ../../view/theme/diabook/diabook-dark/theme.php:117 #: ../../view/theme/diabook/diabook-aerith/theme.php:117 #: ../../view/theme/diabook/diabook-pink/theme.php:117 -#: ../../view/theme/diabook-aerith/theme.php:117 msgid "Profile Photos" msgstr "Profilbilder" @@ -444,8 +432,6 @@ msgstr "wurde getaggt in einem" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook-red/theme.php:87 -#: ../../view/theme/diabook-blue/theme.php:87 #: ../../view/theme/diabook/diabook-green/theme.php:88 #: ../../view/theme/diabook/diabook-red/theme.php:87 #: ../../view/theme/diabook/diabook-blue/theme.php:87 @@ -453,9 +439,8 @@ msgstr "wurde getaggt in einem" #: ../../view/theme/diabook/diabook-dark/theme.php:88 #: ../../view/theme/diabook/diabook-aerith/theme.php:88 #: ../../view/theme/diabook/diabook-pink/theme.php:88 -#: ../../view/theme/diabook-aerith/theme.php:88 ../../include/text.php:1304 -#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 -#: ../../include/conversation.php:126 +#: ../../include/text.php:1304 ../../include/diaspora.php:1654 +#: ../../include/conversation.php:53 ../../include/conversation.php:126 msgid "photo" msgstr "Foto" @@ -629,16 +614,15 @@ msgstr "Neueste Fotos" msgid "Not available." msgstr "Nicht verfügbar." -#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:233 -#: ../../view/theme/diabook-blue/theme.php:233 +#: ../../mod/community.php:30 #: ../../view/theme/diabook/diabook-green/theme.php:235 #: ../../view/theme/diabook/diabook-red/theme.php:233 #: ../../view/theme/diabook/diabook-blue/theme.php:233 -#: ../../view/theme/diabook/theme.php:253 +#: ../../view/theme/diabook/theme.php:252 #: ../../view/theme/diabook/diabook-dark/theme.php:235 #: ../../view/theme/diabook/diabook-aerith/theme.php:235 #: ../../view/theme/diabook/diabook-pink/theme.php:235 -#: ../../view/theme/diabook-aerith/theme.php:235 ../../include/nav.php:101 +#: ../../include/nav.php:101 msgid "Community" msgstr "Gemeinschaft" @@ -1280,17 +1264,15 @@ msgstr "Netzwerk" msgid "Personal" msgstr "Persönlich" -#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:227 -#: ../../view/theme/diabook-blue/theme.php:227 +#: ../../mod/notifications.php:90 #: ../../view/theme/diabook/diabook-green/theme.php:229 #: ../../view/theme/diabook/diabook-red/theme.php:227 #: ../../view/theme/diabook/diabook-blue/theme.php:227 -#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook/theme.php:246 #: ../../view/theme/diabook/diabook-dark/theme.php:229 #: ../../view/theme/diabook/diabook-aerith/theme.php:229 #: ../../view/theme/diabook/diabook-pink/theme.php:229 -#: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:77 -#: ../../include/nav.php:115 +#: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Pinnwand" @@ -1666,16 +1648,15 @@ msgstr "du bist Fan von" msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:229 -#: ../../view/theme/diabook-blue/theme.php:229 +#: ../../mod/contacts.php:529 #: ../../view/theme/diabook/diabook-green/theme.php:231 #: ../../view/theme/diabook/diabook-red/theme.php:229 #: ../../view/theme/diabook/diabook-blue/theme.php:229 -#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook/theme.php:248 #: ../../view/theme/diabook/diabook-dark/theme.php:231 #: ../../view/theme/diabook/diabook-aerith/theme.php:231 #: ../../view/theme/diabook/diabook-pink/theme.php:231 -#: ../../view/theme/diabook-aerith/theme.php:231 ../../include/nav.php:139 +#: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" @@ -2586,16 +2567,14 @@ msgstr "Ungültiger Profil-Bezeichner" msgid "Profile Visibility Editor" msgstr "Editor für die Profil-Sichtbarkeit" -#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:228 -#: ../../view/theme/diabook-blue/theme.php:228 +#: ../../mod/profperm.php:103 #: ../../view/theme/diabook/diabook-green/theme.php:230 #: ../../view/theme/diabook/diabook-red/theme.php:228 #: ../../view/theme/diabook/diabook-blue/theme.php:228 -#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook/theme.php:247 #: ../../view/theme/diabook/diabook-dark/theme.php:230 #: ../../view/theme/diabook/diabook-aerith/theme.php:230 #: ../../view/theme/diabook/diabook-pink/theme.php:230 -#: ../../view/theme/diabook-aerith/theme.php:230 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/nav.php:50 ../../boot.php:1458 msgid "Profile" @@ -2781,10 +2760,6 @@ msgstr "Personen Suche" #: ../../addon/facebook/facebook.php:1655 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook-red/theme.php:82 -#: ../../view/theme/diabook-red/theme.php:91 -#: ../../view/theme/diabook-blue/theme.php:82 -#: ../../view/theme/diabook-blue/theme.php:91 #: ../../view/theme/diabook/diabook-green/theme.php:83 #: ../../view/theme/diabook/diabook-green/theme.php:92 #: ../../view/theme/diabook/diabook-red/theme.php:82 @@ -2799,8 +2774,6 @@ msgstr "Personen Suche" #: ../../view/theme/diabook/diabook-aerith/theme.php:92 #: ../../view/theme/diabook/diabook-pink/theme.php:83 #: ../../view/theme/diabook/diabook-pink/theme.php:92 -#: ../../view/theme/diabook-aerith/theme.php:83 -#: ../../view/theme/diabook-aerith/theme.php:92 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 @@ -2809,8 +2782,6 @@ msgstr "Status" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook-red/theme.php:96 -#: ../../view/theme/diabook-blue/theme.php:96 #: ../../view/theme/diabook/diabook-green/theme.php:97 #: ../../view/theme/diabook/diabook-red/theme.php:96 #: ../../view/theme/diabook/diabook-blue/theme.php:96 @@ -2818,7 +2789,6 @@ msgstr "Status" #: ../../view/theme/diabook/diabook-dark/theme.php:97 #: ../../view/theme/diabook/diabook-aerith/theme.php:97 #: ../../view/theme/diabook/diabook-pink/theme.php:97 -#: ../../view/theme/diabook-aerith/theme.php:97 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2839,17 +2809,15 @@ msgstr "Beitrag nicht gefunden." msgid "Access denied." msgstr "Zugriff verweigert." -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook-red/theme.php:230 -#: ../../view/theme/diabook-blue/theme.php:230 +#: ../../mod/fbrowser.php:23 #: ../../view/theme/diabook/diabook-green/theme.php:232 #: ../../view/theme/diabook/diabook-red/theme.php:230 #: ../../view/theme/diabook/diabook-blue/theme.php:230 -#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook/diabook-dark/theme.php:232 #: ../../view/theme/diabook/diabook-aerith/theme.php:232 #: ../../view/theme/diabook/diabook-pink/theme.php:232 -#: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51 -#: ../../boot.php:1463 +#: ../../include/nav.php:51 ../../boot.php:1463 msgid "Photos" msgstr "Bilder" @@ -4002,16 +3970,14 @@ msgstr "Hinzufügen" msgid "No entries." msgstr "Keine Einträge" -#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:143 -#: ../../view/theme/diabook-blue/theme.php:143 +#: ../../mod/suggest.php:38 #: ../../view/theme/diabook/diabook-green/theme.php:145 #: ../../view/theme/diabook/diabook-red/theme.php:143 #: ../../view/theme/diabook/diabook-blue/theme.php:143 -#: ../../view/theme/diabook/theme.php:159 +#: ../../view/theme/diabook/theme.php:158 #: ../../view/theme/diabook/diabook-dark/theme.php:145 #: ../../view/theme/diabook/diabook-aerith/theme.php:145 #: ../../view/theme/diabook/diabook-pink/theme.php:145 -#: ../../view/theme/diabook-aerith/theme.php:145 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" @@ -4026,16 +3992,14 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es msgid "Ignore/Hide" msgstr "Ignorieren/Verbergen" -#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:141 -#: ../../view/theme/diabook-blue/theme.php:141 +#: ../../mod/directory.php:47 #: ../../view/theme/diabook/diabook-green/theme.php:143 #: ../../view/theme/diabook/diabook-red/theme.php:141 #: ../../view/theme/diabook/diabook-blue/theme.php:141 -#: ../../view/theme/diabook/theme.php:157 +#: ../../view/theme/diabook/theme.php:156 #: ../../view/theme/diabook/diabook-dark/theme.php:143 #: ../../view/theme/diabook/diabook-aerith/theme.php:143 #: ../../view/theme/diabook/diabook-pink/theme.php:143 -#: ../../view/theme/diabook-aerith/theme.php:143 msgid "Global Directory" msgstr "Weltweites Verzeichnis" @@ -4329,7 +4293,7 @@ msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zug #: ../../addon/facebook/facebook.php:707 msgid "The given API Key seems to work correctly." -msgstr "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren." +msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren." #: ../../addon/facebook/facebook.php:709 msgid "" @@ -4565,8 +4529,6 @@ msgid "Latest likes" msgstr "Neueste Favoriten" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook-red/theme.php:79 -#: ../../view/theme/diabook-blue/theme.php:79 #: ../../view/theme/diabook/diabook-green/theme.php:80 #: ../../view/theme/diabook/diabook-red/theme.php:79 #: ../../view/theme/diabook/diabook-blue/theme.php:79 @@ -4574,8 +4536,8 @@ msgstr "Neueste Favoriten" #: ../../view/theme/diabook/diabook-dark/theme.php:80 #: ../../view/theme/diabook/diabook-aerith/theme.php:80 #: ../../view/theme/diabook/diabook-pink/theme.php:80 -#: ../../view/theme/diabook-aerith/theme.php:80 ../../include/text.php:1302 -#: ../../include/conversation.php:45 ../../include/conversation.php:118 +#: ../../include/text.php:1302 ../../include/conversation.php:45 +#: ../../include/conversation.php:118 msgid "event" msgstr "Veranstaltung" @@ -5468,8 +5430,6 @@ msgstr "Posterous-Passwort" msgid "Post to Posterous by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous" -#: ../../view/theme/diabook-red/theme.php:28 -#: ../../view/theme/diabook-blue/theme.php:28 #: ../../view/theme/diabook/diabook-green/theme.php:29 #: ../../view/theme/diabook/diabook-red/theme.php:28 #: ../../view/theme/diabook/diabook-blue/theme.php:28 @@ -5477,12 +5437,9 @@ msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous" #: ../../view/theme/diabook/diabook-dark/theme.php:29 #: ../../view/theme/diabook/diabook-aerith/theme.php:29 #: ../../view/theme/diabook/diabook-pink/theme.php:29 -#: ../../view/theme/diabook-aerith/theme.php:29 msgid "Last users" msgstr "Letzte Nutzer" -#: ../../view/theme/diabook-red/theme.php:57 -#: ../../view/theme/diabook-blue/theme.php:57 #: ../../view/theme/diabook/diabook-green/theme.php:58 #: ../../view/theme/diabook/diabook-red/theme.php:57 #: ../../view/theme/diabook/diabook-blue/theme.php:57 @@ -5490,12 +5447,9 @@ msgstr "Letzte Nutzer" #: ../../view/theme/diabook/diabook-dark/theme.php:58 #: ../../view/theme/diabook/diabook-aerith/theme.php:58 #: ../../view/theme/diabook/diabook-pink/theme.php:58 -#: ../../view/theme/diabook-aerith/theme.php:58 msgid "Last likes" msgstr "Zuletzt gemocht" -#: ../../view/theme/diabook-red/theme.php:102 -#: ../../view/theme/diabook-blue/theme.php:102 #: ../../view/theme/diabook/diabook-green/theme.php:103 #: ../../view/theme/diabook/diabook-red/theme.php:102 #: ../../view/theme/diabook/diabook-blue/theme.php:102 @@ -5503,207 +5457,164 @@ msgstr "Zuletzt gemocht" #: ../../view/theme/diabook/diabook-dark/theme.php:103 #: ../../view/theme/diabook/diabook-aerith/theme.php:103 #: ../../view/theme/diabook/diabook-pink/theme.php:103 -#: ../../view/theme/diabook-aerith/theme.php:103 msgid "Last photos" msgstr "Letzte Fotos" -#: ../../view/theme/diabook-red/theme.php:139 -#: ../../view/theme/diabook-blue/theme.php:139 #: ../../view/theme/diabook/diabook-green/theme.php:141 #: ../../view/theme/diabook/diabook-red/theme.php:139 #: ../../view/theme/diabook/diabook-blue/theme.php:139 -#: ../../view/theme/diabook/theme.php:155 +#: ../../view/theme/diabook/theme.php:154 #: ../../view/theme/diabook/diabook-dark/theme.php:141 #: ../../view/theme/diabook/diabook-aerith/theme.php:141 #: ../../view/theme/diabook/diabook-pink/theme.php:141 -#: ../../view/theme/diabook-aerith/theme.php:141 msgid "Find Friends" msgstr "Freunde finden" -#: ../../view/theme/diabook-red/theme.php:140 -#: ../../view/theme/diabook-blue/theme.php:140 #: ../../view/theme/diabook/diabook-green/theme.php:142 #: ../../view/theme/diabook/diabook-red/theme.php:140 #: ../../view/theme/diabook/diabook-blue/theme.php:140 -#: ../../view/theme/diabook/theme.php:156 +#: ../../view/theme/diabook/theme.php:155 #: ../../view/theme/diabook/diabook-dark/theme.php:142 #: ../../view/theme/diabook/diabook-aerith/theme.php:142 #: ../../view/theme/diabook/diabook-pink/theme.php:142 -#: ../../view/theme/diabook-aerith/theme.php:142 msgid "Local Directory" msgstr "Lokales Verzeichnis" -#: ../../view/theme/diabook-red/theme.php:142 -#: ../../view/theme/diabook-blue/theme.php:142 #: ../../view/theme/diabook/diabook-green/theme.php:144 #: ../../view/theme/diabook/diabook-red/theme.php:142 #: ../../view/theme/diabook/diabook-blue/theme.php:142 -#: ../../view/theme/diabook/theme.php:158 +#: ../../view/theme/diabook/theme.php:157 #: ../../view/theme/diabook/diabook-dark/theme.php:144 #: ../../view/theme/diabook/diabook-aerith/theme.php:144 #: ../../view/theme/diabook/diabook-pink/theme.php:144 -#: ../../view/theme/diabook-aerith/theme.php:144 #: ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Ähnliche Interessen" -#: ../../view/theme/diabook-red/theme.php:144 -#: ../../view/theme/diabook-blue/theme.php:144 #: ../../view/theme/diabook/diabook-green/theme.php:146 #: ../../view/theme/diabook/diabook-red/theme.php:144 #: ../../view/theme/diabook/diabook-blue/theme.php:144 -#: ../../view/theme/diabook/theme.php:160 +#: ../../view/theme/diabook/theme.php:159 #: ../../view/theme/diabook/diabook-dark/theme.php:146 #: ../../view/theme/diabook/diabook-aerith/theme.php:146 #: ../../view/theme/diabook/diabook-pink/theme.php:146 -#: ../../view/theme/diabook-aerith/theme.php:146 #: ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Freunde einladen" -#: ../../view/theme/diabook-red/theme.php:159 -#: ../../view/theme/diabook-red/theme.php:234 -#: ../../view/theme/diabook-blue/theme.php:159 -#: ../../view/theme/diabook-blue/theme.php:234 #: ../../view/theme/diabook/diabook-green/theme.php:161 #: ../../view/theme/diabook/diabook-green/theme.php:236 #: ../../view/theme/diabook/diabook-red/theme.php:159 #: ../../view/theme/diabook/diabook-red/theme.php:234 #: ../../view/theme/diabook/diabook-blue/theme.php:159 #: ../../view/theme/diabook/diabook-blue/theme.php:234 -#: ../../view/theme/diabook/theme.php:176 -#: ../../view/theme/diabook/theme.php:254 +#: ../../view/theme/diabook/theme.php:175 +#: ../../view/theme/diabook/theme.php:253 #: ../../view/theme/diabook/diabook-dark/theme.php:161 #: ../../view/theme/diabook/diabook-dark/theme.php:236 #: ../../view/theme/diabook/diabook-aerith/theme.php:161 #: ../../view/theme/diabook/diabook-aerith/theme.php:236 #: ../../view/theme/diabook/diabook-pink/theme.php:161 #: ../../view/theme/diabook/diabook-pink/theme.php:236 -#: ../../view/theme/diabook-aerith/theme.php:161 -#: ../../view/theme/diabook-aerith/theme.php:236 msgid "Community Pages" msgstr "Foren" -#: ../../view/theme/diabook-red/theme.php:192 -#: ../../view/theme/diabook-blue/theme.php:192 #: ../../view/theme/diabook/diabook-green/theme.php:194 #: ../../view/theme/diabook/diabook-red/theme.php:192 #: ../../view/theme/diabook/diabook-blue/theme.php:192 -#: ../../view/theme/diabook/theme.php:209 +#: ../../view/theme/diabook/theme.php:208 #: ../../view/theme/diabook/diabook-dark/theme.php:194 #: ../../view/theme/diabook/diabook-aerith/theme.php:194 #: ../../view/theme/diabook/diabook-pink/theme.php:194 -#: ../../view/theme/diabook-aerith/theme.php:194 msgid "Help or @NewHere ?" msgstr "Hilfe oder @NewHere" -#: ../../view/theme/diabook-red/theme.php:198 -#: ../../view/theme/diabook-blue/theme.php:198 #: ../../view/theme/diabook/diabook-green/theme.php:200 #: ../../view/theme/diabook/diabook-red/theme.php:198 #: ../../view/theme/diabook/diabook-blue/theme.php:198 -#: ../../view/theme/diabook/theme.php:215 +#: ../../view/theme/diabook/theme.php:214 #: ../../view/theme/diabook/diabook-dark/theme.php:200 #: ../../view/theme/diabook/diabook-aerith/theme.php:200 #: ../../view/theme/diabook/diabook-pink/theme.php:200 -#: ../../view/theme/diabook-aerith/theme.php:200 msgid "Connect Services" msgstr "Verbinde Dienste" -#: ../../view/theme/diabook-red/theme.php:227 -#: ../../view/theme/diabook-blue/theme.php:227 #: ../../view/theme/diabook/diabook-green/theme.php:229 #: ../../view/theme/diabook/diabook-red/theme.php:227 #: ../../view/theme/diabook/diabook-blue/theme.php:227 -#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook/theme.php:246 #: ../../view/theme/diabook/diabook-dark/theme.php:229 #: ../../view/theme/diabook/diabook-aerith/theme.php:229 #: ../../view/theme/diabook/diabook-pink/theme.php:229 -#: ../../view/theme/diabook-aerith/theme.php:229 ../../include/nav.php:49 -#: ../../include/nav.php:115 +#: ../../include/nav.php:49 ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Deine Beiträge und Unterhaltungen" -#: ../../view/theme/diabook-red/theme.php:228 -#: ../../view/theme/diabook-blue/theme.php:228 #: ../../view/theme/diabook/diabook-green/theme.php:230 #: ../../view/theme/diabook/diabook-red/theme.php:228 #: ../../view/theme/diabook/diabook-blue/theme.php:228 -#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook/theme.php:247 #: ../../view/theme/diabook/diabook-dark/theme.php:230 #: ../../view/theme/diabook/diabook-aerith/theme.php:230 #: ../../view/theme/diabook/diabook-pink/theme.php:230 -#: ../../view/theme/diabook-aerith/theme.php:230 ../../include/nav.php:50 +#: ../../include/nav.php:50 msgid "Your profile page" msgstr "Deine Profilseite" -#: ../../view/theme/diabook-red/theme.php:229 -#: ../../view/theme/diabook-blue/theme.php:229 #: ../../view/theme/diabook/diabook-green/theme.php:231 #: ../../view/theme/diabook/diabook-red/theme.php:229 #: ../../view/theme/diabook/diabook-blue/theme.php:229 -#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook/theme.php:248 #: ../../view/theme/diabook/diabook-dark/theme.php:231 #: ../../view/theme/diabook/diabook-aerith/theme.php:231 #: ../../view/theme/diabook/diabook-pink/theme.php:231 -#: ../../view/theme/diabook-aerith/theme.php:231 msgid "Your contacts" msgstr "Deine Kontakte" -#: ../../view/theme/diabook-red/theme.php:230 -#: ../../view/theme/diabook-blue/theme.php:230 #: ../../view/theme/diabook/diabook-green/theme.php:232 #: ../../view/theme/diabook/diabook-red/theme.php:230 #: ../../view/theme/diabook/diabook-blue/theme.php:230 -#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook/theme.php:249 #: ../../view/theme/diabook/diabook-dark/theme.php:232 #: ../../view/theme/diabook/diabook-aerith/theme.php:232 #: ../../view/theme/diabook/diabook-pink/theme.php:232 -#: ../../view/theme/diabook-aerith/theme.php:232 ../../include/nav.php:51 +#: ../../include/nav.php:51 msgid "Your photos" msgstr "Deine Fotos" -#: ../../view/theme/diabook-red/theme.php:231 -#: ../../view/theme/diabook-blue/theme.php:231 #: ../../view/theme/diabook/diabook-green/theme.php:233 #: ../../view/theme/diabook/diabook-red/theme.php:231 #: ../../view/theme/diabook/diabook-blue/theme.php:231 -#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook/theme.php:250 #: ../../view/theme/diabook/diabook-dark/theme.php:233 #: ../../view/theme/diabook/diabook-aerith/theme.php:233 #: ../../view/theme/diabook/diabook-pink/theme.php:233 -#: ../../view/theme/diabook-aerith/theme.php:233 ../../include/nav.php:52 +#: ../../include/nav.php:52 msgid "Your events" msgstr "Deine Ereignisse" -#: ../../view/theme/diabook-red/theme.php:232 -#: ../../view/theme/diabook-blue/theme.php:232 #: ../../view/theme/diabook/diabook-green/theme.php:234 #: ../../view/theme/diabook/diabook-red/theme.php:232 #: ../../view/theme/diabook/diabook-blue/theme.php:232 -#: ../../view/theme/diabook/theme.php:252 +#: ../../view/theme/diabook/theme.php:251 #: ../../view/theme/diabook/diabook-dark/theme.php:234 #: ../../view/theme/diabook/diabook-aerith/theme.php:234 #: ../../view/theme/diabook/diabook-pink/theme.php:234 -#: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53 +#: ../../include/nav.php:53 msgid "Personal notes" msgstr "Persönliche Notizen" -#: ../../view/theme/diabook-red/theme.php:232 -#: ../../view/theme/diabook-blue/theme.php:232 #: ../../view/theme/diabook/diabook-green/theme.php:234 #: ../../view/theme/diabook/diabook-red/theme.php:232 #: ../../view/theme/diabook/diabook-blue/theme.php:232 -#: ../../view/theme/diabook/theme.php:252 +#: ../../view/theme/diabook/theme.php:251 #: ../../view/theme/diabook/diabook-dark/theme.php:234 #: ../../view/theme/diabook/diabook-aerith/theme.php:234 #: ../../view/theme/diabook/diabook-pink/theme.php:234 -#: ../../view/theme/diabook-aerith/theme.php:234 ../../include/nav.php:53 +#: ../../include/nav.php:53 msgid "Your personal photos" msgstr "Deine privaten Fotos" -#: ../../view/theme/diabook-red/config.php:78 -#: ../../view/theme/diabook-blue/config.php:78 #: ../../view/theme/diabook/diabook-green/config.php:78 #: ../../view/theme/diabook/diabook-red/config.php:78 #: ../../view/theme/diabook/diabook-blue/config.php:78 @@ -5712,12 +5623,9 @@ msgstr "Deine privaten Fotos" #: ../../view/theme/diabook/diabook-pink/config.php:78 #: ../../view/theme/diabook/config.php:93 #: ../../view/theme/quattro/config.php:54 -#: ../../view/theme/diabook-aerith/config.php:78 msgid "Theme settings" msgstr "Themen Einstellungen" -#: ../../view/theme/diabook-red/config.php:79 -#: ../../view/theme/diabook-blue/config.php:79 #: ../../view/theme/diabook/diabook-green/config.php:79 #: ../../view/theme/diabook/diabook-red/config.php:79 #: ../../view/theme/diabook/diabook-blue/config.php:79 @@ -5725,12 +5633,9 @@ msgstr "Themen Einstellungen" #: ../../view/theme/diabook/diabook-aerith/config.php:79 #: ../../view/theme/diabook/diabook-pink/config.php:79 #: ../../view/theme/diabook/config.php:94 -#: ../../view/theme/diabook-aerith/config.php:79 msgid "Set font-size for posts and comments" msgstr "Schriftgröße für Beiträge und Kommentare festlegen" -#: ../../view/theme/diabook-red/config.php:80 -#: ../../view/theme/diabook-blue/config.php:80 #: ../../view/theme/diabook/diabook-green/config.php:80 #: ../../view/theme/diabook/diabook-red/config.php:80 #: ../../view/theme/diabook/diabook-blue/config.php:80 @@ -5738,12 +5643,9 @@ msgstr "Schriftgröße für Beiträge und Kommentare festlegen" #: ../../view/theme/diabook/diabook-aerith/config.php:80 #: ../../view/theme/diabook/diabook-pink/config.php:80 #: ../../view/theme/diabook/config.php:95 -#: ../../view/theme/diabook-aerith/config.php:80 msgid "Set line-height for posts and comments" msgstr "Liniengröße für Beiträge und Kommantare festlegen" -#: ../../view/theme/diabook-red/config.php:81 -#: ../../view/theme/diabook-blue/config.php:81 #: ../../view/theme/diabook/diabook-green/config.php:81 #: ../../view/theme/diabook/diabook-red/config.php:81 #: ../../view/theme/diabook/diabook-blue/config.php:81 @@ -5751,7 +5653,6 @@ msgstr "Liniengröße für Beiträge und Kommantare festlegen" #: ../../view/theme/diabook/diabook-aerith/config.php:81 #: ../../view/theme/diabook/diabook-pink/config.php:81 #: ../../view/theme/diabook/config.php:96 -#: ../../view/theme/diabook-aerith/config.php:81 msgid "Set resolution for middle column" msgstr "Auflösung für die Mittelspalte setzen" diff --git a/view/de/strings.php b/view/de/strings.php index 4e31f97de..74125549d 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -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 interesting profile change"] = ""; +$a->strings["making an interesting profile change"] = "interessante Ä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 - change theme settings"] = ""; +$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - Theme-Einstellungen ändern"; $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.

"] = "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.

"; $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"; diff --git a/view/eo/follow_notify_eml.tpl b/view/eo/follow_notify_eml.tpl new file mode 100644 index 000000000..e76453ac1 --- /dev/null +++ b/view/eo/follow_notify_eml.tpl @@ -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 \ No newline at end of file diff --git a/view/eo/friend_complete_eml.tpl b/view/eo/friend_complete_eml.tpl new file mode 100644 index 000000000..f429ca450 --- /dev/null +++ b/view/eo/friend_complete_eml.tpl @@ -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 + + \ No newline at end of file diff --git a/view/eo/intro_complete_eml.tpl b/view/eo/intro_complete_eml.tpl new file mode 100644 index 000000000..56a4fd880 --- /dev/null +++ b/view/eo/intro_complete_eml.tpl @@ -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 \ No newline at end of file diff --git a/view/eo/messages.po b/view/eo/messages.po index dea7d919d..421f92788 100644 --- a/view/eo/messages.po +++ b/view/eo/messages.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-04-16 10:00-0700\n" -"PO-Revision-Date: 2012-04-18 17:16+0000\n" +"POT-Creation-Date: 2012-04-22 10:00-0700\n" +"PO-Revision-Date: 2012-04-23 19:27+0000\n" "Last-Translator: Martin Schmitt \n" "Language-Team: Esperanto (http://www.transifex.net/projects/p/friendica/language/eo/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "Ĝisdatigo de kontakto malsukcesis." #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866 +#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 #: ../../mod/settings.php:99 ../../mod/settings.php:514 @@ -57,7 +57,7 @@ msgstr "Ĝisdatigo de kontakto malsukcesis." #: ../../mod/profiles.php:7 ../../mod/profiles.php:329 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 -#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3170 +#: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171 #: ../../index.php:309 msgid "Permission denied." msgstr "Malpermesita." @@ -88,7 +88,7 @@ msgid "Return to contact editor" msgstr "Reen al kontakta redaktilo" #: ../../mod/crepair.php:148 ../../mod/settings.php:534 -#: ../../mod/settings.php:560 ../../mod/admin.php:544 ../../mod/admin.php:553 +#: ../../mod/settings.php:560 ../../mod/admin.php:573 ../../mod/admin.php:582 msgid "Name" msgstr "Nomo" @@ -125,17 +125,17 @@ msgid "New photo from this URL" msgstr "Nova bildo el tiu adreso" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:400 ../../mod/photos.php:901 ../../mod/photos.php:959 -#: ../../mod/photos.php:1194 ../../mod/photos.php:1234 -#: ../../mod/photos.php:1274 ../../mod/photos.php:1305 +#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958 +#: ../../mod/photos.php:1193 ../../mod/photos.php:1233 +#: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:325 #: ../../mod/settings.php:532 ../../mod/settings.php:678 #: ../../mod/settings.php:739 ../../mod/settings.php:930 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:374 -#: ../../mod/admin.php:541 ../../mod/admin.php:670 ../../mod/admin.php:850 -#: ../../mod/admin.php:930 ../../mod/profiles.php:498 ../../mod/invite.php:119 -#: ../../addon/facebook/facebook.php:552 ../../addon/yourls/yourls.php:76 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:392 +#: ../../mod/admin.php:570 ../../mod/admin.php:706 ../../mod/admin.php:905 +#: ../../mod/admin.php:993 ../../mod/profiles.php:498 ../../mod/invite.php:119 +#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 #: ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 @@ -147,6 +147,7 @@ msgstr "Nova bildo el tiu adreso" #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 #: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 +#: ../../addon/jappixmini/jappixmini.php:302 #: ../../addon/statusnet/statusnet.php:278 #: ../../addon/statusnet/statusnet.php:292 #: ../../addon/statusnet/statusnet.php:318 @@ -159,12 +160,14 @@ msgstr "Nova bildo el tiu adreso" #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:90 -#: ../../view/theme/diabook-red/config.php:64 -#: ../../view/theme/diabook-blue/config.php:64 -#: ../../view/theme/diabook/config.php:76 -#: ../../view/theme/quattro/config.php:52 -#: ../../view/theme/diabook-aerith/config.php:64 -#: ../../include/conversation.php:555 +#: ../../view/theme/diabook/diabook-green/config.php:76 +#: ../../view/theme/diabook/diabook-red/config.php:76 +#: ../../view/theme/diabook/diabook-blue/config.php:76 +#: ../../view/theme/diabook/diabook-dark/config.php:76 +#: ../../view/theme/diabook/diabook-aerith/config.php:76 +#: ../../view/theme/diabook/diabook-pink/config.php:76 +#: ../../view/theme/diabook/config.php:91 +#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 msgid "Submit" msgstr "Sendi" @@ -222,11 +225,15 @@ msgstr "Redakti okazon" msgid "link to source" msgstr "ligi al fonto" -#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243 -#: ../../view/theme/diabook-blue/theme.php:243 -#: ../../view/theme/diabook/theme.php:253 -#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52 -#: ../../boot.php:1471 +#: ../../mod/events.php:296 +#: ../../view/theme/diabook/diabook-green/theme.php:233 +#: ../../view/theme/diabook/diabook-red/theme.php:231 +#: ../../view/theme/diabook/diabook-blue/theme.php:231 +#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook/diabook-dark/theme.php:233 +#: ../../view/theme/diabook/diabook-aerith/theme.php:233 +#: ../../view/theme/diabook/diabook-pink/theme.php:233 +#: ../../include/nav.php:52 ../../boot.php:1471 msgid "Events" msgstr "Okazoj" @@ -355,17 +362,20 @@ msgstr "Ne" msgid "Photo Albums" msgstr "Bildalbumoj" -#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880 -#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383 -#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook-red/theme.php:113 -#: ../../view/theme/diabook-blue/theme.php:113 -#: ../../view/theme/diabook/theme.php:119 -#: ../../view/theme/diabook-aerith/theme.php:114 +#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 +#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 +#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 +#: ../../view/theme/diabook/diabook-green/theme.php:116 +#: ../../view/theme/diabook/diabook-red/theme.php:115 +#: ../../view/theme/diabook/diabook-blue/theme.php:115 +#: ../../view/theme/diabook/theme.php:130 +#: ../../view/theme/diabook/diabook-dark/theme.php:116 +#: ../../view/theme/diabook/diabook-aerith/theme.php:116 +#: ../../view/theme/diabook/diabook-pink/theme.php:116 msgid "Contact Photos" msgstr "Kontaktbildoj" -#: ../../mod/photos.php:58 ../../mod/photos.php:976 ../../mod/photos.php:1425 +#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424 msgid "Upload New Photos" msgstr "Alŝuti novajn bildojn" @@ -377,17 +387,20 @@ msgstr "ĉiuj" msgid "Contact information unavailable" msgstr "Kontaktoj informoj ne disponeblas" -#: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951 -#: ../../mod/photos.php:966 ../../mod/register.php:335 +#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950 +#: ../../mod/photos.php:965 ../../mod/register.php:335 #: ../../mod/register.php:342 ../../mod/register.php:349 #: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook-red/theme.php:114 -#: ../../view/theme/diabook-blue/theme.php:114 -#: ../../view/theme/diabook/theme.php:120 -#: ../../view/theme/diabook-aerith/theme.php:115 +#: ../../view/theme/diabook/diabook-green/theme.php:117 +#: ../../view/theme/diabook/diabook-red/theme.php:116 +#: ../../view/theme/diabook/diabook-blue/theme.php:116 +#: ../../view/theme/diabook/theme.php:131 +#: ../../view/theme/diabook/diabook-dark/theme.php:117 +#: ../../view/theme/diabook/diabook-aerith/theme.php:117 +#: ../../view/theme/diabook/diabook-pink/theme.php:117 msgid "Profile Photos" msgstr "Profilbildoj" @@ -395,192 +408,195 @@ msgstr "Profilbildoj" msgid "Album not found." msgstr "Albumo ne trovita." -#: ../../mod/photos.php:179 ../../mod/photos.php:960 +#: ../../mod/photos.php:179 ../../mod/photos.php:959 msgid "Delete Album" msgstr "Forviŝi albumon" -#: ../../mod/photos.php:242 ../../mod/photos.php:1195 +#: ../../mod/photos.php:242 ../../mod/photos.php:1194 msgid "Delete Photo" msgstr "Forviŝi bildon" -#: ../../mod/photos.php:529 +#: ../../mod/photos.php:528 msgid "was tagged in a" msgstr "estas markita en" -#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook-red/theme.php:85 -#: ../../view/theme/diabook-blue/theme.php:85 -#: ../../view/theme/diabook/theme.php:91 -#: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304 -#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 -#: ../../include/conversation.php:126 +#: ../../view/theme/diabook/diabook-green/theme.php:88 +#: ../../view/theme/diabook/diabook-red/theme.php:87 +#: ../../view/theme/diabook/diabook-blue/theme.php:87 +#: ../../view/theme/diabook/theme.php:102 +#: ../../view/theme/diabook/diabook-dark/theme.php:88 +#: ../../view/theme/diabook/diabook-aerith/theme.php:88 +#: ../../view/theme/diabook/diabook-pink/theme.php:88 +#: ../../include/text.php:1304 ../../include/diaspora.php:1654 +#: ../../include/conversation.php:53 ../../include/conversation.php:126 msgid "photo" msgstr "bildo" -#: ../../mod/photos.php:529 +#: ../../mod/photos.php:528 msgid "by" msgstr "de" -#: ../../mod/photos.php:632 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "Bildo estas pli granda ol la limito de" -#: ../../mod/photos.php:640 +#: ../../mod/photos.php:639 msgid "Image file is empty." msgstr "Bilddosiero estas malplena." -#: ../../mod/photos.php:654 ../../mod/profile_photo.php:124 +#: ../../mod/photos.php:653 ../../mod/profile_photo.php:124 #: ../../mod/wall_upload.php:69 msgid "Unable to process image." msgstr "Ne eblas procedi la bildon." -#: ../../mod/photos.php:674 ../../mod/profile_photo.php:257 +#: ../../mod/photos.php:673 ../../mod/profile_photo.php:257 #: ../../mod/wall_upload.php:88 msgid "Image upload failed." msgstr "Alŝuto de bildo malsukcesis." -#: ../../mod/photos.php:760 ../../mod/community.php:16 +#: ../../mod/photos.php:759 ../../mod/community.php:16 #: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "Publika atingo ne permesita." -#: ../../mod/photos.php:770 +#: ../../mod/photos.php:769 msgid "No photos selected" msgstr "Neniu bildoj elektita" -#: ../../mod/photos.php:847 +#: ../../mod/photos.php:846 msgid "Access to this item is restricted." msgstr "Atingo al tio elemento estas limigita." -#: ../../mod/photos.php:908 +#: ../../mod/photos.php:907 msgid "Upload Photos" msgstr "Alŝuti bildojn" -#: ../../mod/photos.php:911 ../../mod/photos.php:955 +#: ../../mod/photos.php:910 ../../mod/photos.php:954 msgid "New album name: " msgstr "Nomo por nova albumo:" -#: ../../mod/photos.php:912 +#: ../../mod/photos.php:911 msgid "or existing album name: " msgstr "aŭ nomo de estanta albumo:" -#: ../../mod/photos.php:913 +#: ../../mod/photos.php:912 msgid "Do not show a status post for this upload" msgstr "Ne kreu statan afiŝon por tio alŝuto." -#: ../../mod/photos.php:915 ../../mod/photos.php:1190 +#: ../../mod/photos.php:914 ../../mod/photos.php:1189 msgid "Permissions" msgstr "Permesoj" -#: ../../mod/photos.php:970 +#: ../../mod/photos.php:969 msgid "Edit Album" msgstr "Redakti albumon" -#: ../../mod/photos.php:985 ../../mod/photos.php:1408 +#: ../../mod/photos.php:984 ../../mod/photos.php:1407 msgid "View Photo" msgstr "Vidi bildon" -#: ../../mod/photos.php:1020 +#: ../../mod/photos.php:1019 msgid "Permission denied. Access to this item may be restricted." msgstr "Malpermesita. Atingo al tio elemento eble estas limigita." -#: ../../mod/photos.php:1022 +#: ../../mod/photos.php:1021 msgid "Photo not available" msgstr "La bildo ne disponeblas" -#: ../../mod/photos.php:1072 +#: ../../mod/photos.php:1071 msgid "View photo" msgstr "Vidi bildon" -#: ../../mod/photos.php:1072 +#: ../../mod/photos.php:1071 msgid "Edit photo" msgstr "Redakti bildon" -#: ../../mod/photos.php:1073 +#: ../../mod/photos.php:1072 msgid "Use as profile photo" msgstr "Uzi kiel profilbildo" -#: ../../mod/photos.php:1079 ../../include/conversation.php:480 +#: ../../mod/photos.php:1078 ../../include/conversation.php:480 msgid "Private Message" msgstr "Privata mesaĝo" -#: ../../mod/photos.php:1101 +#: ../../mod/photos.php:1100 msgid "View Full Size" msgstr "Vidi plengrande " -#: ../../mod/photos.php:1169 +#: ../../mod/photos.php:1168 msgid "Tags: " msgstr "Markoj:" -#: ../../mod/photos.php:1172 +#: ../../mod/photos.php:1171 msgid "[Remove any tag]" msgstr "[Forviŝi iun markon]" -#: ../../mod/photos.php:1183 +#: ../../mod/photos.php:1182 msgid "New album name" msgstr "Nova nomo de albumo" -#: ../../mod/photos.php:1186 +#: ../../mod/photos.php:1185 msgid "Caption" msgstr "Apudskribo" -#: ../../mod/photos.php:1188 +#: ../../mod/photos.php:1187 msgid "Add a Tag" msgstr "Aldoni markon" -#: ../../mod/photos.php:1192 +#: ../../mod/photos.php:1191 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Ekzemple: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1212 ../../include/conversation.php:529 +#: ../../mod/photos.php:1211 ../../include/conversation.php:529 msgid "I like this (toggle)" msgstr "Mi ŝatas tion (ŝalti)" -#: ../../mod/photos.php:1213 ../../include/conversation.php:530 +#: ../../mod/photos.php:1212 ../../include/conversation.php:530 msgid "I don't like this (toggle)" msgstr "Mi malŝatas tion(ŝalti)" -#: ../../mod/photos.php:1214 ../../include/conversation.php:956 +#: ../../mod/photos.php:1213 ../../include/conversation.php:956 msgid "Share" msgstr "Kunhavigi" -#: ../../mod/photos.php:1215 ../../mod/editpost.php:104 +#: ../../mod/photos.php:1214 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:188 -#: ../../mod/message.php:357 ../../include/conversation.php:362 +#: ../../mod/message.php:357 ../../include/conversation.php:361 #: ../../include/conversation.php:698 ../../include/conversation.php:975 msgid "Please wait" msgstr "Bonvolu atendi" -#: ../../mod/photos.php:1231 ../../mod/photos.php:1271 -#: ../../mod/photos.php:1302 ../../include/conversation.php:552 +#: ../../mod/photos.php:1230 ../../mod/photos.php:1270 +#: ../../mod/photos.php:1301 ../../include/conversation.php:552 msgid "This is you" msgstr "Tiu estas vi" -#: ../../mod/photos.php:1233 ../../mod/photos.php:1273 -#: ../../mod/photos.php:1304 ../../include/conversation.php:554 +#: ../../mod/photos.php:1232 ../../mod/photos.php:1272 +#: ../../mod/photos.php:1303 ../../include/conversation.php:554 #: ../../boot.php:495 msgid "Comment" msgstr "Komenti" -#: ../../mod/photos.php:1235 ../../mod/editpost.php:125 +#: ../../mod/photos.php:1234 ../../mod/editpost.php:125 #: ../../include/conversation.php:556 ../../include/conversation.php:993 msgid "Preview" msgstr "Antaŭrigardi" -#: ../../mod/photos.php:1332 ../../mod/settings.php:595 -#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:548 +#: ../../mod/photos.php:1331 ../../mod/settings.php:595 +#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:577 #: ../../include/conversation.php:318 ../../include/conversation.php:576 msgid "Delete" msgstr "Forviŝi" -#: ../../mod/photos.php:1414 +#: ../../mod/photos.php:1413 msgid "View Album" msgstr "Vidi albumon" -#: ../../mod/photos.php:1423 +#: ../../mod/photos.php:1422 msgid "Recent Photos" msgstr "̂Ĵusaj bildoj" @@ -588,10 +604,15 @@ msgstr "̂Ĵusaj bildoj" msgid "Not available." msgstr "Ne disponebla." -#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245 -#: ../../view/theme/diabook-blue/theme.php:245 -#: ../../view/theme/diabook/theme.php:255 -#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101 +#: ../../mod/community.php:30 +#: ../../view/theme/diabook/diabook-green/theme.php:235 +#: ../../view/theme/diabook/diabook-red/theme.php:233 +#: ../../view/theme/diabook/diabook-blue/theme.php:233 +#: ../../view/theme/diabook/theme.php:252 +#: ../../view/theme/diabook/diabook-dark/theme.php:235 +#: ../../view/theme/diabook/diabook-aerith/theme.php:235 +#: ../../view/theme/diabook/diabook-pink/theme.php:235 +#: ../../include/nav.php:101 msgid "Community" msgstr "Komunumo" @@ -821,7 +842,7 @@ msgstr "Bonvolu konfirmi vian prezenton / kontaktpeton al %s." msgid "Confirm" msgstr "Konfirmi." -#: ../../mod/dfrn_request.php:628 ../../include/items.php:2690 +#: ../../mod/dfrn_request.php:628 ../../include/items.php:2691 msgid "[Name Withheld]" msgstr "[Kaŝita nomo]" @@ -1070,8 +1091,8 @@ msgid "mb_string PHP module" msgstr "PHP modulo mb_string" #: ../../mod/install.php:383 ../../mod/install.php:385 -msgid "Apace mod_rewrite module" -msgstr "Apache modulo mod_rewrite" +msgid "Apache mod_rewrite module" +msgstr "Apache mod_rewrite modulo" #: ../../mod/install.php:383 msgid "" @@ -1233,11 +1254,15 @@ msgstr "Reto" msgid "Personal" msgstr "Propra" -#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239 -#: ../../view/theme/diabook-blue/theme.php:239 -#: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77 -#: ../../include/nav.php:115 +#: ../../mod/notifications.php:90 +#: ../../view/theme/diabook/diabook-green/theme.php:229 +#: ../../view/theme/diabook/diabook-red/theme.php:227 +#: ../../view/theme/diabook/diabook-blue/theme.php:227 +#: ../../view/theme/diabook/theme.php:246 +#: ../../view/theme/diabook/diabook-dark/theme.php:229 +#: ../../view/theme/diabook/diabook-aerith/theme.php:229 +#: ../../view/theme/diabook/diabook-pink/theme.php:229 +#: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Hejmo" @@ -1285,7 +1310,7 @@ msgid "if applicable" msgstr "se aplikebla" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:546 +#: ../../mod/admin.php:575 msgid "Approve" msgstr "Aprobi" @@ -1482,12 +1507,12 @@ msgid "View all contacts" msgstr "Vidi ĉiujn kontaktojn" #: ../../mod/contacts.php:303 ../../mod/contacts.php:350 -#: ../../mod/admin.php:550 +#: ../../mod/admin.php:579 msgid "Unblock" msgstr "Malbloki" #: ../../mod/contacts.php:303 ../../mod/contacts.php:350 -#: ../../mod/admin.php:549 +#: ../../mod/admin.php:578 msgid "Block" msgstr "Bloki" @@ -1556,7 +1581,7 @@ msgstr "Plej ĵusa ĝisdatigo:" msgid "Update public posts" msgstr "Ĝisdatigi publikajn afiŝojn" -#: ../../mod/contacts.php:347 ../../mod/admin.php:979 +#: ../../mod/contacts.php:347 ../../mod/admin.php:1051 msgid "Update now" msgstr "Ĝisdatigi nun" @@ -1613,10 +1638,15 @@ msgstr "vi estas admiranto de" msgid "Edit contact" msgstr "Redakti kontakton" -#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241 -#: ../../view/theme/diabook-blue/theme.php:241 -#: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139 +#: ../../mod/contacts.php:529 +#: ../../view/theme/diabook/diabook-green/theme.php:231 +#: ../../view/theme/diabook/diabook-red/theme.php:229 +#: ../../view/theme/diabook/diabook-blue/theme.php:229 +#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook/diabook-dark/theme.php:231 +#: ../../view/theme/diabook/diabook-aerith/theme.php:231 +#: ../../view/theme/diabook/diabook-pink/theme.php:231 +#: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontaktoj" @@ -1649,9 +1679,9 @@ msgstr "Pasvorta riparado petita je %s" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/register.php:388 ../../mod/register.php:442 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 -#: ../../addon/facebook/facebook.php:625 -#: ../../addon/facebook/facebook.php:1090 -#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2699 +#: ../../addon/facebook/facebook.php:650 +#: ../../addon/facebook/facebook.php:1136 +#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700 msgid "Administrator" msgstr "Administranto" @@ -1707,19 +1737,19 @@ msgstr "Repari" #: ../../mod/settings.php:49 ../../include/nav.php:137 msgid "Account settings" -msgstr "Kontoagordoj" +msgstr "Konto" #: ../../mod/settings.php:54 msgid "Display settings" -msgstr "Ekranagordoj" +msgstr "Ekrano" #: ../../mod/settings.php:60 msgid "Connector settings" -msgstr "Konektiloagordoj" +msgstr "Konektiloj" #: ../../mod/settings.php:65 msgid "Plugin settings" -msgstr "Agordoj pri kromprogramoj" +msgstr "Kromprogramoj" #: ../../mod/settings.php:70 msgid "Connected apps" @@ -1727,9 +1757,9 @@ msgstr "Konektitaj programoj" #: ../../mod/settings.php:75 msgid "Export personal data" -msgstr "Eksporti personan datumaron" +msgstr "Eksporto" -#: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817 +#: ../../mod/settings.php:83 ../../mod/admin.php:665 ../../mod/admin.php:870 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 msgid "Settings" msgstr "Agordoj" @@ -1739,7 +1769,7 @@ msgid "Missing some important data!" msgstr "Mankas importantaj datumoj!" #: ../../mod/settings.php:129 ../../mod/settings.php:558 -#: ../../mod/admin.php:89 +#: ../../mod/admin.php:97 msgid "Update" msgstr "Ĝisdatigi" @@ -1783,10 +1813,10 @@ msgstr " Repoŝtadreso ne validas." msgid " Cannot change to that email." msgstr " Ne povas ŝanĝi al tio retpoŝtadreso." -#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450 +#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:469 #: ../../addon/impressum/impressum.php:75 #: ../../addon/openstreetmap/openstreetmap.php:80 -#: ../../addon/mathjax/mathjax.php:64 ../../addon/piwik/piwik.php:105 +#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 #: ../../addon/twitter/twitter.php:370 msgid "Settings updated." msgstr "Agordoj ĝisdatigita." @@ -1955,9 +1985,9 @@ msgstr "Maksimume 100 eroj" #: ../../mod/settings.php:746 msgid "Don't show emoticons" -msgstr "Ne montru ridetulojn." +msgstr "Ne montru ridetulojn" -#: ../../mod/settings.php:811 ../../mod/admin.php:162 ../../mod/admin.php:522 +#: ../../mod/settings.php:811 ../../mod/admin.php:173 ../../mod/admin.php:551 msgid "Normal Account" msgstr "Normala konto" @@ -1965,15 +1995,15 @@ msgstr "Normala konto" msgid "This account is a normal personal profile" msgstr "Tiu konto estas normala persona profilo" -#: ../../mod/settings.php:815 ../../mod/admin.php:163 ../../mod/admin.php:523 +#: ../../mod/settings.php:815 ../../mod/admin.php:174 ../../mod/admin.php:552 msgid "Soapbox Account" -msgstr "Konto ĉe Soapbox" +msgstr "Soapbox Konto" #: ../../mod/settings.php:816 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel nurlegaj admirantoj" -#: ../../mod/settings.php:819 ../../mod/admin.php:164 ../../mod/admin.php:524 +#: ../../mod/settings.php:819 ../../mod/admin.php:175 ../../mod/admin.php:553 msgid "Community/Celebrity Account" msgstr "Komunuma/eminentula Konto" @@ -1982,7 +2012,7 @@ msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel admirantoj kapable legi kaj skribi" -#: ../../mod/settings.php:823 ../../mod/admin.php:165 ../../mod/admin.php:525 +#: ../../mod/settings.php:823 ../../mod/admin.php:176 ../../mod/admin.php:554 msgid "Automatic Friend Account" msgstr "Aŭtomata Amika Konto" @@ -2040,7 +2070,7 @@ msgstr "aŭ" #: ../../mod/settings.php:907 msgid "Your Identity Address is" -msgstr "Via identeco adreso estas" +msgstr "Via identeca adreso estas" #: ../../mod/settings.php:918 msgid "Automatically expire posts after this many days:" @@ -2285,7 +2315,7 @@ msgid "Personal Notes" msgstr "Personaj Notoj" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:683 ../../include/text.php:652 +#: ../../addon/facebook/facebook.php:715 ../../include/text.php:652 msgid "Save" msgstr "Konservi" @@ -2527,11 +2557,15 @@ msgstr "Nevaliada profila identigilo." msgid "Profile Visibility Editor" msgstr "Redaktilo por profila videbleco." -#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240 -#: ../../view/theme/diabook-blue/theme.php:240 -#: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook-aerith/theme.php:241 -#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76 +#: ../../mod/profperm.php:103 +#: ../../view/theme/diabook/diabook-green/theme.php:230 +#: ../../view/theme/diabook/diabook-red/theme.php:228 +#: ../../view/theme/diabook/diabook-blue/theme.php:228 +#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook/diabook-dark/theme.php:230 +#: ../../view/theme/diabook/diabook-aerith/theme.php:230 +#: ../../view/theme/diabook/diabook-pink/theme.php:230 +#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/nav.php:50 ../../boot.php:1458 msgid "Profile" msgstr "Profilo" @@ -2681,7 +2715,7 @@ msgstr "Membriĝi ĉi tie nur eblas laŭ invito." msgid "Your invitation ID: " msgstr "Via invita idento: " -#: ../../mod/register.php:553 ../../mod/admin.php:375 +#: ../../mod/register.php:553 ../../mod/admin.php:393 msgid "Registration" msgstr "Registrado" @@ -2713,28 +2747,38 @@ msgid "People Search" msgstr "Serĉi Membrojn" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1574 +#: ../../addon/facebook/facebook.php:1655 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook-red/theme.php:80 -#: ../../view/theme/diabook-red/theme.php:89 -#: ../../view/theme/diabook-blue/theme.php:80 -#: ../../view/theme/diabook-blue/theme.php:89 -#: ../../view/theme/diabook/theme.php:86 ../../view/theme/diabook/theme.php:95 -#: ../../view/theme/diabook-aerith/theme.php:81 -#: ../../view/theme/diabook-aerith/theme.php:90 +#: ../../view/theme/diabook/diabook-green/theme.php:83 +#: ../../view/theme/diabook/diabook-green/theme.php:92 +#: ../../view/theme/diabook/diabook-red/theme.php:82 +#: ../../view/theme/diabook/diabook-red/theme.php:91 +#: ../../view/theme/diabook/diabook-blue/theme.php:82 +#: ../../view/theme/diabook/diabook-blue/theme.php:91 +#: ../../view/theme/diabook/theme.php:97 +#: ../../view/theme/diabook/theme.php:106 +#: ../../view/theme/diabook/diabook-dark/theme.php:83 +#: ../../view/theme/diabook/diabook-dark/theme.php:92 +#: ../../view/theme/diabook/diabook-aerith/theme.php:83 +#: ../../view/theme/diabook/diabook-aerith/theme.php:92 +#: ../../view/theme/diabook/diabook-pink/theme.php:83 +#: ../../view/theme/diabook/diabook-pink/theme.php:92 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 msgid "status" msgstr "staton" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1578 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook-red/theme.php:94 -#: ../../view/theme/diabook-blue/theme.php:94 -#: ../../view/theme/diabook/theme.php:100 -#: ../../view/theme/diabook-aerith/theme.php:95 +#: ../../view/theme/diabook/diabook-green/theme.php:97 +#: ../../view/theme/diabook/diabook-red/theme.php:96 +#: ../../view/theme/diabook/diabook-blue/theme.php:96 +#: ../../view/theme/diabook/theme.php:111 +#: ../../view/theme/diabook/diabook-dark/theme.php:97 +#: ../../view/theme/diabook/diabook-aerith/theme.php:97 +#: ../../view/theme/diabook/diabook-pink/theme.php:97 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2745,9 +2789,9 @@ msgstr "%1$s ŝatas la %3$s de %2$s" msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s malŝatas la %3$s de %2$s" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141 -#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3082 +#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149 +#: ../../mod/admin.php:614 ../../mod/admin.php:813 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3083 msgid "Item not found." msgstr "Elemento ne estas trovita." @@ -2755,6 +2799,22 @@ msgstr "Elemento ne estas trovita." msgid "Access denied." msgstr "Atingo nepermesita." +#: ../../mod/fbrowser.php:23 +#: ../../view/theme/diabook/diabook-green/theme.php:232 +#: ../../view/theme/diabook/diabook-red/theme.php:230 +#: ../../view/theme/diabook/diabook-blue/theme.php:230 +#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook/diabook-dark/theme.php:232 +#: ../../view/theme/diabook/diabook-aerith/theme.php:232 +#: ../../view/theme/diabook/diabook-pink/theme.php:232 +#: ../../include/nav.php:51 ../../boot.php:1463 +msgid "Photos" +msgstr "Bildoj" + +#: ../../mod/fbrowser.php:86 +msgid "Files" +msgstr "Dosieroj" + #: ../../mod/regmod.php:61 msgid "Account approved." msgstr "Konto aprobita." @@ -2965,481 +3025,481 @@ msgstr "Amikoj de %s" msgid "No friends to display." msgstr "Neniom da amiko al montri." -#: ../../mod/admin.php:51 +#: ../../mod/admin.php:55 msgid "Theme settings updated." msgstr "Gisdatigis agordojn pri etosoj." -#: ../../mod/admin.php:85 ../../mod/admin.php:373 +#: ../../mod/admin.php:93 ../../mod/admin.php:391 msgid "Site" msgstr "Retejo" -#: ../../mod/admin.php:86 ../../mod/admin.php:540 ../../mod/admin.php:552 +#: ../../mod/admin.php:94 ../../mod/admin.php:569 ../../mod/admin.php:581 msgid "Users" msgstr "Uzantoj" -#: ../../mod/admin.php:87 ../../mod/admin.php:629 ../../mod/admin.php:669 +#: ../../mod/admin.php:95 ../../mod/admin.php:663 ../../mod/admin.php:705 msgid "Plugins" msgstr "Kromprogramoj" -#: ../../mod/admin.php:88 ../../mod/admin.php:815 ../../mod/admin.php:849 +#: ../../mod/admin.php:96 ../../mod/admin.php:868 ../../mod/admin.php:904 msgid "Themes" msgstr "Etosoj" -#: ../../mod/admin.php:103 ../../mod/admin.php:929 +#: ../../mod/admin.php:111 ../../mod/admin.php:992 msgid "Logs" msgstr "Protokoloj" -#: ../../mod/admin.php:108 +#: ../../mod/admin.php:116 msgid "User registrations waiting for confirmation" msgstr "Uzantaj registradoj atendante konfirmon" -#: ../../mod/admin.php:177 ../../mod/admin.php:372 ../../mod/admin.php:539 -#: ../../mod/admin.php:628 ../../mod/admin.php:668 ../../mod/admin.php:814 -#: ../../mod/admin.php:848 ../../mod/admin.php:928 +#: ../../mod/admin.php:188 ../../mod/admin.php:390 ../../mod/admin.php:568 +#: ../../mod/admin.php:662 ../../mod/admin.php:704 ../../mod/admin.php:867 +#: ../../mod/admin.php:903 ../../mod/admin.php:991 msgid "Administration" msgstr "Administrado" -#: ../../mod/admin.php:178 +#: ../../mod/admin.php:189 msgid "Summary" msgstr "Resumo" -#: ../../mod/admin.php:179 +#: ../../mod/admin.php:190 msgid "Registered users" msgstr "Registrataj uzantoj" -#: ../../mod/admin.php:181 +#: ../../mod/admin.php:192 msgid "Pending registrations" msgstr "Okazontaj registradoj" -#: ../../mod/admin.php:182 +#: ../../mod/admin.php:193 msgid "Version" msgstr "Versio" -#: ../../mod/admin.php:184 +#: ../../mod/admin.php:195 msgid "Active plugins" msgstr "Ŝaltitaj kromprogramoj" -#: ../../mod/admin.php:315 +#: ../../mod/admin.php:329 msgid "Site settings updated." msgstr "Ĝisdatigis retejaj agordoj." -#: ../../mod/admin.php:359 +#: ../../mod/admin.php:377 msgid "Closed" msgstr "Ferma" -#: ../../mod/admin.php:360 +#: ../../mod/admin.php:378 msgid "Requires approval" msgstr "Bezonas aprobon" -#: ../../mod/admin.php:361 +#: ../../mod/admin.php:379 msgid "Open" msgstr "Malferma" -#: ../../mod/admin.php:365 +#: ../../mod/admin.php:383 msgid "No SSL policy, links will track page SSL state" msgstr "Sen SSL strategio. Ligiloj sekvos la SSL staton de la paĝo." -#: ../../mod/admin.php:366 +#: ../../mod/admin.php:384 msgid "Force all links to use SSL" msgstr "Devigi ke ĉiuj ligiloj uzu SSL." -#: ../../mod/admin.php:367 +#: ../../mod/admin.php:385 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "Memsubskribita atestilo, nur uzu SSL por lokaj ligiloj (malkuraĝigata)" -#: ../../mod/admin.php:376 +#: ../../mod/admin.php:394 msgid "File upload" msgstr "Alŝuto" -#: ../../mod/admin.php:377 +#: ../../mod/admin.php:395 msgid "Policies" msgstr "Politiko" -#: ../../mod/admin.php:378 +#: ../../mod/admin.php:396 msgid "Advanced" msgstr "Altnivela" -#: ../../mod/admin.php:382 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:400 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "Nomo de retejo" -#: ../../mod/admin.php:383 +#: ../../mod/admin.php:401 msgid "Banner/Logo" msgstr "Emblemo" -#: ../../mod/admin.php:384 +#: ../../mod/admin.php:402 msgid "System language" msgstr "Sistema lingvo" -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:403 msgid "System theme" msgstr "Sistema etoso" -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:403 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Defaŭlta sistema etoso - transpasebla de uzantprofiloj - redakti agordoj pri etosoj" -#: ../../mod/admin.php:386 +#: ../../mod/admin.php:404 msgid "SSL link policy" msgstr "Strategio por SSL ligiloj" -#: ../../mod/admin.php:386 +#: ../../mod/admin.php:404 msgid "Determines whether generated links should be forced to use SSL" msgstr "Difinas ĉu generotaj ligiloj devige uzu SSL." -#: ../../mod/admin.php:387 +#: ../../mod/admin.php:405 msgid "Maximum image size" msgstr "Maksimuma bildgrando" -#: ../../mod/admin.php:387 +#: ../../mod/admin.php:405 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maksimuma grando en bajtoj por alŝutotaj bildoj. Defaŭlte 0, kio signifas neniu limito." -#: ../../mod/admin.php:389 +#: ../../mod/admin.php:407 msgid "Register policy" msgstr "Interkonsento pri registrado" -#: ../../mod/admin.php:390 +#: ../../mod/admin.php:408 msgid "Register text" msgstr "Interkonsento teksto" -#: ../../mod/admin.php:390 +#: ../../mod/admin.php:408 msgid "Will be displayed prominently on the registration page." msgstr "Tio estos eminente montrata en la registro paĝo." -#: ../../mod/admin.php:391 +#: ../../mod/admin.php:409 msgid "Accounts abandoned after x days" msgstr "Kontoj forlasitaj post x tagoj" -#: ../../mod/admin.php:391 +#: ../../mod/admin.php:409 msgid "" -"Will not waste system resources polling external sites for abandoned " +"Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo." -#: ../../mod/admin.php:392 +#: ../../mod/admin.php:410 msgid "Allowed friend domains" msgstr "Permesitaj amikaj domainoj" -#: ../../mod/admin.php:392 +#: ../../mod/admin.php:410 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Perkome disigita listo da domajnoj kiuj rajtas konstrui amikecojn kun ĉi tiu retejo. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn." -#: ../../mod/admin.php:393 +#: ../../mod/admin.php:411 msgid "Allowed email domains" msgstr "Permesitaj retpoŝtaj domajnoj" -#: ../../mod/admin.php:393 +#: ../../mod/admin.php:411 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "Perkome disigita listo da domajnoj kiuj uzeblas kiel retpoŝtaj adresoj en novaj registradoj. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn." -#: ../../mod/admin.php:394 +#: ../../mod/admin.php:412 msgid "Block public" msgstr "Bloki publike" -#: ../../mod/admin.php:394 +#: ../../mod/admin.php:412 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Elektu por bloki publikan atingon al ĉiuj alie publikajn paĝojn en ĉi tiu retejo kiam vi ne estas ensalutita." -#: ../../mod/admin.php:395 +#: ../../mod/admin.php:413 msgid "Force publish" msgstr "Devigi publikigon" -#: ../../mod/admin.php:395 +#: ../../mod/admin.php:413 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Elektu por devigi la registradon en la loka katalogo al ĉiuj profiloj en ĉi tiu retejo." -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:414 msgid "Global directory update URL" msgstr "Ĝenerala adreso por ĝisdatigi la katalogon" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:414 msgid "" "URL to update the global directory. If this is not set, the global directory" " is completely unavailable to the application." msgstr "URL adreso por ĝisdatigi la tutmondan katalogon. Se ne agordita, la tutmonda katatolge tute ne disponeblas al la programo." -#: ../../mod/admin.php:398 +#: ../../mod/admin.php:416 msgid "Block multiple registrations" msgstr "Bloki pluroblajn registradojn." -#: ../../mod/admin.php:398 +#: ../../mod/admin.php:416 msgid "Disallow users to register additional accounts for use as pages." msgstr "Malpermesi al uzantoj la permeson por registri pluajn kontojn kiel paĝoj." -#: ../../mod/admin.php:399 +#: ../../mod/admin.php:417 msgid "OpenID support" msgstr "Subteno por OpenID" -#: ../../mod/admin.php:399 +#: ../../mod/admin.php:417 msgid "OpenID support for registration and logins." msgstr "Subteni OpenID por registrado kaj ensaluto." -#: ../../mod/admin.php:400 +#: ../../mod/admin.php:418 msgid "Fullname check" msgstr "Kontroli plenan nomon" -#: ../../mod/admin.php:400 +#: ../../mod/admin.php:418 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "Kiel kontraŭspamilo, devigi uzantoj al registrado kun spaceto inter la persona nomo kaj la familia nomo." -#: ../../mod/admin.php:401 +#: ../../mod/admin.php:419 msgid "UTF-8 Regular expressions" msgstr "UTF-8 regulaj exprimoj" -#: ../../mod/admin.php:401 +#: ../../mod/admin.php:419 msgid "Use PHP UTF8 regular expressions" msgstr "Uzi PHP UTF8 regulajn esprimojn." -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:420 msgid "Show Community Page" msgstr "Montri Komunuma Paĝo" -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:420 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "Montri komunuma paĝo kun ĉiuj ĵusaj afiŝoj en ĉi tiu retejo." -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:421 msgid "Enable OStatus support" msgstr "Ŝalti subtenon por OStatus" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:421 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "Provizi integritan OStatus (identi.ca, status.net ktp) subtenon. Ĉiuj komunikadoj en OStatus estas publikaj, do privatecaj avertoj aperos de tempo al tempo." -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:422 msgid "Enable Diaspora support" msgstr "Ŝalti subtenon por Diaspora" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:422 msgid "Provide built-in Diaspora network compatibility." msgstr "Provizi integritan Diaspora subtenon." -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:423 msgid "Only allow Friendica contacts" msgstr "Nur permesigi Friendica kontaktojn" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:423 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "Ĉiuj kontaktoj devas uzi Friendica protokolojn. Ĉiuj aliaj komunikaj protokoloj malaktivita." -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:424 msgid "Verify SSL" msgstr "Kontroli SSL" -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:424 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." msgstr "Se vi deziras, vi povas aktivigi severan kontroladon de SSL atestiloj. Pro tio, vie (tute) ne eblos konekti al SSL retejoj kun memsubskribitaj atestiloj." -#: ../../mod/admin.php:407 +#: ../../mod/admin.php:425 msgid "Proxy user" msgstr "Uzantnomo por retperanto" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:426 msgid "Proxy URL" msgstr "URL adreso de retperanto" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:427 msgid "Network timeout" msgstr "Reta tempolimo" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:427 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Valoro en sekundoj. Uzu 0 por mallimitigi (ne rekomendata)." -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:453 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "Blokis/malblokis %s uzanton" msgstr[1] "Blokis/malblokis %s uzantojn" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:460 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s uzanto forviŝita" msgstr[1] "%s uzanto forviŝitaj" -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:499 #, php-format msgid "User '%s' deleted" msgstr "Uzanto '%s' forviŝita" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:507 #, php-format msgid "User '%s' unblocked" msgstr "Uzanto '%s' malblokita" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:507 #, php-format msgid "User '%s' blocked" msgstr "Uzanto '%s' blokita" -#: ../../mod/admin.php:542 +#: ../../mod/admin.php:571 msgid "select all" msgstr "elekti ĉiujn" -#: ../../mod/admin.php:543 +#: ../../mod/admin.php:572 msgid "User registrations waiting for confirm" msgstr "Registriĝoj atendante aprobon" -#: ../../mod/admin.php:544 +#: ../../mod/admin.php:573 msgid "Request date" msgstr "Dato de peto" -#: ../../mod/admin.php:544 ../../mod/admin.php:553 +#: ../../mod/admin.php:573 ../../mod/admin.php:582 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "Retpoŝto" -#: ../../mod/admin.php:545 +#: ../../mod/admin.php:574 msgid "No registrations." msgstr "Neniom da registriĝoj." -#: ../../mod/admin.php:547 +#: ../../mod/admin.php:576 msgid "Deny" msgstr "Negi" -#: ../../mod/admin.php:553 +#: ../../mod/admin.php:582 msgid "Register date" msgstr "Dato de registrado" -#: ../../mod/admin.php:553 +#: ../../mod/admin.php:582 msgid "Last login" msgstr "Plej ĵusa ensaluto" -#: ../../mod/admin.php:553 +#: ../../mod/admin.php:582 msgid "Last item" msgstr "Plej ĵusa elemento" -#: ../../mod/admin.php:553 +#: ../../mod/admin.php:582 msgid "Account" msgstr "Konto" -#: ../../mod/admin.php:555 +#: ../../mod/admin.php:584 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "La elektitaj uzantkontoj estas forviŝotaj!\\n\\nĈiuj elementoj kiujn ili afiŝis je la retpaĝo estos permanente forviŝitaj.\\n\\nĈu vi certas?" -#: ../../mod/admin.php:556 +#: ../../mod/admin.php:585 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "La uzanto {0} estas forviŝota!\\n\\nĈiuj elementoj kiujn li afiŝis je la retpaĝo estos permanente forviŝitaj.\\n\\nĈu vi certas?" -#: ../../mod/admin.php:592 +#: ../../mod/admin.php:626 #, php-format msgid "Plugin %s disabled." msgstr "Kromprogramo %s estas malŝaltita." -#: ../../mod/admin.php:596 +#: ../../mod/admin.php:630 #, php-format msgid "Plugin %s enabled." msgstr "Kromprogramo %s estas ŝaltita." -#: ../../mod/admin.php:606 ../../mod/admin.php:785 +#: ../../mod/admin.php:640 ../../mod/admin.php:838 msgid "Disable" msgstr "Malŝalti" -#: ../../mod/admin.php:608 ../../mod/admin.php:787 +#: ../../mod/admin.php:642 ../../mod/admin.php:840 msgid "Enable" msgstr "Ŝalti" -#: ../../mod/admin.php:630 ../../mod/admin.php:816 +#: ../../mod/admin.php:664 ../../mod/admin.php:869 msgid "Toggle" msgstr "Ŝalti/Malŝalti" -#: ../../mod/admin.php:638 ../../mod/admin.php:826 +#: ../../mod/admin.php:672 ../../mod/admin.php:879 msgid "Author: " msgstr "Aŭtoro: " -#: ../../mod/admin.php:639 ../../mod/admin.php:827 +#: ../../mod/admin.php:673 ../../mod/admin.php:880 msgid "Maintainer: " msgstr "Prizorganto: " -#: ../../mod/admin.php:750 +#: ../../mod/admin.php:802 msgid "No themes found." msgstr "Ne trovis etosojn." -#: ../../mod/admin.php:808 +#: ../../mod/admin.php:861 msgid "Screenshot" msgstr "Ekrankopio" -#: ../../mod/admin.php:854 +#: ../../mod/admin.php:909 msgid "[Experimental]" msgstr "[Eksperimenta]" -#: ../../mod/admin.php:855 +#: ../../mod/admin.php:910 msgid "[Unsupported]" msgstr "[Nesubtenata]" -#: ../../mod/admin.php:878 +#: ../../mod/admin.php:937 msgid "Log settings updated." msgstr "Protokolagordoj ĝisdatigitaj." -#: ../../mod/admin.php:931 +#: ../../mod/admin.php:994 msgid "Clear" msgstr "Forviŝi" -#: ../../mod/admin.php:937 +#: ../../mod/admin.php:1000 msgid "Debugging" msgstr "Sencimigado" -#: ../../mod/admin.php:938 +#: ../../mod/admin.php:1001 msgid "Log file" msgstr "Protokolo" -#: ../../mod/admin.php:938 +#: ../../mod/admin.php:1001 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "Devas esti skribebla de la retservilo. Relativa al via plej supra Friendica dosierujo." -#: ../../mod/admin.php:939 +#: ../../mod/admin.php:1002 msgid "Log level" msgstr "Protokolnivelo" -#: ../../mod/admin.php:980 +#: ../../mod/admin.php:1052 msgid "Close" msgstr "Fermi" -#: ../../mod/admin.php:986 +#: ../../mod/admin.php:1058 msgid "FTP Host" msgstr "FTP Servilo" -#: ../../mod/admin.php:987 +#: ../../mod/admin.php:1059 msgid "FTP Path" msgstr "FTP Vojo" -#: ../../mod/admin.php:988 +#: ../../mod/admin.php:1060 msgid "FTP User" msgstr "FTP Uzanto" -#: ../../mod/admin.php:989 +#: ../../mod/admin.php:1061 msgid "FTP Password" msgstr "FTP Pasvorto" @@ -3900,10 +3960,14 @@ msgstr "Aldoni" msgid "No entries." msgstr "Neniom da afiŝoj." -#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149 -#: ../../view/theme/diabook-blue/theme.php:149 -#: ../../view/theme/diabook/theme.php:155 -#: ../../view/theme/diabook-aerith/theme.php:150 +#: ../../mod/suggest.php:38 +#: ../../view/theme/diabook/diabook-green/theme.php:145 +#: ../../view/theme/diabook/diabook-red/theme.php:143 +#: ../../view/theme/diabook/diabook-blue/theme.php:143 +#: ../../view/theme/diabook/theme.php:158 +#: ../../view/theme/diabook/diabook-dark/theme.php:145 +#: ../../view/theme/diabook/diabook-aerith/theme.php:145 +#: ../../view/theme/diabook/diabook-pink/theme.php:145 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Amikosugestoj." @@ -3918,10 +3982,14 @@ msgstr "Neniu sugestoj disponeblas. Se ĉi tiu estas nova retejo, bonvolu reprov msgid "Ignore/Hide" msgstr "Ignori/Kaŝi" -#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147 -#: ../../view/theme/diabook-blue/theme.php:147 -#: ../../view/theme/diabook/theme.php:153 -#: ../../view/theme/diabook-aerith/theme.php:148 +#: ../../mod/directory.php:47 +#: ../../view/theme/diabook/diabook-green/theme.php:143 +#: ../../view/theme/diabook/diabook-red/theme.php:141 +#: ../../view/theme/diabook/diabook-blue/theme.php:141 +#: ../../view/theme/diabook/theme.php:156 +#: ../../view/theme/diabook/diabook-dark/theme.php:143 +#: ../../view/theme/diabook/diabook-aerith/theme.php:143 +#: ../../view/theme/diabook/diabook-pink/theme.php:143 msgid "Global Directory" msgstr "Tutmonda Katalogo" @@ -4107,71 +4175,71 @@ msgstr "Neeblas ĝisdatigi viajn profildetalojn ĉe nia sistemo." msgid "Connection accepted at %s" msgstr "Konekto akceptita je %s" -#: ../../addon/facebook/facebook.php:467 +#: ../../addon/facebook/facebook.php:490 msgid "Facebook disabled" msgstr "Facebook malŝaltita" -#: ../../addon/facebook/facebook.php:472 +#: ../../addon/facebook/facebook.php:495 msgid "Updating contacts" msgstr "Mi ĝisdatigas la kontaktojn." -#: ../../addon/facebook/facebook.php:493 +#: ../../addon/facebook/facebook.php:515 msgid "Facebook API key is missing." msgstr "La API ŝlosilo de Facebook ne estas konata ĉi tie." -#: ../../addon/facebook/facebook.php:500 +#: ../../addon/facebook/facebook.php:522 msgid "Facebook Connect" msgstr "Kontekto al Facebook" -#: ../../addon/facebook/facebook.php:506 +#: ../../addon/facebook/facebook.php:528 msgid "Install Facebook connector for this account." msgstr "Instali la Facebook konektilo por ĉi tiu konto." -#: ../../addon/facebook/facebook.php:513 +#: ../../addon/facebook/facebook.php:535 msgid "Remove Facebook connector" msgstr "Forigi la Facebook konektilon." -#: ../../addon/facebook/facebook.php:518 +#: ../../addon/facebook/facebook.php:540 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "Reaŭtentiĝi [Tio estas bezonata ĉiam kiam vi ŝanĝis vian pasvorton ĉe Facebook.]" -#: ../../addon/facebook/facebook.php:525 +#: ../../addon/facebook/facebook.php:547 msgid "Post to Facebook by default" msgstr "Ĉiam afiŝi al Facebook." -#: ../../addon/facebook/facebook.php:529 +#: ../../addon/facebook/facebook.php:551 msgid "Link all your Facebook friends and conversations on this website" msgstr "Alligu ĉiujn viajn Facebook amikojn kaj konversaciojn je ĉi-tiu retejo." -#: ../../addon/facebook/facebook.php:531 +#: ../../addon/facebook/facebook.php:553 msgid "" "Facebook conversations consist of your profile wall and your friend" " stream." msgstr "Facebok konversacioj konsistas el via profilmuro kaj la fluo de viaj amikoj." -#: ../../addon/facebook/facebook.php:532 +#: ../../addon/facebook/facebook.php:554 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "Je ĉi-tiu retejo, la fluo de viaj amikoj ĉe Facebook nur videblas al vi." -#: ../../addon/facebook/facebook.php:533 +#: ../../addon/facebook/facebook.php:555 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "La sekvontaj agordoj difinas la privatecon de via Facebook profilmuro je ĉi-tiu retejo." -#: ../../addon/facebook/facebook.php:537 +#: ../../addon/facebook/facebook.php:559 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "Je ĉi-tiu retejo, la conversacioj sur via Facebook profilmuro nur videblas al vi." -#: ../../addon/facebook/facebook.php:542 +#: ../../addon/facebook/facebook.php:564 msgid "Do not import your Facebook profile wall conversations" msgstr "Ne importi konversaciojn de via Facebook profilmuro" -#: ../../addon/facebook/facebook.php:544 +#: ../../addon/facebook/facebook.php:566 msgid "" "If you choose to link conversations and leave both of these boxes unchecked," " your Facebook profile wall will be merged with your profile wall on this " @@ -4179,114 +4247,114 @@ msgid "" "who may see the conversations." msgstr "Se vi elektas alligi conversaciojn kaj ne elektas tiujn butonojn, via Facebook profilmuro estas kunigota kun via profilmuro ĉi tie. Viaj privatecaj agordoj ĉi tie difinos kiu povas vidi la coversaciojn." -#: ../../addon/facebook/facebook.php:549 +#: ../../addon/facebook/facebook.php:571 msgid "Comma separated applications to ignore" msgstr "Ignorotaj programoj, disigita per komo" -#: ../../addon/facebook/facebook.php:623 +#: ../../addon/facebook/facebook.php:648 msgid "Problems with Facebook Real-Time Updates" msgstr "Problemoj kun Facebook Realtempaj Ĝisdatigoj" -#: ../../addon/facebook/facebook.php:647 +#: ../../addon/facebook/facebook.php:675 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "Facebook" -#: ../../addon/facebook/facebook.php:648 +#: ../../addon/facebook/facebook.php:676 msgid "Facebook Connector Settings" msgstr "Agordoj por la Facebook konektilo" -#: ../../addon/facebook/facebook.php:659 +#: ../../addon/facebook/facebook.php:691 msgid "Facebook API Key" msgstr "Facebook API ŝlosilo" -#: ../../addon/facebook/facebook.php:668 +#: ../../addon/facebook/facebook.php:700 msgid "" "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.

" msgstr "Eraro: Ŝajnas kvazaŭ vi agordis la App-ID kaj la sekreton en via .htconfig.php dosiero. Kiam ili estas agordita tie, vi ne povas agordi ĝin tra tiu ĉi formo.

" -#: ../../addon/facebook/facebook.php:673 +#: ../../addon/facebook/facebook.php:705 msgid "" "Error: the given API Key seems to be incorrect (the application access token" " could not be retrieved)." msgstr "Eraro: La API ŝlosilo aspektas malĝusta (ne eblas ricevi la programa atingoĵetono)." -#: ../../addon/facebook/facebook.php:675 +#: ../../addon/facebook/facebook.php:707 msgid "The given API Key seems to work correctly." msgstr "La API ŝlosilo ŝajne ĝuste funkcias." -#: ../../addon/facebook/facebook.php:677 +#: ../../addon/facebook/facebook.php:709 msgid "" "The correctness of the API Key could not be detected. Somthing strange's " "going on." msgstr "Ne povis kontroli la ĝustecon de la API ŝlosilo. Ia stranga afero okazas. " -#: ../../addon/facebook/facebook.php:680 +#: ../../addon/facebook/facebook.php:712 msgid "App-ID / API-Key" msgstr "Programo ID / API Ŝlosilo" -#: ../../addon/facebook/facebook.php:681 +#: ../../addon/facebook/facebook.php:713 msgid "Application secret" msgstr "Programo sekreto" -#: ../../addon/facebook/facebook.php:682 +#: ../../addon/facebook/facebook.php:714 #, php-format msgid "Polling Interval (min. %1$s minutes)" msgstr "Intervalo por la enketilo (poller intervalo, minimume %1$s mintuoj) " -#: ../../addon/facebook/facebook.php:686 +#: ../../addon/facebook/facebook.php:718 msgid "Real-Time Updates" msgstr "Realtempaj Ĝisdatigoj" -#: ../../addon/facebook/facebook.php:690 +#: ../../addon/facebook/facebook.php:722 msgid "Real-Time Updates are activated." msgstr "Realtempaj Ĝisdatigoj estas ŝaltita" -#: ../../addon/facebook/facebook.php:691 +#: ../../addon/facebook/facebook.php:723 msgid "Deactivate Real-Time Updates" msgstr "Malŝalti Realtempaj Ĝisdatigoj" -#: ../../addon/facebook/facebook.php:693 +#: ../../addon/facebook/facebook.php:725 msgid "Real-Time Updates not activated." msgstr "Realtempaj Ĝisdatigoj estas malŝaltita" -#: ../../addon/facebook/facebook.php:693 +#: ../../addon/facebook/facebook.php:725 msgid "Activate Real-Time Updates" msgstr "Ŝalti Realtempaj Ĝisdatigoj" -#: ../../addon/facebook/facebook.php:707 +#: ../../addon/facebook/facebook.php:743 msgid "The new values have been saved." msgstr "Konservis novajn valorojn." -#: ../../addon/facebook/facebook.php:726 +#: ../../addon/facebook/facebook.php:767 msgid "Post to Facebook" msgstr "Afiŝi al Facebook" -#: ../../addon/facebook/facebook.php:818 +#: ../../addon/facebook/facebook.php:865 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "Afiŝado al Facebook nuligita ĉar okazis konflikto en la multretpermesoj." -#: ../../addon/facebook/facebook.php:1039 +#: ../../addon/facebook/facebook.php:1085 msgid "View on Friendica" msgstr "Vidi ĉe Friendica" -#: ../../addon/facebook/facebook.php:1072 +#: ../../addon/facebook/facebook.php:1118 msgid "Facebook post failed. Queued for retry." msgstr "Malsukcesis afiŝi ĉe Facebook. Enigita en vico." -#: ../../addon/facebook/facebook.php:1108 +#: ../../addon/facebook/facebook.php:1158 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "Via Facbook konekto iĝis nevalida. Bonvolu reaŭtentiĝi." -#: ../../addon/facebook/facebook.php:1109 +#: ../../addon/facebook/facebook.php:1159 msgid "Facebook connection became invalid" msgstr "Facebook konekto iĝis nevalida." -#: ../../addon/facebook/facebook.php:1110 +#: ../../addon/facebook/facebook.php:1160 #, php-format msgid "" "Hi %1$s,\n" @@ -4451,11 +4519,15 @@ msgid "Latest likes" msgstr "Ĵusaj ŝatitaĵoj" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook-red/theme.php:77 -#: ../../view/theme/diabook-blue/theme.php:77 -#: ../../view/theme/diabook/theme.php:83 -#: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302 -#: ../../include/conversation.php:45 ../../include/conversation.php:118 +#: ../../view/theme/diabook/diabook-green/theme.php:80 +#: ../../view/theme/diabook/diabook-red/theme.php:79 +#: ../../view/theme/diabook/diabook-blue/theme.php:79 +#: ../../view/theme/diabook/theme.php:94 +#: ../../view/theme/diabook/diabook-dark/theme.php:80 +#: ../../view/theme/diabook/diabook-aerith/theme.php:80 +#: ../../view/theme/diabook/diabook-pink/theme.php:80 +#: ../../include/text.php:1302 ../../include/conversation.php:45 +#: ../../include/conversation.php:118 msgid "event" msgstr "okazo" @@ -4671,7 +4743,7 @@ msgstr "Kolofono" #: ../../addon/impressum/impressum.php:49 #: ../../addon/impressum/impressum.php:81 msgid "Site Owner" -msgstr "Proprietulo de la laĝo" +msgstr "Proprietulo de la paĝo" #: ../../addon/impressum/impressum.php:47 #: ../../addon/impressum/impressum.php:85 @@ -4818,11 +4890,11 @@ msgstr "La Mathjax kromprogramo bildigas matematikajn formulojn skribitajn en la msgid "Use the MathJax renderer" msgstr "Ĉu uzi la Mathjax bildigilo" -#: ../../addon/mathjax/mathjax.php:72 +#: ../../addon/mathjax/mathjax.php:74 msgid "MathJax Base URL" msgstr "Mathjax Baza URL Adreso" -#: ../../addon/mathjax/mathjax.php:72 +#: ../../addon/mathjax/mathjax.php:74 msgid "" "The URL for the javascript file that should be included to use MathJax. Can " "be either the MathJax CDN or another installation of MathJax." @@ -5348,187 +5420,236 @@ msgstr "Posterous pasvorto" msgid "Post to Posterous by default" msgstr "Defaŭlte afiŝi al Posterous" -#: ../../view/theme/diabook-red/theme.php:26 -#: ../../view/theme/diabook-blue/theme.php:26 -#: ../../view/theme/diabook/theme.php:32 -#: ../../view/theme/diabook-aerith/theme.php:27 +#: ../../view/theme/diabook/diabook-green/theme.php:29 +#: ../../view/theme/diabook/diabook-red/theme.php:28 +#: ../../view/theme/diabook/diabook-blue/theme.php:28 +#: ../../view/theme/diabook/theme.php:43 +#: ../../view/theme/diabook/diabook-dark/theme.php:29 +#: ../../view/theme/diabook/diabook-aerith/theme.php:29 +#: ../../view/theme/diabook/diabook-pink/theme.php:29 msgid "Last users" msgstr "Ĵusaj uzantoj" -#: ../../view/theme/diabook-red/theme.php:55 -#: ../../view/theme/diabook-blue/theme.php:55 -#: ../../view/theme/diabook/theme.php:61 -#: ../../view/theme/diabook-aerith/theme.php:56 +#: ../../view/theme/diabook/diabook-green/theme.php:58 +#: ../../view/theme/diabook/diabook-red/theme.php:57 +#: ../../view/theme/diabook/diabook-blue/theme.php:57 +#: ../../view/theme/diabook/theme.php:72 +#: ../../view/theme/diabook/diabook-dark/theme.php:58 +#: ../../view/theme/diabook/diabook-aerith/theme.php:58 +#: ../../view/theme/diabook/diabook-pink/theme.php:58 msgid "Last likes" msgstr "Ĵusaj ŝatitaj elementoj" -#: ../../view/theme/diabook-red/theme.php:100 -#: ../../view/theme/diabook-blue/theme.php:100 -#: ../../view/theme/diabook/theme.php:106 -#: ../../view/theme/diabook-aerith/theme.php:101 +#: ../../view/theme/diabook/diabook-green/theme.php:103 +#: ../../view/theme/diabook/diabook-red/theme.php:102 +#: ../../view/theme/diabook/diabook-blue/theme.php:102 +#: ../../view/theme/diabook/theme.php:117 +#: ../../view/theme/diabook/diabook-dark/theme.php:103 +#: ../../view/theme/diabook/diabook-aerith/theme.php:103 +#: ../../view/theme/diabook/diabook-pink/theme.php:103 msgid "Last photos" msgstr "Ĵusaj bildoj" -#: ../../view/theme/diabook-red/theme.php:145 -#: ../../view/theme/diabook-blue/theme.php:145 -#: ../../view/theme/diabook/theme.php:151 -#: ../../view/theme/diabook-aerith/theme.php:146 +#: ../../view/theme/diabook/diabook-green/theme.php:141 +#: ../../view/theme/diabook/diabook-red/theme.php:139 +#: ../../view/theme/diabook/diabook-blue/theme.php:139 +#: ../../view/theme/diabook/theme.php:154 +#: ../../view/theme/diabook/diabook-dark/theme.php:141 +#: ../../view/theme/diabook/diabook-aerith/theme.php:141 +#: ../../view/theme/diabook/diabook-pink/theme.php:141 msgid "Find Friends" msgstr "Trovi Amikojn" -#: ../../view/theme/diabook-red/theme.php:146 -#: ../../view/theme/diabook-blue/theme.php:146 -#: ../../view/theme/diabook/theme.php:152 -#: ../../view/theme/diabook-aerith/theme.php:147 +#: ../../view/theme/diabook/diabook-green/theme.php:142 +#: ../../view/theme/diabook/diabook-red/theme.php:140 +#: ../../view/theme/diabook/diabook-blue/theme.php:140 +#: ../../view/theme/diabook/theme.php:155 +#: ../../view/theme/diabook/diabook-dark/theme.php:142 +#: ../../view/theme/diabook/diabook-aerith/theme.php:142 +#: ../../view/theme/diabook/diabook-pink/theme.php:142 msgid "Local Directory" msgstr "Loka Katalogo" -#: ../../view/theme/diabook-red/theme.php:148 -#: ../../view/theme/diabook-blue/theme.php:148 -#: ../../view/theme/diabook/theme.php:154 -#: ../../view/theme/diabook-aerith/theme.php:149 +#: ../../view/theme/diabook/diabook-green/theme.php:144 +#: ../../view/theme/diabook/diabook-red/theme.php:142 +#: ../../view/theme/diabook/diabook-blue/theme.php:142 +#: ../../view/theme/diabook/theme.php:157 +#: ../../view/theme/diabook/diabook-dark/theme.php:144 +#: ../../view/theme/diabook/diabook-aerith/theme.php:144 +#: ../../view/theme/diabook/diabook-pink/theme.php:144 #: ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Similaj Interesoj" -#: ../../view/theme/diabook-red/theme.php:150 -#: ../../view/theme/diabook-blue/theme.php:150 -#: ../../view/theme/diabook/theme.php:156 -#: ../../view/theme/diabook-aerith/theme.php:151 +#: ../../view/theme/diabook/diabook-green/theme.php:146 +#: ../../view/theme/diabook/diabook-red/theme.php:144 +#: ../../view/theme/diabook/diabook-blue/theme.php:144 +#: ../../view/theme/diabook/theme.php:159 +#: ../../view/theme/diabook/diabook-dark/theme.php:146 +#: ../../view/theme/diabook/diabook-aerith/theme.php:146 +#: ../../view/theme/diabook/diabook-pink/theme.php:146 #: ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Inviti amikojn" -#: ../../view/theme/diabook-red/theme.php:165 -#: ../../view/theme/diabook-red/theme.php:246 -#: ../../view/theme/diabook-blue/theme.php:165 -#: ../../view/theme/diabook-blue/theme.php:246 -#: ../../view/theme/diabook/theme.php:172 -#: ../../view/theme/diabook/theme.php:256 -#: ../../view/theme/diabook-aerith/theme.php:166 -#: ../../view/theme/diabook-aerith/theme.php:247 +#: ../../view/theme/diabook/diabook-green/theme.php:161 +#: ../../view/theme/diabook/diabook-green/theme.php:236 +#: ../../view/theme/diabook/diabook-red/theme.php:159 +#: ../../view/theme/diabook/diabook-red/theme.php:234 +#: ../../view/theme/diabook/diabook-blue/theme.php:159 +#: ../../view/theme/diabook/diabook-blue/theme.php:234 +#: ../../view/theme/diabook/theme.php:175 +#: ../../view/theme/diabook/theme.php:253 +#: ../../view/theme/diabook/diabook-dark/theme.php:161 +#: ../../view/theme/diabook/diabook-dark/theme.php:236 +#: ../../view/theme/diabook/diabook-aerith/theme.php:161 +#: ../../view/theme/diabook/diabook-aerith/theme.php:236 +#: ../../view/theme/diabook/diabook-pink/theme.php:161 +#: ../../view/theme/diabook/diabook-pink/theme.php:236 msgid "Community Pages" msgstr "Komunumaj paĝoj" -#: ../../view/theme/diabook-red/theme.php:198 -#: ../../view/theme/diabook-blue/theme.php:198 -#: ../../view/theme/diabook/theme.php:205 -#: ../../view/theme/diabook-aerith/theme.php:199 +#: ../../view/theme/diabook/diabook-green/theme.php:194 +#: ../../view/theme/diabook/diabook-red/theme.php:192 +#: ../../view/theme/diabook/diabook-blue/theme.php:192 +#: ../../view/theme/diabook/theme.php:208 +#: ../../view/theme/diabook/diabook-dark/theme.php:194 +#: ../../view/theme/diabook/diabook-aerith/theme.php:194 +#: ../../view/theme/diabook/diabook-pink/theme.php:194 msgid "Help or @NewHere ?" msgstr "Helpu aŭ @NewHere ?" -#: ../../view/theme/diabook-red/theme.php:204 -#: ../../view/theme/diabook-blue/theme.php:204 -#: ../../view/theme/diabook/theme.php:211 -#: ../../view/theme/diabook-aerith/theme.php:205 +#: ../../view/theme/diabook/diabook-green/theme.php:200 +#: ../../view/theme/diabook/diabook-red/theme.php:198 +#: ../../view/theme/diabook/diabook-blue/theme.php:198 +#: ../../view/theme/diabook/theme.php:214 +#: ../../view/theme/diabook/diabook-dark/theme.php:200 +#: ../../view/theme/diabook/diabook-aerith/theme.php:200 +#: ../../view/theme/diabook/diabook-pink/theme.php:200 msgid "Connect Services" msgstr "Konekti Servojn" -#: ../../view/theme/diabook-red/theme.php:210 -#: ../../view/theme/diabook-blue/theme.php:210 -#: ../../view/theme/diabook/theme.php:217 -#: ../../view/theme/diabook-aerith/theme.php:211 -msgid "PostIt to Friendica" -msgstr "PostIt al Friendica" - -#: ../../view/theme/diabook-red/theme.php:210 -#: ../../view/theme/diabook-blue/theme.php:210 -#: ../../view/theme/diabook/theme.php:217 -#: ../../view/theme/diabook-aerith/theme.php:211 -msgid "Post to Friendica" -msgstr "Afiŝi al Friendica" - -#: ../../view/theme/diabook-red/theme.php:211 -#: ../../view/theme/diabook-blue/theme.php:211 -#: ../../view/theme/diabook/theme.php:218 -#: ../../view/theme/diabook-aerith/theme.php:212 -msgid " from anywhere by bookmarking this Link." -msgstr " de iu kun ĉi tio ligilo." - -#: ../../view/theme/diabook-red/theme.php:239 -#: ../../view/theme/diabook-blue/theme.php:239 -#: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49 -#: ../../include/nav.php:115 +#: ../../view/theme/diabook/diabook-green/theme.php:229 +#: ../../view/theme/diabook/diabook-red/theme.php:227 +#: ../../view/theme/diabook/diabook-blue/theme.php:227 +#: ../../view/theme/diabook/theme.php:246 +#: ../../view/theme/diabook/diabook-dark/theme.php:229 +#: ../../view/theme/diabook/diabook-aerith/theme.php:229 +#: ../../view/theme/diabook/diabook-pink/theme.php:229 +#: ../../include/nav.php:49 ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Viaj afiŝoj kaj komunikadoj" -#: ../../view/theme/diabook-red/theme.php:240 -#: ../../view/theme/diabook-blue/theme.php:240 -#: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50 +#: ../../view/theme/diabook/diabook-green/theme.php:230 +#: ../../view/theme/diabook/diabook-red/theme.php:228 +#: ../../view/theme/diabook/diabook-blue/theme.php:228 +#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook/diabook-dark/theme.php:230 +#: ../../view/theme/diabook/diabook-aerith/theme.php:230 +#: ../../view/theme/diabook/diabook-pink/theme.php:230 +#: ../../include/nav.php:50 msgid "Your profile page" msgstr "Via profilo" -#: ../../view/theme/diabook-red/theme.php:241 -#: ../../view/theme/diabook-blue/theme.php:241 -#: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook-aerith/theme.php:242 +#: ../../view/theme/diabook/diabook-green/theme.php:231 +#: ../../view/theme/diabook/diabook-red/theme.php:229 +#: ../../view/theme/diabook/diabook-blue/theme.php:229 +#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook/diabook-dark/theme.php:231 +#: ../../view/theme/diabook/diabook-aerith/theme.php:231 +#: ../../view/theme/diabook/diabook-pink/theme.php:231 msgid "Your contacts" msgstr "Viaj kontaktoj" -#: ../../view/theme/diabook-red/theme.php:242 -#: ../../view/theme/diabook-blue/theme.php:242 -#: ../../view/theme/diabook/theme.php:252 -#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51 -#: ../../boot.php:1463 -msgid "Photos" -msgstr "Bildoj" - -#: ../../view/theme/diabook-red/theme.php:242 -#: ../../view/theme/diabook-blue/theme.php:242 -#: ../../view/theme/diabook/theme.php:252 -#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51 +#: ../../view/theme/diabook/diabook-green/theme.php:232 +#: ../../view/theme/diabook/diabook-red/theme.php:230 +#: ../../view/theme/diabook/diabook-blue/theme.php:230 +#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook/diabook-dark/theme.php:232 +#: ../../view/theme/diabook/diabook-aerith/theme.php:232 +#: ../../view/theme/diabook/diabook-pink/theme.php:232 +#: ../../include/nav.php:51 msgid "Your photos" msgstr "Viaj bildoj" -#: ../../view/theme/diabook-red/theme.php:243 -#: ../../view/theme/diabook-blue/theme.php:243 -#: ../../view/theme/diabook/theme.php:253 -#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52 +#: ../../view/theme/diabook/diabook-green/theme.php:233 +#: ../../view/theme/diabook/diabook-red/theme.php:231 +#: ../../view/theme/diabook/diabook-blue/theme.php:231 +#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook/diabook-dark/theme.php:233 +#: ../../view/theme/diabook/diabook-aerith/theme.php:233 +#: ../../view/theme/diabook/diabook-pink/theme.php:233 +#: ../../include/nav.php:52 msgid "Your events" msgstr "Viaj okazoj" -#: ../../view/theme/diabook-red/theme.php:244 -#: ../../view/theme/diabook-blue/theme.php:244 -#: ../../view/theme/diabook/theme.php:254 -#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53 +#: ../../view/theme/diabook/diabook-green/theme.php:234 +#: ../../view/theme/diabook/diabook-red/theme.php:232 +#: ../../view/theme/diabook/diabook-blue/theme.php:232 +#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook/diabook-dark/theme.php:234 +#: ../../view/theme/diabook/diabook-aerith/theme.php:234 +#: ../../view/theme/diabook/diabook-pink/theme.php:234 +#: ../../include/nav.php:53 msgid "Personal notes" msgstr "Personaj notoj" -#: ../../view/theme/diabook-red/theme.php:244 -#: ../../view/theme/diabook-blue/theme.php:244 -#: ../../view/theme/diabook/theme.php:254 -#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53 +#: ../../view/theme/diabook/diabook-green/theme.php:234 +#: ../../view/theme/diabook/diabook-red/theme.php:232 +#: ../../view/theme/diabook/diabook-blue/theme.php:232 +#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook/diabook-dark/theme.php:234 +#: ../../view/theme/diabook/diabook-aerith/theme.php:234 +#: ../../view/theme/diabook/diabook-pink/theme.php:234 +#: ../../include/nav.php:53 msgid "Your personal photos" msgstr "Viaj personaj bildoj" -#: ../../view/theme/diabook-red/config.php:66 -#: ../../view/theme/diabook-blue/config.php:66 -#: ../../view/theme/diabook/config.php:78 +#: ../../view/theme/diabook/diabook-green/config.php:78 +#: ../../view/theme/diabook/diabook-red/config.php:78 +#: ../../view/theme/diabook/diabook-blue/config.php:78 +#: ../../view/theme/diabook/diabook-dark/config.php:78 +#: ../../view/theme/diabook/diabook-aerith/config.php:78 +#: ../../view/theme/diabook/diabook-pink/config.php:78 +#: ../../view/theme/diabook/config.php:93 #: ../../view/theme/quattro/config.php:54 -#: ../../view/theme/diabook-aerith/config.php:66 msgid "Theme settings" msgstr "Agordoj pri la etoso" -#: ../../view/theme/diabook-red/config.php:67 -#: ../../view/theme/diabook-blue/config.php:67 -#: ../../view/theme/diabook/config.php:79 -#: ../../view/theme/diabook-aerith/config.php:67 +#: ../../view/theme/diabook/diabook-green/config.php:79 +#: ../../view/theme/diabook/diabook-red/config.php:79 +#: ../../view/theme/diabook/diabook-blue/config.php:79 +#: ../../view/theme/diabook/diabook-dark/config.php:79 +#: ../../view/theme/diabook/diabook-aerith/config.php:79 +#: ../../view/theme/diabook/diabook-pink/config.php:79 +#: ../../view/theme/diabook/config.php:94 msgid "Set font-size for posts and comments" msgstr "Agordi la tiparan grandon por afiŝoj kaj komentoj" -#: ../../view/theme/diabook-red/config.php:68 -#: ../../view/theme/diabook-blue/config.php:68 -#: ../../view/theme/diabook/config.php:80 -#: ../../view/theme/diabook-aerith/config.php:68 +#: ../../view/theme/diabook/diabook-green/config.php:80 +#: ../../view/theme/diabook/diabook-red/config.php:80 +#: ../../view/theme/diabook/diabook-blue/config.php:80 +#: ../../view/theme/diabook/diabook-dark/config.php:80 +#: ../../view/theme/diabook/diabook-aerith/config.php:80 +#: ../../view/theme/diabook/diabook-pink/config.php:80 +#: ../../view/theme/diabook/config.php:95 msgid "Set line-height for posts and comments" msgstr "Agordi la linigrandon por afiŝoj kaj komentoj" -#: ../../view/theme/diabook/config.php:81 +#: ../../view/theme/diabook/diabook-green/config.php:81 +#: ../../view/theme/diabook/diabook-red/config.php:81 +#: ../../view/theme/diabook/diabook-blue/config.php:81 +#: ../../view/theme/diabook/diabook-dark/config.php:81 +#: ../../view/theme/diabook/diabook-aerith/config.php:81 +#: ../../view/theme/diabook/diabook-pink/config.php:81 +#: ../../view/theme/diabook/config.php:96 msgid "Set resolution for middle column" msgstr "Agordi la distingivon por la meza kolumno" +#: ../../view/theme/diabook/config.php:97 +msgid "Set color scheme" +msgstr "Agordi Kolorskemon" + #: ../../view/theme/quattro/config.php:55 msgid "Alignment" msgstr "Ĝisrandigo" @@ -5558,7 +5679,7 @@ msgid "j F" msgstr "j F" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:448 -#: ../../include/items.php:1402 +#: ../../include/items.php:1403 msgid "Birthday:" msgstr "Naskiĝtago:" @@ -6111,7 +6232,7 @@ msgstr "Kunsendaĵoj:" msgid "[Relayed] Comment authored by %s from network %s" msgstr "[Plusendita] %s en la reto %s skribis komenton" -#: ../../include/network.php:823 +#: ../../include/network.php:824 msgid "view full size" msgstr "vidi plengrande" @@ -6244,7 +6365,7 @@ msgstr "Administri aliajn paĝojn" #: ../../include/nav.php:138 ../../boot.php:1043 msgid "Profiles" -msgstr "Profiloj:" +msgstr "Profiloj" #: ../../include/nav.php:138 ../../boot.php:1043 msgid "Manage/edit profiles" @@ -6439,11 +6560,11 @@ msgstr "Videbla al ĉiuj" #: ../../include/acl_selectors.php:287 msgid "show" -msgstr "montru" +msgstr "montri" #: ../../include/acl_selectors.php:288 msgid "don't show" -msgstr "ne montru" +msgstr "kaŝi" #: ../../include/enotify.php:14 msgid "Friendica Notification" @@ -6633,11 +6754,11 @@ msgstr "Bildo:" msgid "Please visit %s to approve or reject the suggestion." msgstr "Bonvolu viziti %s por aprobi aŭ malaprobi la sugeston." -#: ../../include/items.php:2697 +#: ../../include/items.php:2698 msgid "A new person is sharing with you at " msgstr "Nova persono kunhavigas kun vi ĉe " -#: ../../include/items.php:2697 +#: ../../include/items.php:2698 msgid "You have a new follower at " msgstr "Vi havas novan sekvanton ĉe " @@ -6719,7 +6840,7 @@ msgstr "Vidi la profilon de %s ĉe %s" msgid "%s from %s" msgstr "%s de %s" -#: ../../include/conversation.php:360 +#: ../../include/conversation.php:359 msgid "View in context" msgstr "Vidi kun kunteksto" diff --git a/view/eo/passchanged_eml.tpl b/view/eo/passchanged_eml.tpl new file mode 100644 index 000000000..ee775d5dd --- /dev/null +++ b/view/eo/passchanged_eml.tpl @@ -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 + + \ No newline at end of file diff --git a/view/eo/register_open_eml.tpl b/view/eo/register_open_eml.tpl new file mode 100644 index 000000000..735ea9a4b --- /dev/null +++ b/view/eo/register_open_eml.tpl @@ -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 + + \ No newline at end of file diff --git a/view/eo/register_verify_eml.tpl b/view/eo/register_verify_eml.tpl new file mode 100644 index 000000000..cc99ab4b6 --- /dev/null +++ b/view/eo/register_verify_eml.tpl @@ -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! diff --git a/view/eo/request_notify_eml.tpl b/view/eo/request_notify_eml.tpl new file mode 100644 index 000000000..eb91414b9 --- /dev/null +++ b/view/eo/request_notify_eml.tpl @@ -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 \ No newline at end of file diff --git a/view/eo/strings.php b/view/eo/strings.php index 33c856ed0..ed473ec07 100644 --- a/view/eo/strings.php +++ b/view/eo/strings.php @@ -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 not published."] = "Profilo ne estas publika."; $a->strings["or"] = "aŭ"; -$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"; @@ -1049,7 +1051,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!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "La kolofono (impressum) kromprogramo bezonas agordojn!
Bonvolu aldoni minimume la owner variablon al via agorda dosiero. Por aliaj variabloj, bonvolu legi la README dosieron de la kromprogramo."; @@ -1212,13 +1214,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 +1225,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 +1405,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 +1455,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"; diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl index 33d0f508c..dd89b81a9 100644 --- a/view/theme/diabook/admin_site.tpl +++ b/view/theme/diabook/admin_site.tpl @@ -8,7 +8,7 @@

$title - $page

- + {{ inc field_input.tpl with $field=$sitename }}{{ endinc }} {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }} {{ inc field_select.tpl with $field=$language }}{{ endinc }} diff --git a/view/theme/diabook/diabook-aerith/admin_users.tpl b/view/theme/diabook/diabook-aerith/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-aerith/admin_users.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -
-

$title - $page

- - - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
-
$select_all
-
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl b/view/theme/diabook/diabook-aerith/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-aerith/comment_item.tpl b/view/theme/diabook/diabook-aerith/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-aerith/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-aerith/communityhome.tpl b/view/theme/diabook/diabook-aerith/communityhome.tpl deleted file mode 100644 index 875d83f1b..000000000 --- a/view/theme/diabook/diabook-aerith/communityhome.tpl +++ /dev/null @@ -1,86 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$con_services.title.1

-
-Facebook -StatusNet -LiveJournal -Posterous -Tumblr -Twitter -WordPress -E-Mail -
-{{ endif }} -
- -
-{{ if $nv }} -

$nv.title.1

-$nv.directory.1
-$nv.global_directory.1
-$nv.match.1
-$nv.suggest.1
-$nv.invite.1 -$nv.search -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$lastusers_title

-
-{{ for $lastusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- - -{{ if $activeusers_title }} -

$activeusers_title

-
-{{ for $activeusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - -
-{{ if $photos_title }} -

$photos_title

-
-{{ for $photos_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- -
-{{ if $like_title }} -

$like_title

-
    -{{ for $like_items as $i }} -
  • $i
    • -{{ endfor }} -
-{{ endif }} -
diff --git a/view/theme/diabook/diabook-aerith/config.php b/view/theme/diabook/diabook-aerith/config.php deleted file mode 100644 index 0083a4df7..000000000 --- a/view/theme/diabook/diabook-aerith/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"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; -} diff --git a/view/theme/diabook/diabook-aerith/contact_template.tpl b/view/theme/diabook/diabook-aerith/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-aerith/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-aerith/directory_item.tpl b/view/theme/diabook/diabook-aerith/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-aerith/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-aerith/generic_links_widget.tpl b/view/theme/diabook/diabook-aerith/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-aerith/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - -
    - {{ for $items as $item }} -
  • $item.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-aerith/group_side.tpl b/view/theme/diabook/diabook-aerith/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-aerith/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-aerith/jot.tpl b/view/theme/diabook/diabook-aerith/jot.tpl deleted file mode 100644 index 0928c9f36..000000000 --- a/view/theme/diabook/diabook-aerith/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- - - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-aerith/js/README b/view/theme/diabook/diabook-aerith/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-aerith/js/README +++ /dev/null @@ -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 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-aerith/js/jquery.autogrow.textarea.js +++ /dev/null @@ -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 = $('
').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, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - 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); \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/js/jquery.cookie.js b/view/theme/diabook/diabook-aerith/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-aerith/js/jquery.cookie.js +++ /dev/null @@ -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); diff --git a/view/theme/diabook/diabook-aerith/login.tpl b/view/theme/diabook/diabook-aerith/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-aerith/login.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -
- - -
- {{ inc field_input.tpl with $field=$lname }}{{ endinc }} - {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} -
- - {{ if $openid }} -
- {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }} -
- {{ endif }} - -
- -
- - - - {{ for $hiddens as $k=>$v }} - - {{ endfor }} - - -
- - - diff --git a/view/theme/diabook/diabook-aerith/mail_conv.tpl b/view/theme/diabook/diabook-aerith/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-aerith/mail_conv.tpl +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- -
-
- $mail.body -
-
-
-
-
-
-
-
-
-
-
-
-
- $mail.from_name $mail.date -
- -
-
- -
- $mail.delete -
- -
-
-
-
-
- - -{# - - -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
$mail.body
-
-
-
-
-
- -#} diff --git a/view/theme/diabook/diabook-aerith/mail_display.tpl b/view/theme/diabook/diabook-aerith/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-aerith/mail_display.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
- $thread_subject - -
- -{{ for $mails as $mail }} -
- {{ inc mail_conv.tpl }}{{endinc}} -
-{{ endfor }} - -{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook/diabook-aerith/mail_list.tpl b/view/theme/diabook/diabook-aerith/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-aerith/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-aerith/message_side.tpl b/view/theme/diabook/diabook-aerith/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-aerith/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-aerith/nav.tpl b/view/theme/diabook/diabook-aerith/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-aerith/nav.tpl +++ /dev/null @@ -1,190 +0,0 @@ -
-
$sitelocation
- -
- - - - -
$langselector
-
- - - - - - - - -{# - -{{ if $nav.logout }}$nav.logout.1 {{ endif }} -{{ if $nav.login }} {{ endif }} - - - -{{ if $nav.register }}$nav.register.1{{ endif }} - -$nav.help.1 - -{{ if $nav.apps }}$nav.apps.1{{ endif }} - -$nav.search.1 -$nav.directory.1 - -{{ if $nav.admin }}$nav.admin.1{{ endif }} - -{{ if $nav.notifications }} -$nav.notifications.1 - -{{ endif }} -{{ if $nav.messages }} -$nav.messages.1 - -{{ endif }} - -{{ if $nav.manage }}$nav.manage.1{{ endif }} - -{{ if $nav.settings }}$nav.settings.1{{ endif }} -{{ if $nav.profiles }}$nav.profiles.1{{ endif }} - - - - - -#} diff --git a/view/theme/diabook/diabook-aerith/nets.tpl b/view/theme/diabook/diabook-aerith/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-aerith/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-aerith/oembed_video.tpl b/view/theme/diabook/diabook-aerith/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-aerith/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-aerith/photo_item.tpl b/view/theme/diabook/diabook-aerith/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-aerith/photo_item.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{{ if $indent }}{{ else }} -
- -
-{{ endif }} - -
-
-
-
- - $name - - menu - - -
-
-
- $name - - - {{ if $plink }}$ago{{ else }} $ago {{ endif }} - {{ if $lock }} - $lock {{ endif }} - -
-
- {{ if $title }}

$title

{{ endif }} - $body -
-
-
-
-
-
- {{ for $tags as $tag }} - $tag - {{ endfor }} -
-
- -
-
-
-
- -
- - {{ if $drop.dropping }} - - $drop.delete - {{ endif }} - {{ if $edpost }} - - {{ endif }} -
- -
-
-
- -
-
- diff --git a/view/theme/diabook/diabook-aerith/photo_view.tpl b/view/theme/diabook/diabook-aerith/photo_view.tpl deleted file mode 100644 index 071972e0c..000000000 --- a/view/theme/diabook/diabook-aerith/photo_view.tpl +++ /dev/null @@ -1,35 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} -
- -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -
-
-
-$comments -
- -$paginate diff --git a/view/theme/diabook/diabook-aerith/profile_side.tpl b/view/theme/diabook/diabook-aerith/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-aerith/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-aerith/profile_vcard.tpl b/view/theme/diabook/diabook-aerith/profile_vcard.tpl deleted file mode 100644 index 6fcffcc9b..000000000 --- a/view/theme/diabook/diabook-aerith/profile_vcard.tpl +++ /dev/null @@ -1,64 +0,0 @@ -
- -
-
$profile.name
- {{ if $profile.edit }} -
- $profile.edit.1 - -
- {{ endif }} -
- - - -
$profile.name
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} - - - {{ if $location }} -
$location

-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/diabook/diabook-aerith/right_aside.tpl b/view/theme/diabook/diabook-aerith/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-aerith/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/screenshot.png b/view/theme/diabook/diabook-aerith/screenshot.png deleted file mode 100644 index 4eee5be5a..000000000 Binary files a/view/theme/diabook/diabook-aerith/screenshot.png and /dev/null differ diff --git a/view/theme/diabook/diabook-aerith/search_item.tpl b/view/theme/diabook/diabook-aerith/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-aerith/search_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-aerith/style.php b/view/theme/diabook/diabook-aerith/style.php deleted file mode 100644 index b8c37fc96..000000000 --- a/view/theme/diabook/diabook-aerith/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $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 = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //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 = '' . $post_type . ''; - - $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'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $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 .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //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('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $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('', $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('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-aerith/theme_settings.tpl b/view/theme/diabook/diabook-aerith/theme_settings.tpl deleted file mode 100644 index 472232cf0..000000000 --- a/view/theme/diabook/diabook-aerith/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{inc field_select.tpl with $field=$font_size}}{{endinc}} - -{{inc field_select.tpl with $field=$line_height}}{{endinc}} - -{{inc field_select.tpl with $field=$resolution}}{{endinc}} - -
- -
- diff --git a/view/theme/diabook/diabook-aerith/wall_item.tpl b/view/theme/diabook/diabook-aerith/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-aerith/wall_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-aerith/wallwall_item.tpl b/view/theme/diabook/diabook-aerith/wallwall_item.tpl deleted file mode 100644 index 6a0c93f88..000000000 --- a/view/theme/diabook/diabook-aerith/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/admin_users.tpl b/view/theme/diabook/diabook-blue/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-blue/admin_users.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -
-

$title - $page

- - - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
-
$select_all
-
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-blue/ch_directory_item.tpl b/view/theme/diabook/diabook-blue/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-blue/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-blue/comment_item.tpl b/view/theme/diabook/diabook-blue/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-blue/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-blue/communityhome.tpl b/view/theme/diabook/diabook-blue/communityhome.tpl deleted file mode 100644 index 6ac414ef4..000000000 --- a/view/theme/diabook/diabook-blue/communityhome.tpl +++ /dev/null @@ -1,87 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$con_services.title.1

-
-Facebook -StatusNet -LiveJournal -Posterous -Tumblr -Twitter -WordPress -E-Mail -
-{{ endif }} -
- -
-{{ if $nv }} -

$nv.title.1

-$nv.directory.1
-$nv.global_directory.1
-$nv.match.1
-$nv.suggest.1
-$nv.invite.1 -$nv.search -{{ endif }} -
- - -
-{{ if $lastusers_title }} -

$lastusers_title

-
-{{ for $lastusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- - -{{ if $activeusers_title }} -

$activeusers_title

-
-{{ for $activeusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - -
-{{ if $photos_title }} -

$photos_title

-
-{{ for $photos_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- -
-{{ if $like_title }} -

$like_title

-
    -{{ for $like_items as $i }} -
  • $i
    • -{{ endfor }} -
-{{ endif }} -
diff --git a/view/theme/diabook/diabook-blue/config.php b/view/theme/diabook/diabook-blue/config.php deleted file mode 100644 index 40a6415f0..000000000 --- a/view/theme/diabook/diabook-blue/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"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-blue_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), - '$line_height' => array('diabook-blue_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), - '$resolution' => array('diabook-blue_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), - )); - return $o; -} diff --git a/view/theme/diabook/diabook-blue/contact_template.tpl b/view/theme/diabook/diabook-blue/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-blue/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-blue/directory_item.tpl b/view/theme/diabook/diabook-blue/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-blue/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-blue/generic_links_widget.tpl b/view/theme/diabook/diabook-blue/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-blue/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - -
    - {{ for $items as $item }} -
  • $item.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-blue/group_side.tpl b/view/theme/diabook/diabook-blue/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-blue/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-blue/jot.tpl b/view/theme/diabook/diabook-blue/jot.tpl deleted file mode 100644 index 982201f56..000000000 --- a/view/theme/diabook/diabook-blue/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
-
- -
- - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-blue/js/README b/view/theme/diabook/diabook-blue/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-blue/js/README +++ /dev/null @@ -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 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-blue/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-blue/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-blue/js/jquery.autogrow.textarea.js +++ /dev/null @@ -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 = $('
').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, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - 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); \ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/js/jquery.cookie.js b/view/theme/diabook/diabook-blue/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-blue/js/jquery.cookie.js +++ /dev/null @@ -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); diff --git a/view/theme/diabook/diabook-blue/login.tpl b/view/theme/diabook/diabook-blue/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-blue/login.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -
- - -
- {{ inc field_input.tpl with $field=$lname }}{{ endinc }} - {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} -
- - {{ if $openid }} -
- {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }} -
- {{ endif }} - -
- -
- - - - {{ for $hiddens as $k=>$v }} - - {{ endfor }} - - -
- - - diff --git a/view/theme/diabook/diabook-blue/mail_conv.tpl b/view/theme/diabook/diabook-blue/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-blue/mail_conv.tpl +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- -
-
- $mail.body -
-
-
-
-
-
-
-
-
-
-
-
-
- $mail.from_name $mail.date -
- -
-
- -
- $mail.delete -
- -
-
-
-
-
- - -{# - - -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
$mail.body
-
-
-
-
-
- -#} diff --git a/view/theme/diabook/diabook-blue/mail_display.tpl b/view/theme/diabook/diabook-blue/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-blue/mail_display.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
- $thread_subject - -
- -{{ for $mails as $mail }} -
- {{ inc mail_conv.tpl }}{{endinc}} -
-{{ endfor }} - -{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook/diabook-blue/mail_list.tpl b/view/theme/diabook/diabook-blue/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-blue/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-blue/message_side.tpl b/view/theme/diabook/diabook-blue/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-blue/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-blue/nav.tpl b/view/theme/diabook/diabook-blue/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-blue/nav.tpl +++ /dev/null @@ -1,190 +0,0 @@ -
-
$sitelocation
- -
- - - - -
$langselector
-
- - - - - - - - -{# - -{{ if $nav.logout }}$nav.logout.1 {{ endif }} -{{ if $nav.login }} {{ endif }} - - - -{{ if $nav.register }}$nav.register.1{{ endif }} - -$nav.help.1 - -{{ if $nav.apps }}$nav.apps.1{{ endif }} - -$nav.search.1 -$nav.directory.1 - -{{ if $nav.admin }}$nav.admin.1{{ endif }} - -{{ if $nav.notifications }} -$nav.notifications.1 - -{{ endif }} -{{ if $nav.messages }} -$nav.messages.1 - -{{ endif }} - -{{ if $nav.manage }}$nav.manage.1{{ endif }} - -{{ if $nav.settings }}$nav.settings.1{{ endif }} -{{ if $nav.profiles }}$nav.profiles.1{{ endif }} - - - - - -#} diff --git a/view/theme/diabook/diabook-blue/nets.tpl b/view/theme/diabook/diabook-blue/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-blue/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-blue/oembed_video.tpl b/view/theme/diabook/diabook-blue/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-blue/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-blue/photo_item.tpl b/view/theme/diabook/diabook-blue/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-blue/photo_item.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{{ if $indent }}{{ else }} -
- -
-{{ endif }} - -
-
-
-
- - $name - - menu - - -
-
-
- $name - - - {{ if $plink }}$ago{{ else }} $ago {{ endif }} - {{ if $lock }} - $lock {{ endif }} - -
-
- {{ if $title }}

$title

{{ endif }} - $body -
-
-
-
-
-
- {{ for $tags as $tag }} - $tag - {{ endfor }} -
-
- -
-
-
-
- -
- - {{ if $drop.dropping }} - - $drop.delete - {{ endif }} - {{ if $edpost }} - - {{ endif }} -
- -
-
-
- -
-
- diff --git a/view/theme/diabook/diabook-blue/photo_view.tpl b/view/theme/diabook/diabook-blue/photo_view.tpl deleted file mode 100644 index 93b01d623..000000000 --- a/view/theme/diabook/diabook-blue/photo_view.tpl +++ /dev/null @@ -1,37 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} -
- -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -
-
-
-$comments -
- -$paginate - - diff --git a/view/theme/diabook/diabook-blue/profile_side.tpl b/view/theme/diabook/diabook-blue/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-blue/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-blue/profile_vcard.tpl b/view/theme/diabook/diabook-blue/profile_vcard.tpl deleted file mode 100644 index 6fcffcc9b..000000000 --- a/view/theme/diabook/diabook-blue/profile_vcard.tpl +++ /dev/null @@ -1,64 +0,0 @@ -
- -
-
$profile.name
- {{ if $profile.edit }} -
- $profile.edit.1 - -
- {{ endif }} -
- - - -
$profile.name
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} - - - {{ if $location }} -
$location

-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/diabook/diabook-blue/right_aside.tpl b/view/theme/diabook/diabook-blue/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-blue/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-blue/screenshot.png b/view/theme/diabook/diabook-blue/screenshot.png deleted file mode 100644 index 5b719c701..000000000 Binary files a/view/theme/diabook/diabook-blue/screenshot.png and /dev/null differ diff --git a/view/theme/diabook/diabook-blue/search_item.tpl b/view/theme/diabook/diabook-blue/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-blue/search_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-blue/style.php b/view/theme/diabook/diabook-blue/style.php deleted file mode 100644 index c6b467999..000000000 --- a/view/theme/diabook/diabook-blue/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $diabook_version); - -//change css on network and profilepages -$cssFile = null; -$resolution=false; -$resolution = get_pconfig(local_user(), "diabook-blue", "resolution"); -if ($resolution===false) $resolution="normal"; - -/** - * prints last community activity - */ -function diabook_blue_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 = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //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 = '' . $post_type . ''; - - $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'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $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 .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //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_blue_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/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_blue_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile-wide.css";} - } -} - - -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); - -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; diff --git a/view/theme/diabook/diabook-blue/theme_settings.tpl b/view/theme/diabook/diabook-blue/theme_settings.tpl deleted file mode 100644 index 0e5f4eb21..000000000 --- a/view/theme/diabook/diabook-blue/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{inc field_select.tpl with $field=$font_size}}{{endinc}} - -{{inc field_select.tpl with $field=$line_height}}{{endinc}} - -{{inc field_select.tpl with $field=$resolution}}{{endinc}} - -
- -
- diff --git a/view/theme/diabook/diabook-blue/wall_item.tpl b/view/theme/diabook/diabook-blue/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-blue/wall_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-blue/wallwall_item.tpl b/view/theme/diabook/diabook-blue/wallwall_item.tpl deleted file mode 100644 index bee75ad99..000000000 --- a/view/theme/diabook/diabook-blue/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/admin_users.tpl b/view/theme/diabook/diabook-dark/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-dark/admin_users.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -
-

$title - $page

- - - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
-
$select_all
-
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-dark/ch_directory_item.tpl b/view/theme/diabook/diabook-dark/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-dark/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-dark/comment_item.tpl b/view/theme/diabook/diabook-dark/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-dark/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-dark/communityhome.tpl b/view/theme/diabook/diabook-dark/communityhome.tpl deleted file mode 100644 index 875d83f1b..000000000 --- a/view/theme/diabook/diabook-dark/communityhome.tpl +++ /dev/null @@ -1,86 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$con_services.title.1

-
-Facebook -StatusNet -LiveJournal -Posterous -Tumblr -Twitter -WordPress -E-Mail -
-{{ endif }} -
- -
-{{ if $nv }} -

$nv.title.1

-$nv.directory.1
-$nv.global_directory.1
-$nv.match.1
-$nv.suggest.1
-$nv.invite.1 -$nv.search -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$lastusers_title

-
-{{ for $lastusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- - -{{ if $activeusers_title }} -

$activeusers_title

-
-{{ for $activeusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - -
-{{ if $photos_title }} -

$photos_title

-
-{{ for $photos_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- -
-{{ if $like_title }} -

$like_title

-
    -{{ for $like_items as $i }} -
  • $i
    • -{{ endfor }} -
-{{ endif }} -
diff --git a/view/theme/diabook/diabook-dark/config.php b/view/theme/diabook/diabook-dark/config.php deleted file mode 100644 index a8dd1376a..000000000 --- a/view/theme/diabook/diabook-dark/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"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-dark_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), - '$line_height' => array('diabook-dark_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), - '$resolution' => array('diabook-dark_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), - )); - return $o; -} diff --git a/view/theme/diabook/diabook-dark/contact_template.tpl b/view/theme/diabook/diabook-dark/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-dark/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-dark/directory_item.tpl b/view/theme/diabook/diabook-dark/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-dark/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-dark/generic_links_widget.tpl b/view/theme/diabook/diabook-dark/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-dark/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - -
    - {{ for $items as $item }} -
  • $item.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-dark/group_side.tpl b/view/theme/diabook/diabook-dark/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-dark/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-dark/icons/contacts.png b/view/theme/diabook/diabook-dark/icons/contacts.png index 79f6d497c..08ea9c53e 100644 Binary files a/view/theme/diabook/diabook-dark/icons/contacts.png and b/view/theme/diabook/diabook-dark/icons/contacts.png differ diff --git a/view/theme/diabook/diabook-dark/icons/contacts2.png b/view/theme/diabook/diabook-dark/icons/contacts2.png index cd0e289a7..2c6013ced 100644 Binary files a/view/theme/diabook/diabook-dark/icons/contacts2.png and b/view/theme/diabook/diabook-dark/icons/contacts2.png differ diff --git a/view/theme/diabook/diabook-dark/icons/contacts3.png b/view/theme/diabook/diabook-dark/icons/contacts3.png index cd0e289a7..53ce579df 100644 Binary files a/view/theme/diabook/diabook-dark/icons/contacts3.png and b/view/theme/diabook/diabook-dark/icons/contacts3.png differ diff --git a/view/theme/diabook/diabook-dark/icons/dislike.png b/view/theme/diabook/diabook-dark/icons/dislike.png index 23de426c5..e9db47780 100644 Binary files a/view/theme/diabook/diabook-dark/icons/dislike.png and b/view/theme/diabook/diabook-dark/icons/dislike.png differ diff --git a/view/theme/diabook/diabook-dark/icons/drop.png b/view/theme/diabook/diabook-dark/icons/drop.png index 2abb82ef2..9799c31af 100644 Binary files a/view/theme/diabook/diabook-dark/icons/drop.png and b/view/theme/diabook/diabook-dark/icons/drop.png differ diff --git a/view/theme/diabook/diabook-dark/icons/file_as.png b/view/theme/diabook/diabook-dark/icons/file_as.png index 16713fa53..6a7343642 100644 Binary files a/view/theme/diabook/diabook-dark/icons/file_as.png and b/view/theme/diabook/diabook-dark/icons/file_as.png differ diff --git a/view/theme/diabook/diabook-dark/icons/like.png b/view/theme/diabook/diabook-dark/icons/like.png index b65edccc0..84b7db18a 100644 Binary files a/view/theme/diabook/diabook-dark/icons/like.png and b/view/theme/diabook/diabook-dark/icons/like.png differ diff --git a/view/theme/diabook/diabook-dark/icons/link.png b/view/theme/diabook/diabook-dark/icons/link.png index 0ef666a67..ac3bde7db 100644 Binary files a/view/theme/diabook/diabook-dark/icons/link.png and b/view/theme/diabook/diabook-dark/icons/link.png differ diff --git a/view/theme/diabook/diabook-dark/icons/lock.png b/view/theme/diabook/diabook-dark/icons/lock.png index 7e34bf279..641873ba2 100644 Binary files a/view/theme/diabook/diabook-dark/icons/lock.png and b/view/theme/diabook/diabook-dark/icons/lock.png differ diff --git a/view/theme/diabook/diabook-dark/icons/messages.png b/view/theme/diabook/diabook-dark/icons/messages.png index c83ba186a..3076f43cd 100644 Binary files a/view/theme/diabook/diabook-dark/icons/messages.png and b/view/theme/diabook/diabook-dark/icons/messages.png differ diff --git a/view/theme/diabook/diabook-dark/icons/messages2.png b/view/theme/diabook/diabook-dark/icons/messages2.png index e2bf7d24d..08af9f6b7 100644 Binary files a/view/theme/diabook/diabook-dark/icons/messages2.png and b/view/theme/diabook/diabook-dark/icons/messages2.png differ diff --git a/view/theme/diabook/diabook-dark/icons/messages3.png b/view/theme/diabook/diabook-dark/icons/messages3.png index e2bf7d24d..e02888c34 100644 Binary files a/view/theme/diabook/diabook-dark/icons/messages3.png and b/view/theme/diabook/diabook-dark/icons/messages3.png differ diff --git a/view/theme/diabook/diabook-dark/icons/notifications.png b/view/theme/diabook/diabook-dark/icons/notifications.png index 2bcd74927..4a0666f76 100644 Binary files a/view/theme/diabook/diabook-dark/icons/notifications.png and b/view/theme/diabook/diabook-dark/icons/notifications.png differ diff --git a/view/theme/diabook/diabook-dark/icons/notifications3.png b/view/theme/diabook/diabook-dark/icons/notifications3.png index 2b4fbb818..a75d1b71f 100644 Binary files a/view/theme/diabook/diabook-dark/icons/notifications3.png and b/view/theme/diabook/diabook-dark/icons/notifications3.png differ diff --git a/view/theme/diabook/diabook-dark/icons/notify.png b/view/theme/diabook/diabook-dark/icons/notify.png index 159cd2c59..610314941 100644 Binary files a/view/theme/diabook/diabook-dark/icons/notify.png and b/view/theme/diabook/diabook-dark/icons/notify.png differ diff --git a/view/theme/diabook/diabook-dark/icons/notify2.png b/view/theme/diabook/diabook-dark/icons/notify2.png index 9765bfd53..9092d6d6b 100644 Binary files a/view/theme/diabook/diabook-dark/icons/notify2.png and b/view/theme/diabook/diabook-dark/icons/notify2.png differ diff --git a/view/theme/diabook/diabook-dark/icons/notify3.png b/view/theme/diabook/diabook-dark/icons/notify3.png index 9765bfd53..4977b42f6 100644 Binary files a/view/theme/diabook/diabook-dark/icons/notify3.png and b/view/theme/diabook/diabook-dark/icons/notify3.png differ diff --git a/view/theme/diabook/diabook-dark/icons/recycle.png b/view/theme/diabook/diabook-dark/icons/recycle.png index c3b8d2bf4..94f5718e6 100644 Binary files a/view/theme/diabook/diabook-dark/icons/recycle.png and b/view/theme/diabook/diabook-dark/icons/recycle.png differ diff --git a/view/theme/diabook/diabook-dark/icons/tagged.png b/view/theme/diabook/diabook-dark/icons/tagged.png index 144649ef8..ee347db47 100644 Binary files a/view/theme/diabook/diabook-dark/icons/tagged.png and b/view/theme/diabook/diabook-dark/icons/tagged.png differ diff --git a/view/theme/diabook/diabook-dark/icons/unstarred.png b/view/theme/diabook/diabook-dark/icons/unstarred.png index ba3183f5c..b4c0bf679 100644 Binary files a/view/theme/diabook/diabook-dark/icons/unstarred.png and b/view/theme/diabook/diabook-dark/icons/unstarred.png differ diff --git a/view/theme/diabook/diabook-dark/jot.tpl b/view/theme/diabook/diabook-dark/jot.tpl deleted file mode 100644 index 0928c9f36..000000000 --- a/view/theme/diabook/diabook-dark/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- - - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-dark/js/README b/view/theme/diabook/diabook-dark/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-dark/js/README +++ /dev/null @@ -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 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-dark/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-dark/js/jquery.autogrow.textarea.js +++ /dev/null @@ -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 = $('
').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, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - 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); \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/js/jquery.cookie.js b/view/theme/diabook/diabook-dark/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-dark/js/jquery.cookie.js +++ /dev/null @@ -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); diff --git a/view/theme/diabook/diabook-dark/login.tpl b/view/theme/diabook/diabook-dark/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-dark/login.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -
- - -
- {{ inc field_input.tpl with $field=$lname }}{{ endinc }} - {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} -
- - {{ if $openid }} -
- {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }} -
- {{ endif }} - -
- -
- - - - {{ for $hiddens as $k=>$v }} - - {{ endfor }} - - -
- - - diff --git a/view/theme/diabook/diabook-dark/mail_conv.tpl b/view/theme/diabook/diabook-dark/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-dark/mail_conv.tpl +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- -
-
- $mail.body -
-
-
-
-
-
-
-
-
-
-
-
-
- $mail.from_name $mail.date -
- -
-
- -
- $mail.delete -
- -
-
-
-
-
- - -{# - - -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
$mail.body
-
-
-
-
-
- -#} diff --git a/view/theme/diabook/diabook-dark/mail_display.tpl b/view/theme/diabook/diabook-dark/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-dark/mail_display.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
- $thread_subject - -
- -{{ for $mails as $mail }} -
- {{ inc mail_conv.tpl }}{{endinc}} -
-{{ endfor }} - -{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook/diabook-dark/mail_list.tpl b/view/theme/diabook/diabook-dark/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-dark/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-dark/message_side.tpl b/view/theme/diabook/diabook-dark/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-dark/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-dark/nav.tpl b/view/theme/diabook/diabook-dark/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-dark/nav.tpl +++ /dev/null @@ -1,190 +0,0 @@ -
-
$sitelocation
- -
- - - - -
$langselector
-
- - - - - - - - -{# - -{{ if $nav.logout }}$nav.logout.1 {{ endif }} -{{ if $nav.login }} {{ endif }} - - - -{{ if $nav.register }}$nav.register.1{{ endif }} - -$nav.help.1 - -{{ if $nav.apps }}$nav.apps.1{{ endif }} - -$nav.search.1 -$nav.directory.1 - -{{ if $nav.admin }}$nav.admin.1{{ endif }} - -{{ if $nav.notifications }} -$nav.notifications.1 - -{{ endif }} -{{ if $nav.messages }} -$nav.messages.1 - -{{ endif }} - -{{ if $nav.manage }}$nav.manage.1{{ endif }} - -{{ if $nav.settings }}$nav.settings.1{{ endif }} -{{ if $nav.profiles }}$nav.profiles.1{{ endif }} - - - - - -#} diff --git a/view/theme/diabook/diabook-dark/nets.tpl b/view/theme/diabook/diabook-dark/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-dark/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-dark/oembed_video.tpl b/view/theme/diabook/diabook-dark/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-dark/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-dark/photo_item.tpl b/view/theme/diabook/diabook-dark/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-dark/photo_item.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{{ if $indent }}{{ else }} -
- -
-{{ endif }} - -
-
-
-
- - $name - - menu - - -
-
-
- $name - - - {{ if $plink }}$ago{{ else }} $ago {{ endif }} - {{ if $lock }} - $lock {{ endif }} - -
-
- {{ if $title }}

$title

{{ endif }} - $body -
-
-
-
-
-
- {{ for $tags as $tag }} - $tag - {{ endfor }} -
-
- -
-
-
-
- -
- - {{ if $drop.dropping }} - - $drop.delete - {{ endif }} - {{ if $edpost }} - - {{ endif }} -
- -
-
-
- -
-
- diff --git a/view/theme/diabook/diabook-dark/photo_view.tpl b/view/theme/diabook/diabook-dark/photo_view.tpl deleted file mode 100644 index 071972e0c..000000000 --- a/view/theme/diabook/diabook-dark/photo_view.tpl +++ /dev/null @@ -1,35 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} -
- -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -
-
-
-$comments -
- -$paginate diff --git a/view/theme/diabook/diabook-dark/profile_side.tpl b/view/theme/diabook/diabook-dark/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-dark/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-dark/profile_vcard.tpl b/view/theme/diabook/diabook-dark/profile_vcard.tpl deleted file mode 100644 index 6fcffcc9b..000000000 --- a/view/theme/diabook/diabook-dark/profile_vcard.tpl +++ /dev/null @@ -1,64 +0,0 @@ -
- -
-
$profile.name
- {{ if $profile.edit }} -
- $profile.edit.1 - -
- {{ endif }} -
- - - -
$profile.name
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} - - - {{ if $location }} -
$location

-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/diabook/diabook-dark/right_aside.tpl b/view/theme/diabook/diabook-dark/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-dark/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/search_item.tpl b/view/theme/diabook/diabook-dark/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-dark/search_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index 5639bde29..d236297b7 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -387,7 +387,7 @@ margin-bottom: 1px; width: 484px; border-bottom: 1px solid #BDCDD4; - background-color: #fff; + background-color: #2e2e2f; padding: 8px; } @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #1872A2; + color: #88a9d2; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -493,7 +493,7 @@ code { float: right; } .tool a { - color: ##3F8FBA; + color: #3465a4; } .tool a:hover { text-decoration: none; @@ -1283,7 +1283,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #1872A2; + color: #88a9d2; } .wall-item-decor { diff --git a/view/theme/diabook/diabook-dark/style.php b/view/theme/diabook/diabook-dark/style.php deleted file mode 100644 index 1f6e965a9..000000000 --- a/view/theme/diabook/diabook-dark/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $diabook_version); - - -//change css on network and profilepages -$cssFile = null; -$resolution=false; -$resolution = get_pconfig(local_user(), "diabook-dark", "resolution"); -if ($resolution===false) $resolution="normal"; - -/** - * prints last community activity - */ -function diabook_dark_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 = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //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 = '' . $post_type . ''; - - $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'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $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 .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //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_dark_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/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_dark_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/style-profile-wide.css";} - } -} - - - -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); - -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-dark/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-dark/theme_settings.tpl b/view/theme/diabook/diabook-dark/theme_settings.tpl deleted file mode 100644 index 472232cf0..000000000 --- a/view/theme/diabook/diabook-dark/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{inc field_select.tpl with $field=$font_size}}{{endinc}} - -{{inc field_select.tpl with $field=$line_height}}{{endinc}} - -{{inc field_select.tpl with $field=$resolution}}{{endinc}} - -
- -
- diff --git a/view/theme/diabook/diabook-dark/wall_item.tpl b/view/theme/diabook/diabook-dark/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-dark/wall_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-dark/wallwall_item.tpl b/view/theme/diabook/diabook-dark/wallwall_item.tpl deleted file mode 100644 index 6a0c93f88..000000000 --- a/view/theme/diabook/diabook-dark/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/diabook-green/admin_users.tpl b/view/theme/diabook/diabook-green/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-green/admin_users.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -
-

$title - $page

- - - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
-
$select_all
-
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-green/ch_directory_item.tpl b/view/theme/diabook/diabook-green/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-green/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-green/comment_item.tpl b/view/theme/diabook/diabook-green/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-green/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-green/communityhome.tpl b/view/theme/diabook/diabook-green/communityhome.tpl deleted file mode 100644 index 875d83f1b..000000000 --- a/view/theme/diabook/diabook-green/communityhome.tpl +++ /dev/null @@ -1,86 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$con_services.title.1

-
-Facebook -StatusNet -LiveJournal -Posterous -Tumblr -Twitter -WordPress -E-Mail -
-{{ endif }} -
- -
-{{ if $nv }} -

$nv.title.1

-$nv.directory.1
-$nv.global_directory.1
-$nv.match.1
-$nv.suggest.1
-$nv.invite.1 -$nv.search -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$lastusers_title

-
-{{ for $lastusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- - -{{ if $activeusers_title }} -

$activeusers_title

-
-{{ for $activeusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - -
-{{ if $photos_title }} -

$photos_title

-
-{{ for $photos_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- -
-{{ if $like_title }} -

$like_title

-
    -{{ for $like_items as $i }} -
  • $i
    • -{{ endfor }} -
-{{ endif }} -
diff --git a/view/theme/diabook/diabook-green/config.php b/view/theme/diabook/diabook-green/config.php deleted file mode 100644 index 0083a4df7..000000000 --- a/view/theme/diabook/diabook-green/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"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; -} diff --git a/view/theme/diabook/diabook-green/contact_template.tpl b/view/theme/diabook/diabook-green/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-green/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-green/directory_item.tpl b/view/theme/diabook/diabook-green/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-green/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-green/generic_links_widget.tpl b/view/theme/diabook/diabook-green/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-green/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - -
    - {{ for $items as $item }} -
  • $item.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-green/group_side.tpl b/view/theme/diabook/diabook-green/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-green/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-green/jot.tpl b/view/theme/diabook/diabook-green/jot.tpl deleted file mode 100644 index 0928c9f36..000000000 --- a/view/theme/diabook/diabook-green/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- - - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-green/js/README b/view/theme/diabook/diabook-green/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-green/js/README +++ /dev/null @@ -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 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-green/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js +++ /dev/null @@ -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 = $('
').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, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - 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); \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/js/jquery.cookie.js b/view/theme/diabook/diabook-green/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-green/js/jquery.cookie.js +++ /dev/null @@ -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); diff --git a/view/theme/diabook/diabook-green/login.tpl b/view/theme/diabook/diabook-green/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-green/login.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -
- - -
- {{ inc field_input.tpl with $field=$lname }}{{ endinc }} - {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} -
- - {{ if $openid }} -
- {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }} -
- {{ endif }} - -
- -
- - - - {{ for $hiddens as $k=>$v }} - - {{ endfor }} - - -
- - - diff --git a/view/theme/diabook/diabook-green/mail_conv.tpl b/view/theme/diabook/diabook-green/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-green/mail_conv.tpl +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- -
-
- $mail.body -
-
-
-
-
-
-
-
-
-
-
-
-
- $mail.from_name $mail.date -
- -
-
- -
- $mail.delete -
- -
-
-
-
-
- - -{# - - -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
$mail.body
-
-
-
-
-
- -#} diff --git a/view/theme/diabook/diabook-green/mail_display.tpl b/view/theme/diabook/diabook-green/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-green/mail_display.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
- $thread_subject - -
- -{{ for $mails as $mail }} -
- {{ inc mail_conv.tpl }}{{endinc}} -
-{{ endfor }} - -{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook/diabook-green/mail_list.tpl b/view/theme/diabook/diabook-green/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-green/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-green/message_side.tpl b/view/theme/diabook/diabook-green/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-green/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-green/nav.tpl b/view/theme/diabook/diabook-green/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-green/nav.tpl +++ /dev/null @@ -1,190 +0,0 @@ -
-
$sitelocation
- -
- - - - -
$langselector
-
- - - - - - - - -{# - -{{ if $nav.logout }}$nav.logout.1 {{ endif }} -{{ if $nav.login }} {{ endif }} - - - -{{ if $nav.register }}$nav.register.1{{ endif }} - -$nav.help.1 - -{{ if $nav.apps }}$nav.apps.1{{ endif }} - -$nav.search.1 -$nav.directory.1 - -{{ if $nav.admin }}$nav.admin.1{{ endif }} - -{{ if $nav.notifications }} -$nav.notifications.1 - -{{ endif }} -{{ if $nav.messages }} -$nav.messages.1 - -{{ endif }} - -{{ if $nav.manage }}$nav.manage.1{{ endif }} - -{{ if $nav.settings }}$nav.settings.1{{ endif }} -{{ if $nav.profiles }}$nav.profiles.1{{ endif }} - - - - - -#} diff --git a/view/theme/diabook/diabook-green/nets.tpl b/view/theme/diabook/diabook-green/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-green/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-green/oembed_video.tpl b/view/theme/diabook/diabook-green/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-green/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-green/photo_item.tpl b/view/theme/diabook/diabook-green/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-green/photo_item.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{{ if $indent }}{{ else }} -
- -
-{{ endif }} - -
-
-
-
- - $name - - menu - - -
-
-
- $name - - - {{ if $plink }}$ago{{ else }} $ago {{ endif }} - {{ if $lock }} - $lock {{ endif }} - -
-
- {{ if $title }}

$title

{{ endif }} - $body -
-
-
-
-
-
- {{ for $tags as $tag }} - $tag - {{ endfor }} -
-
- -
-
-
-
- -
- - {{ if $drop.dropping }} - - $drop.delete - {{ endif }} - {{ if $edpost }} - - {{ endif }} -
- -
-
-
- -
-
- diff --git a/view/theme/diabook/diabook-green/photo_view.tpl b/view/theme/diabook/diabook-green/photo_view.tpl deleted file mode 100644 index 071972e0c..000000000 --- a/view/theme/diabook/diabook-green/photo_view.tpl +++ /dev/null @@ -1,35 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} -
- -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -
-
-
-$comments -
- -$paginate diff --git a/view/theme/diabook/diabook-green/profile_side.tpl b/view/theme/diabook/diabook-green/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-green/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-green/profile_vcard.tpl b/view/theme/diabook/diabook-green/profile_vcard.tpl deleted file mode 100644 index 6fcffcc9b..000000000 --- a/view/theme/diabook/diabook-green/profile_vcard.tpl +++ /dev/null @@ -1,64 +0,0 @@ -
- -
-
$profile.name
- {{ if $profile.edit }} -
- $profile.edit.1 - -
- {{ endif }} -
- - - -
$profile.name
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} - - - {{ if $location }} -
$location

-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/diabook/diabook-green/right_aside.tpl b/view/theme/diabook/diabook-green/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-green/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/screenshot.png b/view/theme/diabook/diabook-green/screenshot.png deleted file mode 100644 index 4eee5be5a..000000000 Binary files a/view/theme/diabook/diabook-green/screenshot.png and /dev/null differ diff --git a/view/theme/diabook/diabook-green/search_item.tpl b/view/theme/diabook/diabook-green/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-green/search_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-green/style.php b/view/theme/diabook/diabook-green/style.php deleted file mode 100644 index b8c37fc96..000000000 --- a/view/theme/diabook/diabook-green/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $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 = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //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 = '' . $post_type . ''; - - $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'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $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 .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //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('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $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('', $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('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-green/theme_settings.tpl b/view/theme/diabook/diabook-green/theme_settings.tpl deleted file mode 100644 index 472232cf0..000000000 --- a/view/theme/diabook/diabook-green/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{inc field_select.tpl with $field=$font_size}}{{endinc}} - -{{inc field_select.tpl with $field=$line_height}}{{endinc}} - -{{inc field_select.tpl with $field=$resolution}}{{endinc}} - -
- -
- diff --git a/view/theme/diabook/diabook-green/wall_item.tpl b/view/theme/diabook/diabook-green/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-green/wall_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-green/wallwall_item.tpl b/view/theme/diabook/diabook-green/wallwall_item.tpl deleted file mode 100644 index 6a0c93f88..000000000 --- a/view/theme/diabook/diabook-green/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/admin_users.tpl b/view/theme/diabook/diabook-pink/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-pink/admin_users.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -
-

$title - $page

- - - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
-
$select_all
-
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-pink/ch_directory_item.tpl b/view/theme/diabook/diabook-pink/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-pink/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-pink/comment_item.tpl b/view/theme/diabook/diabook-pink/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-pink/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-pink/communityhome.tpl b/view/theme/diabook/diabook-pink/communityhome.tpl deleted file mode 100644 index 875d83f1b..000000000 --- a/view/theme/diabook/diabook-pink/communityhome.tpl +++ /dev/null @@ -1,86 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$con_services.title.1

-
-Facebook -StatusNet -LiveJournal -Posterous -Tumblr -Twitter -WordPress -E-Mail -
-{{ endif }} -
- -
-{{ if $nv }} -

$nv.title.1

-$nv.directory.1
-$nv.global_directory.1
-$nv.match.1
-$nv.suggest.1
-$nv.invite.1 -$nv.search -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$lastusers_title

-
-{{ for $lastusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- - -{{ if $activeusers_title }} -

$activeusers_title

-
-{{ for $activeusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - -
-{{ if $photos_title }} -

$photos_title

-
-{{ for $photos_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- -
-{{ if $like_title }} -

$like_title

-
    -{{ for $like_items as $i }} -
  • $i
    • -{{ endfor }} -
-{{ endif }} -
diff --git a/view/theme/diabook/diabook-pink/config.php b/view/theme/diabook/diabook-pink/config.php deleted file mode 100644 index 0083a4df7..000000000 --- a/view/theme/diabook/diabook-pink/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"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; -} diff --git a/view/theme/diabook/diabook-pink/contact_template.tpl b/view/theme/diabook/diabook-pink/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-pink/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-pink/directory_item.tpl b/view/theme/diabook/diabook-pink/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-pink/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-pink/generic_links_widget.tpl b/view/theme/diabook/diabook-pink/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-pink/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - -
    - {{ for $items as $item }} -
  • $item.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-pink/group_side.tpl b/view/theme/diabook/diabook-pink/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-pink/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-pink/jot.tpl b/view/theme/diabook/diabook-pink/jot.tpl deleted file mode 100644 index 0928c9f36..000000000 --- a/view/theme/diabook/diabook-pink/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- - - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-pink/js/README b/view/theme/diabook/diabook-pink/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-pink/js/README +++ /dev/null @@ -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 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-pink/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-pink/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-pink/js/jquery.autogrow.textarea.js +++ /dev/null @@ -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 = $('
').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, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - 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); \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/js/jquery.cookie.js b/view/theme/diabook/diabook-pink/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-pink/js/jquery.cookie.js +++ /dev/null @@ -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); diff --git a/view/theme/diabook/diabook-pink/login.tpl b/view/theme/diabook/diabook-pink/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-pink/login.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -
- - -
- {{ inc field_input.tpl with $field=$lname }}{{ endinc }} - {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} -
- - {{ if $openid }} -
- {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }} -
- {{ endif }} - -
- -
- - - - {{ for $hiddens as $k=>$v }} - - {{ endfor }} - - -
- - - diff --git a/view/theme/diabook/diabook-pink/mail_conv.tpl b/view/theme/diabook/diabook-pink/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-pink/mail_conv.tpl +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- -
-
- $mail.body -
-
-
-
-
-
-
-
-
-
-
-
-
- $mail.from_name $mail.date -
- -
-
- -
- $mail.delete -
- -
-
-
-
-
- - -{# - - -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
$mail.body
-
-
-
-
-
- -#} diff --git a/view/theme/diabook/diabook-pink/mail_display.tpl b/view/theme/diabook/diabook-pink/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-pink/mail_display.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
- $thread_subject - -
- -{{ for $mails as $mail }} -
- {{ inc mail_conv.tpl }}{{endinc}} -
-{{ endfor }} - -{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook/diabook-pink/mail_list.tpl b/view/theme/diabook/diabook-pink/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-pink/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-pink/message_side.tpl b/view/theme/diabook/diabook-pink/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-pink/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-pink/nav.tpl b/view/theme/diabook/diabook-pink/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-pink/nav.tpl +++ /dev/null @@ -1,190 +0,0 @@ -
-
$sitelocation
- -
- - - - -
$langselector
-
- - - - - - - - -{# - -{{ if $nav.logout }}$nav.logout.1 {{ endif }} -{{ if $nav.login }} {{ endif }} - - - -{{ if $nav.register }}$nav.register.1{{ endif }} - -$nav.help.1 - -{{ if $nav.apps }}$nav.apps.1{{ endif }} - -$nav.search.1 -$nav.directory.1 - -{{ if $nav.admin }}$nav.admin.1{{ endif }} - -{{ if $nav.notifications }} -$nav.notifications.1 - -{{ endif }} -{{ if $nav.messages }} -$nav.messages.1 - -{{ endif }} - -{{ if $nav.manage }}$nav.manage.1{{ endif }} - -{{ if $nav.settings }}$nav.settings.1{{ endif }} -{{ if $nav.profiles }}$nav.profiles.1{{ endif }} - - - - - -#} diff --git a/view/theme/diabook/diabook-pink/nets.tpl b/view/theme/diabook/diabook-pink/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-pink/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-pink/oembed_video.tpl b/view/theme/diabook/diabook-pink/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-pink/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-pink/photo_item.tpl b/view/theme/diabook/diabook-pink/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-pink/photo_item.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{{ if $indent }}{{ else }} -
- -
-{{ endif }} - -
-
-
-
- - $name - - menu - - -
-
-
- $name - - - {{ if $plink }}$ago{{ else }} $ago {{ endif }} - {{ if $lock }} - $lock {{ endif }} - -
-
- {{ if $title }}

$title

{{ endif }} - $body -
-
-
-
-
-
- {{ for $tags as $tag }} - $tag - {{ endfor }} -
-
- -
-
-
-
- -
- - {{ if $drop.dropping }} - - $drop.delete - {{ endif }} - {{ if $edpost }} - - {{ endif }} -
- -
-
-
- -
-
- diff --git a/view/theme/diabook/diabook-pink/photo_view.tpl b/view/theme/diabook/diabook-pink/photo_view.tpl deleted file mode 100644 index 071972e0c..000000000 --- a/view/theme/diabook/diabook-pink/photo_view.tpl +++ /dev/null @@ -1,35 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} -
- -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -
-
-
-$comments -
- -$paginate diff --git a/view/theme/diabook/diabook-pink/profile_side.tpl b/view/theme/diabook/diabook-pink/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-pink/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-pink/profile_vcard.tpl b/view/theme/diabook/diabook-pink/profile_vcard.tpl deleted file mode 100644 index 6fcffcc9b..000000000 --- a/view/theme/diabook/diabook-pink/profile_vcard.tpl +++ /dev/null @@ -1,64 +0,0 @@ -
- -
-
$profile.name
- {{ if $profile.edit }} -
- $profile.edit.1 - -
- {{ endif }} -
- - - -
$profile.name
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} - - - {{ if $location }} -
$location

-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/diabook/diabook-pink/right_aside.tpl b/view/theme/diabook/diabook-pink/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-pink/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/screenshot.png b/view/theme/diabook/diabook-pink/screenshot.png deleted file mode 100644 index 4eee5be5a..000000000 Binary files a/view/theme/diabook/diabook-pink/screenshot.png and /dev/null differ diff --git a/view/theme/diabook/diabook-pink/search_item.tpl b/view/theme/diabook/diabook-pink/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-pink/search_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-pink/style.php b/view/theme/diabook/diabook-pink/style.php deleted file mode 100644 index b8c37fc96..000000000 --- a/view/theme/diabook/diabook-pink/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $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 = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //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 = '' . $post_type . ''; - - $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'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $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 .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //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('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $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('', $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('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-pink/theme_settings.tpl b/view/theme/diabook/diabook-pink/theme_settings.tpl deleted file mode 100644 index 472232cf0..000000000 --- a/view/theme/diabook/diabook-pink/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{inc field_select.tpl with $field=$font_size}}{{endinc}} - -{{inc field_select.tpl with $field=$line_height}}{{endinc}} - -{{inc field_select.tpl with $field=$resolution}}{{endinc}} - -
- -
- diff --git a/view/theme/diabook/diabook-pink/wall_item.tpl b/view/theme/diabook/diabook-pink/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-pink/wall_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-pink/wallwall_item.tpl b/view/theme/diabook/diabook-pink/wallwall_item.tpl deleted file mode 100644 index 6a0c93f88..000000000 --- a/view/theme/diabook/diabook-pink/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/diabook-red/admin_users.tpl b/view/theme/diabook/diabook-red/admin_users.tpl deleted file mode 100644 index 8aabb51ec..000000000 --- a/view/theme/diabook/diabook-red/admin_users.tpl +++ /dev/null @@ -1,88 +0,0 @@ - -
-

$title - $page

- - - -

$h_pending

- {{ if $pending }} - - - - {{ for $th_pending as $th }}{{ endfor }} - - - - - - {{ for $pending as $u }} - - - - - - - - {{ endfor }} - -
$th
$u.created$u.name - - -
-
$select_all
-
- {{ else }} -

$no_pending

- {{ endif }} - - - - -

$h_users

- {{ if $users }} - - - - - {{ for $th_users as $th }}{{ endfor }} - - - - - - {{ for $users as $u }} - - - - - - - - - - - - {{ endfor }} - -
$th
$u.nickname$u.name$u.register_date$u.lastitem_date - - -
-
$select_all
-
- {{ else }} - NO USERS?!? - {{ endif }} - -
diff --git a/view/theme/diabook/diabook-red/ch_directory_item.tpl b/view/theme/diabook/diabook-red/ch_directory_item.tpl deleted file mode 100755 index db1936e4b..000000000 --- a/view/theme/diabook/diabook-red/ch_directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
diff --git a/view/theme/diabook/diabook-red/comment_item.tpl b/view/theme/diabook/diabook-red/comment_item.tpl deleted file mode 100644 index ee4dfba45..000000000 --- a/view/theme/diabook/diabook-red/comment_item.tpl +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- - img - url - video - u - i - b - quote - {{ if $qcomment }} - - {{ endif }} - -
- - -
-
- -
diff --git a/view/theme/diabook/diabook-red/communityhome.tpl b/view/theme/diabook/diabook-red/communityhome.tpl deleted file mode 100644 index 179757f4a..000000000 --- a/view/theme/diabook/diabook-red/communityhome.tpl +++ /dev/null @@ -1,87 +0,0 @@ -
-{{ if $page }} -
$page
-{{ endif }} -
- -
-{{ if $lastusers_title }} -

$helpers.title.1

-NewHere
-Friendica Support
-Let's talk
-Local Friendica -{{ endif }} -
- -
-{{ if $lastusers_title }} -

$con_services.title.1

-
-Facebook -StatusNet -LiveJournal -Posterous -Tumblr -Twitter -WordPress -E-Mail -
-{{ endif }} -
- -
-{{ if $nv }} -

$nv.title.1

-$nv.directory.1
-$nv.global_directory.1
-$nv.match.1
-$nv.suggest.1
-$nv.invite.1 -$nv.search -{{ endif }} -
- - -
-{{ if $lastusers_title }} -

$lastusers_title

-
-{{ for $lastusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- - -{{ if $activeusers_title }} -

$activeusers_title

-
-{{ for $activeusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - -
-{{ if $photos_title }} -

$photos_title

-
-{{ for $photos_items as $i }} - $i -{{ endfor }} -
-{{ endif }} -
- -
-{{ if $like_title }} -

$like_title

-
    -{{ for $like_items as $i }} -
  • $i
    • -{{ endfor }} -
-{{ endif }} -
diff --git a/view/theme/diabook/diabook-red/config.php b/view/theme/diabook/diabook-red/config.php deleted file mode 100644 index 59a461178..000000000 --- a/view/theme/diabook/diabook-red/config.php +++ /dev/null @@ -1,84 +0,0 @@ -"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-red_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), - '$line_height' => array('diabook-red_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), - '$resolution' => array('diabook-red_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions), - )); - return $o; -} diff --git a/view/theme/diabook/diabook-red/contact_template.tpl b/view/theme/diabook/diabook-red/contact_template.tpl deleted file mode 100644 index 48930b48a..000000000 --- a/view/theme/diabook/diabook-red/contact_template.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/diabook/diabook-red/directory_item.tpl b/view/theme/diabook/diabook-red/directory_item.tpl deleted file mode 100755 index bc2af16c2..000000000 --- a/view/theme/diabook/diabook-red/directory_item.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-
- - $alt-text - -
-
-
$name
-
diff --git a/view/theme/diabook/diabook-red/generic_links_widget.tpl b/view/theme/diabook/diabook-red/generic_links_widget.tpl deleted file mode 100644 index 001c1395e..000000000 --- a/view/theme/diabook/diabook-red/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - -
    - {{ for $items as $item }} -
  • $item.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-red/group_side.tpl b/view/theme/diabook/diabook-red/group_side.tpl deleted file mode 100755 index 8600402f2..000000000 --- a/view/theme/diabook/diabook-red/group_side.tpl +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

$title

-
- - - {{ if $ungrouped }} - - {{ endif }} -
- diff --git a/view/theme/diabook/diabook-red/jot.tpl b/view/theme/diabook/diabook-red/jot.tpl deleted file mode 100644 index 982201f56..000000000 --- a/view/theme/diabook/diabook-red/jot.tpl +++ /dev/null @@ -1,85 +0,0 @@ - -
-
-
 
-
-
- -
- - - - - - - - -
-
- - - - -
- -
-
-
-
-
-
- - -
- -
-
- -
-
- -
-
- -
- - - - $preview - -
- $bang -
- - -
- $jotplugins -
- -
- -
- -
-
- - - -
-
- $acl -
-
$emailcc
-
- $jotnets -
-
- - - - -
-
- {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/diabook-red/js/README b/view/theme/diabook/diabook-red/js/README deleted file mode 100644 index c93b2118e..000000000 --- a/view/theme/diabook/diabook-red/js/README +++ /dev/null @@ -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 }); -}); \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.js b/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.js deleted file mode 100644 index bac09cd45..000000000 --- a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.js +++ /dev/null @@ -1,69 +0,0 @@ -(function( $ ) { - - $.fn.aeImageResize = function( params ) { - - var aspectRatio = 0 - // Nasty I know but it's done only once, so not too bad I guess - // Alternate suggestions welcome :) - , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) - ; - - // We cannot do much unless we have one of these - if ( !params.height && !params.width ) { - return this; - } - - // Calculate aspect ratio now, if possible - if ( params.height && params.width ) { - aspectRatio = params.width / params.height; - } - - // Attach handler to load - // Handler is executed just once per element - // Load event required for Webkit browsers - return this.one( "load", function() { - - // Remove all attributes and CSS rules - this.removeAttribute( "height" ); - this.removeAttribute( "width" ); - this.style.height = this.style.width = ""; - - var imgHeight = this.height - , imgWidth = this.width - , imgAspectRatio = imgWidth / imgHeight - , bxHeight = params.height - , bxWidth = params.width - , bxAspectRatio = aspectRatio; - - // Work the magic! - // If one parameter is missing, we just force calculate it - if ( !bxAspectRatio ) { - if ( bxHeight ) { - bxAspectRatio = imgAspectRatio + 1; - } else { - bxAspectRatio = imgAspectRatio - 1; - } - } - - // Only resize the images that need resizing - if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { - - if ( imgAspectRatio > bxAspectRatio ) { - bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); - } else { - bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); - } - - this.height = bxHeight; - this.width = bxWidth; - } - }) - .each(function() { - - // Trigger load event (for Gecko and MSIE) - if ( this.complete || isIE6 ) { - $( this ).trigger( "load" ); - } - }); - }; -})( jQuery ); \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.min.js b/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.min.js deleted file mode 100644 index 16c30b123..000000000 --- a/view/theme/diabook/diabook-red/js/jquery.ae.image.resize.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-red/js/jquery.autogrow.textarea.js deleted file mode 100644 index 806e34f51..000000000 --- a/view/theme/diabook/diabook-red/js/jquery.autogrow.textarea.js +++ /dev/null @@ -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 = $('
').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, '>') - .replace(/&/g, '&') - .replace(/\n/g, '
'); - - 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); \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/js/jquery.cookie.js b/view/theme/diabook/diabook-red/js/jquery.cookie.js deleted file mode 100644 index 6d5974a2c..000000000 --- a/view/theme/diabook/diabook-red/js/jquery.cookie.js +++ /dev/null @@ -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); diff --git a/view/theme/diabook/diabook-red/login.tpl b/view/theme/diabook/diabook-red/login.tpl deleted file mode 100644 index efa7c2d6d..000000000 --- a/view/theme/diabook/diabook-red/login.tpl +++ /dev/null @@ -1,33 +0,0 @@ - -
- - -
- {{ inc field_input.tpl with $field=$lname }}{{ endinc }} - {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} -
- - {{ if $openid }} -
- {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }} -
- {{ endif }} - -
- -
- - - - {{ for $hiddens as $k=>$v }} - - {{ endfor }} - - -
- - - diff --git a/view/theme/diabook/diabook-red/mail_conv.tpl b/view/theme/diabook/diabook-red/mail_conv.tpl deleted file mode 100644 index 989f17878..000000000 --- a/view/theme/diabook/diabook-red/mail_conv.tpl +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
- -
-
- $mail.body -
-
-
-
-
-
-
-
-
-
-
-
-
- $mail.from_name $mail.date -
- -
-
- -
- $mail.delete -
- -
-
-
-
-
- - -{# - - -
-
- $mail.from_name -
-
-
$mail.from_name
-
$mail.date
-
$mail.subject
-
$mail.body
-
-
-
-
-
- -#} diff --git a/view/theme/diabook/diabook-red/mail_display.tpl b/view/theme/diabook/diabook-red/mail_display.tpl deleted file mode 100644 index 8b82e95c6..000000000 --- a/view/theme/diabook/diabook-red/mail_display.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
- $thread_subject - -
- -{{ for $mails as $mail }} -
- {{ inc mail_conv.tpl }}{{endinc}} -
-{{ endfor }} - -{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/diabook/diabook-red/mail_list.tpl b/view/theme/diabook/diabook-red/mail_list.tpl deleted file mode 100644 index 6bc6c84f6..000000000 --- a/view/theme/diabook/diabook-red/mail_list.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
- $subject - $from_name - $date - $count - - -
diff --git a/view/theme/diabook/diabook-red/message_side.tpl b/view/theme/diabook/diabook-red/message_side.tpl deleted file mode 100644 index 9f1587096..000000000 --- a/view/theme/diabook/diabook-red/message_side.tpl +++ /dev/null @@ -1,10 +0,0 @@ -
- - -
    - {{ for $tabs as $t }} -
  • $t.label
    • - {{ endfor }} -
- -
diff --git a/view/theme/diabook/diabook-red/nav.tpl b/view/theme/diabook/diabook-red/nav.tpl deleted file mode 100644 index e3aabaa8b..000000000 --- a/view/theme/diabook/diabook-red/nav.tpl +++ /dev/null @@ -1,190 +0,0 @@ -
-
$sitelocation
- -
- - - - -
$langselector
-
- - - - - - - - -{# - -{{ if $nav.logout }}$nav.logout.1 {{ endif }} -{{ if $nav.login }} {{ endif }} - - - -{{ if $nav.register }}$nav.register.1{{ endif }} - -$nav.help.1 - -{{ if $nav.apps }}$nav.apps.1{{ endif }} - -$nav.search.1 -$nav.directory.1 - -{{ if $nav.admin }}$nav.admin.1{{ endif }} - -{{ if $nav.notifications }} -$nav.notifications.1 - -{{ endif }} -{{ if $nav.messages }} -$nav.messages.1 - -{{ endif }} - -{{ if $nav.manage }}$nav.manage.1{{ endif }} - -{{ if $nav.settings }}$nav.settings.1{{ endif }} -{{ if $nav.profiles }}$nav.profiles.1{{ endif }} - - - - - -#} diff --git a/view/theme/diabook/diabook-red/nets.tpl b/view/theme/diabook/diabook-red/nets.tpl deleted file mode 100644 index be25ddee1..000000000 --- a/view/theme/diabook/diabook-red/nets.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$title

-
$desc
- -
    -
  • - - $all
    • - {{ for $nets as $net }} -
  • - - $net.name
    • - {{ endfor }} -
-
diff --git a/view/theme/diabook/diabook-red/oembed_video.tpl b/view/theme/diabook/diabook-red/oembed_video.tpl deleted file mode 100644 index d6d29f724..000000000 --- a/view/theme/diabook/diabook-red/oembed_video.tpl +++ /dev/null @@ -1,4 +0,0 @@ - - -
- diff --git a/view/theme/diabook/diabook-red/photo_item.tpl b/view/theme/diabook/diabook-red/photo_item.tpl deleted file mode 100644 index 5d65a89b7..000000000 --- a/view/theme/diabook/diabook-red/photo_item.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{{ if $indent }}{{ else }} -
- -
-{{ endif }} - -
-
-
-
- - $name - - menu - - -
-
-
- $name - - - {{ if $plink }}$ago{{ else }} $ago {{ endif }} - {{ if $lock }} - $lock {{ endif }} - -
-
- {{ if $title }}

$title

{{ endif }} - $body -
-
-
-
-
-
- {{ for $tags as $tag }} - $tag - {{ endfor }} -
-
- -
-
-
-
- -
- - {{ if $drop.dropping }} - - $drop.delete - {{ endif }} - {{ if $edpost }} - - {{ endif }} -
- -
-
-
- -
-
- diff --git a/view/theme/diabook/diabook-red/photo_view.tpl b/view/theme/diabook/diabook-red/photo_view.tpl deleted file mode 100644 index 09dfb2aae..000000000 --- a/view/theme/diabook/diabook-red/photo_view.tpl +++ /dev/null @@ -1,36 +0,0 @@ -
-

$album.1

- - - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} -
- -
-
$desc
-{{ if $tags }} -
$tags.0
-
$tags.1
-{{ endif }} -{{ if $tags.2 }}{{ endif }} - -{{ if $edit }}$edit{{ endif }} - -
-
-
-$comments -
- -$paginate - diff --git a/view/theme/diabook/diabook-red/profile_side.tpl b/view/theme/diabook/diabook-red/profile_side.tpl deleted file mode 100644 index 01e80f238..000000000 --- a/view/theme/diabook/diabook-red/profile_side.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/view/theme/diabook/diabook-red/profile_vcard.tpl b/view/theme/diabook/diabook-red/profile_vcard.tpl deleted file mode 100644 index e28ec2909..000000000 --- a/view/theme/diabook/diabook-red/profile_vcard.tpl +++ /dev/null @@ -1,64 +0,0 @@ -
- -
-
$profile.name
- {{ if $profile.edit }} -
- $profile.edit.1 - -
- {{ endif }} -
- - - -
$profile.name
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} - - - {{ if $location }} -
$location

-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} - - {{ if $profile.pubkey }}{{ endif }} - - {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} - - {{ inc diaspora_vcard.tpl }}{{ endinc }} - - -
- -$contact_block - - diff --git a/view/theme/diabook/diabook-red/right_aside.tpl b/view/theme/diabook/diabook-red/right_aside.tpl deleted file mode 100644 index a65677696..000000000 --- a/view/theme/diabook/diabook-red/right_aside.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - - \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/screenshot.png b/view/theme/diabook/diabook-red/screenshot.png deleted file mode 100644 index f7e9b41b7..000000000 Binary files a/view/theme/diabook/diabook-red/screenshot.png and /dev/null differ diff --git a/view/theme/diabook/diabook-red/search_item.tpl b/view/theme/diabook/diabook-red/search_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-red/search_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-red/style.php b/view/theme/diabook/diabook-red/style.php deleted file mode 100644 index bbdc32e6d..000000000 --- a/view/theme/diabook/diabook-red/style.php +++ /dev/null @@ -1,277 +0,0 @@ -page['htmlhead'] .= sprintf('', $diabook_version); - -//change css on network and profilepages -$cssFile = null; -$resolution=false; -$resolution = get_pconfig(local_user(), "diabook-red", "resolution"); -if ($resolution===false) $resolution="normal"; - -/** - * prints last community activity - */ -function diabook_red_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 = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //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 = '' . $post_type . ''; - - $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'] = '
- - - - - '; - - $aside['$nv'] = $nv; - }; - //Community Page - if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

-
    '; - - $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 .= '
  • ' . $contact['url'] . ' '. - $contact["name"]."
    • "; - } - $page .= '
'; - //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_red_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/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_red_community_info(); - - // CUSTOM CSS - if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile.css";} - if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile-wide.css";} - } -} - -// custom css -if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - -//load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('', $cookieJS); - -//load jquery.ae.image.resize.js -$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.ae.image.resize.js"; -$a->page['htmlhead'] .= sprintf('', $imageresizeJS); - -//load jquery.autogrow-textarea.js -$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.autogrow.textarea.js"; -$a->page['htmlhead'] .= sprintf('', $autogrowJS); - -//js scripts -//comment-edit-wrapper on photo_view -if ($a->argv[0].$a->argv[2] === "photos"."image"){ - -$a->page['htmlhead'] .= ' -'; - -} - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - -'; - -$a->page['htmlhead'] .= ' - '; - - -if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ -$a->page['htmlhead'] .= ' -'; - - - if($ccCookie != "7") { -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' -';} - -$a->page['htmlhead'] .= ' - - '; \ No newline at end of file diff --git a/view/theme/diabook/diabook-red/theme_settings.tpl b/view/theme/diabook/diabook-red/theme_settings.tpl deleted file mode 100644 index 3ae5fdbf8..000000000 --- a/view/theme/diabook/diabook-red/theme_settings.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{inc field_select.tpl with $field=$font_size}}{{endinc}} - -{{inc field_select.tpl with $field=$line_height}}{{endinc}} - -{{inc field_select.tpl with $field=$resolution}}{{endinc}} - -
- -
- diff --git a/view/theme/diabook/diabook-red/wall_item.tpl b/view/theme/diabook/diabook-red/wall_item.tpl deleted file mode 100644 index 123834064..000000000 --- a/view/theme/diabook/diabook-red/wall_item.tpl +++ /dev/null @@ -1,100 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.name - - menu - - -
-
-
- $item.name - - - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
diff --git a/view/theme/diabook/diabook-red/wallwall_item.tpl b/view/theme/diabook/diabook-red/wallwall_item.tpl deleted file mode 100644 index bee75ad99..000000000 --- a/view/theme/diabook/diabook-red/wallwall_item.tpl +++ /dev/null @@ -1,106 +0,0 @@ -{{ if $item.indent }}{{ else }} -
- -
-{{ endif }} -
-
-
-
- - $item.owner_name - -
-
- - $item.name - - menu - - -
-
-
- $item.name - $item.to $item.owner_name - $item.vwall -   - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} - {{ if $item.lock }} - $item.lock {{ endif }} - -
-
- {{ if $item.title }}

$item.title

{{ endif }} - $item.body -
-
-
-
-
-
- {{ for $item.tags as $tag }} - $tag - {{ endfor }} -
-
-
-
- -
-
- -
- - - {{ if $item.vote }} - - - {{ endif }} - - {{ if $item.vote.share }} - - {{ endif }} - - - {{ if $item.star }} - - $item.star.do - - {{ endif }} - - {{ if $item.filer }} - - {{ endif }} - - {{ if $item.plink }}$item.plink.title{{ endif }} - - - -
- -
- - {{ if $item.drop.dropping }} - - $item.drop.delete - {{ endif }} - {{ if $item.edpost }} - - {{ endif }} -
-
$item.location 
-
-
-
-
- -
$item.dislike
-
-
- -
- $item.comment -
\ No newline at end of file diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl index 1c8ebcd9f..ce4b25fbf 100755 --- a/view/theme/diabook/group_side.tpl +++ b/view/theme/diabook/group_side.tpl @@ -7,8 +7,8 @@
    {{ for $groups as $group }}
  • - + $group.text {{ if $group.edit }} diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl index be25ddee1..351e2c3e2 100644 --- a/view/theme/diabook/nets.tpl +++ b/view/theme/diabook/nets.tpl @@ -8,8 +8,10 @@ $all
    • {{ for $nets as $net }}
  • - - $net.name
    • + + + $net.name + {{ endfor }}
diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css index 13801b6ba..06e9718fc 100644 --- a/view/theme/diabook/style-network-wide.css +++ b/view/theme/diabook/style-network-wide.css @@ -1242,12 +1242,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: #page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; opacity: 0.1; } .close_box:hover { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 1; diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 502e46f23..a8ed1e9a2 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1236,12 +1236,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: #page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; opacity: 0.1; } .close_box:hover { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 1; diff --git a/view/theme/diabook/style-profile-wide.css b/view/theme/diabook/style-profile-wide.css index 1c8257b7e..c4c72fb68 100644 --- a/view/theme/diabook/style-profile-wide.css +++ b/view/theme/diabook/style-profile-wide.css @@ -1217,13 +1217,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: #page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 0.1; } .close_box:hover { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 1; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index cb7f1df69..a0a2adb53 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1212,13 +1212,13 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: #page-sidebar-right_aside .label {max-width: 128px;} right_aside .icon {width: 10px; height: 10px;} .close_box { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 0.1; } .close_box:hover { - background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + background-image: url("../../../view/theme/diabook/icons/close_box.png"); float: right; cursor: pointer; opacity: 1; diff --git a/view/theme/diabook/style.php b/view/theme/diabook/style.php index 12ffa7159..d926579da 100644 --- a/view/theme/diabook/style.php +++ b/view/theme/diabook/style.php @@ -1556,9 +1556,9 @@ } } - if($resolution == "green") { + if($resolution == "wide") { if (file_exists("$THEMEPATH/diabook-green/style-wide.css")){ - echo file_get_contents("$THEMEPATH/diabook-pink/style-green.css"); + echo file_get_contents("$THEMEPATH/diabook-green/style-wide.css"); } if($diabook_font_size == "16"){ echo " @@ -1834,9 +1834,9 @@ } } - if($resolution == "dark") { + if($resolution == "wide") { if (file_exists("$THEMEPATH/diabook-dark/style-wide.css")){ - echo file_get_contents("$THEMEPATH/diabook-dark/style-green.css"); + echo file_get_contents("$THEMEPATH/diabook-dark/style-wide.css"); } if($diabook_font_size == "16"){ echo "