]> git.mxchange.org Git - friendica.git/commitdiff
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 5 Apr 2012 22:00:46 +0000 (00:00 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 5 Apr 2012 22:00:46 +0000 (00:00 +0200)
102 files changed:
boot.php
include/config.php
include/delivery.php
include/diaspora.php
include/network.php
include/notifier.php
mod/admin.php
mod/dfrn_notify.php
mod/dfrn_poll.php
mod/filer.php
mod/install.php
mod/poco.php
mod/profile.php
mod/receive.php
mod/search.php
mod/settings.php
mod/share.php
util/messages.po
view/de/strings.php
view/theme/clean/screenshot.jpg [deleted file]
view/theme/clean/style.css [deleted file]
view/theme/clean/theme.php [deleted file]
view/theme/clean/unsupported [deleted file]
view/theme/darkness/screenshot.jpg [deleted file]
view/theme/darkness/style.css [deleted file]
view/theme/darkness/theme.php [deleted file]
view/theme/darkness/unsupported [deleted file]
view/theme/diabook-aerith/communityhome.tpl
view/theme/diabook-aerith/style-network.css
view/theme/diabook-aerith/style-profile.css
view/theme/diabook-aerith/style.css
view/theme/diabook-aerith/theme.php
view/theme/diabook-blue/communityhome.tpl
view/theme/diabook-blue/style-network.css
view/theme/diabook-blue/style-profile.css
view/theme/diabook-blue/style-settings.css
view/theme/diabook-blue/style.css
view/theme/diabook-blue/theme.php
view/theme/diabook-red/communityhome.tpl
view/theme/diabook-red/style-network.css
view/theme/diabook-red/style-profile.css
view/theme/diabook-red/style.css
view/theme/diabook-red/theme.php
view/theme/diabook/communityhome.tpl
view/theme/diabook/photo-menu.jpg [deleted file]
view/theme/diabook/style-network.css
view/theme/diabook/style-profile.css
view/theme/diabook/style-settings.css
view/theme/diabook/style.css
view/theme/diabook/theme.php
view/theme/dispy-dark/head.tpl
view/theme/dispy-dark/jot-header.tpl
view/theme/dispy-dark/jot.tpl
view/theme/dispy-dark/nets.tpl
view/theme/dispy-dark/saved_searches_aside.tpl
view/theme/dispy-dark/search_item.tpl
view/theme/dispy-dark/style.css
view/theme/dispy-dark/wall_item.tpl
view/theme/dispy-dark/wallwall_item.tpl
view/theme/dispy/communityhome.tpl
view/theme/dispy/head.tpl
view/theme/dispy/jot-header.tpl
view/theme/dispy/jot.tpl
view/theme/dispy/nets.tpl
view/theme/dispy/profile_vcard.tpl
view/theme/dispy/saved_searches_aside.tpl
view/theme/dispy/search_item.tpl [changed mode: 0755->0644]
view/theme/dispy/style.css
view/theme/dispy/wall_item.tpl
view/theme/dispy/wallwall_item.tpl
view/theme/duepuntozero/style.css
view/theme/goldenrod/screenshot.jpg [deleted file]
view/theme/goldenrod/style.css [deleted file]
view/theme/goldenrod/theme.php [deleted file]
view/theme/goldenrod/unsupported [deleted file]
view/theme/loozah/comment_item.tpl [deleted file]
view/theme/loozah/contact_template.tpl [deleted file]
view/theme/loozah/conversation.tpl [deleted file]
view/theme/loozah/ff-16.jpg [deleted file]
view/theme/loozah/friendika-16.png [deleted file]
view/theme/loozah/group_side.tpl [deleted file]
view/theme/loozah/jot.tpl [deleted file]
view/theme/loozah/lock.cur [deleted file]
view/theme/loozah/login-bg.gif [deleted file]
view/theme/loozah/nav.tpl [deleted file]
view/theme/loozah/nets.tpl [deleted file]
view/theme/loozah/photo-menu.jpg [deleted file]
view/theme/loozah/profile_vcard.tpl [deleted file]
view/theme/loozah/saved_searches_aside.tpl [deleted file]
view/theme/loozah/screenshot.jpg [deleted file]
view/theme/loozah/search_item.tpl [deleted file]
view/theme/loozah/style.css [deleted file]
view/theme/loozah/unsupported [deleted file]
view/theme/loozah/wall_item.tpl [deleted file]
view/theme/loozah/wallwall_item.tpl [deleted file]
view/theme/shady/screenshot.jpg [deleted file]
view/theme/shady/style.css [deleted file]
view/theme/shady/theme.php [deleted file]
view/theme/shady/unsupported [deleted file]
view/theme/three-d/screenshot.jpg [deleted file]
view/theme/three-d/style.css [deleted file]
view/theme/three-d/theme.php [deleted file]

index c2690f6ef0e0024eda0f5bd834f4f5e87ae534d9..c0aa9ba82a9d9a83d8cde024616915bd8adad79e 100755 (executable)
--- 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.1299' );
+define ( 'FRIENDICA_VERSION',      '2.3.1302' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1134      );
 
@@ -90,6 +90,7 @@ define ( 'PAGE_SOAPBOX',           1 );
 define ( 'PAGE_COMMUNITY',         2 );
 define ( 'PAGE_FREELOVE',          3 );
 define ( 'PAGE_BLOG',              4 );
+define ( 'PAGE_PRVGROUP',          5 );
 
 /**
  * Network and protocol family types 
index 2cddda0b8d9a98f30f022793c6423378a57382ff..4cff38090c2e5bdd585de562d81fa1c5bb7a67f7 100755 (executable)
@@ -80,6 +80,7 @@ function set_config($family,$key,$value) {
        
        // manage array value
        $dbvalue = (is_array($value)?serialize($value):$value);
+       $dbvalue = (is_bool($value) ? intval($value) : $value);
 
        if(get_config($family,$key,true) === false) {
                $a->config[$family][$key] = $value;
index 532dcd6991a551c5e84130e0ae2322c76873d6ec..794b8f27a3a3998c5d860b5c2f1a93311df0f6df 100755 (executable)
@@ -321,6 +321,14 @@ function delivery_run($argv, $argc){
                                                $x[0]['writable'] = 1;
                                        }
 
+                                       $ssl_policy = get_config('system','ssl_policy');
+                                       fix_contact_ssl_policy($x[0],$ssl_policy);
+
+                                       // If we are setup as a soapbox we aren't accepting input from this person
+
+                                       if($x[0]['page-flags'] == PAGE_SOAPBOX)
+                                               break;
+
                                        require_once('library/simplepie/simplepie.inc');
                                        logger('mod-delivery: local delivery');
                                        local_delivery($x[0],$atom);
index 04238f17ce9d3ae0862db36b58cf1fb079594575..06df9c24a4513d2ddc27cd5de1c13a8e54a67db6 100755 (executable)
@@ -9,6 +9,12 @@ require_once('include/queue_fn.php');
 
 function diaspora_dispatch_public($msg) {
 
+       $enabled = intval(get_config('system','diaspora_enabled'));
+       if(! $enabled) {
+               logger('mod-diaspora: disabled');
+               return;
+       }
+
        $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 ",
                dbesc(NETWORK_DIASPORA),
                dbesc($msg['author'])
@@ -29,6 +35,12 @@ function diaspora_dispatch($importer,$msg) {
 
        $ret = 0;
 
+       $enabled = intval(get_config('system','diaspora_enabled'));
+       if(! $enabled) {
+               logger('mod-diaspora: disabled');
+               return;
+       }
+
        // php doesn't like dashes in variable names
 
        $msg['message'] = str_replace(
@@ -2271,6 +2283,11 @@ function diaspora_send_mail($item,$owner,$contact) {
 
 function diaspora_transmit($owner,$contact,$slap,$public_batch) {
 
+       $enabled = intval(get_config('system','diaspora_enabled'));
+       if(! $enabled) {
+               return 200;
+       }
+
        $a = get_app();
        $logid = random_string(4);
        $dest_url = (($public_batch) ? $contact['batch'] : $contact['notify']);
index 9e1ed2091d5d2f5429846ceeb9c6c600c159c39e..38d0980d50f781464127a77017aeced9f8310ebb 100755 (executable)
@@ -824,3 +824,48 @@ function scale_external_images($s,$include_link = true) {
        }
        return $s;
 }
+
+
+function fix_contact_ssl_policy(&$contact,$new_policy) {
+
+       $ssl_changed = false;
+       if((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'],'https:')) {
+               $ssl_changed = true;
+               $contact['url']     =   str_replace('https:','http:',$contact['url']);
+               $contact['request'] =   str_replace('https:','http:',$contact['request']);
+               $contact['notify']  =   str_replace('https:','http:',$contact['notify']);
+               $contact['poll']    =   str_replace('https:','http:',$contact['poll']);
+               $contact['confirm'] =   str_replace('https:','http:',$contact['confirm']);
+               $contact['poco']    =   str_replace('https:','http:',$contact['poco']);
+       }
+
+       if((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'],'http:')) {
+               $ssl_changed = true;
+               $contact['url']     =   str_replace('http:','https:',$contact['url']);
+               $contact['request'] =   str_replace('http:','https:',$contact['request']);
+               $contact['notify']  =   str_replace('http:','https:',$contact['notify']);
+               $contact['poll']    =   str_replace('http:','https:',$contact['poll']);
+               $contact['confirm'] =   str_replace('http:','https:',$contact['confirm']);
+               $contact['poco']    =   str_replace('http:','https:',$contact['poco']);
+       }
+
+       if($ssl_changed) {
+               q("update contact set 
+                       url = '%s', 
+                       request = '%s',
+                       notify = '%s',
+                       poll = '%s',
+                       confirm = '%s',
+                       poco = '%s'
+                       where id = %d limit 1",
+                       dbesc($contact['url']),
+                       dbesc($contact['request']),
+                       dbesc($contact['notify']),
+                       dbesc($contact['poll']),
+                       dbesc($contact['confirm']),
+                       dbesc($contact['poco']),
+                       intval($contact['id'])
+               );
+       }
+}
+
index d63ad7ae7cceba578572595d34ecad8d3a640107..ca7c7b92eb12e5dea61ad7fd63fb7dec8c1e9377 100755 (executable)
@@ -537,6 +537,17 @@ function notifier_run($argv, $argc){
                                                                $x[0]['writable'] = 1;
                                                        }
 
+                                                       // if contact's ssl policy changed, which we just determined
+                                                       // is on our own server, update our contact links
+                                                       
+                                                       $ssl_policy = get_config('system','ssl_policy');
+                                                       fix_contact_ssl_policy($x[0],$ssl_policy);
+
+                                                       // If we are setup as a soapbox we aren't accepting input from this person
+
+                                                       if($x[0]['page-flags'] == PAGE_SOAPBOX)
+                                                               break;
+
                                                        require_once('library/simplepie/simplepie.inc');
                                                        logger('mod-delivery: local delivery');
                                                        local_delivery($x[0],$atom);
index 53b5ee35447a1984cd1eeeb40733e548e3d7acf3..a395027c11604110f22864e7bcc8fa5fe68358d7 100755 (executable)
@@ -208,6 +208,48 @@ function admin_page_site_post(&$a){
        $diaspora_enabled   =   ((x($_POST,'diaspora_enabled')) ? True   :  False);
        $ssl_policy         =   ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
 
+       if($ssl_policy != intval(get_config('system','ssl_policy'))) {
+               if($ssl_policy == SSL_POLICY_FULL) {
+                       q("update `contact` set 
+                               `url`     = replace(`url`    , 'http:' , 'https:'),
+                               `photo`   = replace(`photo`  , 'http:' , 'https:'),
+                               `thumb`   = replace(`thumb`  , 'http:' , 'https:'),
+                               `micro`   = replace(`micro`  , 'http:' , 'https:'),
+                               `request` = replace(`request`, 'http:' , 'https:'),
+                               `notify`  = replace(`notify` , 'http:' , 'https:'),
+                               `poll`    = replace(`poll`   , 'http:' , 'https:'),
+                               `confirm` = replace(`confirm`, 'http:' , 'https:'),
+                               `poco`    = replace(`poco`   , 'http:' , 'https:')
+                               where `self` = 1"
+                       );
+                       q("update `profile` set 
+                               `photo`   = replace(`photo`  , 'http:' , 'https:'),
+                               `thumb`   = replace(`thumb`  , 'http:' , 'https:')
+                               where 1 "
+                       );
+               }
+               elseif($ssl_policy == SSL_POLICY_SELFSIGN) {
+                       q("update `contact` set 
+                               `url`     = replace(`url`    , 'https:' , 'http:'),
+                               `photo`   = replace(`photo`  , 'https:' , 'http:'),
+                               `thumb`   = replace(`thumb`  , 'https:' , 'http:'),
+                               `micro`   = replace(`micro`  , 'https:' , 'http:'),
+                               `request` = replace(`request`, 'https:' , 'http:'),
+                               `notify`  = replace(`notify` , 'https:' , 'http:'),
+                               `poll`    = replace(`poll`   , 'https:' , 'http:'),
+                               `confirm` = replace(`confirm`, 'https:' , 'http:'),
+                               `poco`    = replace(`poco`   , 'https:' , 'http:')
+                               where `self` = 1"
+                       );
+                       q("update `profile` set 
+                               `photo`   = replace(`photo`  , 'https:' , 'http:'),
+                               `thumb`   = replace(`thumb`  , 'https:' , 'http:')
+                               where 1 "
+                       );
+               }
+       }
+       set_config('system','ssl_policy',$ssl_policy);
+
        set_config('config','sitename',$sitename);
        if ($banner==""){
                // don't know why, but del_config doesn't work...
@@ -218,7 +260,6 @@ function admin_page_site_post(&$a){
        } else {
                set_config('system','banner', $banner);
        }
-       set_config('system','ssl_policy',$ssl_policy);
        set_config('system','language', $language);
        set_config('system','theme', $theme);
        set_config('system','maximagesize', $maximagesize);
index 8e4ce067190a556f09a0b9efad40760bdb161dbd..65d39d5fe12f8d844d7ce15f545e67dd6676fe03 100755 (executable)
@@ -99,65 +99,10 @@ function dfrn_notify_post(&$a) {
                $importer['forum'] = $page;
        }
 
-       // if contact's ssl policy changed, update our links
-
-       $ssl_changed = false;
-
-       if($ssl_policy == 'self' && strstr($importer['url'],'https:')) {
-               $ssl_changed = true;
-               $importer['url']     =  str_replace('https:','http:',$importer['url']);
-               $importer['nurl']    = normalise_link($importer['url']);
-               $importer['photo']   =  str_replace('https:','http:',$importer['photo']);
-               $importer['thumb']   =  str_replace('https:','http:',$importer['thumb']);
-               $importer['micro']   =  str_replace('https:','http:',$importer['micro']);
-               $importer['request'] =  str_replace('https:','http:',$importer['request']);
-               $importer['notify']  =  str_replace('https:','http:',$importer['notify']);
-               $importer['poll']    =  str_replace('https:','http:',$importer['poll']);
-               $importer['confirm'] =  str_replace('https:','http:',$importer['confirm']);
-               $importer['poco']    =  str_replace('https:','http:',$importer['poco']);
-       }
 
-       if($ssl_policy == 'full' && strstr($importer['url'],'http:')) {
-               $ssl_changed = true;
-               $importer['url']     =  str_replace('http:','https:',$importer['url']);
-               $importer['nurl']    = normalise_link($importer['url']);
-               $importer['photo']   =  str_replace('http:','https:',$importer['photo']);
-               $importer['thumb']   =  str_replace('http:','https:',$importer['thumb']);
-               $importer['micro']   =  str_replace('http:','https:',$importer['micro']);
-               $importer['request'] =  str_replace('http:','https:',$importer['request']);
-               $importer['notify']  =  str_replace('http:','https:',$importer['notify']);
-               $importer['poll']    =  str_replace('http:','https:',$importer['poll']);
-               $importer['confirm'] =  str_replace('http:','https:',$importer['confirm']);
-               $importer['poco']    =  str_replace('http:','https:',$importer['poco']);
-       }
+       // if contact's ssl policy changed, update our links
 
-       if($ssl_changed) {
-               q("update contact set 
-                       url = '%s', 
-                       nurl = '%s',
-                       photo = '%s',
-                       thumb = '%s',
-                       micro = '%s',
-                       request = '%s',
-                       notify = '%s',
-                       poll = '%s',
-                       confirm = '%s',
-                       poco = '%s'
-                       where id = %d limit 1",
-                       dbesc($importer['url']),
-                       dbesc($importer['nurl']),
-                       dbesc($importer['photo']),
-                       dbesc($importer['thumb']),
-                       dbesc($importer['micro']),
-                       dbesc($importer['request']),
-                       dbesc($importer['notify']),
-                       dbesc($importer['poll']),
-                       dbesc($importer['confirm']),
-                       dbesc($importer['poco']),
-                       intval($importer['id'])
-               );
-       }
-                       
+       fix_contact_ssl_policy($importer,$ssl_policy);
 
        logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
        logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
index 6030587ce993da373ddcd467c4b7b3259ae78c77..5c27889831575a1e8cbd2f88ffff1a70530666cc 100755 (executable)
@@ -33,7 +33,7 @@ function dfrn_poll_init(&$a) {
 
                $user = '';
                if($a->argc > 1) {
-                       $r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
+                       $r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
                                dbesc($a->argv[1])
                        );
                        if((! count($r)) || (count($r) && $r[0]['hidewall']))
index 3cd1bfe22ff7a67306ef8a67b73e7687bf0b382d..c0cca9e6df072e5a9495e0777db58a08592591b4 100755 (executable)
@@ -22,7 +22,8 @@ function filer_content(&$a) {
        } else {
                // return filer dialog
                $filetags = get_pconfig(local_user(),'system','filetags');
-               $filetags = explode("][", trim($filetags,"[]"));
+               $filetags = file_tag_file_to_list($filetags,'file');
+                $filetags = explode(",", $filetags);
                $tpl = get_markup_template("filer_dialog.tpl");
                $o = replace_macros($tpl, array(
                        '$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
index 003d81c6ab90f1612fc63dc7d1003c4f62bd4ed1..d1142248a3610c12d4db95f57b310b6011b4d7d9 100755 (executable)
@@ -340,7 +340,7 @@ function check_php(&$phpath, &$checks) {
                        $help .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.'). EOL;
                        $help .= t('This is required for message delivery to work.');
                }
-               check_add($checks, t('PHP "register_argc_argv"'), $passed, true, $help);
+               check_add($checks, t('PHP register_argc_argv'), $passed, true, $help);
        }
        
 
index 79cf820bcd9b15c1d040d46e3a90406ed2c01530..acfa3ffaa98e46c637fffdf4c96e5463b5a88cdb 100755 (executable)
@@ -45,6 +45,8 @@ function poco_init(&$a) {
 
        if($justme)
                $sql_extra = " and `contact`.`self` = 1 ";
+       else
+               $sql_extra = " and `contact`.`self` = 0 ";
 
        if($cid)
                $sql_extra = sprintf(" and `contact`.`id` = %d ",intval($cid));
index 26b33d5f1cfcef812fe1a655dcb0407d02d69f21..68d73fba3829b50aab8d2fb33897788ee148dfe9 100755 (executable)
@@ -124,9 +124,9 @@ function profile_content(&$a, $update = 0) {
                return;
        }
 
-       $a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
-
        if(! $update) {
+
+
                if(x($_GET,'tab'))
                        $tab = notags(trim($_GET['tab']));
 
@@ -148,6 +148,7 @@ function profile_content(&$a, $update = 0) {
 
                $celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
+               $a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
 
                if(can_write_wall($a,$a->profile['profile_uid'])) {
 
index 950bf0bd388e80ed20fd69541bd46b7e5765c99e..2bd3cc65bcda1b5ae273d9903184981805b8d33a 100755 (executable)
@@ -12,6 +12,13 @@ require_once('include/diaspora.php');
        
 function receive_post(&$a) {
 
+
+       $enabled = intval(get_config('system','diaspora_enabled'));
+       if(! $enabled) {
+               logger('mod-diaspora: disabled');
+               http_status_exit(500);
+       }
+
        $public = false;
 
        if(($a->argc == 2) && ($a->argv[1] === 'public')) {
index 6495fc8e5f725514268189db8d30c5dfe8f4b894..4ca7db9bb111c4e3000cdf8b672d4603a3d742e0 100755 (executable)
@@ -97,27 +97,26 @@ function search_content(&$a) {
        // OR your own posts if you are a logged in member
        // No items will be shown if the member has a blocked profile wall. 
 
-       $r = q("SELECT COUNT(*) AS `total`
+       $r = q("SELECT distinct(`item`.`uri`) as `total`
                FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
                WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
                AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND `item`.`private` = 0 AND `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' )", 
+               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) . '\\[')
        );
 
        if(count($r))
-               $a->set_pager_total($r[0]['total']);
-
-       if(! $r[0]['total']) {
+               $a->set_pager_total(count($r));
+       if(! count($r)) {
                info( t('No results.') . EOL);
                return $o;
        }
 
-       $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+       $r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`, 
                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
                `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
@@ -128,7 +127,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' ) 
+               AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )
+               group by `item`.`uri`   
                ORDER BY `received` DESC LIMIT %d , %d ",
                intval(local_user()),
                dbesc(preg_quote($search)), 
index 926d1faa5b320d026e5eeebf5b3cbf69cfe4eec0..6879da285f3430160affc06e9bbbdf61ef79e00e 100755 (executable)
@@ -229,7 +229,7 @@ function settings_post(&$a) {
 
 
                if ($theme == $a->user['theme']){
-                       // call theme_post only if theme has not benn changed
+                       // call theme_post only if theme has not been changed
                        if( ($themeconfigfile = get_theme_config_file($theme)) != null){
                                require_once($themeconfigfile);
                                theme_post($a);
@@ -242,6 +242,7 @@ function settings_post(&$a) {
                                intval(local_user())
                );
        
+               call_hooks('display_settings_post', $_POST);
                goaway($a->get_baseurl(true) . '/settings/display' );
                return; // NOTREACHED
        }
@@ -679,6 +680,8 @@ function settings_content(&$a) {
 
                        '$settings_connectors' => $settings_connectors
                ));
+
+               call_hooks('display_settings', $o);
                return $o;
        }
 
index 47bb851a4f3311ae1ff1ae54c7308f1b55190158..6c6098c83c07363e4aec0bdaa73630829b6b3355 100755 (executable)
@@ -16,18 +16,18 @@ function share_init(&$a) {
 
        $o = '';
 
-       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
+//     if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
                $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
                if($r[0]['title'])
                        $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
                $o .= $r[0]['body'] . "\n";
-       }
-       else {
-               $o .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
-               if($r[0]['title'])
-                       $o .= '<strong>' . $r[0]['title'] . '</strong><br />';
-               $o .= bbcode($r[0]['body'], true) . '<br />';
-       }
+//     }
+//     else {
+//             $o .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
+//             if($r[0]['title'])
+//                     $o .= '<strong>' . $r[0]['title'] . '</strong><br />';
+//             $o .= $r[0]['body'] . "\n";
+//     }
        echo $o;
        killme();  
 }
index 132a784dc2db8e5ab65f9b1e0122de48ff018774..60c71f7fef297eb95c666bdfd894690399dd9872 100755 (executable)
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1296\n"
+"Project-Id-Version: 2.3.1302\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-30 04:52-0700\n"
+"POT-Creation-Date: 2012-04-04 15:51-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,22 +38,24 @@ msgstr ""
 #: ../../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/editpost.php:10 ../../mod/install.php:171
-#: ../../mod/notifications.php:62 ../../mod/contacts.php:125
-#: ../../mod/settings.php:49 ../../mod/settings.php:428
-#: ../../mod/settings.php:433 ../../mod/manage.php:86 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36
-#: ../../mod/regmod.php:116 ../../mod/item.php:124 ../../mod/item.php:140
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:139
-#: ../../mod/profile_photo.php:150 ../../mod/profile_photo.php:163
-#: ../../mod/message.php:38 ../../mod/message.php:91
-#: ../../mod/allfriends.php:9 ../../mod/wall_upload.php:42
-#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
-#: ../../mod/profiles.php:7 ../../mod/profiles.php:232
-#: ../../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:452 ../../include/items.php:3110
-#: ../../index.php:291
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
+#: ../../mod/settings.php:62 ../../mod/settings.php:473
+#: ../../mod/settings.php:478 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
+#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
+#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124
+#: ../../mod/item.php:140 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
+#: ../../mod/profile_photo.php:163 ../../mod/message.php:38
+#: ../../mod/message.php:91 ../../mod/allfriends.php:9
+#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
+#: ../../mod/display.php:138 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:232 ../../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:456
+#: ../../include/items.php:3118 ../../index.php:294
 msgid "Permission denied."
 msgstr ""
 
@@ -82,8 +84,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:480
-#: ../../mod/settings.php:507 ../../mod/admin.php:487 ../../mod/admin.php:496
+#: ../../mod/crepair.php:148 ../../mod/settings.php:531
+#: ../../mod/settings.php:558 ../../mod/admin.php:528 ../../mod/admin.php:537
 msgid "Name"
 msgstr ""
 
@@ -125,34 +127,33 @@ msgstr ""
 #: ../../mod/photos.php:1274 ../../mod/photos.php:1305
 #: ../../mod/install.php:251 ../../mod/install.php:289
 #: ../../mod/localtime.php:45 ../../mod/contacts.php:319
-#: ../../mod/settings.php:478 ../../mod/settings.php:628
-#: ../../mod/settings.php:826 ../../mod/manage.php:109 ../../mod/group.php:85
-#: ../../mod/admin.php:316 ../../mod/admin.php:484 ../../mod/admin.php:613
-#: ../../mod/admin.php:785 ../../mod/admin.php:865 ../../mod/profiles.php:390
-#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:531
-#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57
+#: ../../mod/settings.php:529 ../../mod/settings.php:679
+#: ../../mod/settings.php:741 ../../mod/settings.php:926
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:357
+#: ../../mod/admin.php:525 ../../mod/admin.php:654 ../../mod/admin.php:826
+#: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:547 ../../addon/yourls/yourls.php:76
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/drpost/drpost.php:110 ../../addon/frown/frown.php:84
-#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/impressum/impressum.php:69 ../../addon/blockem/blockem.php:57
-#: ../../addon/qcomment/qcomment.php:61
+#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69
+#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
-#: ../../addon/pageheader/pageheader.php:52 ../../addon/ijpost/ijpost.php:93
-#: ../../addon/statusnet/statusnet.php:273
-#: ../../addon/statusnet/statusnet.php:287
-#: ../../addon/statusnet/statusnet.php:313
-#: ../../addon/statusnet/statusnet.php:320
-#: ../../addon/statusnet/statusnet.php:345
-#: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
+#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:292
+#: ../../addon/statusnet/statusnet.php:318
+#: ../../addon/statusnet/statusnet.php:325
+#: ../../addon/statusnet/statusnet.php:353
+#: ../../addon/statusnet/statusnet.php:547 ../../addon/tumblr/tumblr.php:90
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
-#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175
-#: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:369
 #: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:555
+#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555
 msgid "Submit"
 msgstr ""
 
@@ -164,11 +165,11 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:224
+#: ../../mod/help.php:38 ../../index.php:225
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:227
+#: ../../mod/help.php:41 ../../index.php:228
 msgid "Page not found."
 msgstr ""
 
@@ -206,13 +207,15 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:272 ../../include/text.php:1044
+#: ../../mod/events.php:272 ../../include/text.php:1050
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:296 ../../view/theme/diabook-blue/theme.php:219
-#: ../../view/theme/diabook/theme.php:225 ../../include/nav.php:52
-#: ../../boot.php:1399
+#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52
+#: ../../boot.php:1421
 msgid "Events"
 msgstr ""
 
@@ -262,7 +265,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1030
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1042
 msgid "Location:"
 msgstr ""
 
@@ -271,8 +274,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:707 ../../mod/settings.php:479
-#: ../../mod/settings.php:506 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:707 ../../mod/settings.php:530
+#: ../../mod/settings.php:557 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -316,24 +319,24 @@ msgid ""
 msgstr ""
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:695
-#: ../../mod/settings.php:721 ../../mod/settings.php:727
-#: ../../mod/settings.php:735 ../../mod/settings.php:739
-#: ../../mod/settings.php:744 ../../mod/settings.php:750
-#: ../../mod/settings.php:756 ../../mod/settings.php:816
-#: ../../mod/settings.php:817 ../../mod/settings.php:818
-#: ../../mod/settings.php:819 ../../mod/register.php:534
-#: ../../mod/profiles.php:369
+#: ../../mod/settings.php:841 ../../mod/settings.php:847
+#: ../../mod/settings.php:855 ../../mod/settings.php:859
+#: ../../mod/settings.php:864 ../../mod/settings.php:870
+#: ../../mod/settings.php:876 ../../mod/settings.php:882
+#: ../../mod/settings.php:916 ../../mod/settings.php:917
+#: ../../mod/settings.php:918 ../../mod/settings.php:919
+#: ../../mod/register.php:536 ../../mod/profiles.php:369
 msgid "Yes"
 msgstr ""
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:696
-#: ../../mod/settings.php:721 ../../mod/settings.php:727
-#: ../../mod/settings.php:735 ../../mod/settings.php:739
-#: ../../mod/settings.php:744 ../../mod/settings.php:750
-#: ../../mod/settings.php:756 ../../mod/settings.php:816
-#: ../../mod/settings.php:817 ../../mod/settings.php:818
-#: ../../mod/settings.php:819 ../../mod/register.php:535
-#: ../../mod/profiles.php:370
+#: ../../mod/settings.php:841 ../../mod/settings.php:847
+#: ../../mod/settings.php:855 ../../mod/settings.php:859
+#: ../../mod/settings.php:864 ../../mod/settings.php:870
+#: ../../mod/settings.php:876 ../../mod/settings.php:882
+#: ../../mod/settings.php:916 ../../mod/settings.php:917
+#: ../../mod/settings.php:918 ../../mod/settings.php:919
+#: ../../mod/register.php:537 ../../mod/profiles.php:370
 msgid "No"
 msgstr ""
 
@@ -344,8 +347,10 @@ msgstr ""
 #: ../../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:110
 #: ../../view/theme/diabook-blue/theme.php:110
-#: ../../view/theme/diabook/theme.php:113
+#: ../../view/theme/diabook/theme.php:114
+#: ../../view/theme/diabook-aerith/theme.php:110
 msgid "Contact Photos"
 msgstr ""
 
@@ -353,7 +358,7 @@ msgstr ""
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:69 ../../mod/settings.php:11
+#: ../../mod/photos.php:69 ../../mod/settings.php:24
 msgid "everybody"
 msgstr ""
 
@@ -362,14 +367,16 @@ msgid "Contact information unavailable"
 msgstr ""
 
 #: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951
-#: ../../mod/photos.php:966 ../../mod/register.php:337
-#: ../../mod/register.php:344 ../../mod/register.php:351
+#: ../../mod/photos.php:966 ../../mod/register.php:339
+#: ../../mod/register.php:346 ../../mod/register.php:353
 #: ../../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:111
 #: ../../view/theme/diabook-blue/theme.php:111
-#: ../../view/theme/diabook/theme.php:114
+#: ../../view/theme/diabook/theme.php:115
+#: ../../view/theme/diabook-aerith/theme.php:111
 msgid "Profile Photos"
 msgstr ""
 
@@ -391,9 +398,11 @@ msgstr ""
 
 #: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook-red/theme.php:82
 #: ../../view/theme/diabook-blue/theme.php:82
-#: ../../view/theme/diabook/theme.php:85 ../../include/text.php:1288
-#: ../../include/diaspora.php:1642 ../../include/conversation.php:53
+#: ../../view/theme/diabook/theme.php:86
+#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294
+#: ../../include/diaspora.php:1650 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
@@ -527,9 +536,9 @@ msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1215 ../../mod/editpost.php:104
-#: ../../mod/message.php:189 ../../mod/message.php:352
-#: ../../include/conversation.php:362 ../../include/conversation.php:702
-#: ../../include/conversation.php:977
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:189
+#: ../../mod/message.php:358 ../../include/conversation.php:362
+#: ../../include/conversation.php:702 ../../include/conversation.php:979
 msgid "Please wait"
 msgstr ""
 
@@ -540,17 +549,17 @@ msgstr ""
 
 #: ../../mod/photos.php:1233 ../../mod/photos.php:1273
 #: ../../mod/photos.php:1304 ../../include/conversation.php:554
-#: ../../boot.php:488
+#: ../../boot.php:494
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1235 ../../mod/editpost.php:123
-#: ../../include/conversation.php:556 ../../include/conversation.php:995
+#: ../../mod/photos.php:1235 ../../mod/editpost.php:125
+#: ../../include/conversation.php:556 ../../include/conversation.php:997
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1332 ../../mod/settings.php:542
-#: ../../mod/settings.php:626 ../../mod/group.php:168 ../../mod/admin.php:491
+#: ../../mod/photos.php:1332 ../../mod/settings.php:593
+#: ../../mod/settings.php:677 ../../mod/group.php:168 ../../mod/admin.php:532
 #: ../../include/conversation.php:318 ../../include/conversation.php:576
 msgid "Delete"
 msgstr ""
@@ -568,12 +577,14 @@ msgid "Not available."
 msgstr ""
 
 #: ../../mod/community.php:30 ../../addon/pages/pages.php:75
-#: ../../view/theme/diabook-blue/theme.php:221
-#: ../../view/theme/diabook/theme.php:227 ../../include/nav.php:101
+#: ../../view/theme/diabook-red/theme.php:242
+#: ../../view/theme/diabook-blue/theme.php:242
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:101
 msgid "Community"
 msgstr ""
 
-#: ../../mod/community.php:61 ../../mod/search.php:119
+#: ../../mod/community.php:61 ../../mod/search.php:115
 msgid "No results."
 msgstr ""
 
@@ -621,13 +632,14 @@ msgstr ""
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:541
+#: ../../mod/editpost.php:95 ../../mod/settings.php:592
 #: ../../include/conversation.php:563
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/editpost.php:96 ../../mod/message.php:187
-#: ../../mod/message.php:350 ../../include/conversation.php:961
+#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../mod/message.php:187 ../../mod/message.php:356
+#: ../../include/conversation.php:961
 msgid "Upload photo"
 msgstr ""
 
@@ -635,8 +647,9 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:98 ../../mod/message.php:188
-#: ../../mod/message.php:351 ../../include/conversation.php:965
+#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
+#: ../../mod/message.php:188 ../../mod/message.php:357
+#: ../../include/conversation.php:965
 msgid "Insert web link"
 msgstr ""
 
@@ -660,15 +673,15 @@ msgstr ""
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:978
+#: ../../mod/editpost.php:105 ../../include/conversation.php:980
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:987
+#: ../../mod/editpost.php:113 ../../include/conversation.php:989
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:988
+#: ../../mod/editpost.php:114 ../../include/conversation.php:990
 msgid "Public post"
 msgstr ""
 
@@ -676,7 +689,11 @@ msgstr ""
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:990
+#: ../../mod/editpost.php:119 ../../include/conversation.php:978
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../mod/editpost.php:120 ../../include/conversation.php:992
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -785,17 +802,10 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:583 ../../include/items.php:2641
+#: ../../mod/dfrn_request.php:583 ../../include/items.php:2649
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:667
-#, php-format
-msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
-msgstr ""
-
 #: ../../mod/dfrn_request.php:670
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
@@ -844,13 +854,16 @@ msgstr ""
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:578
+#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:629
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
 #: ../../mod/dfrn_request.php:702
-msgid "- please share from your own site as noted above"
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search "
+"bar."
 msgstr ""
 
 #: ../../mod/dfrn_request.php:703
@@ -1152,7 +1165,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:980
+#: ../../include/contact_widgets.php:9 ../../boot.php:986
 msgid "Connect"
 msgstr ""
 
@@ -1177,185 +1190,187 @@ msgstr ""
 msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:157
-#: ../../mod/notifications.php:203
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:207
 msgid "Discard"
 msgstr ""
 
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:156
-#: ../../mod/notifications.php:202 ../../mod/contacts.php:302
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:302
 #: ../../mod/contacts.php:345
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/notifications.php:71
+#: ../../mod/notifications.php:75
 msgid "System"
 msgstr ""
 
-#: ../../mod/notifications.php:76 ../../include/nav.php:113
+#: ../../mod/notifications.php:80 ../../include/nav.php:113
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:81 ../../mod/network.php:182
+#: ../../mod/notifications.php:85 ../../mod/network.php:182
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:86 ../../view/theme/diabook-blue/theme.php:215
-#: ../../view/theme/diabook/theme.php:221 ../../include/nav.php:77
+#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:236
+#: ../../view/theme/diabook-blue/theme.php:236
+#: ../../view/theme/diabook/theme.php:244
+#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:77
 #: ../../include/nav.php:115
 msgid "Home"
 msgstr ""
 
-#: ../../mod/notifications.php:91 ../../include/nav.php:121
+#: ../../mod/notifications.php:95 ../../include/nav.php:121
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:96 ../../mod/message.php:103
+#: ../../mod/notifications.php:100 ../../mod/message.php:103
 #: ../../include/nav.php:128
 msgid "Messages"
 msgstr ""
 
-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119
 msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119
 msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:141 ../../mod/notifications.php:187
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:191
 msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/notifications.php:142
+#: ../../mod/notifications.php:146
 msgid "Friend Suggestion"
 msgstr ""
 
-#: ../../mod/notifications.php:144
+#: ../../mod/notifications.php:148
 #, php-format
 msgid "suggested by %s"
 msgstr ""
 
-#: ../../mod/notifications.php:149 ../../mod/notifications.php:196
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
 #: ../../mod/contacts.php:350
 msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
 msgid "Post a new friend activity"
 msgstr ""
 
-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
 msgid "if applicable"
 msgstr ""
 
-#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/admin.php:489
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:530
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "yes"
 msgstr ""
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "no"
 msgstr ""
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:184
 msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/notifications.php:181
+#: ../../mod/notifications.php:185
 msgid "Friend"
 msgstr ""
 
-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186
 msgid "Sharer"
 msgstr ""
 
-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186
 msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192
 msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192
 msgid "New Follower"
 msgstr ""
 
-#: ../../mod/notifications.php:209
+#: ../../mod/notifications.php:213
 msgid "No introductions."
 msgstr ""
 
-#: ../../mod/notifications.php:212 ../../include/nav.php:122
+#: ../../mod/notifications.php:216 ../../include/nav.php:122
 msgid "Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:249 ../../mod/notifications.php:374
-#: ../../mod/notifications.php:461
+#: ../../mod/notifications.php:253 ../../mod/notifications.php:378
+#: ../../mod/notifications.php:465
 #, php-format
 msgid "%s liked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:258 ../../mod/notifications.php:383
-#: ../../mod/notifications.php:470
+#: ../../mod/notifications.php:262 ../../mod/notifications.php:387
+#: ../../mod/notifications.php:474
 #, php-format
 msgid "%s disliked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:272 ../../mod/notifications.php:397
-#: ../../mod/notifications.php:484
+#: ../../mod/notifications.php:276 ../../mod/notifications.php:401
+#: ../../mod/notifications.php:488
 #, php-format
 msgid "%s is now friends with %s"
 msgstr ""
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
+#: ../../mod/notifications.php:283 ../../mod/notifications.php:408
 #, php-format
 msgid "%s created a new post"
 msgstr ""
 
-#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
-#: ../../mod/notifications.php:493
+#: ../../mod/notifications.php:284 ../../mod/notifications.php:409
+#: ../../mod/notifications.php:497
 #, php-format
 msgid "%s commented on %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:294
+#: ../../mod/notifications.php:298
 msgid "No more network notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:298
+#: ../../mod/notifications.php:302
 msgid "Network Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:324 ../../mod/notify.php:61
+#: ../../mod/notifications.php:328 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:328 ../../mod/notify.php:65
+#: ../../mod/notifications.php:332 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:419
+#: ../../mod/notifications.php:423
 msgid "No more personal notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:423
+#: ../../mod/notifications.php:427
 msgid "Personal Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:504
 msgid "No more home notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:504
+#: ../../mod/notifications.php:508
 msgid "Home Notifications"
 msgstr ""
 
@@ -1447,12 +1462,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:534
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:492
+#: ../../mod/admin.php:533
 msgid "Block"
 msgstr ""
 
@@ -1521,7 +1536,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:341 ../../mod/admin.php:914
+#: ../../mod/contacts.php:341 ../../mod/admin.php:955
 msgid "Update now"
 msgstr ""
 
@@ -1579,8 +1594,10 @@ msgstr ""
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:523 ../../view/theme/diabook-blue/theme.php:217
-#: ../../view/theme/diabook/theme.php:223 ../../include/nav.php:139
+#: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:238
+#: ../../view/theme/diabook-blue/theme.php:238
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook-aerith/theme.php:238 ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 
@@ -1611,9 +1628,10 @@ msgid "Password reset requested at %s"
 msgstr ""
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:390 ../../mod/register.php:444
+#: ../../mod/register.php:392 ../../mod/register.php:446
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:601 ../../include/items.php:2650
+#: ../../addon/facebook/facebook.php:617
+#: ../../addon/facebook/facebook.php:1069 ../../include/items.php:2658
 msgid "Administrator"
 msgstr ""
 
@@ -1623,7 +1641,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:773
+#: ../../mod/lostpass.php:83 ../../boot.php:779
 msgid "Password Reset"
 msgstr ""
 
@@ -1667,456 +1685,490 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:76
+#: ../../mod/settings.php:89
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:505 ../../mod/admin.php:75
+#: ../../mod/settings.php:92 ../../mod/settings.php:556 ../../mod/admin.php:75
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:184
+#: ../../mod/settings.php:197
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:189
+#: ../../mod/settings.php:202
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:208
+#: ../../mod/settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:213
+#: ../../mod/settings.php:266
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:224
+#: ../../mod/settings.php:277
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:279
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:294
+#: ../../mod/settings.php:340
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:296
+#: ../../mod/settings.php:342
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:302
+#: ../../mod/settings.php:348
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:304
+#: ../../mod/settings.php:350
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:375 ../../addon/facebook/facebook.php:441
+#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:445
 #: ../../addon/impressum/impressum.php:64
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:364
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:439 ../../include/nav.php:137
+#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:284
+#: ../../view/theme/diabook-blue/theme.php:283
+#: ../../view/theme/diabook/theme.php:293
+#: ../../view/theme/diabook-aerith/theme.php:283 ../../include/nav.php:137
 msgid "Account settings"
 msgstr ""
 
-#: ../../mod/settings.php:444
+#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:289
+#: ../../view/theme/diabook-blue/theme.php:288
+#: ../../view/theme/diabook/theme.php:298
+#: ../../view/theme/diabook-aerith/theme.php:288
+msgid "Display settings"
+msgstr ""
+
+#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:298
+#: ../../view/theme/diabook-blue/theme.php:297
+#: ../../view/theme/diabook/theme.php:307
+#: ../../view/theme/diabook-aerith/theme.php:297
 msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/settings.php:449
+#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:303
+#: ../../view/theme/diabook-blue/theme.php:302
+#: ../../view/theme/diabook/theme.php:312
+#: ../../view/theme/diabook-aerith/theme.php:302
 msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/settings.php:454
+#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:308
+#: ../../view/theme/diabook-blue/theme.php:307
+#: ../../view/theme/diabook/theme.php:317
+#: ../../view/theme/diabook-aerith/theme.php:307
 msgid "Connections"
 msgstr ""
 
-#: ../../mod/settings.php:459
+#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:313
+#: ../../view/theme/diabook-blue/theme.php:312
+#: ../../view/theme/diabook/theme.php:322
+#: ../../view/theme/diabook-aerith/theme.php:312
 msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/settings.php:477 ../../mod/settings.php:504
-#: ../../mod/settings.php:540
+#: ../../mod/settings.php:528 ../../mod/settings.php:555
+#: ../../mod/settings.php:591
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:481 ../../mod/settings.php:508
-#: ../../addon/statusnet/statusnet.php:526
+#: ../../mod/settings.php:532 ../../mod/settings.php:559
+#: ../../addon/statusnet/statusnet.php:541
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:482 ../../mod/settings.php:509
-#: ../../addon/statusnet/statusnet.php:525
+#: ../../mod/settings.php:533 ../../mod/settings.php:560
+#: ../../addon/statusnet/statusnet.php:540
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:483 ../../mod/settings.php:510
+#: ../../mod/settings.php:534 ../../mod/settings.php:561
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:484 ../../mod/settings.php:511
+#: ../../mod/settings.php:535 ../../mod/settings.php:562
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:495
+#: ../../mod/settings.php:546
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:539
+#: ../../mod/settings.php:590
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:543
+#: ../../mod/settings.php:594
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:544
+#: ../../mod/settings.php:595
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:545
+#: ../../mod/settings.php:596
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:557
+#: ../../mod/settings.php:608
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:565 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:616 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:578 ../../mod/settings.php:579
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:578 ../../mod/settings.php:579
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:578 ../../mod/settings.php:579
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:579
+#: ../../mod/settings.php:630
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:609
+#: ../../mod/settings.php:660
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:615
+#: ../../mod/settings.php:666
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:616
+#: ../../mod/settings.php:667
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/settings.php:617
+#: ../../mod/settings.php:668
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:669
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:670
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:671
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:672
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:621 ../../mod/settings.php:626
+#: ../../mod/settings.php:672 ../../mod/settings.php:677
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:622
+#: ../../mod/settings.php:673
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:674
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:675
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:676
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:677
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:677
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:677
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:627
+#: ../../mod/settings.php:678
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:688 ../../mod/admin.php:142 ../../mod/admin.php:465
+#: ../../mod/settings.php:739
+msgid "Display Settings"
+msgstr ""
+
+#: ../../mod/settings.php:745
+msgid "Display Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:746
+msgid "Update browser every xx seconds"
+msgstr ""
+
+#: ../../mod/settings.php:746
+msgid "Minimum of 10 seconds, no maximum"
+msgstr ""
+
+#: ../../mod/settings.php:747
+msgid "Number of items to display on the network page:"
+msgstr ""
+
+#: ../../mod/settings.php:747
+msgid "Maximum of 100 items"
+msgstr ""
+
+#: ../../mod/settings.php:748
+msgid "Don't show emoticons"
+msgstr ""
+
+#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:506
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/settings.php:689
+#: ../../mod/settings.php:809
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:692 ../../mod/admin.php:143 ../../mod/admin.php:466
+#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:507
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:813
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:696 ../../mod/admin.php:144 ../../mod/admin.php:467
+#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:508
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:817
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:700 ../../mod/admin.php:145 ../../mod/admin.php:468
+#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:509
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/settings.php:701
+#: ../../mod/settings.php:821
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:711
+#: ../../mod/settings.php:831
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:711
+#: ../../mod/settings.php:831
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:841
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:847
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:855
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:739
+#: ../../mod/settings.php:859
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:744
+#: ../../mod/settings.php:864
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:750
+#: ../../mod/settings.php:870
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:756
+#: ../../mod/settings.php:876
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:882
+msgid "Permit unknown people to send you private mail?"
+msgstr ""
+
+#: ../../mod/settings.php:891
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:797 ../../mod/profile_photo.php:211
+#: ../../mod/settings.php:897 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:802
+#: ../../mod/settings.php:902
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:913
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:913
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:814
+#: ../../mod/settings.php:914
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:915
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:916
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:917
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:918
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:919
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:824
+#: ../../mod/settings.php:924
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:833
+#: ../../mod/settings.php:933
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:934
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:835
+#: ../../mod/settings.php:935
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:835
+#: ../../mod/settings.php:935
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:939
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:840 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:940 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:841
+#: ../../mod/settings.php:941
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:842
+#: ../../mod/settings.php:942
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:843
+#: ../../mod/settings.php:943
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:844
+#: ../../mod/settings.php:944
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:845
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:846
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../mod/settings.php:846
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../mod/settings.php:847
-msgid "Number of items to display on the network page:"
-msgstr ""
-
-#: ../../mod/settings.php:847
-msgid "Maximum of 100 items"
-msgstr ""
-
-#: ../../mod/settings.php:848
-msgid "Don't show emoticons"
-msgstr ""
-
-#: ../../mod/settings.php:850
+#: ../../mod/settings.php:947
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:852
+#: ../../mod/settings.php:949
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:852
+#: ../../mod/settings.php:949 ../../mod/settings.php:964
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:853
+#: ../../mod/settings.php:950
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:854
+#: ../../mod/settings.php:951
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:869
+#: ../../mod/settings.php:964
+msgid "Maximum private messages per day from unknown people:"
+msgstr ""
+
+#: ../../mod/settings.php:967
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:968
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:871
+#: ../../mod/settings.php:969
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:872
+#: ../../mod/settings.php:970
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:873
+#: ../../mod/settings.php:971
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:874
+#: ../../mod/settings.php:972
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:875
+#: ../../mod/settings.php:973
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:876
+#: ../../mod/settings.php:974
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:877
+#: ../../mod/settings.php:975
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:880
+#: ../../mod/settings.php:978
 msgid "Advanced Page Settings"
 msgstr ""
 
@@ -2206,14 +2258,75 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1404
+#: ../../mod/notes.php:44 ../../boot.php:1426
 msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/notes.php:63 ../../mod/filer.php:29 ../../include/text.php:647
+#: ../../mod/notes.php:63 ../../mod/filer.php:29
+#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649
 msgid "Save"
 msgstr ""
 
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr ""
+
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:60
+msgid "No recipient selected."
+msgstr ""
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr ""
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:67
+msgid "Message could not be sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:70
+msgid "Message collection failure."
+msgstr ""
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:73
+msgid "Message sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr ""
+
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:170
+#: ../../include/conversation.php:914
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:178
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../mod/wallmessage.php:132
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr ""
+
+#: ../../mod/wallmessage.php:133 ../../mod/message.php:179
+#: ../../mod/message.php:348
+msgid "To:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:180
+#: ../../mod/message.php:349
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:184
+#: ../../mod/message.php:352 ../../mod/invite.php:113
+msgid "Your message:"
+msgstr ""
+
 #: ../../mod/newmember.php:6
 msgid "Welcome to Friendica"
 msgstr ""
@@ -2232,12 +2345,19 @@ msgstr ""
 
 #: ../../mod/newmember.php:16
 msgid ""
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, connect to Facebook, make some new connections, "
+"and find some groups to join."
+msgstr ""
+
+#: ../../mod/newmember.php:18
+msgid ""
 "On your <em>Settings</em> page -  change your initial password. Also make a "
 "note of your Identity Address. This looks just like an email address - and "
 "will be useful in making friends on the free social web."
 msgstr ""
 
-#: ../../mod/newmember.php:18
+#: ../../mod/newmember.php:20
 msgid ""
 "Review the other settings, particularly the privacy settings. An unpublished "
 "directory listing is like having an unlisted phone number. In general, you "
@@ -2245,61 +2365,61 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr ""
 
-#: ../../mod/newmember.php:20
+#: ../../mod/newmember.php:22
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make "
 "friends than people who do not."
 msgstr ""
 
-#: ../../mod/newmember.php:23
+#: ../../mod/newmember.php:25
 msgid ""
 "Authorise the Facebook Connector if you currently have a Facebook account "
 "and we will (optionally) import all your Facebook friends and conversations."
 msgstr ""
 
-#: ../../mod/newmember.php:25
+#: ../../mod/newmember.php:27
 msgid ""
 "<em>If</em> this is your own personal server, installing the Facebook addon "
 "may ease your transition to the free social web."
 msgstr ""
 
-#: ../../mod/newmember.php:30
+#: ../../mod/newmember.php:32
 msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
 msgstr ""
 
-#: ../../mod/newmember.php:32
+#: ../../mod/newmember.php:34
 msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown "
 "visitors."
 msgstr ""
 
-#: ../../mod/newmember.php:34
+#: ../../mod/newmember.php:36
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
 msgstr ""
 
-#: ../../mod/newmember.php:36
+#: ../../mod/newmember.php:38
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
 msgstr ""
 
-#: ../../mod/newmember.php:38
+#: ../../mod/newmember.php:40
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: ../../mod/newmember.php:40
+#: ../../mod/newmember.php:42
 msgid ""
 "On the side panel of the Contacts page are several tools to find new "
 "friends. We can match people by interest, look up people by name or "
@@ -2308,14 +2428,14 @@ msgid ""
 "hours."
 msgstr ""
 
-#: ../../mod/newmember.php:42
+#: ../../mod/newmember.php:44
 msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with "
 "each group privately on your Network page."
 msgstr ""
 
-#: ../../mod/newmember.php:44
+#: ../../mod/newmember.php:46
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program "
 "features and resources."
@@ -2345,7 +2465,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:290
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:293
 msgid "Permission denied"
 msgstr ""
 
@@ -2385,10 +2505,12 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/profperm.php:103 ../../view/theme/diabook-blue/theme.php:216
-#: ../../view/theme/diabook/theme.php:222 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:76 ../../include/nav.php:50
-#: ../../boot.php:1386
+#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:237
+#: ../../view/theme/diabook-blue/theme.php:237
+#: ../../view/theme/diabook/theme.php:245
+#: ../../view/theme/diabook-aerith/theme.php:237
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
+#: ../../include/nav.php:50 ../../boot.php:1408
 msgid "Profile"
 msgstr ""
 
@@ -2404,163 +2526,163 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:584
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:586
 msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/register.php:62
+#: ../../mod/register.php:64
 msgid "An invitation is required."
 msgstr ""
 
-#: ../../mod/register.php:67
+#: ../../mod/register.php:69
 msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../mod/register.php:75
+#: ../../mod/register.php:77
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/register.php:90
+#: ../../mod/register.php:92
 msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/register.php:104
+#: ../../mod/register.php:106
 msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:108
 msgid "Name too short."
 msgstr ""
 
-#: ../../mod/register.php:121
+#: ../../mod/register.php:123
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/register.php:126
+#: ../../mod/register.php:128
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/register.php:129
+#: ../../mod/register.php:131
 msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/register.php:139
+#: ../../mod/register.php:141
 msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/register.php:145
+#: ../../mod/register.php:147
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
 
-#: ../../mod/register.php:151 ../../mod/register.php:262
+#: ../../mod/register.php:153 ../../mod/register.php:264
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/register.php:161
+#: ../../mod/register.php:163
 msgid ""
 "Nickname was once registered here and may not be re-used. Please choose "
 "another."
 msgstr ""
 
-#: ../../mod/register.php:180
+#: ../../mod/register.php:182
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/register.php:248
+#: ../../mod/register.php:250
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:284
+#: ../../mod/register.php:286
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:388 ../../mod/regmod.php:52
+#: ../../mod/register.php:390 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:396
+#: ../../mod/register.php:398
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:400
+#: ../../mod/register.php:402
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:405
+#: ../../mod/register.php:407
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:442
+#: ../../mod/register.php:444
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:451
+#: ../../mod/register.php:453
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:489
+#: ../../mod/register.php:491
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/register.php:515
+#: ../../mod/register.php:517
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:516
+#: ../../mod/register.php:518
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: ../../mod/register.php:517
+#: ../../mod/register.php:519
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:531
+#: ../../mod/register.php:533
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:546
+#: ../../mod/register.php:553
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:547
+#: ../../mod/register.php:554
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:550 ../../mod/admin.php:317
+#: ../../mod/register.php:557 ../../mod/admin.php:358
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:558
+#: ../../mod/register.php:565
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:559
+#: ../../mod/register.php:566
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:560
+#: ../../mod/register.php:567
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: ../../mod/register.php:561
+#: ../../mod/register.php:568
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:564 ../../include/nav.php:81 ../../boot.php:739
+#: ../../mod/register.php:571 ../../include/nav.php:81 ../../boot.php:745
 msgid "Register"
 msgstr ""
 
@@ -2569,23 +2691,29 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1327
+#: ../../addon/facebook/facebook.php:1440
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
+#: ../../view/theme/diabook-red/theme.php:77
+#: ../../view/theme/diabook-red/theme.php:86
 #: ../../view/theme/diabook-blue/theme.php:77
 #: ../../view/theme/diabook-blue/theme.php:86
-#: ../../view/theme/diabook/theme.php:80 ../../view/theme/diabook/theme.php:89
-#: ../../include/diaspora.php:1642 ../../include/conversation.php:48
+#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90
+#: ../../view/theme/diabook-aerith/theme.php:77
+#: ../../view/theme/diabook-aerith/theme.php:86
+#: ../../include/diaspora.php:1650 ../../include/conversation.php:48
 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1331
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1444
 #: ../../addon/communityhome/communityhome.php:172
+#: ../../view/theme/diabook-red/theme.php:91
 #: ../../view/theme/diabook-blue/theme.php:91
-#: ../../view/theme/diabook/theme.php:94 ../../include/diaspora.php:1658
-#: ../../include/conversation.php:65
+#: ../../view/theme/diabook/theme.php:95
+#: ../../view/theme/diabook-aerith/theme.php:91
+#: ../../include/diaspora.php:1666 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
@@ -2596,8 +2724,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
-#: ../../mod/admin.php:525 ../../mod/admin.php:704 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3022
+#: ../../mod/admin.php:566 ../../mod/admin.php:745 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3030
 msgid "Item not found."
 msgstr ""
 
@@ -2622,38 +2750,38 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:251
+#: ../../mod/item.php:249
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:362 ../../mod/wall_upload.php:81
+#: ../../mod/item.php:373 ../../mod/wall_upload.php:81
 #: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
-#: ../../include/message.php:143
+#: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:745
+#: ../../mod/item.php:763
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:770
+#: ../../mod/item.php:788
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:772
+#: ../../mod/item.php:790
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:773
+#: ../../mod/item.php:791
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:775
+#: ../../mod/item.php:793
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -2741,26 +2869,10 @@ msgstr ""
 msgid "New Message"
 msgstr ""
 
-#: ../../mod/message.php:60
-msgid "No recipient selected."
-msgstr ""
-
 #: ../../mod/message.php:64
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/message.php:67
-msgid "Message could not be sent."
-msgstr ""
-
-#: ../../mod/message.php:70
-msgid "Message collection failure."
-msgstr ""
-
-#: ../../mod/message.php:73
-msgid "Message sent."
-msgstr ""
-
 #: ../../mod/message.php:118
 msgid "Message deleted."
 msgstr ""
@@ -2769,29 +2881,13 @@ msgstr ""
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:170 ../../include/conversation.php:914
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/message.php:178
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../mod/message.php:179 ../../mod/message.php:342
-msgid "To:"
-msgstr ""
-
-#: ../../mod/message.php:180 ../../mod/message.php:343
-msgid "Subject:"
-msgstr ""
-
-#: ../../mod/message.php:184 ../../mod/message.php:346
-#: ../../mod/invite.php:113
-msgid "Your message:"
+#: ../../mod/message.php:220
+msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:223
-msgid "No messages."
+#: ../../mod/message.php:227
+#, php-format
+msgid "Unknown sender - %s"
 msgstr ""
 
 #: ../../mod/message.php:230
@@ -2799,35 +2895,41 @@ msgstr ""
 msgid "You and %s"
 msgstr ""
 
-#: ../../mod/message.php:232
+#: ../../mod/message.php:233
 #, php-format
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:242 ../../mod/message.php:336
+#: ../../mod/message.php:243 ../../mod/message.php:341
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:245
+#: ../../mod/message.php:246
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/message.php:247
+#: ../../mod/message.php:248
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/message.php:282
+#: ../../mod/message.php:283
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:320
+#: ../../mod/message.php:325
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:341
+#: ../../mod/message.php:343
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/message.php:347
 msgid "Send Reply"
 msgstr ""
 
@@ -2840,23 +2942,23 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/admin.php:71 ../../mod/admin.php:315
+#: ../../mod/admin.php:71 ../../mod/admin.php:356
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:72 ../../mod/admin.php:483 ../../mod/admin.php:495
+#: ../../mod/admin.php:72 ../../mod/admin.php:524 ../../mod/admin.php:536
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:73 ../../mod/admin.php:572 ../../mod/admin.php:612
+#: ../../mod/admin.php:73 ../../mod/admin.php:613 ../../mod/admin.php:653
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:74 ../../mod/admin.php:750 ../../mod/admin.php:784
+#: ../../mod/admin.php:74 ../../mod/admin.php:791 ../../mod/admin.php:825
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:864
+#: ../../mod/admin.php:89 ../../mod/admin.php:905
 msgid "Logs"
 msgstr ""
 
@@ -2864,9 +2966,9 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:157 ../../mod/admin.php:314 ../../mod/admin.php:482
-#: ../../mod/admin.php:571 ../../mod/admin.php:611 ../../mod/admin.php:749
-#: ../../mod/admin.php:783 ../../mod/admin.php:863
+#: ../../mod/admin.php:157 ../../mod/admin.php:355 ../../mod/admin.php:523
+#: ../../mod/admin.php:612 ../../mod/admin.php:652 ../../mod/admin.php:790
+#: ../../mod/admin.php:824 ../../mod/admin.php:904
 msgid "Administration"
 msgstr ""
 
@@ -2890,449 +2992,449 @@ msgstr ""
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:257
+#: ../../mod/admin.php:298
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:301
+#: ../../mod/admin.php:342
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:302
+#: ../../mod/admin.php:343
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:303
+#: ../../mod/admin.php:344
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:307
+#: ../../mod/admin.php:348
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:308
+#: ../../mod/admin.php:349
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:309
+#: ../../mod/admin.php:350
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:318
+#: ../../mod/admin.php:359
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:319
+#: ../../mod/admin.php:360
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:320
+#: ../../mod/admin.php:361
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:324 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:325
+#: ../../mod/admin.php:366
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:367
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:327
+#: ../../mod/admin.php:368
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:327
+#: ../../mod/admin.php:368
 msgid "Default system theme - may be over-ridden by user profiles"
 msgstr ""
 
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:369
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:369
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:370
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:370
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:372
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:373
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:373
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:374
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:374
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:375
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:375
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:376
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:376
 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 ""
 
-#: ../../mod/admin.php:336
+#: ../../mod/admin.php:377
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:336
+#: ../../mod/admin.php:377
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:378
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:378
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:379
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:379
 msgid ""
 "URL to update the global directory. If this is not set, the global directory "
 "is completely unavailable to the application."
 msgstr ""
 
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:381
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:381
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:382
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:382
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:383
 msgid "Gravatar support"
 msgstr ""
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:383
 msgid "Search new user's photo on Gravatar."
 msgstr ""
 
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:384
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:384
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:385
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:385
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:386
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:386
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:387
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:387
 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 ""
 
-#: ../../mod/admin.php:347
+#: ../../mod/admin.php:388
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:347
+#: ../../mod/admin.php:388
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:389
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:389
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:390
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:390
 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 ""
 
-#: ../../mod/admin.php:350
+#: ../../mod/admin.php:391
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:351
+#: ../../mod/admin.php:392
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:352
+#: ../../mod/admin.php:393
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:352
+#: ../../mod/admin.php:393
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:414
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:380
+#: ../../mod/admin.php:421
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:455
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:462
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:462
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:526
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:527
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:528
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:487 ../../mod/admin.php:496
+#: ../../mod/admin.php:528 ../../mod/admin.php:537
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:529
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:490
+#: ../../mod/admin.php:531
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:537
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:537
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:537
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:537
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:539
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:499
+#: ../../mod/admin.php:540
 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 ""
 
-#: ../../mod/admin.php:535
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:549 ../../mod/admin.php:728
+#: ../../mod/admin.php:590 ../../mod/admin.php:769
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:551 ../../mod/admin.php:730
+#: ../../mod/admin.php:592 ../../mod/admin.php:771
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:573 ../../mod/admin.php:751
+#: ../../mod/admin.php:614 ../../mod/admin.php:792
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:574 ../../mod/admin.php:752 ../../include/nav.php:137
+#: ../../mod/admin.php:615 ../../mod/admin.php:793 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
-#: ../../mod/admin.php:581 ../../mod/admin.php:761
+#: ../../mod/admin.php:622 ../../mod/admin.php:802
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:582 ../../mod/admin.php:762
+#: ../../mod/admin.php:623 ../../mod/admin.php:803
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:734
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:743
+#: ../../mod/admin.php:784
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:789
+#: ../../mod/admin.php:830
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:790
+#: ../../mod/admin.php:831
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:813
+#: ../../mod/admin.php:854
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:866
+#: ../../mod/admin.php:907
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:872
+#: ../../mod/admin.php:913
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:873
+#: ../../mod/admin.php:914
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:873
+#: ../../mod/admin.php:914
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:874
+#: ../../mod/admin.php:915
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:915
+#: ../../mod/admin.php:956
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:921
+#: ../../mod/admin.php:962
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:922
+#: ../../mod/admin.php:963
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:964
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:924
+#: ../../mod/admin.php:965
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:15 ../../boot.php:895
+#: ../../mod/profile.php:20 ../../boot.php:901
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:111 ../../mod/display.php:75
+#: ../../mod/profile.php:123 ../../mod/display.php:75
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:131
+#: ../../mod/profile.php:144
 msgid "Tips for New Members"
 msgstr ""
 
@@ -3391,7 +3493,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/openid.php:93 ../../include/auth.php:90
-#: ../../include/auth.php:149
+#: ../../include/auth.php:153
 msgid "Login failed."
 msgstr ""
 
@@ -3656,27 +3758,30 @@ msgstr ""
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:476
+#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:294
+#: ../../view/theme/diabook-blue/theme.php:293
+#: ../../view/theme/diabook/theme.php:303
+#: ../../view/theme/diabook-aerith/theme.php:293
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:477 ../../boot.php:996
+#: ../../mod/profiles.php:477 ../../boot.php:1008
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:478 ../../boot.php:997
+#: ../../mod/profiles.php:478 ../../boot.php:1009
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:489 ../../boot.php:1007
+#: ../../mod/profiles.php:489 ../../boot.php:1019
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:491 ../../boot.php:1010
+#: ../../mod/profiles.php:491 ../../boot.php:1022
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:492 ../../boot.php:1011
+#: ../../mod/profiles.php:492 ../../boot.php:1023
 msgid "Edit visibility"
 msgstr ""
 
@@ -3728,8 +3833,11 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook-blue/theme.php:144
-#: ../../view/theme/diabook/theme.php:147 ../../include/contact_widgets.php:33
+#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:146
+#: ../../view/theme/diabook-blue/theme.php:146
+#: ../../view/theme/diabook/theme.php:150
+#: ../../view/theme/diabook-aerith/theme.php:146
+#: ../../include/contact_widgets.php:33
 msgid "Friend Suggestions"
 msgstr ""
 
@@ -3743,7 +3851,10 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:47
+#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:144
+#: ../../view/theme/diabook-blue/theme.php:144
+#: ../../view/theme/diabook/theme.php:148
+#: ../../view/theme/diabook-aerith/theme.php:144
 msgid "Global Directory"
 msgstr ""
 
@@ -3882,7 +3993,7 @@ msgstr ""
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:495
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:503
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
@@ -3929,71 +4040,71 @@ msgstr ""
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:458
+#: ../../addon/facebook/facebook.php:462
 msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:463
+#: ../../addon/facebook/facebook.php:467
 msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:472
+#: ../../addon/facebook/facebook.php:488
 msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:479
+#: ../../addon/facebook/facebook.php:495
 msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:485
+#: ../../addon/facebook/facebook.php:501
 msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:492
+#: ../../addon/facebook/facebook.php:508
 msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:497
+#: ../../addon/facebook/facebook.php:513
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:504
+#: ../../addon/facebook/facebook.php:520
 msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:508
+#: ../../addon/facebook/facebook.php:524
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:510
+#: ../../addon/facebook/facebook.php:526
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:511
+#: ../../addon/facebook/facebook.php:527
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:512
+#: ../../addon/facebook/facebook.php:528
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:516
+#: ../../addon/facebook/facebook.php:532
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:521
+#: ../../addon/facebook/facebook.php:537
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:523
+#: ../../addon/facebook/facebook.php:539
 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 "
@@ -4001,67 +4112,125 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:544
 msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:599
+#: ../../addon/facebook/facebook.php:615
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:623
+#: ../../addon/facebook/facebook.php:639
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:624
+#: ../../addon/facebook/facebook.php:640
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:634
+#: ../../addon/facebook/facebook.php:649
+msgid "Facebook API Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:658
+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.<br><br>"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:663
+msgid ""
+"Error: the given API Key seems to be incorrect (the application access token "
+"could not be retrieved)."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:665
+msgid "The given API Key seems to work correctly."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:667
+msgid ""
+"The correctness of the API Key could not be detected. Somthing strange's "
+"going on."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:670
+msgid "App-ID / API-Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:671
+msgid "Application secret"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:672
+#, php-format
+msgid "Polling Interval (min. %1$s minutes)"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:676
+msgid "Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:680
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:635
+#: ../../addon/facebook/facebook.php:681
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:637
+#: ../../addon/facebook/facebook.php:683
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:637
+#: ../../addon/facebook/facebook.php:683
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:659
+#: ../../addon/facebook/facebook.php:697
+msgid "The new values have been saved."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:716
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:751
+#: ../../addon/facebook/facebook.php:808
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:923
+#: ../../addon/facebook/facebook.php:1026
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:948
+#: ../../addon/facebook/facebook.php:1051
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:981
+#: ../../addon/facebook/facebook.php:1087
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:982
+#: ../../addon/facebook/facebook.php:1088
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1107
-#: ../../addon/facebook/facebook.php:1116 ../../include/bb2diaspora.php:102
+#: ../../addon/facebook/facebook.php:1089
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"The connection between your accounts on %2$s and Facebook became invalid. "
+"This usually happens after you change your Facebook-password. To enable the "
+"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1214
+#: ../../addon/facebook/facebook.php:1223 ../../include/bb2diaspora.php:102
 msgid "link"
 msgstr ""
 
@@ -4144,15 +4313,25 @@ msgid "Post to LiveJournal by default"
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:47
-msgid "\"Not Safe For Work\" Settings"
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:49
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and "
+"can thereby be used as a general purpose content filter."
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:50
-msgid "Enable NSFW filter"
+msgid "Enable Content filter"
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:53
-msgid "Comma separated words to treat as NSFW"
+msgid "Comma separated list of keywords to hide"
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:58
@@ -4176,7 +4355,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:760
+#: ../../include/nav.php:64 ../../boot.php:766
 msgid "Login"
 msgstr ""
 
@@ -4186,9 +4365,8 @@ msgid "OpenID"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:38
-#: ../../view/theme/diabook-blue/theme.php:23
-#: ../../view/theme/diabook/theme.php:26
-msgid "Last users"
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:81
@@ -4197,28 +4375,22 @@ msgid "Most active users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:98
-#: ../../view/theme/diabook-blue/theme.php:97
-#: ../../view/theme/diabook/theme.php:100
-msgid "Last photos"
+msgid "Latest photos"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:133
-#: ../../view/theme/diabook-blue/theme.php:52
-#: ../../view/theme/diabook/theme.php:55
-msgid "Last likes"
+msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
+#: ../../view/theme/diabook-red/theme.php:74
 #: ../../view/theme/diabook-blue/theme.php:74
-#: ../../view/theme/diabook/theme.php:77 ../../include/text.php:1286
+#: ../../view/theme/diabook/theme.php:78
+#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1292
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
 
-#: ../../addon/communityhome/twillingham/communityhome.php:38
-msgid "Latest users"
-msgstr ""
-
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""
@@ -4365,23 +4537,11 @@ msgstr ""
 msgid "Post to Drupal by default"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
 #: ../../addon/posterous/posterous.php:173
 msgid "Post from Friendica"
 msgstr ""
 
-#: ../../addon/frown/frown.php:46
-msgid "Frown settings updated."
-msgstr ""
-
-#: ../../addon/frown/frown.php:76
-msgid "Frown Settings"
-msgstr ""
-
-#: ../../addon/frown/frown.php:78
-msgid "Disable graphical smilies"
-msgstr ""
-
 #: ../../addon/geonames/geonames.php:143
 msgid "Geonames settings updated."
 msgstr ""
@@ -4562,11 +4722,11 @@ msgstr ""
 msgid "Disable richtext status editor"
 msgstr ""
 
-#: ../../addon/pageheader/pageheader.php:47
+#: ../../addon/pageheader/pageheader.php:50
 msgid "\"pageheader\" Settings"
 msgstr ""
 
-#: ../../addon/pageheader/pageheader.php:65
+#: ../../addon/pageheader/pageheader.php:68
 msgid "pageheader Settings saved."
 msgstr ""
 
@@ -4602,40 +4762,40 @@ msgstr ""
 msgid "Post to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:175
+#: ../../addon/statusnet/statusnet.php:176
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:203
+#: ../../addon/statusnet/statusnet.php:204
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:229
+#: ../../addon/statusnet/statusnet.php:232
 msgid "StatusNet settings updated."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:252
+#: ../../addon/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:266
+#: ../../addon/statusnet/statusnet.php:271
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:267
+#: ../../addon/statusnet/statusnet.php:272
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
 "available. If you are useing one of them, please use these credentials. If "
 "not feel free to connect to any other StatusNet instance (see below)."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:275
+#: ../../addon/statusnet/statusnet.php:280
 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:276
+#: ../../addon/statusnet/statusnet.php:281
 msgid ""
 "No consumer key pair for StatusNet found. Register your Friendica Account as "
 "an desktop client on your StatusNet account, copy the consumer key pair here "
@@ -4644,19 +4804,19 @@ msgid ""
 "installation at your favorited StatusNet installation."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:284
+#: ../../addon/statusnet/statusnet.php:289
 msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:305
+#: ../../addon/statusnet/statusnet.php:310
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
 "security code from StatusNet which you have to copy into the input box below "
@@ -4664,38 +4824,38 @@ msgid ""
 "to StatusNet."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:306
+#: ../../addon/statusnet/statusnet.php:311
 msgid "Log in with StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:308
+#: ../../addon/statusnet/statusnet.php:313
 msgid "Copy the security code from StatusNet here"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:314
+#: ../../addon/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:316
+#: ../../addon/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:317
+#: ../../addon/statusnet/statusnet.php:322
 msgid "Cancel StatusNet Connection"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184
+#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
 msgid "Currently connected to: "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:329
+#: ../../addon/statusnet/statusnet.php:334
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated StatusNet account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:331
+#: ../../addon/statusnet/statusnet.php:336
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -4703,19 +4863,23 @@ msgid ""
 "informing the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:334
+#: ../../addon/statusnet/statusnet.php:339
 msgid "Allow posting to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:337
+#: ../../addon/statusnet/statusnet.php:342
 msgid "Send public postings to StatusNet by default"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198
+#: ../../addon/statusnet/statusnet.php:345
+msgid "Send #tag links to StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:524
+#: ../../addon/statusnet/statusnet.php:539
 msgid "API URL"
 msgstr ""
 
@@ -4823,7 +4987,7 @@ msgid "Show More Settings saved."
 msgstr ""
 
 #: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466
-#: ../../boot.php:489
+#: ../../boot.php:495
 msgid "show more"
 msgstr ""
 
@@ -4867,21 +5031,21 @@ msgstr ""
 msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:119
+#: ../../addon/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:141
+#: ../../addon/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:148
+#: ../../addon/twitter/twitter.php:153
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:167
+#: ../../addon/twitter/twitter.php:172
 msgid ""
 "At this Friendica instance the Twitter plugin was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
@@ -4890,22 +5054,22 @@ msgid ""
 "be posted to Twitter."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:168
+#: ../../addon/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:170
+#: ../../addon/twitter/twitter.php:175
 msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:185
+#: ../../addon/twitter/twitter.php:190
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for "
 "every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:187
+#: ../../addon/twitter/twitter.php:192
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -4913,24 +5077,32 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:195
 msgid "Allow posting to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:193
+#: ../../addon/twitter/twitter.php:198
 msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:357
+#: ../../addon/twitter/twitter.php:201
+msgid "Send #tag links to Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:371
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:358
+#: ../../addon/twitter/twitter.php:372
 msgid "Consumer secret"
 msgstr ""
 
 #: ../../addon/irc/irc.php:25
-msgid "irc Chatroom"
+msgid "IRC Chatroom"
+msgstr ""
+
+#: ../../addon/irc/irc.php:46
+msgid "Popular Channels"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:36
@@ -4957,87 +5129,183 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""
 
+#: ../../view/theme/diabook-red/theme.php:23
+#: ../../view/theme/diabook-blue/theme.php:23
+#: ../../view/theme/diabook/theme.php:27
+#: ../../view/theme/dispy-dark/theme.php:116
+#: ../../view/theme/diabook-aerith/theme.php:23
+msgid "Last users"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:52
+#: ../../view/theme/diabook-blue/theme.php:52
+#: ../../view/theme/diabook/theme.php:56
+#: ../../view/theme/diabook-aerith/theme.php:52
+msgid "Last likes"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:97
+#: ../../view/theme/diabook-blue/theme.php:97
+#: ../../view/theme/diabook/theme.php:101
+#: ../../view/theme/diabook-aerith/theme.php:97
+msgid "Last photos"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:142
 #: ../../view/theme/diabook-blue/theme.php:142
-#: ../../view/theme/diabook/theme.php:145 ../../include/nav.php:103
-msgid "Directory"
+#: ../../view/theme/diabook/theme.php:146
+#: ../../view/theme/diabook-aerith/theme.php:142
+msgid "Find Friends"
 msgstr ""
 
+#: ../../view/theme/diabook-red/theme.php:143
 #: ../../view/theme/diabook-blue/theme.php:143
-#: ../../view/theme/diabook/theme.php:146 ../../include/contact_widgets.php:34
-msgid "Similar Interests"
+#: ../../view/theme/diabook/theme.php:147
+#: ../../view/theme/diabook-aerith/theme.php:143
+msgid "Local Directory"
 msgstr ""
 
+#: ../../view/theme/diabook-red/theme.php:145
 #: ../../view/theme/diabook-blue/theme.php:145
-#: ../../view/theme/diabook/theme.php:148 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:149
+#: ../../view/theme/diabook-aerith/theme.php:145
+#: ../../include/contact_widgets.php:34
+msgid "Similar Interests"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:147
+#: ../../view/theme/diabook-blue/theme.php:147
+#: ../../view/theme/diabook/theme.php:151
+#: ../../view/theme/diabook-aerith/theme.php:147
+#: ../../include/contact_widgets.php:35
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:160
-#: ../../view/theme/diabook-blue/theme.php:222
-#: ../../view/theme/diabook/theme.php:164
-#: ../../view/theme/diabook/theme.php:228
+#: ../../view/theme/diabook-red/theme.php:162
+#: ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:162
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:167
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:162
+#: ../../view/theme/diabook-aerith/theme.php:243
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:215
-#: ../../view/theme/diabook/theme.php:221 ../../include/nav.php:49
+#: ../../view/theme/diabook-red/theme.php:195
+#: ../../view/theme/diabook-blue/theme.php:195
+#: ../../view/theme/diabook/theme.php:200
+#: ../../view/theme/diabook-aerith/theme.php:195
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:201
+#: ../../view/theme/diabook-blue/theme.php:201
+#: ../../view/theme/diabook/theme.php:206
+#: ../../view/theme/diabook-aerith/theme.php:201
+msgid "Connect Services"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:207
+#: ../../view/theme/diabook-blue/theme.php:207
+#: ../../view/theme/diabook/theme.php:212
+#: ../../view/theme/diabook-aerith/theme.php:207
+msgid "PostIt to Friendica"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:207
+#: ../../view/theme/diabook-blue/theme.php:207
+#: ../../view/theme/diabook/theme.php:212
+#: ../../view/theme/diabook-aerith/theme.php:207
+msgid "Post to Friendica"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:208
+#: ../../view/theme/diabook-blue/theme.php:208
+#: ../../view/theme/diabook/theme.php:213
+#: ../../view/theme/diabook-aerith/theme.php:208
+msgid " from anywhere by bookmarking this Link."
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:236
+#: ../../view/theme/diabook-blue/theme.php:236
+#: ../../view/theme/diabook/theme.php:244
+#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:49
 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:216
-#: ../../view/theme/diabook/theme.php:222 ../../include/nav.php:50
+#: ../../view/theme/diabook-red/theme.php:237
+#: ../../view/theme/diabook-blue/theme.php:237
+#: ../../view/theme/diabook/theme.php:245
+#: ../../view/theme/diabook-aerith/theme.php:237 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:217
-#: ../../view/theme/diabook/theme.php:223
+#: ../../view/theme/diabook-red/theme.php:238
+#: ../../view/theme/diabook-blue/theme.php:238
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook-aerith/theme.php:238
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:218
-#: ../../view/theme/diabook/theme.php:224 ../../include/nav.php:51
-#: ../../boot.php:1391
+#: ../../view/theme/diabook-red/theme.php:239
+#: ../../view/theme/diabook-blue/theme.php:239
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51
+#: ../../boot.php:1413
 msgid "Photos"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:218
-#: ../../view/theme/diabook/theme.php:224 ../../include/nav.php:51
+#: ../../view/theme/diabook-red/theme.php:239
+#: ../../view/theme/diabook-blue/theme.php:239
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:219
-#: ../../view/theme/diabook/theme.php:225 ../../include/nav.php:52
+#: ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:220
-#: ../../view/theme/diabook/theme.php:226 ../../include/nav.php:53
+#: ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:220
-#: ../../view/theme/diabook/theme.php:226 ../../include/nav.php:53
+#: ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:17
+#: ../../view/theme/quattro/config.php:23
 msgid "Theme settings"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:24
 msgid "Alignment"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:24
 msgid "Left"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:24
 msgid "Center"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:1032
+#: ../../view/theme/quattro/config.php:25
+msgid "Color scheme"
+msgstr ""
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:1044
 msgid "Gender:"
 msgstr ""
 
@@ -5050,7 +5318,7 @@ msgid "j F"
 msgstr ""
 
 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
-#: ../../include/items.php:1384
+#: ../../include/items.php:1392
 msgid "Birthday:"
 msgstr ""
 
@@ -5058,11 +5326,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1035
+#: ../../include/profile_advanced.php:37 ../../boot.php:1047
 msgid "Status:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:1037
+#: ../../include/profile_advanced.php:45 ../../boot.php:1049
 msgid "Homepage:"
 msgstr ""
 
@@ -5406,184 +5674,184 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:426 ../../include/notifier.php:640
+#: ../../include/delivery.php:434 ../../include/notifier.php:651
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/delivery.php:433 ../../include/enotify.php:23
-#: ../../include/notifier.php:647
+#: ../../include/delivery.php:441 ../../include/enotify.php:23
+#: ../../include/notifier.php:658
 msgid "noreply"
 msgstr ""
 
-#: ../../include/text.php:238
+#: ../../include/text.php:240
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:240
+#: ../../include/text.php:242
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:269
+#: ../../include/text.php:271
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:272
+#: ../../include/text.php:274
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:563
+#: ../../include/text.php:565
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:572
+#: ../../include/text.php:574
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:645 ../../include/nav.php:91
+#: ../../include/text.php:647 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:828
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:828
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:828
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:828
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:828
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:828
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:828
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:832
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:910
+#: ../../include/text.php:916
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:927
+#: ../../include/text.php:933
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/text.php:939
+#: ../../include/text.php:945
 msgid "remove"
 msgstr ""
 
-#: ../../include/text.php:939
+#: ../../include/text.php:945
 msgid "[remove]"
 msgstr ""
 
-#: ../../include/text.php:942
+#: ../../include/text.php:948
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/text.php:958 ../../include/text.php:970
+#: ../../include/text.php:964 ../../include/text.php:976
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1062
+#: ../../include/text.php:1068
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1074
+#: ../../include/text.php:1080
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1290
+#: ../../include/text.php:1296
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1292
+#: ../../include/text.php:1298
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1293
+#: ../../include/text.php:1299
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1335
+#: ../../include/text.php:1454
 msgid "Item filed"
 msgstr ""
 
-#: ../../include/diaspora.php:570
+#: ../../include/diaspora.php:578
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:1953
+#: ../../include/diaspora.php:1965
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/diaspora.php:2136
+#: ../../include/diaspora.php:2148
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr ""
 
-#: ../../include/network.php:814
+#: ../../include/network.php:817
 msgid "view full size"
 msgstr ""
 
@@ -5622,7 +5890,7 @@ msgstr ""
 msgid "Create a new group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:759
+#: ../../include/nav.php:46 ../../boot.php:765
 msgid "Logout"
 msgstr ""
 
@@ -5630,7 +5898,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1381
+#: ../../include/nav.php:49 ../../boot.php:1403
 msgid "Status"
 msgstr ""
 
@@ -5666,6 +5934,10 @@ msgstr ""
 msgid "Conversations on this site"
 msgstr ""
 
+#: ../../include/nav.php:103
+msgid "Directory"
+msgstr ""
+
 #: ../../include/nav.php:103
 msgid "People directory"
 msgstr ""
@@ -5706,11 +5978,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:990
+#: ../../include/nav.php:138 ../../boot.php:1002
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:990
+#: ../../include/nav.php:138 ../../boot.php:1002
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -5777,14 +6049,28 @@ msgstr ""
 msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/contact_widgets.php:99
+#: ../../include/contact_widgets.php:99 ../../include/contact_widgets.php:127
 msgid "Everything"
 msgstr ""
 
+#: ../../include/contact_widgets.php:124
+msgid "Categories"
+msgstr ""
+
 #: ../../include/auth.php:29
 msgid "Logged out."
 msgstr ""
 
+#: ../../include/auth.php:106
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr ""
+
+#: ../../include/auth.php:106
+msgid "The error message was:"
+msgstr ""
+
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
 msgstr ""
@@ -5875,7 +6161,7 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/message.php:14
+#: ../../include/message.php:15 ../../include/message.php:171
 msgid "[no subject]"
 msgstr ""
 
@@ -6079,11 +6365,11 @@ msgstr ""
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2648
+#: ../../include/items.php:2656
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2648
+#: ../../include/items.php:2656
 msgid "You have a new follower at "
 msgstr ""
 
@@ -6318,70 +6604,74 @@ msgstr ""
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:979
+#: ../../include/conversation.php:981
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:487
+#: ../../boot.php:493
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:490
+#: ../../boot.php:496
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:738
+#: ../../boot.php:744
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:762
+#: ../../boot.php:768
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:763
+#: ../../boot.php:769
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:766
+#: ../../boot.php:772
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:772
+#: ../../boot.php:778
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:929
+#: ../../boot.php:935
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1096 ../../boot.php:1167
+#: ../../boot.php:994
+msgid "Message"
+msgstr ""
+
+#: ../../boot.php:1109 ../../boot.php:1180
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1097 ../../boot.php:1168
+#: ../../boot.php:1110 ../../boot.php:1181
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1122
+#: ../../boot.php:1135
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1123
+#: ../../boot.php:1136
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1146 ../../boot.php:1210
+#: ../../boot.php:1159 ../../boot.php:1223
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1191
+#: ../../boot.php:1204
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1192
+#: ../../boot.php:1205
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1204
+#: ../../boot.php:1217
 msgid "[No description]"
 msgstr ""
index 3f9176cd7be9821ee6781d3287dba1bd74202c46..c9cd91138ac7b8a21d4ec5b696c0bd3059d0809b 100755 (executable)
@@ -26,6 +26,7 @@ $a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
 $a->strings["Submit"] = "Senden";
 $a->strings["Help:"] = "Hilfe:";
 $a->strings["Help"] = "Hilfe";
+$a->strings["Help or @NewHere ?"] = "Hilfe oder @NeuHier";
 $a->strings["Not Found"] = "Nicht gefunden";
 $a->strings["Page not found."] = "Seite nicht gefunden.";
 $a->strings["File exceeds size limit of %d"] = "Die Datei ist größer als das erlaubte Limit von %d";
@@ -125,6 +126,9 @@ $a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/A
 $a->strings["Item not found"] = "Beitrag nicht gefunden";
 $a->strings["Edit post"] = "Beitrag bearbeiten";
 $a->strings["Post to Email"] = "An E-Mail senden";
+$a->strings["PostIt to Friendica"] = "Teile mit Friendica";
+$a->strings["Post to Friendica"] = "Teile mit Friendica";
+$a->strings[" from anywhere by bookmarking this Link."] = " von &uuml;berall her, indem du diesen Link zu deinen Lesezeichen hinzuf&uuml;gst.";
 $a->strings["Edit"] = "Bearbeiten";
 $a->strings["Upload photo"] = "Foto hochladen";
 $a->strings["Attach file"] = "Datei anhängen";
@@ -244,6 +248,7 @@ $a->strings["Profile Match"] = "Profilübereinstimmungen";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Standardprofil hinzu.";
 $a->strings["is interested in:"] = "ist interessiert an:";
 $a->strings["Connect"] = "Verbinden";
+$a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["No matches"] = "Keine Ãœbereinstimmungen";
 $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar.";
 $a->strings["Visible to:"] = "Sichtbar für:";
@@ -676,6 +681,7 @@ $a->strings["Force users to register with a space between firstname and lastname
 $a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
 $a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden";
 $a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen";
+$a->strings["Community Pages"] = "Foren";
 $a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen Ã¶ffentlichen Beiträgen auf diesem Server.";
 $a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren";
 $a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist Ã¶ffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt.";
@@ -830,6 +836,7 @@ $a->strings["Friend Suggestions"] = "Kontaktvorschläge";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
 $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
 $a->strings["Global Directory"] = "Weltweites Verzeichnis";
+$a->strings["Local Directory"] = "Lokales Verzeichnis";
 $a->strings["Normal site view"] = "Normale Seitenansicht";
 $a->strings["Admin - View all site entries"] = "Admin: Alle Einträge dieses Servers anzeigen";
 $a->strings["Find on this site"] = "Auf diesem Server suchen";
@@ -1164,6 +1171,7 @@ $a->strings["Dating"] = "Dating";
 $a->strings["Unfaithful"] = "Untreu";
 $a->strings["Sex Addict"] = "Sexbesessen";
 $a->strings["Friends"] = "Freunde";
+$a->strings["Find Friends"] = "Freunde finden";
 $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen";
 $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Verlobt";
diff --git a/view/theme/clean/screenshot.jpg b/view/theme/clean/screenshot.jpg
deleted file mode 100644 (file)
index 8d9d772..0000000
Binary files a/view/theme/clean/screenshot.jpg and /dev/null differ
diff --git a/view/theme/clean/style.css b/view/theme/clean/style.css
deleted file mode 100755 (executable)
index 86bca37..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-@import url('../loozah/style.css');
-
-footer {
-       background: #CCC;
-}
-
-#banner {
-       color: #444444;
-}
-
-body { 
-       background: #FFFFFF;
-       color: #000000;
-}
-.nav-selected {
-       background: #FFFFFF !important;
-       color: #888888 !important;
-}
-
-input:hover {
-       background-color: #CCCCCC;
-       color: #000000;
-       border: 1px solid #FFFFFF;
-}
-
-input, select {
-       background-color: #FFFFFF;
-       color: #000000;
-}
-.nav-link:hover, .nav-commlink:hover {
-       background: #DDDDDD;
-       color: #0000EE;
-}
-option {
-       background-color: #FFFFFF;
-}
-#page-footer {
-       border: none;
-}
-
-nav {
-       background: #F4F4F4;
-}
-
-body { 
-       background: #FFFFFF;
-       color: #444444;
-}
-
-.nav-link {
-       color: #444444;
-       background: #EEE;
-       border: 2px solid #CCCCCC;
-}
-
-.nav-commlink {
-       color: #444444;
-       background: #EEE;
-       border: 2px solid #CCCCCC;
-}
-
-.tab {
-       color: #444444;
-       background: #EEE;
-
-}
-
-a, a:visited {
-       color: #8888FF;
-       text-decoration: none;
-}
-
-a:hover {
-       color: #0000FF;
-       text-decoration: underline;
-}
-
-.fakelink, .fakelink:visited {
-       color: #8888FF;
-}
-
-.fakelink:hover {
-       color: #0000FF;
-}
-
-.wall-item-content-wrapper {
-       border: 1px solid #CCC;
-}
-
-.wall-item-content-wrapper.comment {
-       background: #CCC;
-}
-
-.comment-edit-wrapper {
-       background: #CCC;
-}
-
-.comment-wwedit-wrapper {
-       background: #CCC;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
-       color: #8888FF;
-}
-
-#photos-upload-perms-menu:hover {
-       color: #0000FF;
-}
-#settings-default-perms-menu, #settings-default-perms-menu:visited {
-       color: #8888FF;
-}
-
-#settings-default-perms-menu:hover {
-       color: #0000FF;
-}
diff --git a/view/theme/clean/theme.php b/view/theme/clean/theme.php
deleted file mode 100755 (executable)
index 47b43cf..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/clean/unsupported b/view/theme/clean/unsupported
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/view/theme/darkness/screenshot.jpg b/view/theme/darkness/screenshot.jpg
deleted file mode 100644 (file)
index aec866e..0000000
Binary files a/view/theme/darkness/screenshot.jpg and /dev/null differ
diff --git a/view/theme/darkness/style.css b/view/theme/darkness/style.css
deleted file mode 100755 (executable)
index 3bc4c6a..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-@import url('../loozah/style.css');
-
-nav {
-       background: #CCC;
-}
-footer {
-       background: #CCC;
-}
-#banner {
-       color: #FF0000;
-}
-
-body { 
-       background: #000000;
-       color: #FF0000;
-}
-.nav-selected {
-       background: #000000 !important;
-       color: #888888 !important;
-}
-
-input:hover {
-       background-color: #800000;
-}
-input, select {
-       background-color: #000000;
-       color: #FF0000;
-}
-.nav-link:hover, .nav-commlink:hover, .tab:hover {
-       background: #DDDDDD;
-       color: #FF0000;
-}
-
-#logo-text a, #logo-text a:visited, #site-location {
-       color: #000000;
-}
-
-
-#page-footer {
-       border: none;
-}
-.nav-link {
-       color: #FF0000;
-       background: #444444;
-}
-
-.nav-commlink {
-       color: #FF0000;
-       background: #444444;
-}
-
-.tab {
-       color: #FF0000;
-       background: #444444;
-
-}
-
-a, a:visited, .fakelink, .fakelink:visited {
-       color: #888888;
-       text-decoration: none;
-}
-
-a:hover, .fakelink:hover {
-       color: #FF0000;
-       text-decoration: underline;
-}
-
diff --git a/view/theme/darkness/theme.php b/view/theme/darkness/theme.php
deleted file mode 100755 (executable)
index 47b43cf..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/darkness/unsupported b/view/theme/darkness/unsupported
deleted file mode 100644 (file)
index e69de29..0000000
index c26d02dc6aff9e4fe9eac6df2ddd6985461a91fa..4873cdd14b20d26c3f809da29437070527ebb4a7 100755 (executable)
@@ -6,7 +6,7 @@
 
 <div id="close_helpers">
 {{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
 <a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
 <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@@ -16,7 +16,7 @@
 
 <div id="close_services">
 {{ if $lastusers_title }}
-<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
 <div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
 <a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
 <a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
@@ -32,9 +32,9 @@
 
 <div id="close_friends" style="margin-bottom:53px;">
 {{ if $nv }}
-<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
 <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
 <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
 <a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
 <a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>                 
@@ -44,8 +44,8 @@ $nv.search
 
 <div id="close_postit">
 {{ if $lastusers_title }}
-<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
+<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
+<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
 {{ endif }}
 </div>
 
index 7e2c8f02b512ab4b16f137a06b5514535f603106..6e3b3f82244c508da8866e764391e593d63dcf8a 100644 (file)
@@ -1260,7 +1260,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #3465A4;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
index 29982c8c5946996aa211779db4ec6849f2b8e1d0..f41c4a98acdbd005fee0f87afe1e082f270a7bd1 100644 (file)
@@ -1255,7 +1255,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #3465A4;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
index 14bbb6cdac0e283710f729c125aefdc9325de391..3d53115df48ce84fd8ff145ac43d674c2aba527b 100644 (file)
@@ -2042,6 +2042,14 @@ ul.tabs li .active {
 .field.radio .field_help {
   margin-left: 0px;
 }
+.suggest-select {
+width: 500px;
+height: 350px; 
+       }
+.message-to-select {
+       width: 400px;
+   height: 150px;
+       }
 #directory-search-form{
        margin-bottom: 50px;
        }
index 008e80c14e181151fd5191a77cce8d58f9af63f3..e56f0ab742dd02a3c32916ef49850dfb2d2e0998 100755 (executable)
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-aerith
  * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.011)
+ * Version: (Version: 1.012)
  * Author: 
  */
 
@@ -139,7 +139,8 @@ function diabook_aerith_community_info(){
    //nav FIND FRIENDS
        if(local_user()) {
        $nv = array();
-       $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+   $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'), "", "");
@@ -188,10 +189,28 @@ function diabook_aerith_community_info(){
                
                $aside['$page'] = $page;
        }               
-  //END Community 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
+   //postit
+   $postit = array();
+       $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+       $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+       
+       $aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl             
    $url = $a->get_baseurl($ssl_state);   
    $aside['$url'] = $url;
 
index 3b95b376e21eba2186f6759957cc610d97f16d5e..6e126827b548c6924ae0389ca3e1a65566429b59 100755 (executable)
@@ -6,7 +6,7 @@
 
 <div id="close_helpers">
 {{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
 <a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
 <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@@ -16,7 +16,7 @@
 
 <div id="close_services">
 {{ if $lastusers_title }}
-<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
 <div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
 <a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
 <a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
@@ -32,9 +32,9 @@
 
 <div id="close_friends" style="margin-bottom:53px;">
 {{ if $nv }}
-<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
 <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
 <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
 <a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
 <a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>                 
@@ -44,8 +44,8 @@ $nv.search
 
 <div id="close_postit">
 {{ if $lastusers_title }}
-<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
+<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
+<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
 {{ endif }}
 </div>
 
index 3542dc00cf5f17cf30c51dfec74ba40a913b291e..991b198497b1870611c74ac5a44c698a5a40ae5a 100644 (file)
@@ -543,15 +543,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -630,7 +632,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -1007,6 +1009,8 @@ aside #profiles-menu {
 }
 aside #search-text {
        width: 150px;
+               height: 17px;
+               padding-left: 10px;
        border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1219,7 +1223,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1720,7 +1724,7 @@ transition: all 0.2s ease-in-out;
 #profile-jot-submit {
        float: right;
        margin-top: 2px;
-       
+       font-size: 14px;
 }
 #profile-upload-wrapper {
        float: left;
@@ -1772,7 +1776,9 @@ transition: all 0.2s ease-in-out;
        float: right;
        margin-left: 10px;
        margin-top: 2px;
-       font-size: 10px;
+       font-size: 9px;
+       font-weight: bolder;
+       cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1783,18 +1789,20 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
-    background-color: #1872A2;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    background-color: #055580;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
        border: 0px;
index 0b27e4a77ef0cf7b25e118230f65376f61e73d95..fca29d088c629d6568771fc608a6d502ecb9ff7c 100644 (file)
@@ -544,15 +544,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -631,7 +633,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -1006,6 +1008,8 @@ aside #profiles-menu {
 }
 aside #search-text {
        width: 150px;
+               height: 17px;
+               padding-left: 10px;
        border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1218,7 +1222,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1721,7 +1725,7 @@ transition: all 0.2s ease-in-out;
        float: left;
        margin-top: 2px;
        margin-left: 10px;
-       
+       font-size: 14px;
 }
 #profile-attach-wrapper {
        float: left;
@@ -1767,7 +1771,9 @@ transition: all 0.2s ease-in-out;
        float: right;
        margin-left: 10px;
        margin-top: 2px;
-       font-size: 10px;
+       font-size: 9px;
+       font-weight: bolder;
+       cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1778,18 +1784,20 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
-    background-color: #1872A2;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    background-color: #055580;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
        border: 0px;
index 2e7db1e1f20866526dd201e8ccba9b4a84518d47..e07962bc7ea53a87c643b8252180bea18730ff49 100644 (file)
@@ -544,15 +544,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -631,7 +633,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -1706,7 +1708,7 @@ transition: all 0.2s ease-in-out;
 #profile-jot-submit {
        float: right;
        margin-top: 2px;
-       
+       font-size: 14px;
 }
 #profile-upload-wrapper {
        float: left;
@@ -1758,7 +1760,9 @@ transition: all 0.2s ease-in-out;
        float: right;
        margin-left: 10px;
        margin-top: 2px;
-       font-size: 10px;
+       font-size: 9px;
+       font-weight: bolder;
+       cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1769,18 +1773,20 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
-    background-color: #1872A2;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    background-color: #055580;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
        border: 0px;
index 8d3d854bac75496003c92cb45f746ab402952e54..8a05fc4c4bdffd1af4db0c560765f8a380187585 100644 (file)
@@ -541,15 +541,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* messages */
 #message-new {
@@ -708,7 +710,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -1085,6 +1087,8 @@ aside #profiles-menu {
 }
 aside #search-text {
        width: 173px;
+       height: 17px;
+   padding-left: 10px;
        border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1725,7 +1729,7 @@ body .pageheader{
 #profile-jot-submit {
        float: right;
        margin-top: 2px;
-       
+       font-size: 14px;
 }
 #profile-upload-wrapper {
        float: left;
@@ -1777,7 +1781,9 @@ body .pageheader{
        float: right;
        margin-left: 10px;
        margin-top: 2px;
-       font-size: 10px;
+       font-size: 9px;
+       font-weight: bolder;
+       cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1788,18 +1794,20 @@ body .pageheader{
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
-    background-color: #1872A2;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    background-color: #055580;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
        border: 0px;
@@ -1990,6 +1998,14 @@ ul.tabs li .active {
 .field.radio .field_help {
   margin-left: 0px;
 }
+.suggest-select {
+width: 500px;
+height: 350px; 
+       }
+.message-to-select {
+       width: 400px;
+   height: 150px;
+       }
 #directory-search-form{
        margin-bottom: 50px;
        }
index 19468779edded39d994c328767b3eb78c9553426..2e7aca92a975832be306b1614d2890a9ac863431 100755 (executable)
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-blue
  * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.011)
+ * Version: (Version: 1.012)
  * Author: 
  */
 
@@ -139,7 +139,8 @@ function diabook_blue_community_info(){
    //nav FIND FRIENDS
        if(local_user()) {
        $nv = array();
-       $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+       $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'), "", "");
@@ -188,10 +189,28 @@ function diabook_blue_community_info(){
                
                $aside['$page'] = $page;
        }               
-  //END Community 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
+   //postit
+   $postit = array();
+       $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+       $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+       
+       $aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl   
    $url = $a->get_baseurl($ssl_state);   
    $aside['$url'] = $url;
 
index 91935a9d3558d76e70d85aaae276e0b81e7e8a15..c47bfbda5f3a6ae27bdfc48ff434df2ff456d041 100755 (executable)
@@ -6,7 +6,7 @@
 
 <div id="close_helpers">
 {{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
 <a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
 <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@@ -16,7 +16,7 @@
 
 <div id="close_services">
 {{ if $lastusers_title }}
-<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
 <div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
 <a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-red/icons/facebook.png" title="Facebook"></a>
 <a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-red/icons/StatusNet.png?" title="StatusNet"></a>
@@ -32,9 +32,9 @@
 
 <div id="close_friends" style="margin-bottom:53px;">
 {{ if $nv }}
-<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
 <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
 <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
 <a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
 <a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>                 
@@ -44,8 +44,8 @@ $nv.search
 
 <div id="close_postit">
 {{ if $lastusers_title }}
-<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
+<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
+<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
 {{ endif }}
 </div>
 
index bbd4ceeee42584a7e192afdda602dbc5a1bd5c9b..863ad87ad973168a2474d122bfb264c9e0d31e12 100644 (file)
@@ -1257,7 +1257,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
index 74217acf3c565badb3e15d009c963e559ccc1118..dcd0092c9f0838198f0ac7c04400acf872e01d98 100644 (file)
@@ -1235,7 +1235,7 @@ right_aside {
   /* background: #F1F1F1; */
 }
 right_aside a{color: red;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
index 16c8fe6c5993f9af922385974f35e19feac6473b..b1061f035fd7053e0ec5f9b0394a9e86129e89c7 100644 (file)
@@ -579,6 +579,7 @@ header #banner #logo-text {
   font-weight: bold;
   padding: 1em 0px;
   text-decoration: none;
+  background-color: red;
 }
 .mail-list-wrapper {
   background-color: #f6f7f8;
@@ -2027,6 +2028,14 @@ ul.tabs li .active {
 .field.radio .field_help {
   margin-left: 0px;
 }
+.suggest-select {
+width: 500px;
+height: 350px; 
+       }
+.message-to-select {
+       width: 400px;
+   height: 150px;
+       }
 #directory-search-form{
        margin-bottom: 50px;
        }
index a6b2ea823b25e8c5e192f22cb8c743a96df000dd..0db9818e47eaf67d6835203095181ec04131f0b1 100755 (executable)
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-red
  * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.011)
+ * Version: (Version: 1.012)
  * Author: 
  */
 
@@ -139,7 +139,8 @@ function diabook_red_community_info(){
    //nav FIND FRIENDS
        if(local_user()) {
        $nv = array();
-       $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+       $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'), "", "");
@@ -188,10 +189,28 @@ function diabook_red_community_info(){
                
                $aside['$page'] = $page;
        }               
-  //END Community 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
+   //postit
+   $postit = array();
+       $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+       $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+       
+       $aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl   
    $url = $a->get_baseurl($ssl_state);   
    $aside['$url'] = $url;
 
index d344cad31a5251544d80af346f34436ed79d7ee0..5c2164b50aa87dd3989e4ab96286ca3a681d37ef 100755 (executable)
@@ -6,7 +6,7 @@
 
 <div id="close_helpers">
 {{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
 <a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
 <a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
@@ -16,8 +16,8 @@
 
 <div id="close_services">
 {{ if $lastusers_title }}
-<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
 <a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
 <a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
 <a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
@@ -32,9 +32,9 @@
 
 <div id="close_friends" style="margin-bottom:53px;">
 {{ if $nv }}
-<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
 <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
 <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
 <a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
 <a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
@@ -44,8 +44,8 @@ $nv.search
 
 <div id="close_postit">
 {{ if $lastusers_title }}
-<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>
+<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
+<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
 {{ endif }}
 </div>
 
diff --git a/view/theme/diabook/photo-menu.jpg b/view/theme/diabook/photo-menu.jpg
deleted file mode 100755 (executable)
index fde5eb5..0000000
Binary files a/view/theme/diabook/photo-menu.jpg and /dev/null differ
index 58d8fb0e89eb5dc9e054fa3efa4835035e8ae74f..c40a9bf502aa79c18a85c9f726ace3cecc822ffe 100644 (file)
@@ -545,15 +545,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -632,7 +634,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -1001,6 +1003,8 @@ aside #profiles-menu {
 }
 aside #search-text {
        width: 150px;
+       height: 17px;
+       padding-left: 10px;
        border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1201,7 +1205,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1694,6 +1698,7 @@ transition: all 0.2s ease-in-out;
 #profile-jot-submit {
        float: right;
        margin-top: 2px;
+       font-size: 14px;
        
 }
 #profile-upload-wrapper {
@@ -1746,7 +1751,9 @@ transition: all 0.2s ease-in-out;
        float: right;
        margin-left: 10px;
        margin-top: 2px;
-       font-size: 10px;
+       font-size: 9px;
+       font-weight: bolder;
+       cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1757,9 +1764,10 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
     background-color: #33ACFF;
@@ -1769,6 +1777,8 @@ transition: all 0.2s ease-in-out;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
     background-color: #33ACFF;
index 9d462a458e29526c777986fe92c5bc51481484d6..a34ee4cc9bb6539d2a872dba18821a4ece8aaf7a 100644 (file)
@@ -543,15 +543,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -630,7 +632,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -995,6 +997,8 @@ aside #profiles-menu {
 }
 aside #search-text {
        width: 150px;
+       height: 17px;
+       padding-left: 10px;
        border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1195,7 +1199,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1688,7 +1692,7 @@ transition: all 0.2s ease-in-out;
 #profile-jot-submit {
        float: right;
        margin-top: 2px;
-       
+       font-size: 14px;
 }
 #profile-upload-wrapper {
        float: left;
@@ -1740,7 +1744,9 @@ transition: all 0.2s ease-in-out;
        float: right;
        margin-left: 10px;
        margin-top: 2px;
-       font-size: 10px;
+       font-size: 9px;
+       font-weight: bolder;
+       cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1751,9 +1757,10 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
     background-color: #33ACFF;
@@ -1763,6 +1770,8 @@ transition: all 0.2s ease-in-out;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
        border: 0px;
index 8e7c2dd0bb8bc70d9c5238c47bf140fe4ef6151a..60e2f336b2644815d8d3f5f8d2d80b0b770a9e0b 100644 (file)
@@ -543,15 +543,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -630,7 +632,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -1680,7 +1682,7 @@ transition: all 0.2s ease-in-out;
 #profile-jot-submit {
        float: right;
        margin-top: 2px;
-       
+       font-size: 14px;
 }
 #profile-upload-wrapper {
        float: left;
@@ -1732,7 +1734,9 @@ transition: all 0.2s ease-in-out;
        float: right;
        margin-left: 10px;
        margin-top: 2px;
-       font-size: 10px;
+       font-size: 9px;
+       font-weight: bolder;
+       cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1743,9 +1747,10 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
     background-color: #33ACFF;
@@ -1755,6 +1760,8 @@ transition: all 0.2s ease-in-out;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
        border: 0px;
index 1d8d052142e3f503aa608a2e1829eb0f10735c6c..c097545e5165a7a37c4aa36f1d504d7a1d5fb43f 100644 (file)
@@ -542,15 +542,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* messages */
 #message-new {
@@ -709,7 +711,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -1076,7 +1078,13 @@ aside #profiles-menu {
   width: 20em;
 }
 aside #search-text {
-       width: 173px;
+       width: 150px;
+       height: 17px;
+       padding-left: 10px;
+       border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
 }
 aside #side-follow-url {
        width: 173px;
@@ -1699,7 +1707,7 @@ body .pageheader{
 #profile-jot-submit {
        float: right;
        margin-top: 2px;
-       
+       font-size: 14px;
 }
 #profile-upload-wrapper {
        float: left;
@@ -1751,7 +1759,9 @@ body .pageheader{
        float: right;
        margin-left: 10px;
        margin-top: 2px;
-       font-size: 10px;
+       font-size: 9px;
+       font-weight: bolder;
+       cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1762,9 +1772,10 @@ body .pageheader{
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
     background-color: #33ACFF;
@@ -1774,6 +1785,8 @@ body .pageheader{
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
        border: 0px;
@@ -1964,6 +1977,14 @@ ul.tabs li .active {
 .field.radio .field_help {
   margin-left: 0px;
 }
+.suggest-select {
+width: 500px;
+height: 350px; 
+       }
+.message-to-select {
+       width: 400px;
+   height: 150px;
+       }
 #directory-search-form{
        margin-bottom: 50px;
        }
index 2fe985060633a472e0475699854605d4d7a12998..50a7c69742fd2281e8f493458d6725caa2cf8347 100755 (executable)
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.011)
+ * Version: (Version: 1.012)
  * Author: 
  */
 
@@ -143,7 +143,8 @@ function diabook_community_info(){
    //right_aside FIND FRIENDS
        if(local_user()) {
        $nv = array();
-       $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+       $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'), "", "");
@@ -193,9 +194,28 @@ function diabook_community_info(){
                
                $aside['$page'] = $page;        
        }
-  //END Community 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
+   //postit
+   $postit = array();
+       $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+       $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+       
+       $aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl
    $url = $a->get_baseurl($ssl_state);   
    $aside['$url'] = $url;
 
@@ -330,6 +350,12 @@ $a->page['htmlhead'] .= '
  $(function() {
        $("a.lightbox").fancybox(); // Select all links with lightbox class
  });
+ $(document).ready(function (){
+       $("iframe").each(function(){
+               var url = $(this).attr("src");
+               $(this).attr("src",url+"?wmode=transparent"); });
+    });
   
  </script>';
 
index f606f2f7e2dde6a0bdff17a11e9a9c4e19f1a4bf..cd6f5ca972e97564fc78148d02571650ab4d8c9e 100644 (file)
@@ -7,7 +7,7 @@
 
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
 <link rel="search"
          href="$baseurl/opensearch" 
          type="application/opensearchdescription+xml" 
        function commentOpen(obj,id) {
                if(obj.value == '$comment') {
                        obj.value = '';
-                       obj.className = "comment-edit-text-full";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                        openMenu("comment-edit-submit-wrapper-" + id);
                }
        }
        function commentClose(obj,id) {
                if(obj.value == '') {
                        obj.value = '$comment';
-                       obj.className="comment-edit-text-empty";
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
                        closeMenu("comment-edit-submit-wrapper-" + id);
                }
        }
                $("#comment-edit-text-" + id).val(tmpStr + ins);
        }
 
+       function qCommentInsert(obj,id) {
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == '$comment') {
+                       tmpStr = '';
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+               }
+               var ins = $(obj).val();
+               ins = ins.replace('&lt;','<');
+               ins = ins.replace('&gt;','>');
+               ins = ins.replace('&amp;','&');
+               ins = ins.replace('&quot;','"');
+               $("#comment-edit-text-" + id).val(tmpStr + ins);
+       }
+
        function showHideComments(id) {
                if( $('#collapsed-comments-' + id).is(':visible')) {
                        $('#collapsed-comments-' + id).hide();
index 92eccf74012dcafc20ac1e89c2a6a76e53c69fd8..5838729cc50c4431d6bb0eadf1b924da376152e8 100644 (file)
@@ -9,6 +9,7 @@ function initEditor(cb) {
                if(plaintext == 'none') {
                        $("#profile-jot-text-loading").hide();
                        $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+                       $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
                        editor = true;
                        $("a#jot-perms-icon").fancybox({
                                'transitionIn' : 'elastic',
@@ -30,6 +31,7 @@ function initEditor(cb) {
                        theme_advanced_toolbar_location : "top",
                        theme_advanced_toolbar_align : "center",
                        theme_advanced_blockformats : "blockquote,code",
+                       gecko_spellcheck : true,
                        paste_text_sticky : true,
                        entity_encoding : "raw",
                        add_unload_trigger : false,
@@ -296,7 +298,6 @@ function enableOnUser(){
                
        }
 
-
        function jotClearLocation() {
                $('#jot-coord').val('');
                $('#profile-nolocation-wrapper').hide();
index 94c31da23b4c62c61125aa837a036075aa4b3f3f..688ac1451ebcd64a19206f4689295871bc06c74d 100644 (file)
@@ -11,7 +11,7 @@
                <input type="hidden" name="coord" id="jot-coord" value="" />
                <input type="hidden" name="post_id" value="$post_id" />
                <input type="hidden" name="preview" id="jot-preview" value="0" />
-
+               <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
                </textarea>
 
index b322717ad107dc1f85485cf550c2a37aa2fa5df3..b0cb8890c546c228654d791c97bc3e77e2faf747 100644 (file)
@@ -4,7 +4,7 @@
        <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
        <ul class="nets-ul">
        {{ for $nets as $net }}
-       <li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+       <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
        {{ endfor }}
        </ul>
 </div>
index 63a85dda536cd44fedaf2f82358ee82c8dfdd0a3..fb822fe5dbd90086826ca7375a00cf6093d647a0 100644 (file)
@@ -1,12 +1,12 @@
-<div id="saved-search-list" class="widget">
+<div class="widget" id="saved-search-list">
        <h3 id="search">$title</h3>
        $searchbox
        
        <ul id="saved-search-ul">
                {{ for $saved as $search }}
                <li class="saved-search-li clear">
-                       <a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-                       <a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
+                       <a title="$search.delete" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-$search.id" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
+                       <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
                </li>
                {{ endfor }}
        </ul>
index 54c3e389c05dcc954c4700890b64b3e7dd26d054..bfad1b7b72e8871b48b172728444ca7b3d6d079f 100644 (file)
@@ -1,10 +1,10 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
        <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
                                 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
                                 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-                               <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
                                <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
                                <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                                </div>
                        </div>
                        <div class="wall-item-photo-end"></div> 
-                       <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
+                       <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
+                               <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+                       </div>
                </div>
-               <div class="wall-item-lock-wrapper">
-                       {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-                       {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
+               <div class="wall-item-author">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+                               <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+                               
+               </div>                  
+               <div class="wall-item-content" id="wall-item-content-$item.id" >
+                       <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+                       <div class="wall-item-title-end"></div>
+                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
                </div>
                <div class="wall-item-tools" id="wall-item-tools-$item.id">
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
                        <div class="wall-item-delete-end"></div>
                </div>
-               <div class="wall-item-content" id="wall-item-content-$item.id" >
-                       <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-                       <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-               </div>
-               <div class="wall-item-author">
-                               <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-                               <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-                               
-               </div>                  
-               
        </div>
        <div class="wall-item-wrapper-end"></div>
-</div>
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
        <div class="wall-item-conv" id="wall-item-conv-$item.id" >
        {{ if $item.conv }}
-               <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+                       <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
        {{ endif }}
        </div>
 
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
+</div>
+
+
index 5f9b38f8c413b5c9bd48878754fab0f38b515518..30d5cb8a9c1dcd049145c771faf4886fabf32ed4 100644 (file)
@@ -444,10 +444,10 @@ div.jGrowl div.info {
     padding-left: 58px;
 }
 #nav-notifications-menu {
-    margin: 30px 0 0 -45px;
-    width: 300px;
-    max-height: 400px;
-    overflow: auto;
+    margin: 30px 0 0 -20px;
+    width: 275px;
+    max-height: 300px;
+    overflow-y: auto;
     font-size: 9pt;
 }
 #nav-notifications-menu .contactname {
@@ -762,12 +762,20 @@ aside #viewcontacts {
     list-style: none;
 }
 #dfrn-request-link {
-       background:#3465A4 url(connect.png) no-repeat 95% center;
-       border-radius:5px 5px 5px 5px;
-       color:#fff;
-       display:block;
-       font-size:1.2em;
-       padding:.2em .5em;
+       background: #3465A4 url(connect.png) no-repeat 95% center;
+       border-radius: 5px 5px 5px 5px;
+       color: #eec;
+       display: block;
+       font-size: 1.2em;
+       padding: 0.2em 0.5em;
+}
+#wallmessage-link {
+       /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+       /*border-radius: 5px 5px 5px 5px;*/
+       color: #eee;
+       display: block;
+       font-size: 1.2em;
+       padding: 0.2em 0.5em;
 }
 #netsearch-box {
        margin: 20px 0px 30px;
@@ -848,6 +856,16 @@ aside #viewcontacts {
     border-radius: 5px;
        vertical-align: middle;
 }
+#jot-category {
+       margin: 5px 0;
+       border-radius: 5px;
+       border: 1px #999 solid;
+       color: #aaa;
+       font-size: smaller;
+}
+#jot-category:focus {
+       color: #eee;
+}
 #jot #character-counter {
        width: 6%;
        float: right;
@@ -1113,6 +1131,7 @@ section {
 }
 .shiny {
     background: #2e3436;
+       border-radius: 5px;
 }
 .wall-outside-wrapper .shiny {
        border-radius: 5px;
@@ -2167,12 +2186,12 @@ div[id$="wrapper"] br {
        opacity: 1.0 !important;
        filter:alpha(opacity=100) !important;
 }
-.filesavetags {
+.filesavetags, .categorytags {
        margin: 20px 0;
        opacity: 0.5;
        filter:alpha(opacity=50);
 }
-.filesavetags:hover {
+.filesavetags:hover, .categorytags:hover {
        margin: 20px 0;
        opacity: 1.0 !important;
        filter:alpha(opacity=100) !important;
index b54f753d3f661873f4014687b326a747b49c879a..8acaeaf02767505b85ee82f520be93621e69801f 100644 (file)
@@ -1,10 +1,12 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
        <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
                                 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
                                 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-                               <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+                                       <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
+                               </a>
                                <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                                        <ul>
                        <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>                                
                </div>
                <div class="wall-item-tools" id="wall-item-tools-$item.id">
-                               <div class="wall-item-lock-wrapper">
-                                       {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-                                       {{ else }}<div class="wall-item-lock"></div>{{ endif }}
-                               </div>
+                       <div class="wall-item-lock-wrapper">
+                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+                       </div>
                        <ul class="wall-item-subtools1">
                                {{ if $item.star }}
                                <li>
@@ -69,7 +71,6 @@
                <div class="wall-item-author">
                                <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
                                <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-                               
                </div>  
        </div>
        <div class="wall-item-wrapper-end"></div>
index b25d13409b4483aa488458bc61dda19911bd749f..421cddadfc0fbe80c9747fb3d32b3f34f278c400 100644 (file)
                        <div class="wall-item-photo-end"></div>
                        <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>                                
                </div>
-               <div class="wall-item-lock-wrapper">
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       <div class="wall-item-lock-wrapper">
                                {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
                                {{ else }}<div class="wall-item-lock"></div>{{ endif }}
-               </div>
-               <div class="wall-item-tools" id="wall-item-tools-$item.id">
-                       {{ if $item.star }}
-                               <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-                               <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-                       {{ endif }}
-                       
-                       {{ if $item.vote }}
-                       <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-                               <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-                               <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-
-                       {{ if $item.vote.share }}
-                               <a href="#" id="share-$item.id"
-class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-                               <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
                        </div>
-                       {{ endif }}
+                       <ul class="wall-item-subtools1">
+                               {{ if $item.star }}
+                               <li>
+                                       <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+                                       <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+                               </li>
+                               {{ endif }}
+                               {{ if $item.vote }}
+                               <li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+                                       <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+                                       <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+                                       {{ if $item.vote.share }}
+                                       <a href="#" id="share-$item.id"
+class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+                                       <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+                               </li>
+                               {{ endif }}
+                       </ul><br style="clear:left;" />
+                       <ul class="wall-item-subtools2">
                        {{ if $item.filer }}
-                               <div class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></div>
+                               <li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
                        {{ endif }}
                        {{ if $item.plink }}
-                               <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+                               <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
                        {{ endif }}
                        {{ if $item.edpost }}
-                               <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+                               <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
                        {{ endif }}
                
-                       <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+                       <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-                       </div>
                                {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+                       </li>
+                       </ul>
                        <div class="wall-item-delete-end"></div>
-
                </div>
                <div class="wall-item-content" id="wall-item-content-$item.id" >
                        <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
@@ -70,7 +73,6 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
                                                {{ endfor }}
                                        </div>                  
                        </div>
-                       
                </div>
                <div class="wall-item-author">
                        <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
index 2876f936eeddff51cb858b333d9a0faf7f17bdcc..340b7216cfb57757546cedd2663b18242a3c6202 100644 (file)
 </div>
 {{ endif }}
 
+{{ if $lastusers_title }}
 <h3 id="postit-header">PostIt to Friendica</h3>
 <div id="postit">
 <a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
 </div>
+{{ endif }}
 
index f606f2f7e2dde6a0bdff17a11e9a9c4e19f1a4bf..cd6f5ca972e97564fc78148d02571650ab4d8c9e 100644 (file)
@@ -7,7 +7,7 @@
 
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
 <link rel="search"
          href="$baseurl/opensearch" 
          type="application/opensearchdescription+xml" 
        function commentOpen(obj,id) {
                if(obj.value == '$comment') {
                        obj.value = '';
-                       obj.className = "comment-edit-text-full";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                        openMenu("comment-edit-submit-wrapper-" + id);
                }
        }
        function commentClose(obj,id) {
                if(obj.value == '') {
                        obj.value = '$comment';
-                       obj.className="comment-edit-text-empty";
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
                        closeMenu("comment-edit-submit-wrapper-" + id);
                }
        }
                $("#comment-edit-text-" + id).val(tmpStr + ins);
        }
 
+       function qCommentInsert(obj,id) {
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == '$comment') {
+                       tmpStr = '';
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+               }
+               var ins = $(obj).val();
+               ins = ins.replace('&lt;','<');
+               ins = ins.replace('&gt;','>');
+               ins = ins.replace('&amp;','&');
+               ins = ins.replace('&quot;','"');
+               $("#comment-edit-text-" + id).val(tmpStr + ins);
+       }
+
        function showHideComments(id) {
                if( $('#collapsed-comments-' + id).is(':visible')) {
                        $('#collapsed-comments-' + id).hide();
index 92eccf74012dcafc20ac1e89c2a6a76e53c69fd8..5838729cc50c4431d6bb0eadf1b924da376152e8 100644 (file)
@@ -9,6 +9,7 @@ function initEditor(cb) {
                if(plaintext == 'none') {
                        $("#profile-jot-text-loading").hide();
                        $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+                       $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
                        editor = true;
                        $("a#jot-perms-icon").fancybox({
                                'transitionIn' : 'elastic',
@@ -30,6 +31,7 @@ function initEditor(cb) {
                        theme_advanced_toolbar_location : "top",
                        theme_advanced_toolbar_align : "center",
                        theme_advanced_blockformats : "blockquote,code",
+                       gecko_spellcheck : true,
                        paste_text_sticky : true,
                        entity_encoding : "raw",
                        add_unload_trigger : false,
@@ -296,7 +298,6 @@ function enableOnUser(){
                
        }
 
-
        function jotClearLocation() {
                $('#jot-coord').val('');
                $('#profile-nolocation-wrapper').hide();
index 94c31da23b4c62c61125aa837a036075aa4b3f3f..688ac1451ebcd64a19206f4689295871bc06c74d 100644 (file)
@@ -11,7 +11,7 @@
                <input type="hidden" name="coord" id="jot-coord" value="" />
                <input type="hidden" name="post_id" value="$post_id" />
                <input type="hidden" name="preview" id="jot-preview" value="0" />
-
+               <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
                </textarea>
 
index b322717ad107dc1f85485cf550c2a37aa2fa5df3..b0cb8890c546c228654d791c97bc3e77e2faf747 100644 (file)
@@ -4,7 +4,7 @@
        <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
        <ul class="nets-ul">
        {{ for $nets as $net }}
-       <li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+       <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
        {{ endfor }}
        </ul>
 </div>
index 350a6ce4a9978e0919911fa529e94ab759ff27f7..f14ea7915e1f75c48c89577e75fd3b59bfe7f89b 100644 (file)
@@ -10,9 +10,8 @@
                        <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
                </li>
                {{ endfor }}
-               <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+               <li><a href="profile_photo">$profile.menu.chg_photo</a></li>
                <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-               
        </ul>
        </div>
        {{ endif }}
@@ -81,4 +80,3 @@
 
 $contact_block
 
-
index 63a85dda536cd44fedaf2f82358ee82c8dfdd0a3..fb822fe5dbd90086826ca7375a00cf6093d647a0 100644 (file)
@@ -1,12 +1,12 @@
-<div id="saved-search-list" class="widget">
+<div class="widget" id="saved-search-list">
        <h3 id="search">$title</h3>
        $searchbox
        
        <ul id="saved-search-ul">
                {{ for $saved as $search }}
                <li class="saved-search-li clear">
-                       <a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-                       <a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
+                       <a title="$search.delete" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-$search.id" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
+                       <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
                </li>
                {{ endfor }}
        </ul>
old mode 100755 (executable)
new mode 100644 (file)
index 54c3e38..bfad1b7
@@ -1,10 +1,10 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
        <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
                                 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
                                 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-                               <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
                                <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
                                <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                                </div>
                        </div>
                        <div class="wall-item-photo-end"></div> 
-                       <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
+                       <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
+                               <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+                       </div>
                </div>
-               <div class="wall-item-lock-wrapper">
-                       {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-                       {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
+               <div class="wall-item-author">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+                               <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+                               
+               </div>                  
+               <div class="wall-item-content" id="wall-item-content-$item.id" >
+                       <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+                       <div class="wall-item-title-end"></div>
+                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
                </div>
                <div class="wall-item-tools" id="wall-item-tools-$item.id">
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
                        <div class="wall-item-delete-end"></div>
                </div>
-               <div class="wall-item-content" id="wall-item-content-$item.id" >
-                       <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-                       <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-               </div>
-               <div class="wall-item-author">
-                               <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-                               <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-                               
-               </div>                  
-               
        </div>
        <div class="wall-item-wrapper-end"></div>
-</div>
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
        <div class="wall-item-conv" id="wall-item-conv-$item.id" >
        {{ if $item.conv }}
-               <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+                       <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
        {{ endif }}
        </div>
 
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
+</div>
+
+
index 49148eed4bf230bd6a84cb72623b21c7aa5aea08..f8287c6ec77faacd2e098ea93c5a9037c44ecd03 100644 (file)
@@ -444,10 +444,10 @@ div.jGrowl div.info {
     padding-left: 58px;
 }
 #nav-notifications-menu {
-    margin: 30px 0 0 -45px;
-    width: 300px;
-    max-height: 400px;
-    overflow: auto;
+    margin: 30px 0 0 -20px;
+    width: 275px;
+    max-height: 300px;
+    overflow-y: auto;
     font-size: 9pt;
 }
 #nav-notifications-menu .contactname {
@@ -762,12 +762,20 @@ aside #viewcontacts {
     list-style: none;
 }
 #dfrn-request-link {
-       background:#3465A4 url(connect.png) no-repeat 95% center;
-       border-radius:5px 5px 5px 5px;
-       color:#fff;
-       display:block;
-       font-size:1.2em;
-       padding:.2em .5em;
+       background: #3465A4 url(connect.png) no-repeat 95% center;
+       border-radius: 5px 5px 5px 5px;
+       color: #fff;
+       display: block;
+       font-size: 1.2em;
+       padding: 0.2em 0.5em;
+}
+#wallmessage-link {
+       /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+       /*border-radius: 5px 5px 5px 5px;*/
+       color: #eee;
+       display: block;
+       font-size: 1.2em;
+       padding: 0.2em 0.5em;
 }
 #netsearch-box {
        margin: 20px 0px 30px;
@@ -848,6 +856,16 @@ aside #viewcontacts {
     border-radius: 5px;
        vertical-align: middle;
 }
+#jot-category {
+       margin: 5px 0;
+       border-radius: 5px;
+       border: 1px #ccc solid;
+       color: #666;
+       font-size: small;
+}
+#jot-category:focus {
+       color: #111;
+}
 #jot #character-counter {
        width: 6%;
        float: right;
@@ -1113,6 +1131,7 @@ section {
 }
 .shiny {
     background: #efefdf;
+       border-radius: 5px;
 }
 .wall-outside-wrapper .shiny {
        border-radius: 5px;
@@ -2076,6 +2095,9 @@ div[id$="wrapper"] br {
     float:left;
     font-size:20px;
 }
+.event {
+       background: #2e2f2e;
+}
 .vevent {
     border:1px solid #ccc;
 }
@@ -2087,15 +2109,14 @@ div[id$="wrapper"] br {
        margin-left: 10px;
        margin-right: 10px;
 }
-
 #new-event-link {
        margin-bottom: 10px;
 }
 .edit-event-link, .plink-event-link {
-       float: left;
-       margin-top: 4px;
-       margin-right: 4px;
-       margin-bottom: 15px;
+       /*float: left;      */
+       /*margin-top: 4px;  */
+       /*margin-right: 4px;*/
+       /*margin-bottom: 15px;*/
 }
 .event-description:before {
        content: url('../../../images/calendar.png');
@@ -2104,6 +2125,7 @@ div[id$="wrapper"] br {
 .event-start, .event-end {
        margin-left: 10px;
        width: 330px;
+       font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
        float: right;
@@ -2164,12 +2186,12 @@ div[id$="wrapper"] br {
        opacity: 1.0 !important;
        filter:alpha(opacity=100) !important;
 }
-.filesavetags {
+.filesavetags, .categorytags {
        margin: 20px 0;
        opacity: 0.5;
        filter:alpha(opacity=50);
 }
-.filesavetags:hover {
+.filesavetags:hover, .categorytags:hover {
        margin: 20px 0;
        opacity: 1.0 !important;
        filter:alpha(opacity=100) !important;
@@ -2178,7 +2200,7 @@ div[id$="wrapper"] br {
        opacity: 0.1;
        filter:alpha(opacity=10);
        float: right;
-       margin-right: 10px;
+       margin-right: 5px;
 }
 .item-select:hover, .checkeditem {
        opacity: 1;
@@ -2204,6 +2226,10 @@ div[id$="wrapper"] br {
 #item-delete-selected-desc:hover {
        text-decoration: underline;
 }
+.fc-state-highlight {
+    background: #eec;
+    color: #2e2f2e;
+}
 
 
 /**
index b54f753d3f661873f4014687b326a747b49c879a..8acaeaf02767505b85ee82f520be93621e69801f 100644 (file)
@@ -1,10 +1,12 @@
-<div class="wall-item-outside-wrapper$item.indent" id="wall-item-outside-wrapper-$item.id" >
+<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
        <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
                                 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
                                 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-                               <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+                                       <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
+                               </a>
                                <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                                        <ul>
                        <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>                                
                </div>
                <div class="wall-item-tools" id="wall-item-tools-$item.id">
-                               <div class="wall-item-lock-wrapper">
-                                       {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-                                       {{ else }}<div class="wall-item-lock"></div>{{ endif }}
-                               </div>
+                       <div class="wall-item-lock-wrapper">
+                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+                       </div>
                        <ul class="wall-item-subtools1">
                                {{ if $item.star }}
                                <li>
@@ -69,7 +71,6 @@
                <div class="wall-item-author">
                                <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
                                <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-                               
                </div>  
        </div>
        <div class="wall-item-wrapper-end"></div>
index b25d13409b4483aa488458bc61dda19911bd749f..421cddadfc0fbe80c9747fb3d32b3f34f278c400 100644 (file)
                        <div class="wall-item-photo-end"></div>
                        <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>                                
                </div>
-               <div class="wall-item-lock-wrapper">
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       <div class="wall-item-lock-wrapper">
                                {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
                                {{ else }}<div class="wall-item-lock"></div>{{ endif }}
-               </div>
-               <div class="wall-item-tools" id="wall-item-tools-$item.id">
-                       {{ if $item.star }}
-                               <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-                               <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-                       {{ endif }}
-                       
-                       {{ if $item.vote }}
-                       <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-                               <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-                               <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-
-                       {{ if $item.vote.share }}
-                               <a href="#" id="share-$item.id"
-class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-                               <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
                        </div>
-                       {{ endif }}
+                       <ul class="wall-item-subtools1">
+                               {{ if $item.star }}
+                               <li>
+                                       <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+                                       <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+                               </li>
+                               {{ endif }}
+                               {{ if $item.vote }}
+                               <li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+                                       <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+                                       <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+                                       {{ if $item.vote.share }}
+                                       <a href="#" id="share-$item.id"
+class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+                                       <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+                               </li>
+                               {{ endif }}
+                       </ul><br style="clear:left;" />
+                       <ul class="wall-item-subtools2">
                        {{ if $item.filer }}
-                               <div class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></div>
+                               <li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
                        {{ endif }}
                        {{ if $item.plink }}
-                               <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
+                               <li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
                        {{ endif }}
                        {{ if $item.edpost }}
-                               <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+                               <li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
                        {{ endif }}
                
-                       <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+                       <li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
                                {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-                       </div>
                                {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+                       </li>
+                       </ul>
                        <div class="wall-item-delete-end"></div>
-
                </div>
                <div class="wall-item-content" id="wall-item-content-$item.id" >
                        <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
@@ -70,7 +73,6 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
                                                {{ endfor }}
                                        </div>                  
                        </div>
-                       
                </div>
                <div class="wall-item-author">
                        <a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
index 38c1fc5bdcae64f3ff7776d3c73dab92d8925a38..c30e643ce49bc4b53e0c6135f3e8553f697905d4 100755 (executable)
@@ -2987,7 +2987,10 @@ div.jGrowl div.info {
   color: #ffffff;
   padding-left: 58px;
 }
-
+#jGrowl.top-right {
+       top: 15px;
+       right: 15px;
+}
 .qcomment {
        border: 1px solid #EEE;
        padding: 3px;
diff --git a/view/theme/goldenrod/screenshot.jpg b/view/theme/goldenrod/screenshot.jpg
deleted file mode 100644 (file)
index 357e00a..0000000
Binary files a/view/theme/goldenrod/screenshot.jpg and /dev/null differ
diff --git a/view/theme/goldenrod/style.css b/view/theme/goldenrod/style.css
deleted file mode 100755 (executable)
index 47985aa..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-@import url('../loozah/style.css');
-
-footer {
-       background: #CCC;
-}
-
-#banner {
-       color: #444444;
-}
-
-#logo-text a, #logo-text a:visited, #site-location {
-       color: #000000;
-}
-
-body { 
-       background: #FFFFFF;
-       color: #000000;
-}
-.nav-selected {
-       background: #FFFFFF !important;
-       color: #888888 !important;
-}
-
-input:hover {
-       background-color: #FFEEBB;
-       color: #000000;
-       border: 1px solid #000000;
-}
-
-input, select {
-       background-color: #FFEEBB;
-       color: #000000;
-}
-.nav-link:hover, .nav-commlink:hover {
-       background: #FFDDAA;
-       color: #0000EE;
-}
-option {
-       background-color: #FFEEBB;
-}
-#page-footer {
-       border: none;
-}
-
-nav {
-       background: #FFEEBB;
-}
-
-
-
-body { 
-       background: #FFDDAA;
-       color: #444444;
-}
-
-.nav-link {
-       color: #444444;
-       background: #FFCC55;
-}
-
-.nav-commlink {
-       color: #444444;
-       background: #FFCC55;
-}
-
-.nav-selected {
-       background: #FFDDAA !important;
-}
-
-.tab {
-       color: #444444;
-       background: #FFCC55;
-
-}
-
-a, a:visited {
-       color: #8888FF;
-       text-decoration: none;
-}
-
-a:hover {
-       color: #0000FF;
-       text-decoration: underline;
-}
-
-.fakelink, .fakelink:visited {
-       color: #8888FF;
-}
-
-.fakelink:hover {
-       color: #0000FF;
-}
-
-
-
-.wall-item-content-wrapper.comment {
-       background: #FFCC55;
-}
-
-.comment-edit-wrapper {
-       background: #FFCC55;
-}
-
-.comment-wwedit-wrapper {
-       background: #FFCC55;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
-       color: #8888FF;
-}
-
-#photos-upload-perms-menu:hover {
-       color: #0000FF;
-}
-#settings-default-perms-menu, #settings-default-perms-menu:visited {
-       color: #8888FF;
-}
-
-#settings-default-perms-menu:hover {
-       color: #0000FF;
-}
diff --git a/view/theme/goldenrod/theme.php b/view/theme/goldenrod/theme.php
deleted file mode 100755 (executable)
index 47b43cf..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/goldenrod/unsupported b/view/theme/goldenrod/unsupported
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/view/theme/loozah/comment_item.tpl b/view/theme/loozah/comment_item.tpl
deleted file mode 100755 (executable)
index 3503c38..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-               <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-                       <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-                               <input type="hidden" name="type" value="$type" />
-                               <input type="hidden" name="profile_uid" value="$profile_uid" />
-                               <input type="hidden" name="parent" value="$parent" />
-                               <input type="hidden" name="return" value="$return_path" />
-                               <input type="hidden" name="jsreload" value="$jsreload" />
-                               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
-                                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-                               </div>
-                               <div class="comment-edit-photo-end"></div>
-                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-                               {{ if $qcomment }}
-                               {{ for $qcomment as $qc }}                              
-                                       <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-                                       &nbsp;
-                               {{ endfor }}
-                               {{ endif }}
-
-                               <div class="comment-edit-text-end"></div>
-                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-                                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-                                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-                               </div>
-
-                               <div class="comment-edit-end"></div>
-                       </form>
-
-               </div>
diff --git a/view/theme/loozah/contact_template.tpl b/view/theme/loozah/contact_template.tpl
deleted file mode 100755 (executable)
index 48930b4..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-       <div class="contact-entry-photo-wrapper" >
-               <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-               onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-               onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-                       <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-                       {{ if $contact.photo_menu }}
-                       <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-                       {{ endif }}
-               </div>
-                       
-       </div>
-       <div class="contact-entry-photo-end" ></div>
-               <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-       <div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/loozah/conversation.tpl b/view/theme/loozah/conversation.tpl
deleted file mode 100755 (executable)
index 33cedfb..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-       $thread.html
-</div>
-{{ endfor }}
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/theme/loozah/ff-16.jpg b/view/theme/loozah/ff-16.jpg
deleted file mode 100755 (executable)
index 3621f59..0000000
Binary files a/view/theme/loozah/ff-16.jpg and /dev/null differ
diff --git a/view/theme/loozah/friendika-16.png b/view/theme/loozah/friendika-16.png
deleted file mode 100755 (executable)
index 1a742ec..0000000
Binary files a/view/theme/loozah/friendika-16.png and /dev/null differ
diff --git a/view/theme/loozah/group_side.tpl b/view/theme/loozah/group_side.tpl
deleted file mode 100755 (executable)
index a1fc70a..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-       <ul id="sidebar-group-ul">
-               {{ for $groups as $group }}
-                       <li class="sidebar-group-li">
-                               {{ if $group.cid }}
-                                       <input type="checkbox" 
-                                               class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-                                               onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-                                               {{ if $group.ismember }}checked="checked"{{ endif }}
-                                       />
-                               {{ endif }}                     
-                               {{ if $group.edit }}
-                                       <a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
-                               {{ endif }}
-                               <a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-                       </li>
-               {{ endfor }}
-       </ul>
-       </div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
-
-
diff --git a/view/theme/loozah/jot.tpl b/view/theme/loozah/jot.tpl
deleted file mode 100755 (executable)
index ac64223..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-       <div id="profile-jot-banner-wrapper">
-               <div id="profile-jot-desc" >&nbsp;</div>
-               <div id="character-counter" class="grey"></div>
-       </div>
-       <div id="profile-jot-banner-end"></div>
-
-       <form id="profile-jot-form" action="$action" method="post" >
-               <input type="hidden" name="type" value="$ptyp" />
-               <input type="hidden" name="profile_uid" value="$profile_uid" />
-               <input type="hidden" name="return" value="$return_path" />
-               <input type="hidden" name="location" id="jot-location" value="$defloc" />
-               <input type="hidden" name="coord" id="jot-coord" value="" />
-               <input type="hidden" name="title" id="jot-title" value="" />
-               <input type="hidden" name="preview" id="jot-preview" value="0" />
-               <input type="hidden" name="post_id" value="$post_id" />
-
-               <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" style="display:none" class="jothidden">
-<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-       <div id="profile-upload-wrapper" style="display: $visitor;" >
-               <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-       </div> 
-       <div id="profile-attach-wrapper" style="display: $visitor;" >
-               <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-       </div> 
-
-       <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-               <a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-       </div> 
-       <div id="profile-video-wrapper" style="display: $visitor;" >
-               <a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-       </div> 
-       <div id="profile-audio-wrapper" style="display: $visitor;" >
-               <a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-       </div> 
-       <div id="profile-location-wrapper" style="display: $visitor;" >
-               <a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-       </div> 
-       <div id="profile-nolocation-wrapper" style="display: none;" >
-               <a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-       </div> 
-       <div id="profile-title-wrapper" style="display: $visitor;" >
-               <a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a>
-       </div> 
-
-       <div id="profile-jot-plugin-wrapper">
-       $jotplugins
-       </div>
-
-       <div id="profile-rotator-wrapper" style="display: $visitor;" >
-               <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-       </div> 
-       <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-               <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-       </div>
-
-       <span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-
-       <div id="profile-jot-perms-end"></div>
-
-       <div id="jot-preview-content" style="display:none;"></div>
-       
-       <div style="display: none;">
-               <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                       $acl
-                       <hr style="clear:both"/>
-                       <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-                       <div id="profile-jot-email-end"></div>
-                       $jotnets
-               </div>
-       </div>
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-               {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/loozah/lock.cur b/view/theme/loozah/lock.cur
deleted file mode 100755 (executable)
index 892c5e8..0000000
Binary files a/view/theme/loozah/lock.cur and /dev/null differ
diff --git a/view/theme/loozah/login-bg.gif b/view/theme/loozah/login-bg.gif
deleted file mode 100755 (executable)
index cde836c..0000000
Binary files a/view/theme/loozah/login-bg.gif and /dev/null differ
diff --git a/view/theme/loozah/nav.tpl b/view/theme/loozah/nav.tpl
deleted file mode 100755 (executable)
index 6ab45b7..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<nav>
-       $langselector
-
-       <div id="site-location">$sitelocation</div>
-
-       {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-       {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-       <span id="nav-link-wrapper" >
-
-       {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-               
-       {{ if $nav.help }}<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-               
-       {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-       <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-       <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-       {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-       {{ if $nav.network }}
-       <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-       <span id="net-update" class="nav-ajax-left"></span>
-       {{ endif }}
-       {{ if $nav.home }}
-       <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-       <span id="home-update" class="nav-ajax-left"></span>
-       {{ endif }}
-       {{ if $nav.community }}
-       <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-       {{ endif }}
-       {{ if $nav.notifications }}
-       <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-       <span id="notify-update" class="nav-ajax-left"></span>
-       {{ endif }}
-       {{ if $nav.messages }}
-       <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-       <span id="mail-update" class="nav-ajax-left"></span>
-       {{ endif }}
-
-       {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-       {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-       {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-       {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-       </span>
-       <span id="nav-end"></span>
-       <span id="banner">$banner</span>
-</nav>
diff --git a/view/theme/loozah/nets.tpl b/view/theme/loozah/nets.tpl
deleted file mode 100755 (executable)
index b0cb889..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="nets-sidebar" class="widget">
-       <h3>$title</h3>
-       <div id="nets-desc">$desc</div>
-       <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
-       <ul class="nets-ul">
-       {{ for $nets as $net }}
-       <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
-       {{ endfor }}
-       </ul>
-</div>
diff --git a/view/theme/loozah/photo-menu.jpg b/view/theme/loozah/photo-menu.jpg
deleted file mode 100755 (executable)
index bd39696..0000000
Binary files a/view/theme/loozah/photo-menu.jpg and /dev/null differ
diff --git a/view/theme/loozah/profile_vcard.tpl b/view/theme/loozah/profile_vcard.tpl
deleted file mode 100755 (executable)
index b3f5cc5..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="vcard">
-
-       <div class="fn label">$profile.name</div>
-       
-                               
-       
-       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-       <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
-
-
-
-       {{ if $location }}
-               <dl class="location"><dt class="location-label">$location</dt> 
-               <dd class="adr">
-                       {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-                       <span class="city-state-zip">
-                               <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-                               <span class="region">$profile.region</span>
-                               <span class="postal-code">$profile.postal-code</span>
-                       </span>
-                       {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-               </dd>
-               </dl>
-       {{ endif }}
-
-       {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-       
-       {{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-       {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-       {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-       {{ inc diaspora_vcard.tpl }}{{ endinc }}
-       
-       <div id="profile-extra-links">
-               <ul>
-                       {{ if $connect }}
-                               <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-                       {{ endif }}
-               </ul>
-       </div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/loozah/saved_searches_aside.tpl b/view/theme/loozah/saved_searches_aside.tpl
deleted file mode 100755 (executable)
index e2aae1e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-       <h3 id="search">$title</h3>
-       $searchbox
-       
-       <ul id="saved-search-ul">
-               {{ for $saved as $search }}
-               <li class="saved-search-li clear">
-                       <a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-                       <a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-               </li>
-               {{ endfor }}
-       </ul>
-       <div class="clear"></div>
-</div>
diff --git a/view/theme/loozah/screenshot.jpg b/view/theme/loozah/screenshot.jpg
deleted file mode 100644 (file)
index 41d6929..0000000
Binary files a/view/theme/loozah/screenshot.jpg and /dev/null differ
diff --git a/view/theme/loozah/search_item.tpl b/view/theme/loozah/search_item.tpl
deleted file mode 100755 (executable)
index 5db19b4..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="wall-item-outside-wrapper$indent$previewing" id="wall-item-outside-wrapper-$id" >
-       <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-               <div class="wall-item-info" id="wall-item-info-$id">
-                       <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-                                onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-                                onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-                               <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-                               <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-                               <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-                               <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
-                                       <ul>
-                                               $item_photo_menu
-                                       </ul>
-                               </div>
-                       </div>
-                       <div class="wall-item-photo-end"></div> 
-                       <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-                               {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
-                               {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
-                               <div class="wall-item-location" id="wall-item-location-$id">$location</div>
-                       </div>
-               </div>
-               <div class="wall-item-author">
-                               <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-                               <div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-                               
-               </div>                  
-               <div class="wall-item-content" id="wall-item-content-$id" >
-                       <div class="wall-item-title" id="wall-item-title-$id">$title</div>
-                       <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
-               </div>
-               <div class="wall-item-tools" id="wall-item-tools-$id">
-                       <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-                               {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-                       </div>
-                               {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
-                       <div class="wall-item-delete-end"></div>
-               </div>
-       </div>
-       <div class="wall-item-wrapper-end"></div>
-
-
-       <div class="wall-item-conv" id="wall-item-conv-$id" >
-       {{ if $conv }}<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>{{ endif }}
-       </div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-
-</div>
-
-
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
deleted file mode 100755 (executable)
index 73c8639..0000000
+++ /dev/null
@@ -1,2831 +0,0 @@
-/*
-       Loozah CSS - Emmanuel Revah manurevah.com
-       Copy, Paste, Send - Free
-
-       this is still considered as messy :]
-*/
-
-/** {*/
-       /*margin: 0;*/
-       /*padding: 0;*/
-/*}*/
-
-/* GENERIC STUFF */
-body {
-       background: #F5F6FB;
-       color: #444444;
-       font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
-       font-size: 90%;
-       margin-left: 10px;
-}
-a, a:visited {
-/*     color: #34366A; */
-       color: #15607B;
-       text-decoration: none;
-}
-a:hover {
-       color: #0CBEFE;
-       text-decoration: none;
-}
-input, select {
-       background-color: #ECECEC;
-       border: 1px solid #858585;
-}
-input:hover {
-
-       background-color: #0CBEFE;
-/*     background-color: #49dbFa; */
-       color: black;
-/*     color: #F5F6FB; */
-/*     border: 1px solid #F5F6FB; */
-       cursor: pointer;
-}
-
-.openid input{
-   background-color: #ECECEC !important;
-   background: url(login-bg.gif) no-repeat;
-   background-position: 0 50%;
-   padding-left: 18px;
-   width: 385px !important;
-}
-
-.openid input:hover {
-       background-color: #0CBEFE !important;
-}
-
-
-
-
-option {
-       background-color: #ECD6D2;
-}
-img {
-       border: none;
-}
-code {
-       font-family: Courier, monospace;
-       white-space: pre;
-       display: block;
-       overflow: auto;
-       border: 1px solid #444;
-       background: #EEE;
-       color: #444;
-       padding: 10px;
-       margin-top: 20px;
-}
-blockquote:before {
-       content: '>> ';
-}
-
-#site-location {
-       position: absolute;
-       right: 5px;
-       top: 3px;
-       color: white;
-       font-size: 60%;
-}
-
-.shiny {
-       border-color: orange !important;
-}
-
-.nav-login-link {
-       float: right;
-       margin-left: 0px;
-       margin-right: 3px;
-       padding: 3px;
-       font-size: 70%;
-}
-
-/* NOTIFICATION */
-#notification-show-hide-link {
-       background-color: red;
-       padding: 2px 4px;
-       background-color: #ECECEC;
-       border: 1px solid #858585;
-}
-#notification-show-hide-link:hover {
-       background-color: #0CBEFE;
-       color: #F5F6FB;
-       border: 1px solid #F5F6FB;
-}
-
-#jot-perms-icon, 
-#profile-location,
-#profile-nolocation,
-#profile-youtube, 
-#profile-video,
-#profile-audio, 
-#profile-link,
-#profile-title, 
-#wall-image-upload,
-#wall-file-upload,
-#profile-upload-wrapper,
-#wall-image-upload-div,
-#wall-file-upload-div,
-.hover, .focus {
-       cursor: pointer;
-}
-
-#jot-perms-icon {
-       float: left;
-}
-
-#jot-title-desc {
-       color: #cccccc;
-}
-
-#jot-title-wrapper {
-       margin-bottom: 5px;
-}
-
-#jot-title {
-       border: 1px solid #cccccc;
-       width: 530px;
-}
-
-#jot-title-display {
-       font-weight: bold;
-}
-
-.fakelink, .fakelink:visited {
-       color: #15607B;
-       text-decoration: none;
-       cursor: pointer;
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-.lockview {
-       cursor: pointer;
-}
-
-
-#group-sidebar {
-    margin-bottom: 10px;
-}
-
-.group-selected, .nets-selected {
-    padding: 3px;
-    border: 1px solid #CCCCCC;
-    background: #F8F8F8;
-    font-weight: bold;
-}
-
-.fakelink:hover {
-       color: #0CBEFE;
-       text-decoration: none;
-       cursor: pointer;
-}
-.smalltext {
-       font-size: 0.7em;
-}
-#sysmsg {
-       width: 600px;
-       margin-bottom: 10px;
-}
-
-#top-margin {
-       height: 20px;
-}
-
-#logo-img {
-       margin-top: 3px;
-
-}
-
-#logo-text {
-       font-family: "gill sans MT bold", "lucida grande",tahoma,verdana,arial,sans-serif;
-       margin-left: 3px;
-       vertical-align: top;
-}
-
-#logo-text a, #logo-text a:hover, #logo-text a:visited {
-       color: #F5F6FB;
-       font-family: "gill sans MT bold", "lucida grande",tahoma,verdana,arial,sans-serif;
-       margin-left: 3px;
-       vertical-align: top;
-}
-
-
-#banner {
-       color: #F5F6FB;
-       font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
-       font-size: 2.0em;
-       position: absolute;
-       top: 5px;
-       left: 39%;
-}
-
-#panel {
-       background-color: ivory;
-       position: absolute;
-       z-index: 2;
-       width: 30%;
-       padding: 25px;
-       border: 1px solid #444;
-}
-
-img.photo {
-       /*border: 1px solid #AAAAAA;*/
-       /*padding: 5px;*/
-       /*background: #FFFFFF;*/
-}
-
-#logo {
-       font-size: 300%;
-       color: #A8A8A8;
-       font-weight: bold;
-       margin-left: 280px;
-}
-
-/*
- * #page-footer {
- *     height: 20px;
- *
- * }
- */
-
-.heart {
-       color: #FF0000;
-       font-size: 100%;
-}
-
-aside {
-       /*position: absolute;*/
-       /*left: 0px;*/
-       /*top: 60px;*/
-       /*right: 250px;*/
-       width: 230px;
-       /*margin-left: 20px;*/
-       /*margin-right: 0px;*/
-       font-size: 0.9em;
-
-       float: left;
-       margin-top: 64px;
-       margin-left: 20px;
-}
-section {
-       position: absolute;
-       left: 250px;
-       top: 60px;
-       margin-top: 25px;
-       margin-left: 20px;
-       margin-right: 20px;
-       right: 0px;
-}
-h1 {
-       font-size: 1.6em;
-}
-
-nav {
-       position: absolute;
-       top: 0px;
-       height: 48px;
-       left: 0px;
-       right: 0px;
-       background: #15607B;
-}
-
-/*
- * footer {
- *     left: 0px;
- *     bottom: 0px;
- *     position: fixed;
- *     background-color: #0CBEFE;
- *     width: 100%;
- *     padding: 2px 3%;
- * }
- */
-
-.fn {
-       font-size: 1.4em;
-       margin-bottom: 5px;
-       line-height: 1.5;
-}
-
-.vcard .title {
-       margin-bottom: 5px;
-}
-
-.vcard dl {
-       clear: both;
-}
-
-.powered {
-       font-size: 0.6em;
-       color: black;
-}
-.powered a {
-       color: #EBF3F3;
-       font-weight: bold;
-}
-.powered a:hover {
-       color: #FFC019;
-}
-.error-message {
-       color: #FF0000;
-       font-size: 1.1em;
-       border: 1px solid #FF8888;
-       background-color: #FFEEEE;
-       padding: 10px;
-}
-.info-message {
-       color: #204a87;
-       font-size: 1.1em;
-       border: 1px solid #3465a4;
-       background-color: #d7e3f1;
-       padding: 10px;
-}
-
-
-.nav-link {
-       float: right;
-       margin-left: 0px;
-       margin-right: 3px;
-       margin-top: 20px;
-       padding: 6px;
-       /*border: 2px solid #000000;*/
-       background: #D5D5D5;
-       font-size: 80%;
-       font-weight: bold;
-       -moz-border-radius-topleft: 3px;
-       -moz-border-radius-topright: 3px;
-       -webkit-border-radius-topleft: 3px;
-       -webkit-border-radius-topright: 3px;
-       border-radius-topleft: 3px;
-       border-radius-topright: 3px;
-}
-.nav-link:hover {
-       background-color: #0CBEFE;
-       color: #F5F6FB;
-}
-
-
-.nav-ajax-left {
-       margin-left: 1px;
-       margin-right: 2px;
-       margin-top: 15px;
-       float: left;
-       font-size: 0.6em;
-       font-weight: bold;
-       color: #F8FF15;
-       /*background: #FFFFFF;*/
-}
-
-
-
-.nav-selected {
-       border-bottom: none !important;
-       background: #F5F6FB !important;
-       padding: 8px 6px 6px 6px !important;
-       color: #000 !important;
-}
-
-
-.nav-ajax-left:hover {
-       font-size: 1.5em;
-}
-
-.nav-ajax-right {
-       margin-left: 1px;
-       float: right;
-       font-size: 0.6em;
-       font-weight: bold;
-       color: #FF0000;
-}
-
-.nav-commlink {
-       float: left;
-       margin-left: 3px;
-       margin-right: 0px;
-       margin-top: 20px;
-       padding: 6px;
-       /*border: 2px solid #000000;*/
-       background: #D5D5D5;
-       font-size: 80%;
-       font-weight: bold;
-       text-decoration: none;
-       -moz-border-radius-topleft: 3px;
-       -moz-border-radius-topright: 3px;
-       -webkit-border-radius-topleft: 3px;
-       -webkit-border-radius-topright: 3px;
-       border-radius-topleft: 3px;
-       border-radius-topright: 3px;
-}
-.nav-commlink:hover {
-       background-color: #0CBEFE;
-       color: #F5F6FB;
-}
-
-#nav-end {
-       clear: both;
-}
-
-.login-extra-links {
-       font-size: 0.7em;
-}
-
-#profile-extra-links {
-       clear: both;
-       margin-top: 20px;
-       margin-bottom: 20px;
-       margin-left: 20px;
-       margin-right: 20px;
-}
-#register-fill-ext {
-       margin-bottom: 25px;
-}
-
-#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid {
-       float: left;
-       width: 350px;
-       margin-top: 10px;
-}
-
-#register-name, #register-email, #register-nickname {
-       float: left;
-       margin-top: 10px;
-       width: 150px;
-}
-
-#register-openid {
-       float: left;
-       margin-top: 10px;
-       width: 130px;
-}
-
-#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end {
-       clear: both;
-}
-
-#register-nickname-desc {
-       margin-top: 30px;
-       width: 650px;
-}
-#register-sitename {
-       float: left;
-       margin-top: 10px;
-}
-
-#register-submit-button {
-       margin-top: 10px;
-}
-
-#login_standard {
-       width: 480px;
-       float: left;
-}
-#login_openid {
-       width: 480px;
-       margin-left: 490px;
-}
-
-#login_standard input,
-#login_openid input {
-       width: 180px!important;
-}
-#login-extra-links { clear: both; }
-
-#register-link, #lost-password-link {
-       float: left;
-       font-size: 80%;
-       margin-right: 15px;
-}
-
-
-#login-submit-button {
-/*     margin-top: 10px; */
-       margin-left: 200px;
-}
-
-input#dfrn-url {
-       float: left;
-       background: url(friendika-16.png) no-repeat;
-       background-position: 2px center;
-       font-size: 17px;
-       padding-left: 21px;
-       height: 21px;
-       background-color: #FFFFFF;
-       color: #000000;
-       margin-bottom: 20px;
-}
-
-#dfrn-url-label {
-       float: left;
-       width: 250px;
-}
-
-#dfrn-request-url-end {
-       clear: both;
-}
-
-#knowyouyes, #knowyouno {
-       float: left;
-}
-
-#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper {
-
-       float: none;
-}
-#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label {
-       float: left;
-       width: 75px;
-       margin-left: 50px;
-       margin-bottom: 7px;
-}
-#dfrn-request-knowyou-break, #dfrn-request-knowyou-end {
-       clear: both;
-
-}
-
-#dfrn-request-message-wrapper {
-       margin-bottom: 50px;
-}
-#dfrn-request-submit-wrapper {
-       clear: both;
-       margin-left: 50px;
-}
-
-#dfrn-request-info-wrapper {
-       margin-left: 50px;
-}
-
-
-#cropimage-wrapper, #cropimage-preview-wrapper {
-       float: left;
-       padding: 30px;
-}
-
-#crop-image-form {
-       margin-top: 30px;
-       clear: both;
-}
-
-.intro-wrapper {
-       margin-top: 20px;
-}
-
-.intro-fullname {
-       font-size: 1.1em;
-       font-weight: bold;
-
-}
-.intro-desc {
-       margin-bottom: 20px;
-       font-weight: bold;
-}
-
-.intro-note {
-       padding: 10px;
-}
-
-.intro-end {
-       padding: 30px;
-}
-
-.intro-form {
-       float: left;
-}
-.intro-approve-form {
-       clear: both;
-}
-.intro-approve-as-friend-end {
-       clear: both;
-}
-.intro-submit-approve, .intro-submit-ignore {
-       margin-right: 20px;
-}
-.intro-submit-approve {
-       margin-top: 15px;
-}
-
-.intro-approve-as-friend-label, .intro-approve-as-fan-label {
-       float: left;
-       width: 100px;
-       margin-left: 20px;
-}
-.intro-approve-as-friend, .intro-approve-as-fan {
-       float: left;
-}
-.intro-form-end {
-       clear: both;
-}
-.intro-approve-as-friend-desc {
-       margin-top: 15px;
-}
-.intro-approve-as-end {
-       clear: both;
-       margin-bottom: 10px;
-}
-
-.intro-end {
-       clear: both;
-       margin-bottom: 30px;
-}
-
-#profile-extra-links ul {
-       list-style-type: none;
-}
-
-
-#profile-extra-links li {
-       margin-top: 5px;
-}
-
-#profile-edit-links ul {
-       list-style-type: none;
-}
-
-#profile-edit-links li {
-       margin-top: 10px;
-}
-
-.profile-edit-side-div {
-       float: right;
-}
-
-.view-contact-wrapper {
-       margin-top: 20px;
-       float: left;
-       margin-left: 20px;
-       width: 180px;
-}
-#view-contact-end {
-       clear: both;
-}
-#viewcontacts {
-       margin-top: 15px;
-}
-#profile-edit-default-desc {
-       color: #FF0000;
-       border: 1px solid #FF8888;
-       background-color: #FFEEEE;
-       padding: 7px;
-}
-
-#profile-edit-clone-link-wrapper {
-       float: left;
-       margin-left: 50px;
-       margin-bottom: 20px;
-       width: 300px;
-}
-
-#profile-edit-drop-link-wrapper {
-       float: left;
-}
-
-#profile-edit-links-end {
-       clear: both;
-}
-.profile-listing-photo {
-       border: none;
-}
-
-.profile-edit-submit-wrapper {
-       margin-top: 20px;
-       margin-bottom: 20px;
-}
-
-#profile-photo-link-select-wrapper {
-       margin-top: 2em;
-}
-#profile-photo-wrapper img {
-       width:175px;
-       height:175px;
-}
-
-#profile-edit-profile-name-label,
-#profile-edit-name-label,
-#profile-edit-pdesc-label,
-#profile-edit-gender-label,
-#profile-edit-dob-label,
-#profile-edit-address-label,
-#profile-edit-locality-label,
-#profile-edit-region-label,
-#profile-edit-postal-code-label,
-#profile-edit-country-name-label,
-#profile-edit-marital-label,
-#profile-edit-sexual-label,
-#profile-edit-politic-label,
-#profile-edit-religion-label,
-#profile-edit-pubkeywords-label,
-#profile-edit-prvkeywords-label,
-#profile-edit-homepage-label {
-       float: left;
-       width: 175px;
-}
-
-#profile-edit-profile-name,
-#profile-edit-name,
-#profile-edit-pdesc,
-#gender-select,
-#profile-edit-dob,
-#profile-edit-address,
-#profile-edit-locality,
-#profile-edit-region,
-#profile-edit-postal-code,
-#profile-edit-country-name,
-#marital-select,
-#sexual-select,
-#profile-edit-politic,
-#profile-edit-religion,
-#profile-edit-pubkeywords,
-#profile-edit-prvkeywords,
-#profile-in-dir-yes,
-#profile-in-dir-no,
-#profile-in-netdir-yes,
-#profile-in-netdir-no,
-#hide-wall-yes,
-#hide-wall-no,
-#hide-friends-yes,
-#hide-friends-no,
-#settings-normal,
-#settings-soapbox,
-#settings-community,
-#settings-freelove {
-       float: left;
-       margin-bottom: 20px;
-}
-
-#profile-in-dir-yes-label,
-#profile-in-dir-no-label,
-#profile-in-netdir-yes-label,
-#profile-in-netdir-no-label,
-#hide-wall-yes-label,
-#hide-wall-no-label,
-#hide-friends-yes-label,
-#hide-friends-no-label {
-       margin-left: 125px;
-       float: left;
-       width: 50px;
-}
-
-#profile-edit-with-label {
-       width: 175px;
-       margin-left: 20px;
-}
-
-#profile-edit-pubkeywords-desc,
-#profile-edit-prvkeywords-desc {
-       float: left;
-       margin-left: 20px;
-}
-
-#profile-publish-yes-reg,
-#profile-publish-no-reg {
-       float: left;
-       margin-bottom: 10px;
-}
-
-#profile-publish-yes-label-reg,
-#profile-publish-no-label-reg {
-       margin-left: 350px;
-       float: left;
-       width: 50px;
-}
-
-#profile-publish-break-reg,
-#profile-publish-end-reg {
-       clear: both;
-}
-
-
-
-#profile-edit-homepage {
-       float: left;
-       margin-bottom: 35px;
-}
-#settings-normal-label,
-#settings-soapbox-label,
-#settings-community-label,
-#settings-freelove-label {
-       float: left;
-       width: 200px;
-}
-#settings-normal-desc,
-#settings-soapbox-desc,
-#settings-community-desc,
-#settings-freelove-desc {
-       float: left;
-       margin-left: 75px;
-}
-
-#profile-edit-profile-name-end,
-#profile-edit-name-end,
-#profile-edit-pdesc-end,
-#profile-edit-gender-end,
-#profile-edit-dob-end,
-#profile-edit-address-end,
-#profile-edit-locality-end,
-#profile-edit-region-end,
-#profile-edit-postal-code-end,
-#profile-edit-country-name-end,
-#profile-edit-marital-end,
-#profile-edit-sexual-end,
-#profile-edit-politic-end,
-#profile-edit-religion-end,
-#profile-edit-pubkeywords-end,
-#profile-edit-prvkeywords-end,
-#profile-edit-homepage-end,
-#profile-in-dir-break,
-#profile-in-dir-end,
-#profile-in-netdir-break,
-#profile-in-netdir-end,
-#hide-wall-break,
-#hide-wall-end,
-#hide-friends-break,
-#hide-friends-end,
-#settings-normal-break,
-#settings-soapbox-break,
-#settings-community-break,
-#settings-freelove-break {
-       clear: both;
-}
-
-
-
-
-
-#gender-select, #marital-select, #sexual-select {
-       width: 220px;
-}
-
-#profile-edit-profile-name-wrapper .required {
-       color: #FF0000;
-       float: left;
-}
-
-#contacts-main {
-       margin-top: 20px;
-       margin-bottom: 20px;
-}
-
-.contact-entry-wrapper {
-       float: left;
-       width: 120px;
-       height: 120px;
-}
-
-.contact-entry-direction-icon {
-       margin-top: 24px;
-       margin-right: 2px;
-}
-
-.contact-entry-photo img {
-       border: none;
-}
-.contact-entry-photo-end {
-       clear: both;
-}
-.contact-entry-name {
-       float: left;
-       margin-left: 0px;
-       width: 120px;
-       oveflow: hidden;
-}
-.contact-entry-edit-links {
-       margin-top: 6px;
-       margin-left: 10px;
-       width: 16px;
-}
-.contact-entry-nav-wrapper {
-       float: left;
-       margin-left: 10px;
-}
-
-.contact-entry-edit-links img {
-       border: none;
-       margin-right: 15px;
-}
-.contact-entry-photo {
-       float: left;
-       position: relative;
-}
-.contact-entry-end {
-       clear: both;
-}
-
-#contact-edit-end {
-       clear: both;
-       margin-bottom: 65px;
-}
-
-.contact-photo-menu-button {
-       position: absolute;
-       background-image: url("photo-menu.jpg");
-       background-position: top left; 
-       background-repeat: no-repeat;
-       margin: 0px; padding: 0px;
-       width: 16px;
-       height: 16px;
-       top: 64px; left:0px;
-       overflow: hidden;
-       text-indent: 40px;
-       display: none;
-       
-}
-
-.contact-photo-menu {
-       width: 100px;
-       border: 2px solid #444444;
-       background: #FFFFFF;
-       position: absolute;
-       left: 0px; top: 90px;
-       display: none;
-       z-index: 10000;
-}
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.contact-photo-menu li a { display: block; padding: 2px; }
-.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-#fsuggest-desc, #fsuggest-submit-wrapper {
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-
-.wall-item-content-wrapper {
-       margin-top: 10px;
-       border: 1px solid #CCC;
-       position: relative;
-}
-
-.wall-item-content-wrapper.comment {
-       margin-left: 50px;
-       background: #CCCCCC;
-}
-
-.wall-item-photo-wrapper {
-       margin-top: 10px;
-       margin-left: 10px;
-       margin-bottom: 10px;
-       width: 100px;
-       float: left;
-}
-
-.wall-item-photo-menu-button {
-       display: block;
-       position: absolute;
-       background-image: url("photo-menu.jpg");
-       background-position: top left; 
-       background-repeat: no-repeat;
-       margin: 0px; padding: 0px;
-       width: 16px;
-       height: 16px;
-       top: 74px; left:10px;
-       overflow: hidden;
-       text-indent: 40px;
-       display: none;
-}
-.wall-item-photo-menu {
-       width: auto;
-       border: 2px solid #444444;
-       background: #FFFFFF;
-       position: absolute;
-       left: 10px; top: 90px;
-       display: none;
-       z-index: 10000;
-}
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
-.wall-item-photo-menu li a { display: block; padding: 2px; }
-.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
-
-
-.wall-item-arrowphoto-wrapper {
-       margin-top: 40px;
-}
-.wall-item-wrapper {
-       margin-left: 10px;;
-}
-
-.wall-item-lock {
-       position: absolute;
-       left: 105px;
-       top: 1px;
-}
-
-.wall-item-ago {
-       color: #888888;
-       font-size: 0.8em;
-}
-.wall-item-like-buttons {
-    float: left;
-    margin-right: 10px;
-    padding-right: 10px;
-    border-right: 2px solid #fff;
-}
-.wall-item-like-buttons > a,
-.wall-item-like-buttons > img {
-       float: left;
-}
-
-.wall-item-share-buttons {
-       margin-left: 5px;
-}
-
-.editpost {
-       margin-left: 10px;
-       float: left;
-}
-.star-item {
-       margin-left: 10px;
-       float: left;    
-}
-
-
-#network-star-link{
-       margin-top: 10px;
-}
-.network-star {
-       float: left;
-       margin-right: 5px;
-}
-#network-bmark-link {
-       margin-top: 10px;
-}
-
-
-
-.wall-item-info.wallwall {
-       width: 285px;
-}
-
-.wwto, .wall-item-arrowphoto-wrapper, .wwfrom {
-       float: left;
-       margin-right: 10px;
-}
-
-
-.wall-item-links-wrapper {
-    float: left;
-}
-
-.wall-item-delete-wrapper {
-    float: right;
-}
-
-.wall-item-delete-end {
-    clear: both;
-}
-
-
-.wall-item-like-buttons img {
-       cursor: pointer;
-}
-
-.wall-item-delete-icon {
-       border: none;
-}
-
-
-.wall-item-wrapper-end {
-       clear: both;
-}
-.wall-item-name-link {
-       font-weight: bold;
-       text-decoration: none;
-       color: #3172BD;
-}
-.wall-item-photo {
-       border: none;
-}
-.wall-item-content {
-       float: left;
-       width: 450px;
-       margin-left: 10px;
-       margin-bottom: 20px;
-       padding: 20px;
-       max-height: 400px;
-       overflow: auto;
-
-}
-.wall-item-tools {
-    clear: both;
-padding: 5px 10px 0px;
-}
-.wall-item-photo-end {
-       clear: both;
-}
-.wall-item-author {
-       margin-top: 10px;
-}
-.wall-item-info {
-    display: block;
-    float: left;
-    width:110px;
-    margin-right:10px;
-}
-
-.wall-item-title {
-       float: left;
-       font-weight: bold;
-       width: 450px;
-}
-
-.wall-item-body {
-       float: left;
-       width: 450px;
-       margin-top: 10px;
-}
-
-.comment-edit-wrapper {
-       margin-top: 15px;
-       background: #CCCCCC;
-       margin-left: 50px;
-}
-
-.comment-wwedit-wrapper {
-       margin-top: 15px;
-       background: #CCCCCC;
-       margin-left: 250px;
-}
-
-.comment-edit-photo {
-       margin-top: 10px;
-       margin-left: 10px;
-       margin-bottom: 10px;
-       width: 100px;
-       float: left;
-}
-.comment-edit-text-empty, .comment-edit-text-full {
-       float: left;
-       margin-top: 40px;
-}
-.comment-edit-text-end {
-       clear: both;
-}
-
-.comment-edit-submit {
-       margin-left: 110px;
-       margin-top: 10px;
-}
-#profile-jot-plugin-wrapper,
-#profile-jot-submit-wrapper {
-       margin-top: 15px;
-}
-
-#profile-jot-submit {
-       float: left;
-}
-#profile-upload-wrapper {
-       float: left;
-       margin-left: 30px;
-}
-#profile-attach-wrapper {
-    float: left;
-    margin-left: 30px;
-}
-#profile-rotator {
-       float: left;
-       margin-left: 30px;
-}
-#profile-link-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#profile-youtube-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#profile-video-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#profile-audio-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#profile-location-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-#profile-nolocation-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-
-#profile-title-wrapper {
-       float: left;
-       margin-left: 15px;
-}
-
-#profile-jot-perms {
-       float: left;
-       margin-left: 100px;
-       font-weight: bold;
-       font-size: 1.2em;
-}
-
-#jot-preview-link {
-       margin-left: 45px;
-}
-
-.preview {
-       background: #FFFFC8;
-}
-
-
-
-#profile-jot-perms-end {
-       clear: both;
-}
-#profile-jot-plugin-end {
-  clear:both;
-}
-.profile-jot-net {
-       float: left;
-       margin-right: 10px;
-       margin-top: 5px;
-       margin-bottom: 5px;
-}
-
-#profile-jot-networks-end {
-       clear: both;
-}
-
-#profile-jot-end {
-       clear: both;
-       margin-bottom: 30px;
-}
-#about-jot-submit-wrapper {
-       margin-top: 15px;
-}
-#about-jot-end {
-       margin-bottom: 30px;
-}
-#contacts-main {
-       margin-bottom: 30px;
-}
-
-#profile-listing-desc {
-       margin-left: 30px;
-}
-
-#profile-listing-new-link-wrapper {
-       margin-left: 30px;
-       margin-bottom: 30px;
-}
-.profile-listing-photo-wrapper {
-       float: left;
-}
-
-.profile-listing-edit-buttons-wrapper {
-       clear: both;
-}
-.profile-listing-photo-edit-link {
-       float: left;
-       width: 125px;
-}
-.profile-listing-end {
-       clear: both;
-}
-.profile-listing-edit-buttons-wrapper img{
-       border: none;
-       margin-right: 20px;
-}
-.profile-listing {
-       margin-top: 25px;
-}
-.profile-listing-name {
-       float: left;
-       margin-left: 32px;
-       margin-top: 10px;
-       color: #3172BD;
-       font-weight: bold;
-       width: 200px;
-
-}
-.fortune {
-       margin-top: 50px;
-       color: #4444FF;
-       font-weight: bold;
-       margin-bottom: 20px;
-}
-
-
-.directory-end {
-       clear: both;
-}
-.directory-name {
-       text-align: center;
-}
-.directory-photo {
-       margin-left: 25px;
-}
-.directory-details {
-       font-size: 0.7em;
-       text-align: center;
-       margin-left: 5px;
-       margin-right: 5px;
-}
-.directory-item {
-       float: left;
-       width: 225px;
-       height: 260px;
-       overflow: auto;
-}
-
-#directory-search-wrapper {
-       margin-top: 20px;
-       margin-right: 20px;
-       margin-bottom: 50px;
-}
-
-#directory-search-end {
-}
-
-.directory-photo-img {
-       border: none;
-}
-
-
-.pager {
-  padding: 10px;
-  text-align: center;
-  font-size: 1.0em;
-}
-
-
-.pager_first,
-.pager_last,
-.pager_prev,
-.pager_next,
-.pager_n {
-       border: 1px solid black;
-       background: #EEE;
-       padding: 4px;
-}
-
-.pager_first a,
-.pager_last a,
-.pager_prev a,
-.pager_next a,
-.pager_n a {
-       text-decoration: none;
-}
-
-.pager_current {
-  border: 1px solid black;
-  background: #FFCCCC;
-  padding: 4px;
-}
-
-
-#advanced-profile-name-wrapper,
-#advanced-profile-gender-wrapper,
-#advanced-profile-dob-wrapper,
-#advanced-profile-age-wrapper,
-#advanced-profile-marital-wrapper,
-#advanced-profile-sexual-wrapper,
-#advanced-profile-homepage-wrapper,
-#advanced-profile-politic-wrapper,
-#advanced-profile-religion-wrapper,
-#advanced-profile-about-wrapper,
-#advanced-profile-interest-wrapper,
-#advanced-profile-contact-wrapper,
-#advanced-profile-music-wrapper,
-#advanced-profile-book-wrapper,
-#advanced-profile-tv-wrapper,
-#advanced-profile-film-wrapper,
-#advanced-profile-romance-wrapper,
-#advanced-profile-work-wrapper,
-#advanced-profile-education-wrapper {
-       margin-top: 20px;
-}
-
-#advanced-profile-name-text,
-#advanced-profile-gender-text,
-#advanced-profile-dob-text,
-#advanced-profile-age-text,
-#advanced-profile-marital-text,
-#advanced-profile-sexual-text,
-#advanced-profile-homepage-text,
-#advanced-profile-politic-text,
-#advanced-profile-religion-text,
-#advanced-profile-about-text,
-#advanced-profile-interest-text,
-#advanced-profile-contact-text,
-#advanced-profile-music-text,
-#advanced-profile-book-text,
-#advanced-profile-tv-text,
-#advanced-profile-film-text,
-#advanced-profile-romance-text,
-#advanced-profile-work-text,
-#advanced-profile-education-text {
-       width: 300px;
-       float: left;
-}
-
-#advanced-profile-name-end,
-#advanced-profile-gender-end,
-#advanced-profile-dob-end,
-#advanced-profile-age-end,
-#advanced-profile-marital-end,
-#advanced-profile-sexual-end,
-#advanced-profile-homepage-end,
-#advanced-profile-politic-end,
-#advanced-profile-religion-end {
-       clear: both;
-}
-
-#advanced-profile-about-end,
-#advanced-profile-interest-end,
-#advanced-profile-contact-end,
-#advanced-profile-music-end,
-#advanced-profile-book-end,
-#advanced-profile-tv-end,
-#advanced-profile-film-end,
-#advanced-profile-romance-end,
-#advanced-profile-work-end,
-#advanced-profile-education-end {
-
-
-}
-
-#advanced-profile-name,
-#advanced-profile-gender,
-#advanced-profile-dob,
-#advanced-profile-age,
-#advanced-profile-marital,
-#advanced-profile-sexual,
-#advanced-profile-homepage,
-#advanced-profile-politic,
-#advanced-profile-religion {
-       float: left;
-
-}
-
-
-#advanced-profile-about,
-#advanced-profile-interest,
-#advanced-profile-contact,
-#advanced-profile-music,
-#advanced-profile-book,
-#advanced-profile-tv,
-#advanced-profile-film,
-#advanced-profile-romance,
-#advanced-profile-work,
-#advanced-profile-education {
-       margin-top: 10px;
-       margin-left: 50px;
-       margin-right: 20px;
-       padding: 10px;
-       border: 1px solid #CCCCCC;
-}
-
-#advanced-profile-with {
-       float: left;
-       margin-left: 15px;
-}
-
-#contact-edit-wrapper {
-       margin-top: 50px;
-}
-
-#contact-edit-banner-name {
-       font-size: 1.4em;
-       font-weight: bold;
-       margin-left: 30px;
-}
-#contact-edit-nettype {
-       margin-top: 5px;
-       margin-left: 30px;
-}
-
-
-#contact-edit-poll-wrapper {
-       margin-left: 50px;
-       margin-top: 30px;
-}
-#contact-edit-poll-text {
-       margin-top: 15px;
-       margin-bottom: 5px;
-}
-
-#contact-edit-update-now {
-       margin-top: 15px;
-}
-
-#contact-edit-photo-wrapper {
-       margin-bottom: 20px;
-}
-#contact-edit-links {
-       float: left;
-}
-#contact-edit-links a {
-       float: left;
-}
-#contact-edit-links img {
-       margin-left: 20px;
-       border: none;
-}
-
-#contact-drop-links {
-       float: left;
-}
-
-#contact-drop-links img {
-       margin-left: 20px;
-       border: none;
-}
-
-#contact-edit-nav-end {
-       clear: both;
-}
-
-#contact-edit-direction-icon {
-       float: left;
-       margin-top: 70px;
-       margin-right: 2px;
-}
-
-#contact-edit-photo {
-       float: left;
-}
-
-#contact-edit-photo-end {
-       clear: both;
-}
-
-#contact-edit-photo-wrapper {
-       float: left;
-}
-
-#contact-edit-nav-wrapper {
-       float: left;
-}
-
-#contact-edit-end {
-       clear: both;
-}
-
-#contact-profile-selector {
-       width: 175px;
-       margin-left: 175px;
-}
-
-#contact-reputation-selector {
-       margin-left: 175px;
-}
-
-#contact-edit-rating-text {
-       margin-left: 175px;
-}
-
-.contact-edit-submit {
-       margin-top: 20px;
-       margin-left: 50px;
-}
-
-#block-message, #ignore-message, #profile-edit-insecure {
-       margin-top: 20px;
-       color: #FF0000;
-       font-size: 1.1em;
-       border: 1px solid #FF8888;
-       background-color: #FFEEEE;
-       padding: 10px;
-}
-
-#block-message, #ignore-message {
-       width: 180px;
-}
-
-#profile-edit-insecure {
-       width: 600px;
-}
-
-.tab {
-       float: left;
-       padding: 4px;
-       margin-top: 10px;
-       margin-bottom: 10px;
-       margin-right: 5px;
-       /*border: 1px solid #CCC;*/
-       /*background: #F8F8F8;*/
-       font-size: 0.8em;
-       font-weight: bold;
-       background-color: #ECECEC;
-       border: 1px solid #858585;
-}
-.tab.active,
-.tab:hover {
-       background-color: #0CBEFE;
-       color: #F5F6FB;
-       border: 1px solid #F5F6FB;
-       /*cursor: pointer;*/
-}
-.tabs {        padding:0px; margin: 0px; overflow: auto; height: auto;}
-.tabs li { margin: 0px; list-style: none; }
-
-.comment-edit-text-empty {
-       color: gray;
-       height: 30px;
-       width: 175px;
-       overflow: auto;
-       margin-bottom: 10px;
-}
-
-.comment-edit-text-full {
-       color: black;
-       height: 150px;
-       width: 350px;
-       overflow: auto;
-}
-
-#profile-jot-text {
-       height: 20px;
-       color:#cccccc;
-       border: 1px solid #cccccc;
-}
-
-
-/** acl **/
-#photo-edit-perms-select,
-#photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper{
-       display:block!important;
-}
-
-
-#acl-wrapper {
-       width: 690px;
-       float:left;
-}
-#acl-search {
-       float:right;
-       background: #ffffff url("../../../images/search_18.png") no-repeat right center;
-       padding-right:20px;
-}
-#acl-showall {
-       float: left;
-       display: block;
-       width: auto;
-       height: 20px;
-       background-color: #cccccc;
-       background-image: url("../../../images/show_all_off.png");
-       background-position: 7px 7px;
-       background-repeat: no-repeat;
-       padding: 5px 5px 0px 30px;
-       -webkit-border-radius: 5px ;
-       -moz-border-radius: 5px;
-       border-radius: 5px;
-       color: #999999;
-}
-#acl-showall.selected {
-       color: #000000;
-       background-color: #ff9900;
-       background-image: url("../../../images/show_all_on.png");
-}
-
-
-#acl-list {
-       height: 210px;
-       border: 1px solid #cccccc;
-       clear: both;
-       margin-top: 30px;
-       overflow: auto;
-}
-#acl-list-content {
-
-}
-.acl-list-item {
-       display: block;
-       width: 150px;
-       height: 30px;
-       border: 1px solid #cccccc;
-       margin: 5px;
-       float: left;
-}
-.acl-list-item img{
-       width:22px;
-       height: 22px;
-       float: left;
-       margin: 4px;
-}
-.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
-       font-size: 8px;
-       display: block;
-       width: 40px;
-       height: 10px;
-       float: left;
-       color: #999999;
-       background-color: #cccccc;
-       margin-right: 5px;
-       -webkit-border-radius: 2px ;
-       -moz-border-radius: 2px;
-       border-radius: 2px;
-       padding-left: 15px;
-}
-#acl-wrapper a:hover {
-       text-decoration: none;
-       color:#000000;
-}
-.acl-button-show { background-image: url("../../../images/show_off.png"); }
-.acl-button-hide { background-image: url("../../../images/hide_off.png"); }
-
-.acl-button-show.selected {
-       color: #000000;
-       background-color: #9ade00;
-       background-image: url("../../../images/show_on.png");
-}
-.acl-button-hide.selected {
-       color: #000000;
-       background-color: #ff4141;
-       background-image: url("../../../images/hide_on.png");
-}
-.acl-list-item.groupshow { border-color: #9ade00; }
-.acl-list-item.grouphide { border-color: #ff4141; }
-/** /acl **/
-
-#group-new-submit-wrapper {
-       margin-top: 30px;
-}
-
-#group-edit-name-label {
-       float: left;
-       width: 175px;
-       margin-top: 20px;
-       margin-bottom: 20px;
-}
-
-#group-edit-name {
-       float: left;
-       width: 225px;
-       margin-top: 20px;
-       margin-bottom: 20px;
-}
-
-#group-edit-name-wrapper {
-
-
-}
-
-
-#group_members_select_label {
-       display: block;
-       float: left;
-       width: 175px;
-}
-
-.group_members_select {
-       float: left;
-       width: 230px;
-       overflow: auto;
-}
-
-#group_members_select_end {
-       clear: both;
-}
-#group-edit-name-end {
-       clear: both;
-}
-
-#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
-       margin-bottom: 10px;
-       margin-top: 20px;
-}
-
-#prvmail-submit {
-       float: left;
-       margin-top: 10px;
-       margin-right: 30px;
-}
-#prvmail-upload-wrapper,
-#prvmail-link-wrapper,
-#prvmail-rotator-wrapper {
-       float: left;
-       margin-top: 10px;
-       margin-right: 10px;
-       width: 24px;
-}
-
-#prvmail-end {
-       clear: both;
-}
-
-.mail-list-sender,
-.mail-list-detail {
-       float: left;
-}
-.mail-list-detail {
-       margin-left: 20px;
-}
-
-.mail-list-subject {
-       font-size: 1.1em;
-       margin-top: 10px;
-}
-a.mail-list-link {
-       display: block;
-       padding: 4px 5px;
-}
-
-/*
-*a.mail-list-link:hover {
-*      background-color: #15607B;
-*      color: #F5F6FB;
-*}
-*/
-
-.mail-list-outside-wrapper-end {
-       clear: both;
-}
-
-.mail-list-outside-wrapper {
-       margin-top: 30px;
-}
-
-.mail-list-delete-wrapper {
-       float: right;
-       margin-right: 30px;
-       margin-top: 15px;
-}
-
-.mail-list-delete-icon {
-       border: none;
-}
-
-.mail-conv-sender,
-.mail-conv-detail {
-       float: left;
-}
-.mail-conv-detail {
-       margin-left: 20px;
-       width: 500px;
-}
-
-.mail-conv-subject {
-       font-size: 1.1em;
-       margin-top: 10px;
-}
-
-.mail-conv-outside-wrapper-end {
-       clear: both;
-}
-
-.mail-conv-outside-wrapper {
-       margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-       float: right;
-       margin-right: 30px;
-       margin-top: 15px;
-}
-
-.mail-conv-delete-icon {
-       border: none;
-}
-
-.message-links ul {
-       list-style-type: none;
-}
-
-.message-links li {
-       margin-top: 10px;
-}
-.message-links a {
-       /*background-color: #ECECEC;*/
-       /*border: 1px solid #858585;*/
-       padding: 3px 5px;
-       /*display: block;*/
-}
-.message-links a:hover {
-       background-color: #0CBEFE;
-       color: #F5F6FB;
-       /*border: 1px solid #F5F6FB;*/
-}
-
-#sidebar-group-list ul {
-       list-style-type: none;
-}
-
-#sidebar-group-list li {
-       margin-top: 10px;
-}
-
-#sidebar-group-list .icon {
-       display: inline-block;
-       height: 12px;
-       width: 12px;
-}
-
-.nets-ul {
-       list-style-type: none;
-}
-
-.nets-ul li {
-       margin-top: 10px;
-}
-
-.nets-link {
-       margin-left: 24px;
-}
-.nets-all {
-       margin-left: 42px;
-}
-
-#search-save {
-    margin-left: 5px;
-}
-.groupsideedit {
-    margin-right: 10px;
-}
-#saved-search-ul {
-    list-style-type: none;
-}
-.savedsearchdrop, .savedsearchterm {
-    float: left;
-    margin-top: 10px;
-}
-.savedsearchterm {
-    margin-left: 10px;
-}
-
-
-#side-follow-wrapper {
-       margin-top: 20px;
-}
-#side-follow-url {
-       margin-top: 5px;
-}
-#side-follow-submit {
-       margin-top: 15px;
-}
-
-.photos {
-       height: auto;
-       overflow: auto;
-}
-
-.photo-album-image-wrapper {
-       float: left;
-       margin-top: 15px;
-       height: 350px;
-       width: 350px;
-}
-
-#photo-album-end {
-       clear: both;
-}
-
-.photo-top-image-wrapper {
-       float: left;
-       margin-top: 15px;
-       height: 350px;
-       width: 350px;
-}
-
-#photo-top-end {
-       clear: both;
-}
-
-#photo-top-links {
-       margin-bottom: 30px;
-       margin-left: 30px;
-}
-
-#photos-upload-newalbum-div {
-       float: left;
-       width: 175px;
-}
-#photos-upload-existing-album-text {
-       float: left;
-       width: 175px;
-}
-#photos-upload-newalbum {
-       float: left;
-}
-#photos-upload-album-select {
-       float: left;
-}
-#photos-upload-spacer {
-       margin-top: 25px;
-}
-#photos-upload-new-end, #photos-upload-exist-end {
-       clear: both;
-}
-#photos-upload-exist-end {
-       margin-bottom: 15px;
-}
-#photos-upload-submit {
-       margin-top: 15px;
-}
-
-#photos_upload_applet_wrapper {
-       margin-bottom: 15px;
-}
-
-#photos-upload-no-java-message {
-       margin-bottom: 15px;
-}
-
-#profile-jot-desc {
-       float: left;
-       width: 480px;
-       margin-top: 10px;
-       margin-bottom: 10px;
-}
-#character-counter {
-       float: left;
-       font-size: 120%;
-}
-
-#character-counter.grey {
-       color: #888888;
-}
-
-#character-counter.orange {
-       color: orange;
-}
-#character-counter.red {
-       color: red;
-}
-
-#profile-jot-banner-end {
-       clear: both;
-}
-
-#photos-upload-select-files-text {
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
-       color: #8888FF;
-       text-decoration: none;
-       cursor: pointer;
-}
-
-#photos-upload-perms-menu:hover {
-       color: #0000FF;
-       text-decoration: underline;
-       cursor: pointer;
-}
-#settings-default-perms-menu {
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
-       float: left;
-       width: 150px;
-}
-
-#photo-edit-perms-end {
-       margin-bottom: 15px;
-}
-
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
-       float: left;
-       margin-bottom: 25px;
-}
-#photo-edit-link-wrap {
-       margin-bottom: 15px;
-}
-#photo-like-div {
-       margin-bottom: 25px;
-}
-
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
-       clear: both;
-}
-
-#photo-edit-delete-button {
-       margin-left: 200px;
-}
-#photo-edit-end {
-       margin-bottom: 35px;
-}
-#photo-caption {
-       font-size: 110%;
-       font-weight: bold;
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-#in-this-photo-text {
-       color: #0000FF;
-       margin-left: 30px;
-}
-
-#in-this-photo {
-       margin-left: 60px;
-       margin-top: 10px;
-       margin-bottom: 20px;
-}
-
-#photo-album-edit-submit, #photo-album-edit-drop {
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-#photo-album-edit-drop {
-       margin-left: 200px;
-}
-
-.group-delete-wrapper {
-       float: right;
-       margin-right: 50px;
-}
-
-#install-dbhost-label,
-#install-dbuser-label,
-#install-dbpass-label,
-#install-dbdata-label,
-#install-admin-label,
-#install-tz-desc {
-       float: left;
-       width: 250px;
-       margin-top: 10px;
-       margin-bottom: 10px;
-
-}
-
-#install-dbhost,
-#install-dbuser,
-#install-dbpass,
-#install-dbdata,
-#install-admin {
-       float: left;
-       width: 200px;
-       margin-left: 20px;
-}
-
-#install-dbhost-end,
-#install-dbuser-end,
-#install-dbpass-end,
-#install-dbdata-end,
-#install-admin-end,
-#install-tz-end {
-       clear: both;
-}
-
-#install-form select#timezone_select {
-       float: left;
-       margin-top: 18px;
-       margin-left: 20px;
-}
-
-#dfrn-request-networks {
-       margin-bottom: 30px;
-}
-
-#pause {
-  position: fixed;
-  bottom: 5px;
-  right: 5px;
-}
-
-.sparkle {
-       cursor: url('lock.cur'), pointer;
-/*     cursor: pointer !important; */
-}
-
-.contact-block-div {
-       float: left;
-       width: 52px;
-       height: 52px;
-}
-.contact-block-textdiv {
-       float: left;
-       width: 150px;
-       height: 34px;
-}
-
-#contact-block-end {
-       clear: both;
-}
-.contact-block-link {
-       float: left;
-}
-.contact-block-img {
-       width:48px;
-       height:48px;
-}
-
-#tag-remove {
-       margin-bottom: 15px;
-}
-
-#tagrm li {
-       margin-bottom: 10px;
-}
-
-#tagrm-submit, #tagrm-cancel {
-       margin-top: 25px;
-}
-
-#tagrm-cancel {
-       margin-left: 15px;
-}
-
-.wall-item-conv {
-       margin-top: 5px;
-       margin-bottom: 25px;
-}
-
-#search-submit {
-       margin-left: 15px;
-}
-
-#search-box {
-       margin-bottom: 25px;
-}
-
-.location-label, .gender-label, .marital-label, .homepage-label {
-       float: left;
-       text-align: right;
-       display: block;
-       width: 65px;
-}
-
-.adr, .x-gender, .marital-text, .homepage-url {
-       float: left;
-       display: block;
-       margin-left: 8px;
-}
-
-.profile-clear {
-       clear: both;
-}
-
-
-.clear {
-       clear: both;
-}
-
-.cc-license {
-       margin-top: 50px;
-       font-size: 70%;
-}
-
-
-#plugin-settings-link, #account-settings-link, #uexport-link {
-       margin-bottom: 10px;
-}
-
-
-#birthday-title {
-       float: left;
-       font-weight: bold;      
-}
-
-#birthday-adjust {
-       float: left;
-       font-size: 75%;
-       margin-left: 10px;
-}
-
-#birthday-title-end {
-       clear: both;
-}
-
-.birthday-list {
-       margin-left: 15px;
-}
-
-#birthday-wrapper {
-       margin-bottom: 20px;
-}
-
-
-#network-new-link {
-       margin-top: 15px;
-       margin-bottom: 15px;
-}
-
-.tool-wrapper {
-  float: left;
-  margin-left: 15px;
-}
-.tool-link {
-  cursor: pointer;
-}
-
-
-.calendar {
-       font-family: Courier, monospace;
-}
-.today {
-       color: #FF0000;
-}
-
-
-.settings-block {
-       border: 1px solid #AAA;
-       margin: 10px;
-       padding: 10px;
-}
-
-
-.app-title {
-       margin: 10px;
-}
-
-
-#identity-manage-desc {
-       margin-top:15px;
-       margin-bottom: 15px;
-}
-
-#identity-manage-choose {
-       margin-bottom: 15px;
-}
-
-#identity-submit {
-       margin-top: 20px;
-}
-
-
-#photo-prev-link, #photo-next-link {
-       padding: 10px;
-       float: left;
-}
-
-#photo-photo {
-       float: left;
-}
-
-#photo-photo-end {
-       clear: both;
-}
-
-
-.profile-match-photo {
-       float: left;
-       text-align: center;
-       width: 120px;
-}
-
-.profile-match-name {
-       float: left;
-       text-align: center;
-       width: 120px;
-       overflow: hidden;
-}
-
-.profile-match-break,
-.profile-match-end {
-       clear: both;
-}
-
-.profile-match-wrapper {
-       float: left;
-       padding: 10px;
-    width: 120px;
-    height: 120px;
-    scroll: auto;
-
-}
-#profile-match-wrapper-end {
-       clear: both;
-}
-
-.side-link {
-       margin-bottom: 15px;
-}
-
-#language-selector {
-       position: absolute;
-       top: 0;
-       left: 16px;
-}
-
-
-#group-members {
-       margin-top: 20px;
-       padding: 10px;
-       height: 250px;
-       overflow: auto;
-       border: 1px solid #ddd;
-}
-
-#group-members-end {
-       clear: both;
-}
-
-#group-separator {
-       margin-top: 10px;
-       margin-bottom: 10px;
-}
-
-#group-all-contacts {
-       padding: 10px;
-       height: 450px;
-       overflow: auto;
-       border: 1px solid #ddd;
-}
-
-#group-all-contacts-end {
-       clear: both;
-       margin-bottom: 10px;
-}
-
-#group-edit-desc {
-    margin-top: 15px;
-}
-
-
-#prof-members {
-       margin-top: 20px;
-       padding: 10px;
-       height: 250px;
-       overflow: auto;
-       border: 1px solid #ddd;
-}
-
-#prof-members-end {
-       clear: both;
-}
-
-#prof-separator {
-       margin-top: 10px;
-       margin-bottom: 10px;
-}
-
-#prof-all-contacts {
-       padding: 10px;
-       height: 450px;
-       overflow: auto;
-       border: 1px solid #ddd;
-}
-
-#prof-all-contacts-end {
-       clear: both;
-       margin-bottom: 10px;
-}
-
-#prof-edit-desc {
-       margin-top: 15px;
-}
-
-#crepair-nick-label,
-#crepair-attag-label,
-#crepair-url-label,
-#crepair-request-label,
-#crepair-confirm-label,
-#crepair-notify-label,
-#crepair-poll-label {
-       float: left;
-       width: 200px;
-       margin-bottom: 15px;
-}
-
-#crepair-nick,
-#crepair-attag,
-#crepair-url,
-#crepair-request,
-#crepair-confirm,
-#crepair-notify,
-#crepair-poll {
-       float: left;
-       width: 300px;
-}
-
-#netsearch-box {
-       margin-top: 20px;
-       width: 150px;   
-}
-
-#netsearch-box #search-submit {
-       margin: 5px 0px 0px 0px;
-}
-
-.required {
-       color: #FF0000;
-}
-
-.eventcal {
-       float: left;
-       font-size: 20px;
-}
-
-
-.vevent {
-       border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
-       margin-left: 10px;
-       margin-right: 10px;
-}
-.vevent .event-start {
-       margin-left: 10px;
-       margin-right: 10px;
-}
-
-
-#new-event-link {
-       margin-bottom: 10px;
-}
-
-
-.edit-event-link, .plink-event-link {
-       float: left;
-    margin-top: 4px;
-    margin-right: 4px;
-    margin-bottom: 15px;
-}
-
-
-.event-description:before {
-       content: url('../../../images/calendar.png');
-       margin-right: 15px;
-}
-
-.event-list-date {
-       margin-bottom: 10px;
-}
-
-.event-start, .event-end {
-       margin-left: 10px;
-       width: 330px;
-       clear: both;
-}
-
-.event-start .dtstart, .event-end .dtend {
-       float: right;
-}
-
-.prevcal, .nextcal {
-       float: left;
-       margin-left: 32px;
-       margin-right: 32px;
-       margin-top: 64px;
-}
-.event-calendar-end {
-       clear: both;
-}
-.calendar {
-       font-family: Courier, monospace;
-}
-.today {
-       font-weight: bold;
-       color: #FF0000;
-}
-
-
-#event-start-text, #event-finish-text {
-       margin-top: 10px;
-       margin-bottom: 5px;
-}
-
-#event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text {
-       float: left;
-}
-#event-datetime-break {
-       margin-bottom: 10px;
-}
-
-#event-nofinish-break, #event-adjust-break {
-       clear: both;
-}
-
-#event-desc-text, #event-location-text {
-       margin-top: 10px;
-       margin-bottom: 5px;
-}
-#event-submit {
-       margin-top: 10px;
-}
-
-
-.item-select {
-       opacity: 0.1;
-       filter:alpha(opacity=10);
-       float: right;
-       margin-right: 10px;
-
-}
-.item-select:hover, .checkeditem {
-       opacity: 1;
-       filter:alpha(opacity=100);
-}
-
-
-#item-delete-selected {
-       margin-top: 30px;
-}
-
-#item-delete-selected-end {
-       clear: both;
-}
-#item-delete-selected-icon, #item-delete-selected-desc {
-       float: left;
-       margin-right: 5px;
-}
-#item-delete-selected-desc:hover {
-       text-decoration: underline;
-}
-
-#lang-select-icon {
-       cursor: pointer;
-       position: absolute;
-       left: 0px;
-       top: 0px;
-}
-/**
- * Form fields
- */
-.field {
-       margin-bottom: 10px;
-       padding-bottom: 10px;
-       overflow: auto;
-       width: 100%
-}
-
-.field label {
-       float: left;
-       width: 200px;
-}
-
-.field input,
-.field textarea {
-       width: 400px;
-}
-.field textarea { height: 100px; }
-.field_help {
-       display: block;
-       margin-left: 200px;
-       color: #666666;
-       
-}
-
-
-.field .onoff {
-       float: left;
-       width: 80px;
-}
-.field .onoff a {
-       display: block;
-       border:1px solid #666666;
-       background-image:url("../../../images/onoff.jpg");
-       background-repeat: no-repeat;
-       padding: 4px 2px 2px 2px;
-       height: 16px;
-       text-decoration: none;
-}
-.field .onoff .off {
-       border-color:#666666;
-       padding-left: 40px;
-       background-position: left center;
-       background-color: #cccccc;
-       color: #666666;
-       text-align: right;
-}
-.field .onoff .on {
-       border-color:#204A87;
-       padding-right: 40px;
-       background-position: right center;
-       background-color: #3465A4;
-       color: #FFFFFF;
-       text-align: left;
-}
-.hidden { display: none!important; }
-
-.field.radio .field_help { margin-left: 0px; }
-
-
-/**
- * ADMIN
- */
-#pending-update {
-       float:right;
-       color: #ffffff;
-       font-weight: bold;
-       background-color: #FF0000;
-       padding: 0em 0.3em;
-}
-
-#adminpage dl {
-       clear: left;
-       margin-bottom: 2px;
-       padding-bottom: 2px;
-       border-bottom: 1px solid black;
-}
-#adminpage dt {
-       width: 200px;
-       float: left;
-       font-weight: bold;
-}
-#adminpage dd {
-       margin-left: 200px;
-}
-
-#adminpage h3 {
-       border-bottom: 1px solid #cccccc;
-}
-
-#adminpage .submit {
-       clear:left;
-}
-
-#adminpage #pluginslist {
-       margin: 0px; padding: 0px;
-}
-#adminpage .plugin {
-       list-style: none;
-       display: block;
-       border: 1px solid #888888;
-       padding: 1em;
-       margin-bottom: 5px;
-       clear: left;
-}
-#adminpage .toggleplugin {
-       float:left;
-       margin-right: 1em;
-}
-
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #bbc7d7; }
-#adminpage .selectall { text-align: right; }
-/**
- * ICONS
- */
-.icon {
-       display: block; width: 16px; height: 16px;
-       background-image: url('../../../images/icons.png');
-}
-.article { background-position: 0px 0px;}
-.audio { background-position: -16px 0px;}
-.block { background-position: -32px 0px;}
-.drop { background-position: -48px 0px;}
-.drophide { background-position: -64px 0px;}
-.edit { background-position: -80px 0px;}
-.camera { background-position: -96px 0px;}
-.dislike { background-position: -112px 0px;}
-.like { background-position: -128px 0px;}
-.link { background-position: -144px 0px;}
-
-.globe { background-position: 0px -16px;}
-.noglobe { background-position: -16px -16px;}
-.no { background-position: -32px -16px;}
-.pause { background-position: -48px -16px;}
-.play { background-position: -64px -16px;}
-.pencil { background-position: -80px -16px;}
-.small-pencil { background-position: -96px -16px;}
-.recycle { background-position: -112px -16px;}
-.remote-link { background-position: -128px -16px;}
-.share { background-position: -144px -16px;}
-
-.tools { background-position: 0px -32px;}
-.lock { background-position: -16px -32px;}
-.unlock { background-position: -32px -32px;}
-.video { background-position: -48px -32px;}
-.youtube { background-position: -64px -32px;}
-.attach { background-position: -80px -32px; }
-.language { background-position: -96px -32px; }
-.prev { background-position: -112px -32px; }
-.next { background-position: -128px -32px; }
-.on { background-position: -144px -32px; }
-
-.off { background-position: 0px -48px; }
-.starred { background-position: -16px -48px; }
-.unstarred { background-position: -32px -48px; }
-.tagged { background-position: -48px -48px; }
-
-.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-
-.attachtype {
-       display: block; width: 20px; height: 23px;
-       float: left;
-       background-image: url('../../../images/content-types.png');
-}
-
-.body-attach {
-       margin-top: 10px;
-}
-
-.type-video { background-position: 0px 0px; }
-.type-image { background-position: -20px 0px; }
-.type-audio { background-position: -40px 0px; }
-.type-text  { background-position: -60px 0px; }
-.type-unkn  { background-position: -80px 0px; }
-
-/* autocomplete popup */
-.acpopup {
-       max-height:150px;
-       background-color:#ffffff;
-       overflow:auto;
-       z-index:100000;
-       border:1px solid #cccccc;
-}
-.acpopupitem {
-       background-color:#ffffff; padding: 4px;
-       clear:left;
-}
-.acpopupitem img {
-       float: left;
-       margin-right: 4px;
-}
-
-.acpopupitem.selected {
-       color: #FFFFFF; background: #3465A4;
-}
-
-
diff --git a/view/theme/loozah/unsupported b/view/theme/loozah/unsupported
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/view/theme/loozah/wall_item.tpl b/view/theme/loozah/wall_item.tpl
deleted file mode 100755 (executable)
index 56c8a82..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
-       <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-               <div class="wall-item-info" id="wall-item-info-$id">
-                       <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
-                                onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
-                                onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-                               <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-                                       <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" />
-                               </a>
-                               <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-                               <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
-                                       <ul>
-                                               $item_photo_menu
-                                       </ul>
-                               </div>
-                       </div>
-                       <div class="wall-item-photo-end"></div>
-                       <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-                               {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
-                               {{ else }}<div class="wall-item-lock"></div>{{ endif }}
-                               <div class="wall-item-location" id="wall-item-location-$id">$location</div>                             
-                       </div>
-               </div>
-               <div class="wall-item-author">
-                               <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
-                               <div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-                               
-               </div>  
-               <div class="wall-item-content" id="wall-item-content-$id" >
-                       <div class="wall-item-title" id="wall-item-title-$id">$title</div>
-                       <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
-               </div>
-               <div class="wall-item-tools" id="wall-item-tools-$id">
-                       {{ if $vote }}
-                       <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-                               <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-                               <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-                               {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-                               <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-                       </div>
-                       {{ endif }}
-                       {{ if $plink }}
-                               <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
-                       {{ endif }}
-                       {{ if $edpost }}
-                               <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
-                       {{ endif }}
-                        
-                       {{ if $star }}
-                       <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-                       <a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
-
-                       {{ endif }}
-                       
-                       <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-                               {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-                       </div>
-                               {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
-                       <div class="wall-item-delete-end"></div>
-               </div>
-       </div>
-       <div class="wall-item-wrapper-end"></div>
-       <div class="wall-item-like" id="wall-item-like-$id">$like</div>
-       <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
-       <div class="wall-item-comment-wrapper" >
-       $comment
-       </div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-</div>
diff --git a/view/theme/loozah/wallwall_item.tpl b/view/theme/loozah/wallwall_item.tpl
deleted file mode 100755 (executable)
index 0e4c1a6..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
-       <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-               <div class="wall-item-info wallwall" id="wall-item-info-$id">
-                       <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
-                               <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
-                               <img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" style="height: 80px; width: 80px;" alt="$owner_name" /></a>
-                       </div>
-                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
-                       <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" 
-                               onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
-                onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
-                               <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-                               <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-                               <span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
-                    <ul>
-                        $item_photo_menu
-                    </ul>
-                </div>
-
-                       </div>
-                       <div class="wall-item-photo-end"></div>
-                       <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-                               {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
-                               {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
-                               <div class="wall-item-location" id="wall-item-location-$id">$location</div>
-                       </div>
-               </div>
-               <div class="wall-item-author">
-                               <a href="$profile_url" target="redir" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> $to <a href="$owner_url" target="redir" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall<br />
-                               <div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>                           
-               </div>                  
-               <div class="wall-item-content" id="wall-item-content-$id" >
-                       <div class="wall-item-title" id="wall-item-title-$id">$title</div>
-                       <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
-               </div>
-               <div class="wall-item-tools" id="wall-item-tools-$id">
-                       {{ if $vote }}
-                       <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-                               <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
-                               <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-                               {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
-                               <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-                       </div>
-                       {{ endif }}
-                       {{ if $plink }}
-                               <div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
-                       {{ endif }}
-                       {{ if $edpost }}
-                               <a class="editpost icon pencil" href="$edpost.0" title="$edpost.1"></a>
-                       {{ endif }}
-                        
-                       {{ if $star }}
-                       <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
-                       <a href="#" id="tagger-$id" onclick="itemTag($id); return false;" class="tag-item icon tagged" title="$star.tagger"></a>
-                       {{ endif }}
-                       
-                       <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-                               {{ if $drop.dropping }}<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-                       </div>
-                               {{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
-                       <div class="wall-item-delete-end"></div>
-               </div>
-       </div>  
-       <div class="wall-item-wrapper-end"></div>
-       <div class="wall-item-like" id="wall-item-like-$id">$like</div>
-       <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
-       <div class="wall-item-comment-separator"></div>
-       <div class="wall-item-comment-wrapper" >
-       $comment
-       </div>
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-</div>
-
diff --git a/view/theme/shady/screenshot.jpg b/view/theme/shady/screenshot.jpg
deleted file mode 100644 (file)
index 79a9162..0000000
Binary files a/view/theme/shady/screenshot.jpg and /dev/null differ
diff --git a/view/theme/shady/style.css b/view/theme/shady/style.css
deleted file mode 100755 (executable)
index 1324af0..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-@import url('../loozah/style.css');
-
-body { 
-       background: #DDDDDD;
-       color: #444444;
-}
-
-.nav-link {
-       color: #444444;
-       background: #F4F4F4;
-}
-.nav-selected {
-       background: #DDDDDD !important;
-}
-
-.nav-commlink {
-       color: #444444;
-       background: #F4F4F4;
-}
-
-.tab {
-       color: #444444;
-       background: #F4F4F4;
-
-}
-
-a, a:visited {
-       color: #8888FF;
-       text-decoration: none;
-}
-
-a:hover {
-       color: #0000FF;
-       text-decoration: underline;
-}
-
-.fakelink, .fakelink:visited {
-       color: #8888FF;
-}
-
-.fakelink:hover {
-       color: #0000FF;
-}
-
-.wall-item-content-wrapper.comment {
-       background: #CCCCCC;
-}
-
-.comment-edit-wrapper {
-       background: #CCCCCC;
-}
-
-.comment-wwedit-wrapper {
-       background: #CCCCCC;
-}
-
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
-       color: #8888FF;
-}
-
-#photos-upload-perms-menu:hover {
-       color: #0000FF;
-}
-#settings-default-perms-menu, #settings-default-perms-menu:visited {
-       color: #8888FF;
-}
-
-#settings-default-perms-menu:hover {
-       color: #0000FF;
-}
diff --git a/view/theme/shady/theme.php b/view/theme/shady/theme.php
deleted file mode 100755 (executable)
index 47b43cf..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/shady/unsupported b/view/theme/shady/unsupported
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/view/theme/three-d/screenshot.jpg b/view/theme/three-d/screenshot.jpg
deleted file mode 100644 (file)
index c3f8e85..0000000
Binary files a/view/theme/three-d/screenshot.jpg and /dev/null differ
diff --git a/view/theme/three-d/style.css b/view/theme/three-d/style.css
deleted file mode 100755 (executable)
index ca3f678..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-@import url('../loozah/style.css');
-
-.error-message {
-       -moz-box-shadow: 5px 5px 5px #888888;
-       -webkit-box-shadow: 5px 5px 5px #888888;
-       box-shadow: 5px 5px 5px #888888;
-       -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
-       filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
-
-}
-
-.nav-link {
-       -moz-box-shadow: 5px 5px 5px #888888;
-       -webkit-box-shadow: 5px 5px 5px #888888;
-       box-shadow: 5px 5px 5px #888888;
-       -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
-       filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
-}
-
-.nav-commlink {
-       -moz-box-shadow: 5px 5px 5px #888888;
-       -webkit-box-shadow: 5px 5px 5px #888888;
-       box-shadow: 5px 5px 5px #888888;
-       -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
-       filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
-
-}
-
-.tab {
-       -moz-box-shadow: 5px 5px 5px #888888;
-       -webkit-box-shadow: 5px 5px 5px #888888;
-       box-shadow: 5px 5px 5px #888888;
-       -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')";
-       filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888');
-}
diff --git a/view/theme/three-d/theme.php b/view/theme/three-d/theme.php
deleted file mode 100755 (executable)
index 47b43cf..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);