diff --git a/boot.php b/boot.php index e0ab98bde5..683daf4016 100755 --- a/boot.php +++ b/boot.php @@ -9,9 +9,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1294' ); +define ( 'FRIENDICA_VERSION', '2.3.1298' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1133 ); +define ( 'DB_UPDATE_VERSION', 1134 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -95,8 +95,8 @@ define ( 'PAGE_BLOG', 4 ); * Network and protocol family types */ -define ( 'NETWORK_ZOT', 'zot!'); // Zot! define ( 'NETWORK_DFRN', 'dfrn'); // Friendica, Mistpark, other DFRN implementations +define ( 'NETWORK_ZOT', 'zot!'); // Zot! define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-social, other OStatus implementations define ( 'NETWORK_FEED', 'feed'); // RSS/Atom feeds with no known "post/notify" protocol define ( 'NETWORK_DIASPORA', 'dspr'); // Diaspora @@ -108,6 +108,28 @@ define ( 'NETWORK_XMPP', 'xmpp'); // XMPP define ( 'NETWORK_MYSPACE', 'mysp'); // MySpace define ( 'NETWORK_GPLUS', 'goog'); // Google+ +/* + * These numbers are used in stored permissions + * and existing allocations MUST NEVER BE CHANGED + * OR RE-ASSIGNED! You may only add to them. + */ + +$netgroup_ids = array( + NETWORK_DFRN => (-1), + NETWORK_ZOT => (-2), + NETWORK_OSTATUS => (-3), + NETWORK_FEED => (-4), + NETWORK_DIASPORA => (-5), + NETWORK_MAIL => (-6), + NETWORK_MAIL2 => (-7), + NETWORK_FACEBOOK => (-8), + NETWORK_LINKEDIN => (-9), + NETWORK_XMPP => (-10), + NETWORK_MYSPACE => (-11), + NETWORK_GPLUS => (-12), +); + + /** * Maximum number of "people who like (or don't like) this" that we will list by name */ @@ -962,6 +984,12 @@ function profile_sidebar($profile, $block = 0) { if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid'])) $connect = False; + if(get_my_url() && $profile['unkmail']) + $wallmessage = t('Message'); + else + $wallmessage = false; + + // show edit profile to yourself if ($profile['uid'] == local_user()) { @@ -1044,6 +1072,7 @@ function profile_sidebar($profile, $block = 0) { $o .= replace_macros($tpl, array( '$profile' => $profile, '$connect' => $connect, + '$wallmessage' => $wallmessage, '$location' => template_escape($location), '$gender' => $gender, '$pdesc' => $pdesc, @@ -1239,17 +1268,20 @@ function current_theme(){ $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : ''); $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme); - if($theme_name && file_exists('view/theme/' . $theme_name . '/style.css')) + if($theme_name && + (file_exists('view/theme/' . $theme_name . '/style.css') || + file_exists('view/theme/' . $theme_name . '/style.php'))) return($theme_name); foreach($app_base_themes as $t) { - if(file_exists('view/theme/' . $t . '/style.css')) + if(file_exists('view/theme/' . $t . '/style.css')|| + file_exists('view/theme/' . $t . '/style.php')) return($t); } - $fallback = glob('view/theme/*/style.css'); + $fallback = glob('view/theme/*/style.[css|php]'); if(count($fallback)) - return (str_replace('view/theme/','', str_replace("/style.css","",$fallback[0]))); + return (str_replace('view/theme/','', substr($fallback[0],0,-10))); }} @@ -1261,6 +1293,8 @@ if(! function_exists('current_theme_url')) { function current_theme_url() { global $a; $t = current_theme(); + if (file_exists('view/theme/' . $t . '/style.php')) + return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss'); return($a->get_baseurl() . '/view/theme/' . $t . '/style.css'); }} @@ -1286,8 +1320,12 @@ function feed_birthday($uid,$tz) { * */ + $birthday = ''; + if(! strlen($tz)) + $tz = 'UTC'; + $p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", intval($uid) ); @@ -1393,3 +1431,21 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ return replace_macros($tpl,array('$tabs' => $arr['tabs'])); }} + +function get_my_url() { + if(x($_SESSION,'my_url')) + return $_SESSION['my_url']; + return false; +} + +function zrl($s) { + if(! strlen($s)) + return $s; + if(! strpos($s,'/profile/')) + return $s; + $achar = strpos($s,'?') ? '&' : '?'; + $mine = get_my_url(); + if($mine and ! link_compare($mine,$s)) + return $s . $achar . 'zrl=' . urlencode($mine); + return $s; +} diff --git a/database.sql b/database.sql index 327b482c06..a271e5491c 100755 --- a/database.sql +++ b/database.sql @@ -289,9 +289,10 @@ CREATE TABLE IF NOT EXISTS `mail` ( `convid` int(10) unsigned NOT NULL, `title` char(255) NOT NULL, `body` mediumtext NOT NULL, - `seen` tinyint(1) NOT NULL, + `seen` tinyint(1) NOT NULL DEFAULT '0', `reply` tinyint(1) NOT NULL DEFAULT '0', - `replied` tinyint(1) NOT NULL, + `replied` tinyint(1) NOT NULL DEFAULT '0', + `unknown` tinyint(1) NOT NULL DEFAULT '0', `uri` char(255) NOT NULL, `parent-uri` char(255) NOT NULL, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -300,6 +301,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( KEY `guid` (`guid`), KEY `convid` (`convid`), KEY `reply` (`reply`), + KEY `unknown` (`unknown`), KEY `uri` (`uri`), KEY `parent-uri` (`parent-uri`), KEY `created` (`created`) @@ -453,6 +455,8 @@ CREATE TABLE IF NOT EXISTS `user` ( `blockwall` tinyint(1) unsigned NOT NULL DEFAULT '0', `hidewall` tinyint(1) unsigned NOT NULL DEFAULT '0', `blocktags` tinyint(1) unsigned NOT NULL DEFAULT '0', + `unkmail` tinyint(1) unsigned NOT NULL DEFAULT '0', + `cntunkmail` int(11) unsigned NOT NULL DEFAULT '10', `notify-flags` int(11) unsigned NOT NULL DEFAULT '65535', `page-flags` int(11) unsigned NOT NULL DEFAULT '0', `prvnets` tinyint(1) NOT NULL DEFAULT '0', @@ -472,6 +476,8 @@ CREATE TABLE IF NOT EXISTS `user` ( KEY `account_expired` (`account_expired`), KEY `hidewall` (`hidewall`), KEY `blockwall` (`blockwall`), + KEY `unkmail` (`unkmail`), + KEY `cntunkmail` (`cntunkmail`), KEY `blocked` (`blocked`), KEY `verified` (`verified`), KEY `login_date` (`login_date`) diff --git a/include/api.php b/include/api.php index 64772d6575..065f14cffb 100755 --- a/include/api.php +++ b/include/api.php @@ -83,7 +83,7 @@ $record = $r[0]; } else { logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); - header('WWW-Authenticate: Basic realm="Friendika"'); + header('WWW-Authenticate: Basic realm="Friendica"'); header('HTTP/1.0 401 Unauthorized'); die('This api requires login'); } diff --git a/include/auth.php b/include/auth.php index 835616a829..1341f3bb8a 100755 --- a/include/auth.php +++ b/include/auth.php @@ -94,13 +94,17 @@ else { // Otherwise it's probably an openid. + try { require_once('library/openid.php'); $openid = new LightOpenID; $openid->identity = $openid_url; $_SESSION['openid'] = $openid_url; $a = get_app(); $openid->returnUrl = $a->get_baseurl(true) . '/openid'; - goaway($openid->authUrl()); + goaway($openid->authUrl()); + } catch (Exception $e) { + notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'

'. t('The error message was:').' '.$e->getMessage()); + } // NOTREACHED } } diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 9d7085d201..7346b95afa 100755 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -87,13 +87,13 @@ function fileas_widget($baseurl,$selected = '') { $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { - $unescaped = file_tag_decode($mtch[1]); + $unescaped = xmlify(file_tag_decode($mtch[1])); $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); } } return replace_macros(get_markup_template('fileas_widget.tpl'),array( - '$title' => t('File Selections'), + '$title' => t('Saved Folders'), '$desc' => '', '$sel_all' => (($selected == '') ? 'selected' : ''), '$all' => t('Everything'), diff --git a/include/conversation.php b/include/conversation.php index 5de4fcb51a..5a922b2b52 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -94,9 +94,9 @@ function localize_item(&$item){ } - $A = '[url=' . $Alink . ']' . $Aname . '[/url]'; - $B = '[url=' . $Blink . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . $Blink . '][img]' . $Bphoto . '[/img][/url]'; + $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; + $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; + if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]'; $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto; @@ -108,8 +108,8 @@ function localize_item(&$item){ if(count($r)==0) return; $obj=$r[0]; - $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; - $objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]'; + $author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]'; + $objauthor = '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]'; switch($obj['verb']){ case ACTIVITY_POST: @@ -158,14 +158,21 @@ function localize_item(&$item){ $target = $r[0]; $Bname = $target['author-name']; $Blink = $target['author-link']; - $A = '[url=' . $Alink . ']' . $Aname . '[/url]'; - $B = '[url=' . $Blink . ']' . $Bname . '[/url]'; + $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; + $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; $P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]'; $item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n"; } } } + $matches = null; + if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { + foreach($matches as $mtch) { + if(! strpos($mtch[1],'zrl=')) + $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']); + } + } } @@ -243,7 +250,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $threads = array(); $threadsid = -1; - if(count($items)) { + if($items && count($items)) { if($mode === 'network-new' || $mode === 'search' || $mode === 'community') { @@ -276,13 +283,16 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if($item['author-link'] && (! $item['author-name'])) $profile_name = $item['author-link']; + + $sp = false; $profile_link = best_link_url($item,$sp); - if($sp) - $sparkle = ' sparkle'; if($profile_link === 'mailbox') $profile_link = ''; - + if($sp) + $sparkle = ' sparkle'; + else + $profile_link = zrl($profile_link); $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); if(($normalised != 'mailbox') && (x($a->contacts[$normalised]))) @@ -484,7 +494,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { // This will have been stored in $a->page_contact by our calling page. // Put this person on the left of the wall-to-wall notice. - $owner_url = $a->page_contact['url']; + $owner_url = zrl($a->page_contact['url']); $owner_photo = $a->page_contact['thumb']; $owner_name = $a->page_contact['name']; $template = $wallwall; @@ -501,10 +511,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $commentww = 'ww'; // If it is our contact, use a friendly redirect link if((link_compare($item['owner-link'],$item['url'])) - && ($item['network'] === 'dfrn')) { + && ($item['network'] === NETWORK_DFRN)) { $owner_url = $redirect_url; $osparkle = ' sparkle'; } + else + $owner_url = zrl($owner_url); } } @@ -520,9 +532,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share')); } + $qc = $qcomment = null; - $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null); - $qcomment = (($qc) ? explode("\n",$qc) : null); + if(in_array('qcomment',$a->plugins)) { + $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null); + $qcomment = (($qc) ? explode("\n",$qc) : null); + } if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) { $comment = replace_macros($cmnt_tpl,array( @@ -580,7 +595,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'classtagger' => "", ); } - $filer = t("file as"); + $filer = t("save to folder"); } @@ -596,14 +611,14 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if($item['author-link'] && (! $item['author-name'])) $profile_name = $item['author-link']; - $sp = false; $profile_link = best_link_url($item,$sp); - if($sp) - $sparkle = ' sparkle'; - if($profile_link === 'mailbox') $profile_link = ''; + if($sp) + $sparkle = ' sparkle'; + else + $profile_link = zrl($profile_link); $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) @@ -767,8 +782,10 @@ function item_photo_menu($item){ $photos_link = $profile_link . "?url=photos"; $profile_link = $profile_link . "?url=profile"; $pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid; + $zurl = ''; } else { + $profile_link = zrl($profile_link); if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) { $cid = $item['contact-id']; } @@ -795,7 +812,7 @@ function item_photo_menu($item){ $menu = Array( t("View status") => $status_link, t("View profile") => $profile_link, - t("View photos") => $photos_link, + t("View photos") => $photos_link, t("View recent") => $posts_link, t("Edit contact") => $contact_url, t("Send PM") => $pm_url, @@ -828,6 +845,8 @@ function like_puller($a,$item,&$arr,$mode) { $url = $a->get_baseurl(true) . '/redir/' . $item['contact-id']; $sparkle = ' class="sparkle" '; } + else + $url = zrl($url); if(! ((isset($arr[$item['parent'] . '-l'])) && (is_array($arr[$item['parent'] . '-l'])))) $arr[$item['parent'] . '-l'] = array(); if(! isset($arr[$item['parent']])) @@ -896,7 +915,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$vidurl' => t("Please enter a video link/URL:"), '$audurl' => t("Please enter an audio link/URL:"), '$term' => t('Tag term:'), - '$fileas' => t('File as:'), + '$fileas' => t('Save to Folder:'), '$whereareu' => t('Where are you right now?') )); diff --git a/include/dba.php b/include/dba.php index 5beea7a3ac..76cc0bc7b9 100755 --- a/include/dba.php +++ b/include/dba.php @@ -207,8 +207,10 @@ function q($sql) { unset($args[0]); if($db && $db->connected) { - $ret = $db->q(vsprintf($sql,$args)); - return $ret; + $stmt = vsprintf($sql,$args); + if($stmt === false) + logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true)); + return $db->q($stmt); } /** diff --git a/include/diaspora.php b/include/diaspora.php index 84d28a7ecf..104ccadf2e 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -688,9 +688,9 @@ function diaspora_post($importer,$xml) { // don't link tags that are already embedded in links - if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body)) + if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body)) continue; - if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body)) + if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body)) continue; $basetag = str_replace('_',' ',substr($tag,1)); @@ -853,9 +853,9 @@ function diaspora_reshare($importer,$xml) { // don't link tags that are already embedded in links - if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body)) + if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body)) continue; - if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body)) + if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body)) continue; @@ -1094,9 +1094,9 @@ function diaspora_comment($importer,$xml,$msg) { // don't link tags that are already embedded in links - if(preg_match('/\[(.*?)' . preg_quote($tag) . '(.*?)\]/',$body)) + if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body)) continue; - if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag) . '(.*?)\)/',$body)) + if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body)) continue; diff --git a/include/email.php b/include/email.php index bd44cb763e..b43ae0dc1c 100755 --- a/include/email.php +++ b/include/email.php @@ -250,7 +250,7 @@ function email_header_encode($in_str, $charset) { // remove trailing spacer and // add start and end delimiters - $spacer = preg_quote($spacer); + $spacer = preg_quote($spacer,'/'); $out_str = preg_replace("/" . $spacer . "$/", "", $out_str); $out_str = $start . $out_str . $end; } diff --git a/include/items.php b/include/items.php index 2eecadad10..e09b888cab 100755 --- a/include/items.php +++ b/include/items.php @@ -416,7 +416,7 @@ function get_atom_elements($feed,$item) { // the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining // html. - if((strpos($res['body'],'<') !== false) || (strpos($res['body'],'>') !== false)) { + if((strpos($res['body'],'<') !== false) && (strpos($res['body'],'>') !== false)) { $res['body'] = reltoabs($res['body'],$base_url); @@ -429,13 +429,14 @@ function get_atom_elements($feed,$item) { // we shouldn't need a whitelist, because the bbcode converter // will strip out any unsupported tags. - // $config->set('HTML.Allowed', 'p,b,a[href],i'); $purifier = new HTMLPurifier($config); $res['body'] = $purifier->purify($res['body']); - $res['body'] = html2bbcode($res['body']); + $res['body'] = @html2bbcode($res['body']); } + else + $res['body'] = escape_tags($res['body']); $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); if($allow && $allow[0]['data'] == 1) @@ -1090,12 +1091,23 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $postvars = array(); $sent_dfrn_id = hex2bin((string) $res->dfrn_id); $challenge = hex2bin((string) $res->challenge); + $perm = (($res->perm) ? $res->perm : null); $dfrn_version = (float) (($res->dfrn_version) ? $res->dfrn_version : 2.0); $rino_allowed = ((intval($res->rino) === 1) ? 1 : 0); $page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0); $final_dfrn_id = ''; + if($perm) { + if((($perm == 'rw') && (! intval($contact['writable']))) + || (($perm == 'r') && (intval($contact['writable'])))) { + q("update contact set writable = %d where id = %d limit 1", + intval(($perm == 'rw') ? 1 : 0), + intval($contact['id']) + ); + $contact['writable'] = (string) 1 - intval($contact['writable']); + } + } if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey'])) diff --git a/include/message.php b/include/message.php index 7ad80ae9c6..377d7c715b 100755 --- a/include/message.php +++ b/include/message.php @@ -1,4 +1,5 @@ get_baseurl() . ':' . local_user() . ':' . $hash ; + + $convid = 0; + $reply = false; + + require_once('include/Scrape.php'); + + $me = probe_url($replyto); + + if(! $me['name']) + return -2; + + $conv_guid = get_guid(); + + $recip_handle = $recipient['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + + $sender_nick = basename($replyto); + $sender_host = substr($replyto,strpos($replyto,'://')+3); + $sender_host = substr($sender_host,0,strpos($sender_host,'/')); + $sender_handle = $sender_nick . '@' . $sender_host; + + $handles = $recip_handle . ';' . $sender_handle; + + $r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ", + intval(local_user()), + dbesc($conv_guid), + dbesc($sender_handle), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($subject), + dbesc($handles) + ); + + $r = q("select * from conv where guid = '%s' and uid = %d limit 1", + dbesc($conv_guid), + intval($recipient['uid']) + ); + if(count($r)) + $convid = $r[0]['id']; + + if(! $convid) { + logger('send message: conversation not found.'); + return -4; + } + + $r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, + `contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`) + VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )", + intval($recipient['uid']), + dbesc(get_guid()), + intval($convid), + dbesc($me['name']), + dbesc($me['photo']), + dbesc($me['url']), + 0, + dbesc($subject), + dbesc($body), + 0, + 0, + 0, + dbesc($uri), + dbesc($replyto), + datetime_convert(), + 1 + ); + + return 0; + +} diff --git a/include/nav.php b/include/nav.php index f40e92dbce..2c9c643a92 100755 --- a/include/nav.php +++ b/include/nav.php @@ -69,7 +69,9 @@ function nav(&$a) { * "Home" should also take you home from an authenticated remote profile connection */ - $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : ''); + $homelink = get_my_url(); + if(! $homelink) + $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : ''); if(($a->module != 'home') && (! (local_user()))) $nav['home'] = array($homelink, t('Home'), "", t('Home Page')); diff --git a/include/network.php b/include/network.php index 22157ff188..9e1ed2091d 100755 --- a/include/network.php +++ b/include/network.php @@ -364,6 +364,9 @@ function lrdd($uri, $debug = false) { logger('lrdd: host_meta: ' . $xml, LOGGER_DATA); + if(! stristr($xml,'get_baseurl() . '/profile/' . $user_record['nickname']; + $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3); $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; $a->user = $user_record; diff --git a/include/text.php b/include/text.php index 6d557ed84e..191f4fca8a 100644 --- a/include/text.php +++ b/include/text.php @@ -205,7 +205,6 @@ function hex2bin($s) { return ''; if(! ctype_xdigit($s)) { - logger('hex2bin: illegal input: ' . print_r(debug_backtrace(), true)); return($s); } @@ -610,6 +609,8 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $url = $redirect_url; $sparkle = ' sparkle'; } + else + $url = zrl($url); } $click = ((x($contact,'click')) ? ' onclick="' . $contact['click'] . '" ' : ''); if($click) @@ -919,7 +920,7 @@ function prepare_body($item,$attach = false) { foreach($matches as $mtch) { if(strlen($x)) $x .= ','; - $x .= file_tag_decode($mtch[1]); + $x .= xmlify(file_tag_decode($mtch[1])); } if(strlen($x)) $s .= '
' . t('Categories:') . ' ' . $x . '
'; @@ -934,7 +935,7 @@ function prepare_body($item,$attach = false) { foreach($matches as $mtch) { if(strlen($x)) $x .= '   '; - $x .= file_tag_decode($mtch[1]). ' ' . t('[remove]') . ''; + $x .= xmlify(file_tag_decode($mtch[1])) . ' ' . t('[remove]') . ''; } if(strlen($x) && (local_user() == $item['uid'])) $s .= '
' . t('Filed under:') . ' ' . $x . '
'; @@ -1305,10 +1306,11 @@ function file_tag_decode($s) { } function file_tag_file_query($table,$s,$type = 'file') { + if($type == 'file') - $str = preg_quote( '[' . file_tag_encode($s) . ']' ); + $str = preg_quote( '[' . str_replace('%','%%',file_tag_encode($s)) . ']' ); else - $str = preg_quote( '<' . file_tag_encode($s) . '>' ); + $str = preg_quote( '<' . str_replace('%','%%',file_tag_encode($s)) . '>' ); return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' "; } diff --git a/index.php b/index.php index 0916ed8b10..2faac1f289 100755 --- a/index.php +++ b/index.php @@ -93,6 +93,9 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { load_translation_table($lang); } +if(x($_GET,'zrl')) { + $_SESSION['my_url'] = $_GET['zrl']; +} /** * diff --git a/js/main.js b/js/main.js index defd1f951a..744691b6da 100755 --- a/js/main.js +++ b/js/main.js @@ -16,6 +16,7 @@ document.getElementById(theID).style.display = "none" } + var src = null; var prev = null; var livetime = null; @@ -88,10 +89,12 @@ return false; }); $('html').click(function() { - last_popup_menu.hide(); - last_popup_button.removeClass("selected"); - last_popup_menu = null; - last_popup_button = null; + if(last_popup_menu) { + last_popup_menu.hide(); + last_popup_button.removeClass("selected"); + last_popup_menu = null; + last_popup_button = null; + } }); // fancyboxes @@ -166,6 +169,12 @@ NavUpdate(); // Allow folks to stop the ajax page updates with the pause/break key $(document).keydown(function(event) { + if(event.keyCode == '8') { + var target = event.target || event.srcElement; + if (!/input|textarea/i.test(target.nodeName)) { + return false; + } + } if(event.keyCode == '19' || (event.ctrlKey && event.which == '32')) { event.preventDefault(); if(stopped == false) { diff --git a/library/mcefixes/README b/library/mcefixes/README index dca70e1c39..578163a9d7 100644 --- a/library/mcefixes/README +++ b/library/mcefixes/README @@ -1,4 +1,8 @@ In order to make TinyMCE work smoothly with Friendica, the files in this directory are those few files we've changed in TinyMCE. We will attempt to keep them current, but if you decide to upgrade tinymce, it is best to save current copies of the files in question from the active tinymce tree and replace them or merge them after upgrade. Except for some simple theming, the primary changes are the advanced theme icon set, which we changed the "html" icon to "[]" to represent BBcode, and major changes have been made to the bbcode plugin. - \ No newline at end of file + + +in TinyMCE 3.5b2 it appears that we are getting double linefeeds. Code has been put in place in mod/item.php and mod/message.php to reduce the duplicates. + + diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 71860ac3b1..8e4ce06719 100755 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -158,6 +158,7 @@ function dfrn_notify_post(&$a) { ); } + logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']); logger('dfrn_notify: data: ' . $data, LOGGER_DATA); @@ -174,6 +175,13 @@ function dfrn_notify_post(&$a) { } + + // If we are setup as a soapbox we aren't accepting input from this person + + if($importer['page-flags'] == PAGE_SOAPBOX) + xml_status(0); + + if(strlen($key)) { $rawkey = hex2bin(trim($key)); logger('rino: md5 raw key: ' . md5($rawkey)); @@ -261,7 +269,7 @@ function dfrn_notify_content(&$a) { break; // NOTREACHED } - $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` + $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `user`.`nickname` = '%s' AND `user`.`account_expired` = 0 $sql_extra LIMIT 1", dbesc($a->argv[1]) @@ -299,6 +307,12 @@ function dfrn_notify_content(&$a) { if(! $rino_enable) $rino = 0; + if((($r[0]['rel']) && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) { + $perm = 'rw'; + } + else { + $perm = 'r'; + } header("Content-type: text/xml"); @@ -306,7 +320,8 @@ function dfrn_notify_content(&$a) { . '' . "\r\n" . "\t" . '' . $status . '' . "\r\n" . "\t" . '' . DFRN_PROTOCOL_VERSION . '' . "\r\n" - . "\t" . '' . $rino . '' . "\r\n" + . "\t" . '' . $rino . '' . "\r\n" + . "\t" . '' . $perm . '' . "\r\n" . "\t" . '' . $encrypted_id . '' . "\r\n" . "\t" . '' . $challenge . '' . "\r\n" . '' . "\r\n" ; diff --git a/mod/dirfind.php b/mod/dirfind.php index 75b1c49767..34c54dd918 100755 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -46,7 +46,7 @@ function dirfind_content(&$a) { foreach($j->results as $jj) { $o .= replace_macros($tpl,array( - '$url' => $jj->url, + '$url' => zrl($jj->url), '$name' => $jj->name, '$photo' => $jj->photo, '$tags' => $jj->tags diff --git a/mod/filer.php b/mod/filer.php index 82537848ba..3cd1bfe22f 100755 --- a/mod/filer.php +++ b/mod/filer.php @@ -11,8 +11,8 @@ function filer_content(&$a) { killme(); } - $term = notags(trim($_GET['term'])); - $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0); + $term = unxmlify(trim($_GET['term'])); + $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); logger('filer: tag ' . $term . ' item ' . $item_id); @@ -25,7 +25,7 @@ function filer_content(&$a) { $filetags = explode("][", trim($filetags,"[]")); $tpl = get_markup_template("filer_dialog.tpl"); $o = replace_macros($tpl, array( - '$field' => array('term', t("File as:"), '', '', $filetags, t('- select -')), + '$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')), '$submit' => t('Save'), )); diff --git a/mod/filerm.php b/mod/filerm.php index 66b684dc96..c520fec7ac 100644 --- a/mod/filerm.php +++ b/mod/filerm.php @@ -6,8 +6,8 @@ function filerm_content(&$a) { killme(); } - $term = notags(trim($_GET['term'])); - $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0); + $term = unxmlify(trim($_GET['term'])); + $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); logger('filerm: tag ' . $term . ' item ' . $item_id); diff --git a/mod/friendica.php b/mod/friendica.php index d5dad94484..52a064224a 100755 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -4,8 +4,12 @@ function friendica_init(&$a) { if ($a->argv[1]=="json"){ $register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'); + $sql_extra = ''; + if(x($a->config,'admin_nickname')) { + $sql_extra = sprintf(" AND nickname = '%s' ",dbesc($a->config['admin_nickname'])); + } if (isset($a->config['admin_email']) && $a->config['admin_email']!=''){ - $r = q("SELECT username, nickname FROM user WHERE email='%s'", $a->config['admin_email']); + $r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($a->config['admin_email'])); $admin = array( 'name' => $r[0]['username'], 'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'], diff --git a/mod/match.php b/mod/match.php index 1ae7848a63..926df1dfff 100755 --- a/mod/match.php +++ b/mod/match.php @@ -51,7 +51,7 @@ function match_content(&$a) { $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url; $o .= replace_macros($tpl,array( - '$url' => $jj->url, + '$url' => zrl($jj->url), '$name' => $jj->name, '$photo' => $jj->photo, '$inttxt' => ' ' . t('is interested in:'), diff --git a/mod/message.php b/mod/message.php index 8991f643d4..1369fde2e2 100755 --- a/mod/message.php +++ b/mod/message.php @@ -3,6 +3,35 @@ require_once('include/acl_selectors.php'); require_once('include/message.php'); +function message_init(&$a) { + $tabs = array( + /* + array( + 'label' => t('All'), + 'url'=> $a->get_baseurl(true) . '/message', + 'sel'=> ($a->argc == 1), + ), + array( + 'label' => t('Sent'), + 'url' => $a->get_baseurl(true) . '/message/sent', + 'sel'=> ($a->argv[1] == 'sent'), + ), + */ + ); + $new = array( + 'label' => t('New Message'), + 'url' => $a->get_baseurl(true) . '/message/new', + 'sel'=> ($a->argv[1] == 'new'), + ); + + $tpl = get_markup_template('message_side.tpl'); + $a->page['aside'] = replace_macros($tpl, array( + '$tabs'=>$tabs, + '$new'=>$new, + )); + +} + function message_post(&$a) { if(! local_user()) { @@ -66,25 +95,7 @@ function message_content(&$a) { $myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname']; - $tabs = array( - array( - 'label' => t('Inbox'), - 'url'=> $a->get_baseurl(true) . '/message', - 'sel'=> (($a->argc == 1) ? 'active' : ''), - ), - array( - 'label' => t('Outbox'), - 'url' => $a->get_baseurl(true) . '/message/sent', - 'sel'=> (($a->argv[1] == 'sent') ? 'active' : ''), - ), - array( - 'label' => t('New Message'), - 'url' => $a->get_baseurl(true) . '/message/new', - 'sel'=> (($a->argv[1] == 'new') ? 'active' : ''), - ), - ); - $tpl = get_markup_template('common_tabs.tpl'); - $tab_content = replace_macros($tpl, array('$tabs'=>$tabs)); + $tpl = get_markup_template('mail_head.tpl'); @@ -181,15 +192,12 @@ function message_content(&$a) { return $o; } - if(($a->argc == 1) || ($a->argc == 2 && $a->argv[1] === 'sent')) { + if($a->argc == 1) { + + // list messages $o .= $header; - if($a->argc == 2) - $eq = '='; // I'm not going to bother escaping this. - else - $eq = '!='; // or this. - $r = q("SELECT count(*) AS `total` FROM `mail` WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC", intval(local_user()), @@ -199,11 +207,12 @@ function message_content(&$a) { $a->set_pager_total($r[0]['total']); $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, - `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network` + `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`, + count( * ) as count FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` - WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", + WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", intval(local_user()), - dbesc($myprofile), + // intval($a->pager['start']), intval($a->pager['itemspage']) ); @@ -214,17 +223,29 @@ function message_content(&$a) { $tpl = get_markup_template('mail_list.tpl'); foreach($r as $rr) { + if($rr['unknown']) { + $partecipants = sprintf( t("Unknown sender - %s"),$rr['from-name']); + } + elseif (link_compare($rr['from-url'],$myprofile)){ + $partecipants = sprintf( t("You and %s"), $rr['name']); + } + else { + $partecipants = sprintf( t("%s and You"), $rr['from-name']); + } + $o .= replace_macros($tpl, array( '$id' => $rr['id'], - '$from_name' =>$rr['from-name'], + '$from_name' => $partecipants, '$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']), '$sparkle' => ' sparkle', - '$from_photo' => $rr['thumb'], + '$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']), '$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . '')), '$delete' => t('Delete conversation'), '$body' => template_escape($rr['body']), '$to_name' => template_escape($rr['name']), - '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')) + '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')), + '$seen' => $rr['mailseen'], + '$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']), )); } $o .= paginate($a); @@ -278,8 +299,13 @@ function message_content(&$a) { )); - $tpl = get_markup_template('mail_conv.tpl'); + $mails = array(); + $seen = 0; + $unknown = false; + foreach($messages as $message) { + if($message['unknown']) + $unknown = true; if($message['from-url'] == $myprofile) { $from_url = $myprofile; $sparkle = ''; @@ -288,24 +314,36 @@ function message_content(&$a) { $from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id']; $sparkle = ' sparkle'; } - $o .= replace_macros($tpl, array( - '$id' => $message['id'], - '$from_name' => template_escape($message['from-name']), - '$from_url' => $from_url, - '$sparkle' => $sparkle, - '$from_photo' => $message['from-photo'], - '$subject' => template_escape($message['title']), - '$body' => template_escape(smilies(bbcode($message['body']))), - '$delete' => t('Delete message'), - '$to_name' => template_escape($message['name']), - '$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A') - )); + $mails[] = array( + 'id' => $message['id'], + 'from_name' => template_escape($message['from-name']), + 'from_url' => $from_url, + 'sparkle' => $sparkle, + 'from_photo' => $message['from-photo'], + 'subject' => template_escape($message['title']), + 'body' => template_escape(smilies(bbcode($message['body']))), + 'delete' => t('Delete message'), + 'to_name' => template_escape($message['name']), + 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'), + ); + $seen = $message['seen']; } $select = $message['name'] . ''; $parent = ''; - $tpl = get_markup_template('prv_message.tpl'); - $o .= replace_macros($tpl,array( + + + $tpl = get_markup_template('mail_display.tpl'); + $o = replace_macros($tpl, array( + '$thread_id' => $a->argv[1], + '$thread_subject' => $message['title'], + '$thread_seen' => $seen, + '$delete' => t('Delete conversation'), + '$canreply' => (($unknown) ? false : '1'), + '$unknown_text' => t("No secure communications available. You may be able to respond from the sender's profile page."), + '$mails' => $mails, + + // reply '$header' => t('Send Reply'), '$to' => t('To:'), '$subject' => t('Subject:'), @@ -318,6 +356,7 @@ function message_content(&$a) { '$upload' => t('Upload photo'), '$insert' => t('Insert web link'), '$wait' => t('Please wait') + )); return $o; diff --git a/mod/network.php b/mod/network.php index 5ca0a8c7d6..d27945a860 100755 --- a/mod/network.php +++ b/mod/network.php @@ -393,7 +393,7 @@ function network_content(&$a, $update = 0) { ); } if(strlen($file)) { - $sql_extra .= file_tag_file_query('item',$file); + $sql_extra .= file_tag_file_query('item',unxmlify($file)); } if($conv) { diff --git a/mod/notifications.php b/mod/notifications.php index ff131010f0..690a99562f 100755 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -37,7 +37,11 @@ function notifications_post(&$a) { intval($intro_id) ); if(! $fid) { - $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", + + // The check for blocked and pending is in case the friendship was already approved + // and we just want to get rid of the now pointless notification + + $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1 LIMIT 1", intval($contact_id), intval(local_user()) ); @@ -145,7 +149,7 @@ function notifications_content(&$a) { '$contact_id' => $rr['contact-id'], '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"), '$fullname' => $rr['fname'], - '$url' => $rr['furl'], + '$url' => zrl($rr['furl']), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), @@ -195,7 +199,7 @@ function notifications_content(&$a) { '$fullname' => $rr['name'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), - '$url' => $rr['url'], + '$url' => zrl($rr['url']), '$knowyou' => $knowyou, '$approve' => t('Approve'), '$note' => $rr['note'], diff --git a/mod/ping.php b/mod/ping.php index 1562254b17..e911aaf1f4 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -22,6 +22,7 @@ function ping_init(&$a) { and seen = 0 order by date desc limit 0, 50", intval(local_user()) ); + $sysnotify = $t[0]['total']; } else { $z1 = q("select * from notify where uid = %d @@ -35,6 +36,7 @@ function ping_init(&$a) { intval(50 - intval($t[0]['total'])) ); $z = array_merge($z1,$z2); + $sysnotify = 0; // we will update this in a moment } @@ -147,13 +149,12 @@ function ping_init(&$a) { $tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags); require_once('include/bbcode.php'); - $sysnotify = 0; if($firehose) { echo ' '; } else { - if(count($z)) { + if(count($z) && (! $sysnotify)) { foreach($z as $zz) { if($zz['seen'] == 0) $sysnotify ++; diff --git a/mod/register.php b/mod/register.php index 6d0e2700bc..630c0a6759 100755 --- a/mod/register.php +++ b/mod/register.php @@ -8,6 +8,8 @@ function register_post(&$a) { $verified = 0; $blocked = 1; + $arr = array('post' => $_POST); + call_hooks('register_post', $arr); $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailes) { @@ -218,8 +220,8 @@ function register_post(&$a) { $spubkey = $spkey["key"]; $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`, - `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked` ) - VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )", + `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` ) + VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC' )", dbesc(generate_user_guid()), dbesc($username), dbesc($new_password_encoded), @@ -540,6 +542,11 @@ function register_content(&$a) { $license = ''; $o = get_markup_template("register.tpl"); + + $arr = array('template' => $o); + + call_hooks('register_form',$arr); + $o = replace_macros($o, array( '$oidhtml' => $oidhtml, '$invitations' => get_config('system','invitation_only'), diff --git a/mod/search.php b/mod/search.php index 50e7a6abc7..6495fc8e5f 100755 --- a/mod/search.php +++ b/mod/search.php @@ -97,19 +97,16 @@ 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. - $s_regx = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", - dbesc(preg_quote($search)), dbesc('\\]' . preg_quote($search) . '\\[')); - - $search_alg = $s_regx; - $r = q("SELECT COUNT(*) 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 - $search_alg ", - intval(local_user()) + AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", + intval(local_user()), + dbesc(preg_quote($search)), + dbesc('\\]' . preg_quote($search) . '\\[') ); if(count($r)) @@ -131,9 +128,11 @@ 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 - $search_alg + AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) ORDER BY `received` DESC LIMIT %d , %d ", intval(local_user()), + dbesc(preg_quote($search)), + dbesc('\\]' . preg_quote($search) . '\\['), intval($a->pager['start']), intval($a->pager['itemspage']) diff --git a/mod/settings.php b/mod/settings.php index 99bf8842d2..926d1faa5b 100755 --- a/mod/settings.php +++ b/mod/settings.php @@ -1,6 +1,19 @@ theme_info['extends']; + + if (file_exists("view/theme/$theme/config.php")){ + return "view/theme/$theme/config.php"; + } + if (file_exists("view/theme/$base_theme/config.php")){ + return "view/theme/$base_theme/config.php"; + } + return null; +} + function settings_init(&$a) { if(local_user()) { profile_load($a,$a->user['nickname']); @@ -193,6 +206,45 @@ function settings_post(&$a) { call_hooks('connector_settings_post', $_POST); return; } + + if(($a->argc > 1) && ($a->argv[1] == 'display')) { + + check_form_security_token_redirectOnErr('/settings/display', 'settings_display'); + + $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $a->user['theme']); + $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0); + $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0); + $browser_update = $browser_update * 1000; + if($browser_update < 10000) + $browser_update = 40000; + + $itemspage_network = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40); + if($itemspage_network > 100) + $itemspage_network = 40; + + + set_pconfig(local_user(),'system','update_interval', $browser_update); + set_pconfig(local_user(),'system','itemspage_network', $itemspage_network); + set_pconfig(local_user(),'system','no_smilies',$nosmile); + + + if ($theme == $a->user['theme']){ + // call theme_post only if theme has not benn changed + if( ($themeconfigfile = get_theme_config_file($theme)) != null){ + require_once($themeconfigfile); + theme_post($a); + } + } + + + $r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d LIMIT 1", + dbesc($theme), + intval(local_user()) + ); + + goaway($a->get_baseurl(true) . '/settings/display' ); + return; // NOTREACHED + } check_form_security_token_redirectOnErr('/settings', 'settings'); @@ -227,7 +279,7 @@ function settings_post(&$a) { } } - $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : $a->user['theme']); + $username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : ''); $email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : ''); $timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : ''); @@ -242,14 +294,6 @@ function settings_post(&$a) { $expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0); $expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0); - $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0); - $browser_update = $browser_update * 1000; - if($browser_update < 10000) - $browser_update = 40000; - - $itemspage_network = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40); - if($itemspage_network > 100) - $itemspage_network = 40; $allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0); @@ -259,11 +303,12 @@ function settings_post(&$a) { $page_flags = (((x($_POST,'page-flags')) && (intval($_POST['page-flags']))) ? intval($_POST['page-flags']) : 0); $blockwall = (((x($_POST,'blockwall')) && (intval($_POST['blockwall']) == 1)) ? 0: 1); // this setting is inverted! $blocktags = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted! - + $unkmail = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0); + $cntunkmail = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0); $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0); $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); - $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0); + $notify = 0; @@ -345,11 +390,9 @@ function settings_post(&$a) { set_pconfig(local_user(),'expire','photos', $expire_photos); set_pconfig(local_user(),'system','suggestme', $suggestme); - set_pconfig(local_user(),'system','update_interval', $browser_update); - set_pconfig(local_user(),'system','itemspage_network', $itemspage_network); - set_pconfig(local_user(),'system','no_smilies',$nosmile); - $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d WHERE `uid` = %d LIMIT 1", + + $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d LIMIT 1", dbesc($username), dbesc($email), dbesc($openid), @@ -362,13 +405,14 @@ function settings_post(&$a) { intval($page_flags), dbesc($defloc), intval($allow_location), - dbesc($theme), intval($maxreq), intval($expire), dbesc($openidserver), intval($blockwall), intval($hidewall), intval($blocktags), + intval($unkmail), + intval($cntunkmail), intval(local_user()) ); if($r) @@ -440,6 +484,12 @@ function settings_content(&$a) { 'url' => $a->get_baseurl(true).'/settings', 'sel' => (($a->argc == 1)?'active':''), ), + array( + 'label' => t('Display settings'), + 'url' => $a->get_baseurl(true).'/settings/display', + 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), + ), + array( 'label' => t('Connector settings'), 'url' => $a->get_baseurl(true).'/settings/connectors', @@ -578,31 +628,31 @@ function settings_content(&$a) { $diasp_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('Diaspora'), ((get_config('system','diaspora_enabled')) ? t('enabled') : t('disabled'))); $ostat_enabled = sprintf( t('Built-in support for %s connectivity is %s'), t('StatusNet'), ((get_config('system','ostatus_disabled')) ? t('disabled') : t('enabled'))); - $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); - if(get_config('system','dfrn_only')) - $mail_disabled = 1; + $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); + if(get_config('system','dfrn_only')) + $mail_disabled = 1; - if(! $mail_disabled) { - $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", - local_user() - ); - } - else { - $r = null; - } + if(! $mail_disabled) { + $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", + local_user() + ); + } + else { + $r = null; + } - $mail_server = ((count($r)) ? $r[0]['server'] : ''); - $mail_port = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : ''); - $mail_ssl = ((count($r)) ? $r[0]['ssltype'] : ''); - $mail_user = ((count($r)) ? $r[0]['user'] : ''); - $mail_replyto = ((count($r)) ? $r[0]['reply_to'] : ''); - $mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0); - $mail_action = ((count($r)) ? $r[0]['action'] : 0); - $mail_movetofolder = ((count($r)) ? $r[0]['movetofolder'] : ''); - $mail_chk = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00'); + $mail_server = ((count($r)) ? $r[0]['server'] : ''); + $mail_port = ((count($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : ''); + $mail_ssl = ((count($r)) ? $r[0]['ssltype'] : ''); + $mail_user = ((count($r)) ? $r[0]['user'] : ''); + $mail_replyto = ((count($r)) ? $r[0]['reply_to'] : ''); + $mail_pubmail = ((count($r)) ? $r[0]['pubmail'] : 0); + $mail_action = ((count($r)) ? $r[0]['action'] : 0); + $mail_movetofolder = ((count($r)) ? $r[0]['movetofolder'] : ''); + $mail_chk = ((count($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00'); - $tpl = get_markup_template("settings_connectors.tpl"); + $tpl = get_markup_template("settings_connectors.tpl"); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_connectors"), @@ -618,7 +668,7 @@ function settings_content(&$a) { '$mail_disabled' => (($mail_disabled) ? t('Email access is disabled on this site.') : ''), '$mail_server' => array('mail_server', t('IMAP server name:'), $mail_server, ''), '$mail_port' => array('mail_port', t('IMAP port:'), $mail_port, ''), - '$mail_ssl' => array('mail_ssl', t('Security:'), strtoupper($mail_ssl), '', array( ''=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')), + '$mail_ssl' => array('mail_ssl', t('Security:'), strtoupper($mail_ssl), '', array( 'notls'=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')), '$mail_user' => array('mail_user', t('Email login name:'), $mail_user, ''), '$mail_pass' => array('mail_pass', t('Email password:'), '', ''), '$mail_replyto' => array('mail_replyto', t('Reply-to address:'), '', 'Optional'), @@ -632,6 +682,78 @@ function settings_content(&$a) { return $o; } + /* + * DISPLAY SETTINGS + */ + if(($a->argc > 1) && ($a->argv[1] === 'display')) { + $default_theme = get_config('system','theme'); + if(! $default_theme) + $default_theme = 'default'; + + $allowed_themes_str = get_config('system','allowed_themes'); + $allowed_themes_raw = explode(',',$allowed_themes_str); + $allowed_themes = array(); + if(count($allowed_themes_raw)) + foreach($allowed_themes_raw as $x) + if(strlen(trim($x))) + $allowed_themes[] = trim($x); + + + $themes = array(); + $files = glob('view/theme/*'); + if($allowed_themes) { + foreach($allowed_themes as $th) { + $f = $th; + $is_experimental = file_exists('view/theme/' . $th . '/experimental'); + $unsupported = file_exists('view/theme/' . $th . '/unsupported'); + if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ + $theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f); + $themes[$f]=$theme_name; + } + } + } + $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']); + + $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); + $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds + + $itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network')); + $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items + + $nosmile = get_pconfig(local_user(),'system','no_smilies'); + $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0 + + + $theme_config = ""; + if( ($themeconfigfile = get_theme_config_file($theme_selected)) != null){ + require_once($themeconfigfile); + $theme_config = theme_content($a); + } + + $tpl = get_markup_template("settings_display.tpl"); + $o = replace_macros($tpl, array( + '$tabs' => $tabs, + '$ptitle' => t('Display Settings'), + '$form_security_token' => get_form_security_token("settings_display"), + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(true), + '$uid' => local_user(), + + '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes), + '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), + '$itemspage_network' => array('itemspage_network', t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')), + '$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''), + + '$theme_config' => $theme_config, + )); + + return $o; + } + + + /* + * ACCOUNT SETTINGS + */ require_once('include/acl_selectors.php'); @@ -641,17 +763,19 @@ function settings_content(&$a) { if(count($p)) $profile = $p[0]; - $username = $a->user['username']; - $email = $a->user['email']; - $nickname = $a->user['nickname']; - $timezone = $a->user['timezone']; - $notify = $a->user['notify-flags']; - $defloc = $a->user['default-location']; - $openid = $a->user['openid']; - $maxreq = $a->user['maxreq']; - $expire = ((intval($a->user['expire'])) ? $a->user['expire'] : ''); - $blockwall = $a->user['blockwall']; - $blocktags = $a->user['blocktags']; + $username = $a->user['username']; + $email = $a->user['email']; + $nickname = $a->user['nickname']; + $timezone = $a->user['timezone']; + $notify = $a->user['notify-flags']; + $defloc = $a->user['default-location']; + $openid = $a->user['openid']; + $maxreq = $a->user['maxreq']; + $expire = ((intval($a->user['expire'])) ? $a->user['expire'] : ''); + $blockwall = $a->user['blockwall']; + $blocktags = $a->user['blocktags']; + $unkmail = $a->user['unkmail']; + $cntunkmail = $a->user['cntunkmail']; $expire_items = get_pconfig(local_user(), 'expire','items'); $expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1 @@ -669,14 +793,7 @@ function settings_content(&$a) { $suggestme = get_pconfig(local_user(), 'system','suggestme'); $suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0 - $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); - $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds - $itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network')); - $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items - - $nosmile = get_pconfig(local_user(),'system','no_smilies'); - $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0 if(! strlen($a->user['timezone'])) $timezone = date_default_timezone_get(); @@ -758,6 +875,12 @@ function settings_content(&$a) { )); + $unkmail = replace_macros($opt_tpl,array( + '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))), + + )); + + $invisible = (((! $profile['publish']) && (! $profile['net-publish'])) ? true : false); @@ -765,33 +888,7 @@ function settings_content(&$a) { info( t('Profile is not published.') . EOL ); - $default_theme = get_config('system','theme'); - if(! $default_theme) - $default_theme = 'default'; - $allowed_themes_str = get_config('system','allowed_themes'); - $allowed_themes_raw = explode(',',$allowed_themes_str); - $allowed_themes = array(); - if(count($allowed_themes_raw)) - foreach($allowed_themes_raw as $x) - if(strlen(trim($x))) - $allowed_themes[] = trim($x); - - - $themes = array(); - $files = glob('view/theme/*'); - if($allowed_themes) { - foreach($allowed_themes as $th) { - $f = $th; - $is_experimental = file_exists('view/theme/' . $th . '/experimental'); - $unsupported = file_exists('view/theme/' . $th . '/unsupported'); - if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ - $theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f); - $themes[$f]=$theme_name; - } - } - } - $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']); $subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : ''); @@ -842,10 +939,7 @@ function settings_content(&$a) { '$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''), '$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''), '$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''), - '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes), - '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), - '$itemspage_network' => array('itemspage_network', t("Number of items to display on the network page:"), $itemspage_network, t('Maximum of 100 items')), - '$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''), + '$h_prv' => t('Security and Privacy Settings'), @@ -863,7 +957,8 @@ function settings_content(&$a) { '$profile_in_net_dir' => $profile_in_net_dir, '$hide_friends' => $hide_friends, '$hide_wall' => $hide_wall, - + '$unkmail' => $unkmail, + '$cntunkmail' => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")), '$h_not' => t('Notification Settings'), diff --git a/mod/suggest.php b/mod/suggest.php index b8ca423c5a..7a86d53a1d 100755 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -52,7 +52,7 @@ function suggest_content(&$a) { $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']); $o .= replace_macros($tpl,array( - '$url' => $rr['url'], + '$url' => zrl($rr['url']), '$name' => $rr['name'], '$photo' => $rr['photo'], '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'], diff --git a/mod/view.php b/mod/view.php new file mode 100644 index 0000000000..33aa23f447 --- /dev/null +++ b/mod/view.php @@ -0,0 +1,16 @@ +argc == 4){ + $theme = $a->argv[2]; + $THEMEPATH = "view/theme/$theme"; + require_once("view/theme/$theme/style.php"); + } + + killme(); +} diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index 6b66f60d77..e7d26b73e5 100755 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -54,6 +54,8 @@ function viewcontacts_content(&$a) { if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) $url = 'redir/' . $rr['id']; + else + $url = zrl($url); $contacts[] = array( 'id' => $rr['id'], diff --git a/mod/wallmessage.php b/mod/wallmessage.php new file mode 100644 index 0000000000..1a4882b643 --- /dev/null +++ b/mod/wallmessage.php @@ -0,0 +1,149 @@ +argc > 1) ? notags($a->argv[1]) : ''); + if((! $recipient) || (! $body)) { + return; + } + + $r = q("select * from user where nickname = '%s' limit 1", + dbesc($recipient) + ); + + if(! count($r)) { + logger('wallmessage: no recipient'); + return; + } + + $user = $r[0]; + + if(! intval($user['unkmail'])) { + notice( t('Permission denied.') . EOL); + return; + } + + $r = q("select count(*) as total from mail where uid = %d and created > UTC_TIMESTAMP() - INTERVAL 1 day and unknown = 1", + intval($user['uid']) + ); + + if($r[0]['total'] > $user['cntunkmail']) { + notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']))); + return; + } + + // Work around doubled linefeeds in Tinymce 3.5b2 +dbg(1); + $body = str_replace("\r\n","\n",$body); + $body = str_replace("\n\n","\n",$body); + + + $ret = send_wallmessage($user, $body, $subject, $replyto); + + switch($ret){ + case -1: + notice( t('No recipient selected.') . EOL ); + break; + case -2: + notice( t('Unable to check your home location.') . EOL ); + break; + case -3: + notice( t('Message could not be sent.') . EOL ); + break; + case -4: + notice( t('Message collection failure.') . EOL ); + break; + default: + info( t('Message sent.') . EOL ); + } +dbg(0); +// goaway($a->get_baseurl() . '/profile/' . $user['nickname']); + +} + + +function wallmessage_content(&$a) { + + if(! get_my_url()) { + notice( t('Permission denied.') . EOL); + return; + } + + $recipient = (($a->argc > 1) ? $a->argv[1] : ''); + + if(! $recipient) { + notice( t('No recipient.') . EOL); + return; + } + + $r = q("select * from user where nickname = '%s' limit 1", + dbesc($recipient) + ); + + if(! count($r)) { + notice( t('No recipient.') . EOL); + logger('wallmessage: no recipient'); + return; + } + + $user = $r[0]; + + if(! intval($user['unkmail'])) { + notice( t('Permission denied.') . EOL); + return; + } + + $r = q("select count(*) as total from mail where uid = %d and created > UTC_TIMESTAMP() - INTERVAL 1 day and unknown = 1", + intval($user['uid']) + ); + + if($r[0]['total'] > $user['cntunkmail']) { + notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']))); + return; + } + + + + $tpl = get_markup_template('wallmsg-header.tpl'); + + $a->page['htmlhead'] .= replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(true), + '$editselect' => '/(profile-jot-text|prvmail-text)/', + '$nickname' => $user['nickname'], + '$linkurl' => t('Please enter a link URL:') + )); + + + + $tpl = get_markup_template('wallmessage.tpl'); + $o .= replace_macros($tpl,array( + '$header' => t('Send Private Message'), + '$subheader' => sprintf( t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.'), $user['username']), + '$to' => t('To:'), + '$subject' => t('Subject:'), + '$recipname' => $user['username'], + '$nickname' => $user['nickname'], + '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), + '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''), + '$readonly' => '', + '$yourmessage' => t('Your message:'), + '$select' => $select, + '$parent' => '', + '$upload' => t('Upload photo'), + '$insert' => t('Insert web link'), + '$wait' => t('Please wait') + )); + + return $o; + } diff --git a/update.php b/update.php index a69742a949..d38e39f8b1 100755 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ \n" "Language-Team: LANGUAGE \n" @@ -36,23 +36,24 @@ msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865 +#: ../../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:411 -#: ../../mod/settings.php:416 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../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:111 ../../mod/item.php:124 ../../mod/item.php:140 -#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137 -#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159 -#: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9 -#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9 -#: ../../mod/display.php:133 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:229 ../../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:332 -#: ../../include/items.php:3030 ../../index.php:288 +#: ../../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 msgid "Permission denied." msgstr "" @@ -81,8 +82,8 @@ msgstr "" msgid "Return to contact editor" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/settings.php:462 -#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493 +#: ../../mod/crepair.php:148 ../../mod/settings.php:480 +#: ../../mod/settings.php:507 ../../mod/admin.php:487 ../../mod/admin.php:496 msgid "Name" msgstr "" @@ -119,26 +120,27 @@ msgid "New photo from this URL" msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958 -#: ../../mod/photos.php:1182 ../../mod/photos.php:1222 -#: ../../mod/photos.php:1262 ../../mod/photos.php:1293 +#: ../../mod/events.php:400 ../../mod/photos.php:901 ../../mod/photos.php:959 +#: ../../mod/photos.php:1194 ../../mod/photos.php:1234 +#: ../../mod/photos.php:1274 ../../mod/photos.php:1305 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:319 -#: ../../mod/settings.php:460 ../../mod/settings.php:603 -#: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80 -#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609 -#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375 -#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411 -#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92 +#: ../../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 #: ../../addon/uhremotestorage/uhremotestorage.php:89 -#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:92 -#: ../../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/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/openstreetmap/openstreetmap.php:70 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94 -#: ../../addon/pageheader/pageheader.php:52 +#: ../../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 @@ -150,7 +152,7 @@ msgstr "" #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175 #: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355 #: ../../addon/posterous/posterous.php:90 -#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552 +#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:555 msgid "Submit" msgstr "" @@ -158,15 +160,15 @@ msgstr "" msgid "Help:" msgstr "" -#: ../../mod/help.php:34 ../../include/nav.php:82 +#: ../../mod/help.php:34 ../../include/nav.php:86 msgid "Help" msgstr "" -#: ../../mod/help.php:38 ../../index.php:221 +#: ../../mod/help.php:38 ../../index.php:224 msgid "Not Found" msgstr "" -#: ../../mod/help.php:41 ../../index.php:224 +#: ../../mod/help.php:41 ../../index.php:227 msgid "Page not found." msgstr "" @@ -204,11 +206,13 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:272 ../../include/text.php:982 +#: ../../mod/events.php:272 ../../include/text.php:1044 msgid "link to source" msgstr "" -#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349 +#: ../../mod/events.php:296 ../../view/theme/diabook-blue/theme.php:219 +#: ../../view/theme/diabook/theme.php:225 ../../include/nav.php:52 +#: ../../boot.php:1399 msgid "Events" msgstr "" @@ -258,7 +262,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:395 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:980 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1030 msgid "Location:" msgstr "" @@ -267,8 +271,8 @@ msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:461 -#: ../../mod/settings.php:487 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:707 ../../mod/settings.php:479 +#: ../../mod/settings.php:506 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -288,7 +292,7 @@ msgstr "" msgid "Remove" msgstr "" -#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517 +#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:520 #, php-format msgid "%s welcomes %s" msgstr "" @@ -311,245 +315,251 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676 -#: ../../mod/settings.php:692 ../../mod/settings.php:698 -#: ../../mod/settings.php:706 ../../mod/settings.php:710 -#: ../../mod/settings.php:715 ../../mod/settings.php:721 -#: ../../mod/settings.php:727 ../../mod/settings.php:787 -#: ../../mod/settings.php:788 ../../mod/settings.php:789 -#: ../../mod/settings.php:790 ../../mod/register.php:524 -#: ../../mod/profiles.php:357 +#: ../../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 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677 -#: ../../mod/settings.php:692 ../../mod/settings.php:698 -#: ../../mod/settings.php:706 ../../mod/settings.php:710 -#: ../../mod/settings.php:715 ../../mod/settings.php:721 -#: ../../mod/settings.php:727 ../../mod/settings.php:787 -#: ../../mod/settings.php:788 ../../mod/settings.php:789 -#: ../../mod/settings.php:790 ../../mod/register.php:525 -#: ../../mod/profiles.php:358 +#: ../../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 msgid "No" msgstr "" -#: ../../mod/photos.php:42 +#: ../../mod/photos.php:43 msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:50 ../../mod/photos.php:150 ../../mod/photos.php:879 -#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1371 -#: ../../mod/photos.php:1383 ../../addon/communityhome/communityhome.php:110 +#: ../../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-blue/theme.php:110 +#: ../../view/theme/diabook/theme.php:113 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:57 ../../mod/photos.php:975 ../../mod/photos.php:1413 +#: ../../mod/photos.php:58 ../../mod/photos.php:976 ../../mod/photos.php:1425 msgid "Upload New Photos" msgstr "" -#: ../../mod/photos.php:68 ../../mod/settings.php:11 +#: ../../mod/photos.php:69 ../../mod/settings.php:11 msgid "everybody" msgstr "" -#: ../../mod/photos.php:139 +#: ../../mod/photos.php:140 msgid "Contact information unavailable" msgstr "" -#: ../../mod/photos.php:150 ../../mod/photos.php:597 ../../mod/photos.php:950 -#: ../../mod/photos.php:965 ../../mod/register.php:327 -#: ../../mod/register.php:334 ../../mod/register.php:341 -#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 -#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170 -#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255 +#: ../../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/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-blue/theme.php:111 +#: ../../view/theme/diabook/theme.php:114 msgid "Profile Photos" msgstr "" -#: ../../mod/photos.php:160 +#: ../../mod/photos.php:161 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:178 ../../mod/photos.php:959 +#: ../../mod/photos.php:179 ../../mod/photos.php:960 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:241 ../../mod/photos.php:1183 +#: ../../mod/photos.php:242 ../../mod/photos.php:1195 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:528 +#: ../../mod/photos.php:529 msgid "was tagged in a" msgstr "" -#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1226 -#: ../../include/diaspora.php:1600 ../../include/conversation.php:53 +#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../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 #: ../../include/conversation.php:126 msgid "photo" msgstr "" -#: ../../mod/photos.php:528 +#: ../../mod/photos.php:529 msgid "by" msgstr "" -#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:632 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/photos.php:639 +#: ../../mod/photos.php:640 msgid "Image file is empty." msgstr "" -#: ../../mod/photos.php:653 ../../mod/profile_photo.php:122 +#: ../../mod/photos.php:654 ../../mod/profile_photo.php:124 #: ../../mod/wall_upload.php:65 msgid "Unable to process image." msgstr "" -#: ../../mod/photos.php:673 ../../mod/profile_photo.php:251 +#: ../../mod/photos.php:674 ../../mod/profile_photo.php:257 #: ../../mod/wall_upload.php:84 msgid "Image upload failed." msgstr "" -#: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:625 ../../mod/viewcontacts.php:17 -#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:33 +#: ../../mod/photos.php:760 ../../mod/community.php:16 +#: ../../mod/dfrn_request.php:626 ../../mod/viewcontacts.php:17 +#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:769 +#: ../../mod/photos.php:770 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:846 +#: ../../mod/photos.php:847 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:907 +#: ../../mod/photos.php:908 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:910 ../../mod/photos.php:954 +#: ../../mod/photos.php:911 ../../mod/photos.php:955 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:911 +#: ../../mod/photos.php:912 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:912 +#: ../../mod/photos.php:913 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:914 ../../mod/photos.php:1178 +#: ../../mod/photos.php:915 ../../mod/photos.php:1190 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:969 +#: ../../mod/photos.php:970 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:984 ../../mod/photos.php:1396 +#: ../../mod/photos.php:985 ../../mod/photos.php:1408 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:1019 +#: ../../mod/photos.php:1020 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:1021 +#: ../../mod/photos.php:1022 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:1071 +#: ../../mod/photos.php:1072 msgid "View photo" msgstr "" -#: ../../mod/photos.php:1071 +#: ../../mod/photos.php:1072 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1072 +#: ../../mod/photos.php:1073 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1078 ../../include/conversation.php:482 +#: ../../mod/photos.php:1079 ../../include/conversation.php:480 msgid "Private Message" msgstr "" -#: ../../mod/photos.php:1089 +#: ../../mod/photos.php:1101 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1157 +#: ../../mod/photos.php:1169 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1160 +#: ../../mod/photos.php:1172 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1171 +#: ../../mod/photos.php:1183 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1174 +#: ../../mod/photos.php:1186 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1176 +#: ../../mod/photos.php:1188 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1180 +#: ../../mod/photos.php:1192 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1200 ../../include/conversation.php:529 +#: ../../mod/photos.php:1212 ../../include/conversation.php:529 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1201 ../../include/conversation.php:530 +#: ../../mod/photos.php:1213 ../../include/conversation.php:530 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1202 ../../include/conversation.php:933 +#: ../../mod/photos.php:1214 ../../include/conversation.php:960 msgid "Share" msgstr "" -#: ../../mod/photos.php:1203 ../../mod/editpost.php:104 -#: ../../mod/message.php:155 ../../mod/message.php:296 -#: ../../include/conversation.php:348 ../../include/conversation.php:694 -#: ../../include/conversation.php:950 +#: ../../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 msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1219 ../../mod/photos.php:1259 -#: ../../mod/photos.php:1290 ../../include/conversation.php:549 +#: ../../mod/photos.php:1231 ../../mod/photos.php:1271 +#: ../../mod/photos.php:1302 ../../include/conversation.php:552 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1221 ../../mod/photos.php:1261 -#: ../../mod/photos.php:1292 ../../include/conversation.php:551 -#: ../../boot.php:447 +#: ../../mod/photos.php:1233 ../../mod/photos.php:1273 +#: ../../mod/photos.php:1304 ../../include/conversation.php:554 +#: ../../boot.php:488 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1223 ../../mod/editpost.php:123 -#: ../../include/conversation.php:553 ../../include/conversation.php:968 +#: ../../mod/photos.php:1235 ../../mod/editpost.php:123 +#: ../../include/conversation.php:556 ../../include/conversation.php:995 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1320 ../../mod/settings.php:520 -#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488 -#: ../../include/conversation.php:304 ../../include/conversation.php:573 +#: ../../mod/photos.php:1332 ../../mod/settings.php:542 +#: ../../mod/settings.php:626 ../../mod/group.php:168 ../../mod/admin.php:491 +#: ../../include/conversation.php:318 ../../include/conversation.php:576 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1402 +#: ../../mod/photos.php:1414 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1411 +#: ../../mod/photos.php:1423 msgid "Recent Photos" msgstr "" @@ -557,43 +567,45 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:30 ../../include/nav.php:97 +#: ../../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 msgid "Community" msgstr "" -#: ../../mod/community.php:60 ../../mod/search.php:118 +#: ../../mod/community.php:61 ../../mod/search.php:119 msgid "No results." msgstr "" -#: ../../mod/friendica.php:43 +#: ../../mod/friendica.php:47 msgid "This is Friendica, version" msgstr "" -#: ../../mod/friendica.php:44 +#: ../../mod/friendica.php:48 msgid "running at web location" msgstr "" -#: ../../mod/friendica.php:46 +#: ../../mod/friendica.php:50 msgid "" "Please visit Friendica.com to learn " "more about the Friendica project." msgstr "" -#: ../../mod/friendica.php:48 +#: ../../mod/friendica.php:52 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/friendica.php:49 +#: ../../mod/friendica.php:53 msgid "" "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " "dot com" msgstr "" -#: ../../mod/friendica.php:54 -msgid "Installed plugins/addons/apps" +#: ../../mod/friendica.php:58 +msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/friendica.php:62 +#: ../../mod/friendica.php:71 msgid "No installed plugins/addons/apps" msgstr "" @@ -605,26 +617,26 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:80 ../../include/conversation.php:919 +#: ../../mod/editpost.php:80 ../../include/conversation.php:946 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:95 ../../mod/settings.php:519 -#: ../../include/conversation.php:560 +#: ../../mod/editpost.php:95 ../../mod/settings.php:541 +#: ../../include/conversation.php:563 msgid "Edit" msgstr "" -#: ../../mod/editpost.php:96 ../../mod/message.php:153 -#: ../../mod/message.php:294 ../../include/conversation.php:934 +#: ../../mod/editpost.php:96 ../../mod/message.php:187 +#: ../../mod/message.php:350 ../../include/conversation.php:961 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:97 ../../include/conversation.php:936 +#: ../../mod/editpost.php:97 ../../include/conversation.php:963 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:98 ../../mod/message.php:154 -#: ../../mod/message.php:295 ../../include/conversation.php:938 +#: ../../mod/editpost.php:98 ../../mod/message.php:188 +#: ../../mod/message.php:351 ../../include/conversation.php:965 msgid "Insert web link" msgstr "" @@ -640,201 +652,212 @@ msgstr "" msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:102 ../../include/conversation.php:944 +#: ../../mod/editpost.php:102 ../../include/conversation.php:971 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:103 ../../include/conversation.php:946 +#: ../../mod/editpost.php:103 ../../include/conversation.php:973 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:951 +#: ../../mod/editpost.php:105 ../../include/conversation.php:978 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:960 +#: ../../mod/editpost.php:113 ../../include/conversation.php:987 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:961 +#: ../../mod/editpost.php:114 ../../include/conversation.php:988 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:949 +#: ../../mod/editpost.php:117 ../../include/conversation.php:976 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:118 ../../include/conversation.php:963 +#: ../../mod/editpost.php:118 ../../include/conversation.php:990 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../mod/dfrn_request.php:92 +#: ../../mod/dfrn_request.php:93 msgid "This introduction has already been accepted." msgstr "" -#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381 +#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:382 msgid "Profile location is not valid or does not contain profile information." msgstr "" -#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386 +#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:387 msgid "Warning: profile location has no identifiable owner name." msgstr "" -#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388 +#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:389 msgid "Warning: profile location has no profile photo." msgstr "" -#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391 +#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:392 #, php-format msgid "%d required parameter was not found at the given location" msgid_plural "%d required parameters were not found at the given location" msgstr[0] "" msgstr[1] "" -#: ../../mod/dfrn_request.php:167 +#: ../../mod/dfrn_request.php:168 msgid "Introduction complete." msgstr "" -#: ../../mod/dfrn_request.php:191 +#: ../../mod/dfrn_request.php:192 msgid "Unrecoverable protocol error." msgstr "" -#: ../../mod/dfrn_request.php:219 +#: ../../mod/dfrn_request.php:220 msgid "Profile unavailable." msgstr "" -#: ../../mod/dfrn_request.php:244 +#: ../../mod/dfrn_request.php:245 #, php-format msgid "%s has received too many connection requests today." msgstr "" -#: ../../mod/dfrn_request.php:245 +#: ../../mod/dfrn_request.php:246 msgid "Spam protection measures have been invoked." msgstr "" -#: ../../mod/dfrn_request.php:246 +#: ../../mod/dfrn_request.php:247 msgid "Friends are advised to please try again in 24 hours." msgstr "" -#: ../../mod/dfrn_request.php:306 +#: ../../mod/dfrn_request.php:307 msgid "Invalid locator" msgstr "" -#: ../../mod/dfrn_request.php:326 +#: ../../mod/dfrn_request.php:327 msgid "Unable to resolve your name at the provided location." msgstr "" -#: ../../mod/dfrn_request.php:339 +#: ../../mod/dfrn_request.php:340 msgid "You have already introduced yourself here." msgstr "" -#: ../../mod/dfrn_request.php:343 +#: ../../mod/dfrn_request.php:344 #, php-format msgid "Apparently you are already friends with %s." msgstr "" -#: ../../mod/dfrn_request.php:364 +#: ../../mod/dfrn_request.php:365 msgid "Invalid profile URL." msgstr "" -#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20 +#: ../../mod/dfrn_request.php:371 ../../mod/follow.php:20 msgid "Disallowed profile URL." msgstr "" -#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102 +#: ../../mod/dfrn_request.php:440 ../../mod/contacts.php:102 msgid "Failed to update contact record." msgstr "" -#: ../../mod/dfrn_request.php:460 +#: ../../mod/dfrn_request.php:461 msgid "Your introduction has been sent." msgstr "" -#: ../../mod/dfrn_request.php:513 +#: ../../mod/dfrn_request.php:514 msgid "Please login to confirm introduction." msgstr "" -#: ../../mod/dfrn_request.php:527 +#: ../../mod/dfrn_request.php:528 msgid "" "Incorrect identity currently logged in. Please login to this profile." msgstr "" -#: ../../mod/dfrn_request.php:539 +#: ../../mod/dfrn_request.php:540 #, php-format msgid "Welcome home %s." msgstr "" -#: ../../mod/dfrn_request.php:540 +#: ../../mod/dfrn_request.php:541 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "" -#: ../../mod/dfrn_request.php:541 +#: ../../mod/dfrn_request.php:542 msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566 +#: ../../mod/dfrn_request.php:583 ../../include/items.php:2641 msgid "[Name Withheld]" msgstr "" -#: ../../mod/dfrn_request.php:666 +#: ../../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:669 +#: ../../mod/dfrn_request.php:670 msgid "" "Please enter your 'Identity Address' from one of the following supported " -"social networks:" +"communications networks:" msgstr "" -#: ../../mod/dfrn_request.php:672 +#: ../../mod/dfrn_request.php:686 +msgid "Connect as an email follower (Coming soon)" +msgstr "" + +#: ../../mod/dfrn_request.php:688 +msgid "" +"If you are not yet a member of the free social web, follow this link to find a public Friendica site " +"and join us today." +msgstr "" + +#: ../../mod/dfrn_request.php:691 msgid "Friend/Connection Request" msgstr "" -#: ../../mod/dfrn_request.php:673 +#: ../../mod/dfrn_request.php:692 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "" -#: ../../mod/dfrn_request.php:674 +#: ../../mod/dfrn_request.php:693 msgid "Please answer the following:" msgstr "" -#: ../../mod/dfrn_request.php:675 +#: ../../mod/dfrn_request.php:694 #, php-format msgid "Does %s know you?" msgstr "" -#: ../../mod/dfrn_request.php:678 +#: ../../mod/dfrn_request.php:697 msgid "Add a personal note:" msgstr "" -#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:699 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "" -#: ../../mod/dfrn_request.php:681 +#: ../../mod/dfrn_request.php:700 msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555 +#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:578 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" -#: ../../mod/dfrn_request.php:683 +#: ../../mod/dfrn_request.php:702 msgid "- please share from your own site as noted above" msgstr "" -#: ../../mod/dfrn_request.php:684 +#: ../../mod/dfrn_request.php:703 msgid "Your Identity Address:" msgstr "" -#: ../../mod/dfrn_request.php:685 +#: ../../mod/dfrn_request.php:706 msgid "Submit Request" msgstr "" @@ -1129,7 +1152,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:930 +#: ../../include/contact_widgets.php:9 ../../boot.php:980 msgid "Connect" msgstr "" @@ -1169,25 +1192,26 @@ msgstr "" msgid "System" msgstr "" -#: ../../mod/notifications.php:76 ../../include/nav.php:109 +#: ../../mod/notifications.php:76 ../../include/nav.php:113 msgid "Network" msgstr "" -#: ../../mod/notifications.php:81 ../../mod/network.php:177 +#: ../../mod/notifications.php:81 ../../mod/network.php:182 msgid "Personal" msgstr "" -#: ../../mod/notifications.php:86 ../../include/nav.php:73 -#: ../../include/nav.php:111 +#: ../../mod/notifications.php:86 ../../view/theme/diabook-blue/theme.php:215 +#: ../../view/theme/diabook/theme.php:221 ../../include/nav.php:77 +#: ../../include/nav.php:115 msgid "Home" msgstr "" -#: ../../mod/notifications.php:91 ../../include/nav.php:117 +#: ../../mod/notifications.php:91 ../../include/nav.php:121 msgid "Introductions" msgstr "" -#: ../../mod/notifications.php:96 ../../mod/message.php:76 -#: ../../include/nav.php:124 +#: ../../mod/notifications.php:96 ../../mod/message.php:103 +#: ../../include/nav.php:128 msgid "Messages" msgstr "" @@ -1226,7 +1250,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:489 msgid "Approve" msgstr "" @@ -1270,7 +1294,7 @@ msgstr "" msgid "No introductions." msgstr "" -#: ../../mod/notifications.php:212 ../../include/nav.php:118 +#: ../../mod/notifications.php:212 ../../include/nav.php:122 msgid "Notifications" msgstr "" @@ -1423,12 +1447,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:490 +#: ../../mod/admin.php:493 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:492 msgid "Block" msgstr "" @@ -1463,8 +1487,8 @@ msgstr "" msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:328 ../../mod/contacts.php:497 -#: ../../mod/viewcontacts.php:60 +#: ../../mod/contacts.php:328 ../../mod/contacts.php:501 +#: ../../mod/viewcontacts.php:62 #, php-format msgid "Visit %s's profile [%s]" msgstr "" @@ -1497,7 +1521,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:341 ../../mod/admin.php:905 +#: ../../mod/contacts.php:341 ../../mod/admin.php:914 msgid "Update now" msgstr "" @@ -1514,57 +1538,62 @@ msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/contacts.php:399 ../../mod/group.php:179 +#: ../../mod/contacts.php:399 +msgid "Suggestions" +msgstr "" + +#: ../../mod/contacts.php:404 ../../mod/group.php:191 msgid "All Contacts" msgstr "" -#: ../../mod/contacts.php:404 +#: ../../mod/contacts.php:409 msgid "Unblocked Contacts" msgstr "" -#: ../../mod/contacts.php:410 +#: ../../mod/contacts.php:415 msgid "Blocked Contacts" msgstr "" -#: ../../mod/contacts.php:416 +#: ../../mod/contacts.php:421 msgid "Ignored Contacts" msgstr "" -#: ../../mod/contacts.php:422 +#: ../../mod/contacts.php:427 msgid "Hidden Contacts" msgstr "" -#: ../../mod/contacts.php:473 +#: ../../mod/contacts.php:477 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:481 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:481 +#: ../../mod/contacts.php:485 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:498 ../../include/Contact.php:135 -#: ../../include/conversation.php:792 +#: ../../mod/contacts.php:502 ../../include/Contact.php:141 +#: ../../include/conversation.php:817 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:519 ../../include/nav.php:132 +#: ../../mod/contacts.php:523 ../../view/theme/diabook-blue/theme.php:217 +#: ../../view/theme/diabook/theme.php:223 ../../include/nav.php:139 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:523 +#: ../../mod/contacts.php:527 msgid "Search your contacts" msgstr "" -#: ../../mod/contacts.php:524 ../../mod/directory.php:67 +#: ../../mod/contacts.php:528 ../../mod/directory.php:57 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:525 ../../mod/directory.php:69 -#: ../../include/contact_widgets.php:34 +#: ../../mod/contacts.php:529 ../../mod/directory.php:59 +#: ../../include/contact_widgets.php:32 msgid "Find" msgstr "" @@ -1572,510 +1601,522 @@ msgstr "" msgid "No valid account found." msgstr "" -#: ../../mod/lostpass.php:31 +#: ../../mod/lostpass.php:32 msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/lostpass.php:42 +#: ../../mod/lostpass.php:43 #, php-format msgid "Password reset requested at %s" msgstr "" -#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106 -#: ../../mod/register.php:380 ../../mod/register.php:434 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726 -#: ../../include/items.php:2575 +#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 +#: ../../mod/register.php:390 ../../mod/register.php:444 +#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 +#: ../../addon/facebook/facebook.php:601 ../../include/items.php:2650 msgid "Administrator" msgstr "" -#: ../../mod/lostpass.php:64 +#: ../../mod/lostpass.php:65 msgid "" "Request could not be verified. (You may have previously submitted it.) " "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:82 ../../boot.php:723 +#: ../../mod/lostpass.php:83 ../../boot.php:773 msgid "Password Reset" msgstr "" -#: ../../mod/lostpass.php:83 +#: ../../mod/lostpass.php:84 msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/lostpass.php:84 +#: ../../mod/lostpass.php:85 msgid "Your new password is" msgstr "" -#: ../../mod/lostpass.php:85 +#: ../../mod/lostpass.php:86 msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/lostpass.php:86 +#: ../../mod/lostpass.php:87 msgid "click here to login" msgstr "" -#: ../../mod/lostpass.php:87 +#: ../../mod/lostpass.php:88 msgid "" "Your password may be changed from the Settings page after " "successful login." msgstr "" -#: ../../mod/lostpass.php:118 +#: ../../mod/lostpass.php:119 msgid "Forgot your Password?" msgstr "" -#: ../../mod/lostpass.php:119 +#: ../../mod/lostpass.php:120 msgid "" "Enter your email address and submit to have your password reset. Then check " "your email for further instructions." msgstr "" -#: ../../mod/lostpass.php:120 +#: ../../mod/lostpass.php:121 msgid "Nickname or Email: " msgstr "" -#: ../../mod/lostpass.php:121 +#: ../../mod/lostpass.php:122 msgid "Reset" msgstr "" -#: ../../mod/settings.php:72 +#: ../../mod/settings.php:76 msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75 +#: ../../mod/settings.php:79 ../../mod/settings.php:505 ../../mod/admin.php:75 msgid "Update" msgstr "" -#: ../../mod/settings.php:175 +#: ../../mod/settings.php:184 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: ../../mod/settings.php:180 +#: ../../mod/settings.php:189 msgid "Email settings updated." msgstr "" -#: ../../mod/settings.php:198 +#: ../../mod/settings.php:208 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/settings.php:203 +#: ../../mod/settings.php:213 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/settings.php:214 +#: ../../mod/settings.php:224 msgid "Password changed." msgstr "" -#: ../../mod/settings.php:216 +#: ../../mod/settings.php:226 msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:280 +#: ../../mod/settings.php:294 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:282 +#: ../../mod/settings.php:296 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:288 +#: ../../mod/settings.php:302 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:290 +#: ../../mod/settings.php:304 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321 +#: ../../mod/settings.php:375 ../../addon/facebook/facebook.php:441 #: ../../addon/impressum/impressum.php:64 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:422 ../../include/nav.php:130 +#: ../../mod/settings.php:439 ../../include/nav.php:137 msgid "Account settings" msgstr "" -#: ../../mod/settings.php:427 +#: ../../mod/settings.php:444 msgid "Connector settings" msgstr "" -#: ../../mod/settings.php:432 +#: ../../mod/settings.php:449 msgid "Plugin settings" msgstr "" -#: ../../mod/settings.php:437 +#: ../../mod/settings.php:454 msgid "Connections" msgstr "" -#: ../../mod/settings.php:442 +#: ../../mod/settings.php:459 msgid "Export personal data" msgstr "" -#: ../../mod/settings.php:459 ../../mod/settings.php:485 -#: ../../mod/settings.php:518 +#: ../../mod/settings.php:477 ../../mod/settings.php:504 +#: ../../mod/settings.php:540 msgid "Add application" msgstr "" -#: ../../mod/settings.php:463 ../../mod/settings.php:489 +#: ../../mod/settings.php:481 ../../mod/settings.php:508 #: ../../addon/statusnet/statusnet.php:526 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:464 ../../mod/settings.php:490 +#: ../../mod/settings.php:482 ../../mod/settings.php:509 #: ../../addon/statusnet/statusnet.php:525 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:465 ../../mod/settings.php:491 +#: ../../mod/settings.php:483 ../../mod/settings.php:510 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:466 ../../mod/settings.php:492 +#: ../../mod/settings.php:484 ../../mod/settings.php:511 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:477 +#: ../../mod/settings.php:495 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:517 +#: ../../mod/settings.php:539 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:521 +#: ../../mod/settings.php:543 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:522 +#: ../../mod/settings.php:544 msgid "No name" msgstr "" -#: ../../mod/settings.php:523 +#: ../../mod/settings.php:545 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:535 +#: ../../mod/settings.php:557 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122 +#: ../../mod/settings.php:565 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:555 ../../mod/settings.php:556 +#: ../../mod/settings.php:578 ../../mod/settings.php:579 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: ../../mod/settings.php:555 ../../mod/settings.php:556 +#: ../../mod/settings.php:578 ../../mod/settings.php:579 msgid "enabled" msgstr "" -#: ../../mod/settings.php:555 ../../mod/settings.php:556 +#: ../../mod/settings.php:578 ../../mod/settings.php:579 msgid "disabled" msgstr "" -#: ../../mod/settings.php:556 +#: ../../mod/settings.php:579 msgid "StatusNet" msgstr "" -#: ../../mod/settings.php:584 +#: ../../mod/settings.php:609 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:590 +#: ../../mod/settings.php:615 msgid "Email/Mailbox Setup" msgstr "" -#: ../../mod/settings.php:591 +#: ../../mod/settings.php:616 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:592 +#: ../../mod/settings.php:617 msgid "Last successful email check:" msgstr "" -#: ../../mod/settings.php:593 +#: ../../mod/settings.php:618 msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/settings.php:594 +#: ../../mod/settings.php:619 msgid "IMAP server name:" msgstr "" -#: ../../mod/settings.php:595 +#: ../../mod/settings.php:620 msgid "IMAP port:" msgstr "" -#: ../../mod/settings.php:596 +#: ../../mod/settings.php:621 msgid "Security:" msgstr "" -#: ../../mod/settings.php:596 ../../mod/settings.php:601 +#: ../../mod/settings.php:621 ../../mod/settings.php:626 msgid "None" msgstr "" -#: ../../mod/settings.php:597 +#: ../../mod/settings.php:622 msgid "Email login name:" msgstr "" -#: ../../mod/settings.php:598 +#: ../../mod/settings.php:623 msgid "Email password:" msgstr "" -#: ../../mod/settings.php:599 +#: ../../mod/settings.php:624 msgid "Reply-to address:" msgstr "" -#: ../../mod/settings.php:600 +#: ../../mod/settings.php:625 msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:626 msgid "Action after import:" msgstr "" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:626 msgid "Mark as seen" msgstr "" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:626 msgid "Move to folder" msgstr "" -#: ../../mod/settings.php:602 +#: ../../mod/settings.php:627 msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462 +#: ../../mod/settings.php:688 ../../mod/admin.php:142 ../../mod/admin.php:465 msgid "Normal Account" msgstr "" -#: ../../mod/settings.php:660 +#: ../../mod/settings.php:689 msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463 +#: ../../mod/settings.php:692 ../../mod/admin.php:143 ../../mod/admin.php:466 msgid "Soapbox Account" msgstr "" -#: ../../mod/settings.php:664 +#: ../../mod/settings.php:693 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464 +#: ../../mod/settings.php:696 ../../mod/admin.php:144 ../../mod/admin.php:467 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:697 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465 +#: ../../mod/settings.php:700 ../../mod/admin.php:145 ../../mod/admin.php:468 msgid "Automatic Friend Account" msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:701 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:711 msgid "OpenID:" msgstr "" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:711 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:692 +#: ../../mod/settings.php:721 msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/settings.php:698 +#: ../../mod/settings.php:727 msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/settings.php:706 +#: ../../mod/settings.php:735 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: ../../mod/settings.php:710 +#: ../../mod/settings.php:739 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/settings.php:715 +#: ../../mod/settings.php:744 msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/settings.php:721 +#: ../../mod/settings.php:750 msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/settings.php:727 +#: ../../mod/settings.php:756 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:736 +#: ../../mod/settings.php:765 msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206 +#: ../../mod/settings.php:797 ../../mod/profile_photo.php:211 msgid "or" msgstr "" -#: ../../mod/settings.php:773 +#: ../../mod/settings.php:802 msgid "Your Identity Address is" msgstr "" -#: ../../mod/settings.php:784 +#: ../../mod/settings.php:813 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:784 +#: ../../mod/settings.php:813 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:785 +#: ../../mod/settings.php:814 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:786 +#: ../../mod/settings.php:815 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:787 +#: ../../mod/settings.php:816 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:788 +#: ../../mod/settings.php:817 msgid "Expire personal notes:" msgstr "" -#: ../../mod/settings.php:789 +#: ../../mod/settings.php:818 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:790 +#: ../../mod/settings.php:819 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:795 +#: ../../mod/settings.php:824 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:803 +#: ../../mod/settings.php:833 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:804 +#: ../../mod/settings.php:834 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:835 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:835 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:809 +#: ../../mod/settings.php:839 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:840 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "" -#: ../../mod/settings.php:811 +#: ../../mod/settings.php:841 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:812 +#: ../../mod/settings.php:842 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:813 +#: ../../mod/settings.php:843 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:814 +#: ../../mod/settings.php:844 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:815 +#: ../../mod/settings.php:845 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:816 +#: ../../mod/settings.php:846 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:816 +#: ../../mod/settings.php:846 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:818 -msgid "Security and Privacy Settings" +#: ../../mod/settings.php:847 +msgid "Number of items to display on the network page:" msgstr "" -#: ../../mod/settings.php:820 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: ../../mod/settings.php:820 -msgid "(to prevent spam abuse)" -msgstr "" - -#: ../../mod/settings.php:821 -msgid "Default Post Permissions" -msgstr "" - -#: ../../mod/settings.php:822 -msgid "(click to open/close)" -msgstr "" - -#: ../../mod/settings.php:837 -msgid "Notification Settings" -msgstr "" - -#: ../../mod/settings.php:838 -msgid "Send a notification email when:" -msgstr "" - -#: ../../mod/settings.php:839 -msgid "You receive an introduction" -msgstr "" - -#: ../../mod/settings.php:840 -msgid "Your introductions are confirmed" -msgstr "" - -#: ../../mod/settings.php:841 -msgid "Someone writes on your profile wall" -msgstr "" - -#: ../../mod/settings.php:842 -msgid "Someone writes a followup comment" -msgstr "" - -#: ../../mod/settings.php:843 -msgid "You receive a private message" -msgstr "" - -#: ../../mod/settings.php:844 -msgid "You receive a friend suggestion" -msgstr "" - -#: ../../mod/settings.php:845 -msgid "You are tagged in a post" +#: ../../mod/settings.php:847 +msgid "Maximum of 100 items" msgstr "" #: ../../mod/settings.php:848 +msgid "Don't show emoticons" +msgstr "" + +#: ../../mod/settings.php:850 +msgid "Security and Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:852 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: ../../mod/settings.php:852 +msgid "(to prevent spam abuse)" +msgstr "" + +#: ../../mod/settings.php:853 +msgid "Default Post Permissions" +msgstr "" + +#: ../../mod/settings.php:854 +msgid "(click to open/close)" +msgstr "" + +#: ../../mod/settings.php:869 +msgid "Notification Settings" +msgstr "" + +#: ../../mod/settings.php:870 +msgid "Send a notification email when:" +msgstr "" + +#: ../../mod/settings.php:871 +msgid "You receive an introduction" +msgstr "" + +#: ../../mod/settings.php:872 +msgid "Your introductions are confirmed" +msgstr "" + +#: ../../mod/settings.php:873 +msgid "Someone writes on your profile wall" +msgstr "" + +#: ../../mod/settings.php:874 +msgid "Someone writes a followup comment" +msgstr "" + +#: ../../mod/settings.php:875 +msgid "You receive a private message" +msgstr "" + +#: ../../mod/settings.php:876 +msgid "You receive a friend suggestion" +msgstr "" + +#: ../../mod/settings.php:877 +msgid "You are tagged in a post" +msgstr "" + +#: ../../mod/settings.php:880 msgid "Advanced Page Settings" msgstr "" @@ -2097,39 +2138,39 @@ msgstr "" msgid "Search Results For:" msgstr "" -#: ../../mod/network.php:77 ../../mod/search.php:16 +#: ../../mod/network.php:82 ../../mod/search.php:16 msgid "Remove term" msgstr "" -#: ../../mod/network.php:86 ../../mod/search.php:13 +#: ../../mod/network.php:91 ../../mod/search.php:13 msgid "Saved Searches" msgstr "" -#: ../../mod/network.php:87 ../../include/group.php:216 +#: ../../mod/network.php:92 ../../include/group.php:216 msgid "add" msgstr "" -#: ../../mod/network.php:166 +#: ../../mod/network.php:171 msgid "Commented Order" msgstr "" -#: ../../mod/network.php:171 +#: ../../mod/network.php:176 msgid "Posted Order" msgstr "" -#: ../../mod/network.php:182 +#: ../../mod/network.php:187 msgid "New" msgstr "" -#: ../../mod/network.php:187 +#: ../../mod/network.php:192 msgid "Starred" msgstr "" -#: ../../mod/network.php:192 -msgid "Bookmarks" +#: ../../mod/network.php:197 +msgid "Shared Links" msgstr "" -#: ../../mod/network.php:250 +#: ../../mod/network.php:270 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2137,39 +2178,39 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../../mod/network.php:253 +#: ../../mod/network.php:273 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:298 +#: ../../mod/network.php:318 msgid "No such group" msgstr "" -#: ../../mod/network.php:309 +#: ../../mod/network.php:329 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:313 +#: ../../mod/network.php:333 msgid "Group: " msgstr "" -#: ../../mod/network.php:323 +#: ../../mod/network.php:343 msgid "Contact: " msgstr "" -#: ../../mod/network.php:325 +#: ../../mod/network.php:345 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:330 +#: ../../mod/network.php:350 msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1354 +#: ../../mod/notes.php:44 ../../boot.php:1404 msgid "Personal Notes" msgstr "" -#: ../../mod/notes.php:63 ../../include/text.php:645 +#: ../../mod/notes.php:63 ../../mod/filer.php:29 ../../include/text.php:647 msgid "Save" msgstr "" @@ -2288,51 +2329,51 @@ msgstr "" msgid "Item was not found." msgstr "" -#: ../../mod/group.php:27 +#: ../../mod/group.php:29 msgid "Group created." msgstr "" -#: ../../mod/group.php:33 +#: ../../mod/group.php:35 msgid "Could not create group." msgstr "" -#: ../../mod/group.php:43 ../../mod/group.php:127 +#: ../../mod/group.php:47 ../../mod/group.php:137 msgid "Group not found." msgstr "" -#: ../../mod/group.php:56 +#: ../../mod/group.php:60 msgid "Group name changed." msgstr "" -#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:290 msgid "Permission denied" msgstr "" -#: ../../mod/group.php:85 +#: ../../mod/group.php:90 msgid "Create a group of contacts/friends." msgstr "" -#: ../../mod/group.php:86 ../../mod/group.php:166 +#: ../../mod/group.php:91 ../../mod/group.php:177 msgid "Group Name: " msgstr "" -#: ../../mod/group.php:102 +#: ../../mod/group.php:110 msgid "Group removed." msgstr "" -#: ../../mod/group.php:104 +#: ../../mod/group.php:112 msgid "Unable to remove group." msgstr "" -#: ../../mod/group.php:165 +#: ../../mod/group.php:176 msgid "Group Editor" msgstr "" -#: ../../mod/group.php:177 +#: ../../mod/group.php:189 msgid "Members" msgstr "" -#: ../../mod/group.php:209 ../../mod/profperm.php:105 +#: ../../mod/group.php:221 ../../mod/profperm.php:105 msgid "Click on a contact to add or remove." msgstr "" @@ -2344,9 +2385,10 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7 -#: ../../include/profile_advanced.php:76 ../../include/nav.php:48 -#: ../../boot.php:1336 +#: ../../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 msgid "Profile" msgstr "" @@ -2362,7 +2404,7 @@ msgstr "" msgid "No contacts." msgstr "" -#: ../../mod/viewcontacts.php:74 ../../include/text.php:584 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:584 msgid "View Contacts" msgstr "" @@ -2412,107 +2454,113 @@ msgid "" "must also begin with a letter." msgstr "" -#: ../../mod/register.php:151 ../../mod/register.php:252 +#: ../../mod/register.php:151 ../../mod/register.php:262 msgid "Nickname is already registered. Please choose another." msgstr "" -#: ../../mod/register.php:170 +#: ../../mod/register.php:161 +msgid "" +"Nickname was once registered here and may not be re-used. Please choose " +"another." +msgstr "" + +#: ../../mod/register.php:180 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "" -#: ../../mod/register.php:238 +#: ../../mod/register.php:248 msgid "An error occurred during registration. Please try again." msgstr "" -#: ../../mod/register.php:274 +#: ../../mod/register.php:284 msgid "An error occurred creating your default profile. Please try again." msgstr "" -#: ../../mod/register.php:378 ../../mod/regmod.php:52 +#: ../../mod/register.php:388 ../../mod/regmod.php:52 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../mod/register.php:386 +#: ../../mod/register.php:396 msgid "" "Registration successful. Please check your email for further instructions." msgstr "" -#: ../../mod/register.php:390 +#: ../../mod/register.php:400 msgid "Failed to send email message. Here is the message that failed." msgstr "" -#: ../../mod/register.php:395 +#: ../../mod/register.php:405 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:432 +#: ../../mod/register.php:442 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../mod/register.php:441 +#: ../../mod/register.php:451 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:479 +#: ../../mod/register.php:489 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../mod/register.php:505 +#: ../../mod/register.php:515 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "" -#: ../../mod/register.php:506 +#: ../../mod/register.php:516 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:507 +#: ../../mod/register.php:517 msgid "Your OpenID (optional): " msgstr "" -#: ../../mod/register.php:521 +#: ../../mod/register.php:531 msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/register.php:536 +#: ../../mod/register.php:546 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:537 +#: ../../mod/register.php:547 msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:540 ../../mod/admin.php:314 +#: ../../mod/register.php:550 ../../mod/admin.php:317 msgid "Registration" msgstr "" -#: ../../mod/register.php:548 +#: ../../mod/register.php:558 msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/register.php:549 +#: ../../mod/register.php:559 msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:550 +#: ../../mod/register.php:560 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be 'nickname@$sitename'." msgstr "" -#: ../../mod/register.php:551 +#: ../../mod/register.php:561 msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:693 +#: ../../mod/register.php:564 ../../include/nav.php:81 ../../boot.php:739 msgid "Register" msgstr "" @@ -2521,18 +2569,23 @@ msgid "People Search" msgstr "" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1092 +#: ../../addon/facebook/facebook.php:1327 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../include/diaspora.php:1600 ../../include/conversation.php:48 +#: ../../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 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 msgid "status" msgstr "" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1096 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1331 #: ../../addon/communityhome/communityhome.php:172 -#: ../../include/diaspora.php:1616 ../../include/conversation.php:65 +#: ../../view/theme/diabook-blue/theme.php:91 +#: ../../view/theme/diabook/theme.php:94 ../../include/diaspora.php:1658 +#: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" @@ -2543,13 +2596,12 @@ 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:522 ../../mod/admin.php:700 ../../mod/display.php:29 -#: ../../mod/display.php:137 ../../mod/viewd.php:14 -#: ../../include/items.php:2942 +#: ../../mod/admin.php:525 ../../mod/admin.php:704 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3022 msgid "Item not found." msgstr "" -#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6 +#: ../../mod/viewsrc.php:7 msgid "Access denied." msgstr "" @@ -2557,12 +2609,12 @@ msgstr "" msgid "Account approved." msgstr "" -#: ../../mod/regmod.php:93 +#: ../../mod/regmod.php:98 #, php-format msgid "Registration revoked for %s" msgstr "" -#: ../../mod/regmod.php:105 +#: ../../mod/regmod.php:110 msgid "Please login." msgstr "" @@ -2570,100 +2622,100 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:249 +#: ../../mod/item.php:251 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:351 ../../mod/wall_upload.php:81 +#: ../../mod/item.php:362 ../../mod/wall_upload.php:81 #: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97 #: ../../include/message.php:143 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:833 +#: ../../mod/item.php:745 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:858 +#: ../../mod/item.php:770 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:860 +#: ../../mod/item.php:772 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:861 +#: ../../mod/item.php:773 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:863 +#: ../../mod/item.php:775 #, php-format msgid "%s posted an update." msgstr "" -#: ../../mod/profile_photo.php:28 +#: ../../mod/profile_photo.php:30 msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 -#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258 +#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70 +#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264 #, php-format msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/profile_photo.php:89 +#: ../../mod/profile_photo.php:91 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" -#: ../../mod/profile_photo.php:99 +#: ../../mod/profile_photo.php:101 msgid "Unable to process image" msgstr "" -#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56 +#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:56 #, php-format msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/profile_photo.php:203 +#: ../../mod/profile_photo.php:207 msgid "Upload File:" msgstr "" -#: ../../mod/profile_photo.php:204 +#: ../../mod/profile_photo.php:208 msgid "Upload Profile Photo" msgstr "" -#: ../../mod/profile_photo.php:205 +#: ../../mod/profile_photo.php:209 msgid "Upload" msgstr "" -#: ../../mod/profile_photo.php:206 +#: ../../mod/profile_photo.php:211 msgid "skip this step" msgstr "" -#: ../../mod/profile_photo.php:206 +#: ../../mod/profile_photo.php:211 msgid "select a photo from your photo albums" msgstr "" -#: ../../mod/profile_photo.php:219 +#: ../../mod/profile_photo.php:224 msgid "Crop Image" msgstr "" -#: ../../mod/profile_photo.php:220 +#: ../../mod/profile_photo.php:225 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../mod/profile_photo.php:221 +#: ../../mod/profile_photo.php:227 msgid "Done Editing" msgstr "" -#: ../../mod/profile_photo.php:249 +#: ../../mod/profile_photo.php:255 msgid "Image uploaded successfully." msgstr "" @@ -2685,88 +2737,97 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/message.php:23 -msgid "No recipient selected." -msgstr "" - -#: ../../mod/message.php:26 -msgid "Unable to locate contact information." -msgstr "" - -#: ../../mod/message.php:29 -msgid "Message could not be sent." -msgstr "" - -#: ../../mod/message.php:32 -msgid "Message collection failure." -msgstr "" - -#: ../../mod/message.php:35 -msgid "Message sent." -msgstr "" - -#: ../../mod/message.php:55 -msgid "Inbox" -msgstr "" - -#: ../../mod/message.php:60 -msgid "Outbox" -msgstr "" - -#: ../../mod/message.php:65 +#: ../../mod/message.php:22 ../../include/nav.php:131 msgid "New Message" msgstr "" -#: ../../mod/message.php:91 +#: ../../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 "" -#: ../../mod/message.php:121 +#: ../../mod/message.php:148 msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:137 ../../include/conversation.php:887 +#: ../../mod/message.php:170 ../../include/conversation.php:914 msgid "Please enter a link URL:" msgstr "" -#: ../../mod/message.php:145 +#: ../../mod/message.php:178 msgid "Send Private Message" msgstr "" -#: ../../mod/message.php:146 ../../mod/message.php:287 +#: ../../mod/message.php:179 ../../mod/message.php:342 msgid "To:" msgstr "" -#: ../../mod/message.php:147 ../../mod/message.php:288 +#: ../../mod/message.php:180 ../../mod/message.php:343 msgid "Subject:" msgstr "" -#: ../../mod/message.php:150 ../../mod/message.php:291 -#: ../../mod/invite.php:101 +#: ../../mod/message.php:184 ../../mod/message.php:346 +#: ../../mod/invite.php:113 msgid "Your message:" msgstr "" -#: ../../mod/message.php:188 +#: ../../mod/message.php:223 msgid "No messages." msgstr "" -#: ../../mod/message.php:201 +#: ../../mod/message.php:230 +#, php-format +msgid "You and %s" +msgstr "" + +#: ../../mod/message.php:232 +#, php-format +msgid "%s and You" +msgstr "" + +#: ../../mod/message.php:242 ../../mod/message.php:336 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:204 +#: ../../mod/message.php:245 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:239 +#: ../../mod/message.php:247 +#, php-format +msgid "%d message" +msgid_plural "%d messages" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/message.php:282 msgid "Message not available." msgstr "" -#: ../../mod/message.php:276 +#: ../../mod/message.php:320 msgid "Delete message" msgstr "" -#: ../../mod/message.php:286 +#: ../../mod/message.php:341 msgid "Send Reply" msgstr "" @@ -2779,23 +2840,23 @@ msgstr "" msgid "No friends to display." msgstr "" -#: ../../mod/admin.php:71 ../../mod/admin.php:312 +#: ../../mod/admin.php:71 ../../mod/admin.php:315 msgid "Site" msgstr "" -#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492 +#: ../../mod/admin.php:72 ../../mod/admin.php:483 ../../mod/admin.php:495 msgid "Users" msgstr "" -#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608 +#: ../../mod/admin.php:73 ../../mod/admin.php:572 ../../mod/admin.php:612 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775 +#: ../../mod/admin.php:74 ../../mod/admin.php:750 ../../mod/admin.php:784 msgid "Themes" msgstr "" -#: ../../mod/admin.php:89 ../../mod/admin.php:855 +#: ../../mod/admin.php:89 ../../mod/admin.php:864 msgid "Logs" msgstr "" @@ -2803,447 +2864,471 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479 -#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741 -#: ../../mod/admin.php:774 ../../mod/admin.php:854 +#: ../../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 msgid "Administration" msgstr "" -#: ../../mod/admin.php:162 +#: ../../mod/admin.php:158 msgid "Summary" msgstr "" -#: ../../mod/admin.php:163 +#: ../../mod/admin.php:159 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:165 +#: ../../mod/admin.php:161 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:166 +#: ../../mod/admin.php:162 msgid "Version" msgstr "" -#: ../../mod/admin.php:168 +#: ../../mod/admin.php:164 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:260 +#: ../../mod/admin.php:257 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:304 +#: ../../mod/admin.php:301 msgid "Closed" msgstr "" -#: ../../mod/admin.php:305 +#: ../../mod/admin.php:302 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:306 +#: ../../mod/admin.php:303 msgid "Open" msgstr "" -#: ../../mod/admin.php:315 +#: ../../mod/admin.php:307 +msgid "No SSL policy, links will track page SSL state" +msgstr "" + +#: ../../mod/admin.php:308 +msgid "Force all links to use SSL" +msgstr "" + +#: ../../mod/admin.php:309 +msgid "Self-signed certificate, use SSL for local links only (discouraged)" +msgstr "" + +#: ../../mod/admin.php:318 msgid "File upload" msgstr "" -#: ../../mod/admin.php:316 +#: ../../mod/admin.php:319 msgid "Policies" msgstr "" -#: ../../mod/admin.php:317 +#: ../../mod/admin.php:320 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523 +#: ../../mod/admin.php:324 ../../addon/statusnet/statusnet.php:523 msgid "Site name" msgstr "" -#: ../../mod/admin.php:322 +#: ../../mod/admin.php:325 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:323 +#: ../../mod/admin.php:326 msgid "System language" msgstr "" -#: ../../mod/admin.php:324 +#: ../../mod/admin.php:327 msgid "System theme" msgstr "" -#: ../../mod/admin.php:324 +#: ../../mod/admin.php:327 msgid "Default system theme - may be over-ridden by user profiles" msgstr "" -#: ../../mod/admin.php:326 +#: ../../mod/admin.php:328 +msgid "SSL link policy" +msgstr "" + +#: ../../mod/admin.php:328 +msgid "Determines whether generated links should be forced to use SSL" +msgstr "" + +#: ../../mod/admin.php:329 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:326 +#: ../../mod/admin.php:329 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:328 +#: ../../mod/admin.php:331 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:332 msgid "Register text" msgstr "" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:332 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:333 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:333 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:331 +#: ../../mod/admin.php:334 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:331 +#: ../../mod/admin.php:334 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:332 +#: ../../mod/admin.php:335 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:332 +#: ../../mod/admin.php:335 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:333 +#: ../../mod/admin.php:336 msgid "Block public" msgstr "" -#: ../../mod/admin.php:333 +#: ../../mod/admin.php:336 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:334 +#: ../../mod/admin.php:337 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:334 +#: ../../mod/admin.php:337 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:335 +#: ../../mod/admin.php:338 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:335 +#: ../../mod/admin.php:338 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:337 +#: ../../mod/admin.php:340 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:337 +#: ../../mod/admin.php:340 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:338 +#: ../../mod/admin.php:341 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:338 +#: ../../mod/admin.php:341 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:339 +#: ../../mod/admin.php:342 msgid "Gravatar support" msgstr "" -#: ../../mod/admin.php:339 +#: ../../mod/admin.php:342 msgid "Search new user's photo on Gravatar." msgstr "" -#: ../../mod/admin.php:340 +#: ../../mod/admin.php:343 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:340 +#: ../../mod/admin.php:343 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:341 +#: ../../mod/admin.php:344 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:341 +#: ../../mod/admin.php:344 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:342 +#: ../../mod/admin.php:345 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:342 +#: ../../mod/admin.php:345 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:343 +#: ../../mod/admin.php:346 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:343 +#: ../../mod/admin.php:346 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:344 +#: ../../mod/admin.php:347 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:344 +#: ../../mod/admin.php:347 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:345 +#: ../../mod/admin.php:348 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:345 +#: ../../mod/admin.php:348 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:346 +#: ../../mod/admin.php:349 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:346 +#: ../../mod/admin.php:349 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:347 +#: ../../mod/admin.php:350 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:348 +#: ../../mod/admin.php:351 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:349 +#: ../../mod/admin.php:352 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:349 +#: ../../mod/admin.php:352 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:370 +#: ../../mod/admin.php:373 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:377 +#: ../../mod/admin.php:380 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:414 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:421 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:421 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:485 msgid "select all" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:486 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:487 msgid "Request date" msgstr "" -#: ../../mod/admin.php:484 ../../mod/admin.php:493 +#: ../../mod/admin.php:487 ../../mod/admin.php:496 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:488 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:490 msgid "Deny" msgstr "" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:496 msgid "Register date" msgstr "" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:496 msgid "Last login" msgstr "" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:496 msgid "Last item" msgstr "" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:496 msgid "Account" msgstr "" -#: ../../mod/admin.php:495 +#: ../../mod/admin.php:498 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:496 +#: ../../mod/admin.php:499 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:532 +#: ../../mod/admin.php:535 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:536 +#: ../../mod/admin.php:539 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:546 ../../mod/admin.php:724 +#: ../../mod/admin.php:549 ../../mod/admin.php:728 msgid "Disable" msgstr "" -#: ../../mod/admin.php:548 ../../mod/admin.php:726 +#: ../../mod/admin.php:551 ../../mod/admin.php:730 msgid "Enable" msgstr "" -#: ../../mod/admin.php:570 ../../mod/admin.php:743 +#: ../../mod/admin.php:573 ../../mod/admin.php:751 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130 +#: ../../mod/admin.php:574 ../../mod/admin.php:752 ../../include/nav.php:137 msgid "Settings" msgstr "" -#: ../../mod/admin.php:578 ../../mod/admin.php:753 +#: ../../mod/admin.php:581 ../../mod/admin.php:761 msgid "Author: " msgstr "" -#: ../../mod/admin.php:579 ../../mod/admin.php:754 +#: ../../mod/admin.php:582 ../../mod/admin.php:762 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:689 +#: ../../mod/admin.php:693 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:780 +#: ../../mod/admin.php:743 +msgid "Screenshot" +msgstr "" + +#: ../../mod/admin.php:789 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:781 +#: ../../mod/admin.php:790 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:804 +#: ../../mod/admin.php:813 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:857 +#: ../../mod/admin.php:866 msgid "Clear" msgstr "" -#: ../../mod/admin.php:863 +#: ../../mod/admin.php:872 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:864 +#: ../../mod/admin.php:873 msgid "Log file" msgstr "" -#: ../../mod/admin.php:864 +#: ../../mod/admin.php:873 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:865 +#: ../../mod/admin.php:874 msgid "Log level" msgstr "" -#: ../../mod/admin.php:906 +#: ../../mod/admin.php:915 msgid "Close" msgstr "" -#: ../../mod/admin.php:912 +#: ../../mod/admin.php:921 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:913 +#: ../../mod/admin.php:922 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:914 +#: ../../mod/admin.php:923 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:915 +#: ../../mod/admin.php:924 msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:15 ../../boot.php:845 +#: ../../mod/profile.php:15 ../../boot.php:895 msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:111 ../../mod/display.php:67 +#: ../../mod/profile.php:111 ../../mod/display.php:75 msgid "Access to this profile has been restricted." msgstr "" @@ -3251,53 +3336,62 @@ msgstr "" msgid "Tips for New Members" msgstr "" -#: ../../mod/ping.php:174 +#: ../../mod/ping.php:175 msgid "{0} wants to be your friend" msgstr "" -#: ../../mod/ping.php:179 +#: ../../mod/ping.php:180 msgid "{0} sent you a message" msgstr "" -#: ../../mod/ping.php:184 +#: ../../mod/ping.php:185 msgid "{0} requested registration" msgstr "" -#: ../../mod/ping.php:190 +#: ../../mod/ping.php:191 #, php-format msgid "{0} commented %s's post" msgstr "" -#: ../../mod/ping.php:195 +#: ../../mod/ping.php:196 #, php-format msgid "{0} liked %s's post" msgstr "" -#: ../../mod/ping.php:200 +#: ../../mod/ping.php:201 #, php-format msgid "{0} disliked %s's post" msgstr "" -#: ../../mod/ping.php:205 +#: ../../mod/ping.php:206 #, php-format msgid "{0} is now friends with %s" msgstr "" -#: ../../mod/ping.php:210 +#: ../../mod/ping.php:211 msgid "{0} posted" msgstr "" -#: ../../mod/ping.php:215 +#: ../../mod/ping.php:216 #, php-format msgid "{0} tagged %s's post with #%s" msgstr "" -#: ../../mod/ping.php:221 +#: ../../mod/ping.php:222 msgid "{0} mentioned you in a post" msgstr "" -#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90 -#: ../../include/auth.php:115 ../../include/auth.php:169 +#: ../../mod/openid.php:24 +msgid "OpenID protocol error. No ID returned." +msgstr "" + +#: ../../mod/openid.php:53 +msgid "" +"Account not found and OpenID registration is not permitted on this site." +msgstr "" + +#: ../../mod/openid.php:93 ../../include/auth.php:90 +#: ../../include/auth.php:149 msgid "Login failed." msgstr "" @@ -3354,7 +3448,7 @@ msgstr "" msgid "No friends in common." msgstr "" -#: ../../mod/display.php:130 +#: ../../mod/display.php:135 msgid "Item has been removed." msgstr "" @@ -3370,222 +3464,230 @@ msgstr "" msgid "Search This Site" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:239 -#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:242 +#: ../../mod/profiles.php:356 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" -#: ../../mod/profiles.php:28 +#: ../../mod/profiles.php:31 msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:198 +#: ../../mod/profiles.php:201 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:256 +#: ../../mod/profiles.php:261 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:272 ../../mod/profiles.php:303 +#: ../../mod/profiles.php:279 ../../mod/profiles.php:313 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:291 ../../mod/profiles.php:330 +#: ../../mod/profiles.php:298 ../../mod/profiles.php:340 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:309 +#: ../../mod/profiles.php:319 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:356 +#: ../../mod/profiles.php:368 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:374 +#: ../../mod/profiles.php:389 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:376 +#: ../../mod/profiles.php:391 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:377 +#: ../../mod/profiles.php:392 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:378 +#: ../../mod/profiles.php:393 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:379 +#: ../../mod/profiles.php:394 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:380 +#: ../../mod/profiles.php:395 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:381 +#: ../../mod/profiles.php:396 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:382 +#: ../../mod/profiles.php:397 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:383 +#: ../../mod/profiles.php:398 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:384 +#: ../../mod/profiles.php:399 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:385 +#: ../../mod/profiles.php:400 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:386 +#: ../../mod/profiles.php:401 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:387 +#: ../../mod/profiles.php:402 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:388 +#: ../../mod/profiles.php:403 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:389 +#: ../../mod/profiles.php:404 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:390 +#: ../../mod/profiles.php:405 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:391 +#: ../../mod/profiles.php:406 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:392 +#: ../../mod/profiles.php:407 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43 +#: ../../mod/profiles.php:408 ../../include/profile_advanced.php:43 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:394 +#: ../../mod/profiles.php:409 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49 +#: ../../mod/profiles.php:410 ../../include/profile_advanced.php:49 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:396 +#: ../../mod/profiles.php:411 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:397 +#: ../../mod/profiles.php:412 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:398 +#: ../../mod/profiles.php:413 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:399 +#: ../../mod/profiles.php:414 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:400 +#: ../../mod/profiles.php:415 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:401 +#: ../../mod/profiles.php:416 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:402 +#: ../../mod/profiles.php:417 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:403 +#: ../../mod/profiles.php:418 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:404 +#: ../../mod/profiles.php:419 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:405 +#: ../../mod/profiles.php:420 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:406 +#: ../../mod/profiles.php:421 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:407 +#: ../../mod/profiles.php:422 msgid "Television" msgstr "" -#: ../../mod/profiles.php:408 +#: ../../mod/profiles.php:423 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:409 +#: ../../mod/profiles.php:424 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:410 +#: ../../mod/profiles.php:425 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:411 +#: ../../mod/profiles.php:426 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:416 +#: ../../mod/profiles.php:431 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:426 ../../mod/directory.php:124 +#: ../../mod/profiles.php:441 ../../mod/directory.php:111 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:461 +#: ../../mod/profiles.php:476 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:462 ../../boot.php:946 +#: ../../mod/profiles.php:477 ../../boot.php:996 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:463 ../../boot.php:947 +#: ../../mod/profiles.php:478 ../../boot.php:997 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:473 ../../boot.php:957 +#: ../../mod/profiles.php:489 ../../boot.php:1007 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:475 ../../boot.php:960 +#: ../../mod/profiles.php:491 ../../boot.php:1010 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:476 ../../boot.php:961 +#: ../../mod/profiles.php:492 ../../boot.php:1011 msgid "Edit visibility" msgstr "" +#: ../../mod/filer.php:28 ../../include/conversation.php:918 +msgid "Save to Folder:" +msgstr "" + +#: ../../mod/filer.php:28 +msgid "- select -" +msgstr "" + #: ../../mod/tagger.php:103 ../../include/conversation.php:138 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" @@ -3626,7 +3728,8 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35 +#: ../../mod/suggest.php:38 ../../view/theme/diabook-blue/theme.php:144 +#: ../../view/theme/diabook/theme.php:147 ../../include/contact_widgets.php:33 msgid "Friend Suggestions" msgstr "" @@ -3640,31 +3743,23 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:51 +#: ../../mod/directory.php:47 msgid "Global Directory" msgstr "" -#: ../../mod/directory.php:57 -msgid "Normal site view" -msgstr "" - -#: ../../mod/directory.php:59 -msgid "Admin - View all site entries" -msgstr "" - -#: ../../mod/directory.php:65 +#: ../../mod/directory.php:55 msgid "Find on this site" msgstr "" -#: ../../mod/directory.php:68 +#: ../../mod/directory.php:58 msgid "Site Directory" msgstr "" -#: ../../mod/directory.php:127 +#: ../../mod/directory.php:114 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:153 +#: ../../mod/directory.php:140 msgid "No entries (some entries may be hidden)." msgstr "" @@ -3674,8 +3769,7 @@ msgid "%s : Not a valid email address." msgstr "" #: ../../mod/invite.php:59 -#, php-format -msgid "Please join my network on %s" +msgid "Please join us on Friendica" msgstr "" #: ../../mod/invite.php:69 @@ -3694,179 +3788,212 @@ msgstr[1] "" msgid "You have no more invitations available" msgstr "" -#: ../../mod/invite.php:99 -msgid "Send invitations" -msgstr "" - #: ../../mod/invite.php:100 -msgid "Enter email addresses, one per line:" +#, php-format +msgid "" +"Visit %s for a list of public sites that you can join. Friendica members on " +"other sites can all connect with each other, as well as with members of many " +"other social networks." msgstr "" #: ../../mod/invite.php:102 #, php-format -msgid "Please join my social network on %s" +msgid "" +"To accept this invitation, please visit and register at %s or any other " +"public Friendica website." msgstr "" #: ../../mod/invite.php:103 -msgid "To accept this invitation, please visit:" +#, php-format +msgid "" +"Friendica sites all inter-connect to create a huge privacy-enhanced social " +"web that is owned and controlled by its members. They can also connect with " +"many traditional social networks. See %s for a list of alternate Friendica " +"sites you can join." msgstr "" -#: ../../mod/invite.php:104 +#: ../../mod/invite.php:106 +msgid "" +"Our apologies. This system is not currently configured to connect with other " +"public sites or invite members." +msgstr "" + +#: ../../mod/invite.php:111 +msgid "Send invitations" +msgstr "" + +#: ../../mod/invite.php:112 +msgid "Enter email addresses, one per line:" +msgstr "" + +#: ../../mod/invite.php:114 +msgid "" +"You are cordially invited to join me and other close friends on Friendica - " +"and help us to create a better social web." +msgstr "" + +#: ../../mod/invite.php:116 msgid "You will need to supply this invitation code: $invite_code" msgstr "" -#: ../../mod/invite.php:104 +#: ../../mod/invite.php:116 msgid "" "Once you have registered, please connect with me via my profile page at:" msgstr "" +#: ../../mod/invite.php:118 +msgid "" +"For more information about the Friendica project and why we feel it is " +"important, please visit http://friendica.com" +msgstr "" + #: ../../mod/dfrn_confirm.php:119 msgid "" "This may occasionally happen if contact was requested by both persons and it " "has already been approved." msgstr "" -#: ../../mod/dfrn_confirm.php:239 +#: ../../mod/dfrn_confirm.php:242 msgid "Response from remote site was not understood." msgstr "" -#: ../../mod/dfrn_confirm.php:248 +#: ../../mod/dfrn_confirm.php:251 msgid "Unexpected response from remote site: " msgstr "" -#: ../../mod/dfrn_confirm.php:256 +#: ../../mod/dfrn_confirm.php:259 msgid "Confirmation completed successfully." msgstr "" -#: ../../mod/dfrn_confirm.php:258 ../../mod/dfrn_confirm.php:272 -#: ../../mod/dfrn_confirm.php:279 +#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275 +#: ../../mod/dfrn_confirm.php:282 msgid "Remote site reported: " msgstr "" -#: ../../mod/dfrn_confirm.php:270 +#: ../../mod/dfrn_confirm.php:273 msgid "Temporary failure. Please wait and try again." msgstr "" -#: ../../mod/dfrn_confirm.php:277 +#: ../../mod/dfrn_confirm.php:280 msgid "Introduction failed or was revoked." msgstr "" -#: ../../mod/dfrn_confirm.php:422 +#: ../../mod/dfrn_confirm.php:425 msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:495 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" msgstr "" -#: ../../mod/dfrn_confirm.php:544 +#: ../../mod/dfrn_confirm.php:548 #, php-format msgid "No user record found for '%s' " msgstr "" -#: ../../mod/dfrn_confirm.php:554 +#: ../../mod/dfrn_confirm.php:558 msgid "Our site encryption key is apparently messed up." msgstr "" -#: ../../mod/dfrn_confirm.php:565 +#: ../../mod/dfrn_confirm.php:569 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "" -#: ../../mod/dfrn_confirm.php:586 +#: ../../mod/dfrn_confirm.php:590 msgid "Contact record was not found for you on our site." msgstr "" -#: ../../mod/dfrn_confirm.php:600 +#: ../../mod/dfrn_confirm.php:604 #, php-format msgid "Site public key not available in contact record for URL %s." msgstr "" -#: ../../mod/dfrn_confirm.php:620 +#: ../../mod/dfrn_confirm.php:624 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "" -#: ../../mod/dfrn_confirm.php:631 +#: ../../mod/dfrn_confirm.php:635 msgid "Unable to set your contact credentials on our system." msgstr "" -#: ../../mod/dfrn_confirm.php:694 +#: ../../mod/dfrn_confirm.php:700 msgid "Unable to update your contact profile details on our system" msgstr "" -#: ../../mod/dfrn_confirm.php:724 +#: ../../mod/dfrn_confirm.php:730 #, php-format msgid "Connection accepted at %s" msgstr "" -#: ../../addon/facebook/facebook.php:338 +#: ../../addon/facebook/facebook.php:458 msgid "Facebook disabled" msgstr "" -#: ../../addon/facebook/facebook.php:343 +#: ../../addon/facebook/facebook.php:463 msgid "Updating contacts" msgstr "" -#: ../../addon/facebook/facebook.php:352 +#: ../../addon/facebook/facebook.php:472 msgid "Facebook API key is missing." msgstr "" -#: ../../addon/facebook/facebook.php:359 +#: ../../addon/facebook/facebook.php:479 msgid "Facebook Connect" msgstr "" -#: ../../addon/facebook/facebook.php:365 +#: ../../addon/facebook/facebook.php:485 msgid "Install Facebook connector for this account." msgstr "" -#: ../../addon/facebook/facebook.php:372 +#: ../../addon/facebook/facebook.php:492 msgid "Remove Facebook connector" msgstr "" -#: ../../addon/facebook/facebook.php:377 +#: ../../addon/facebook/facebook.php:497 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "" -#: ../../addon/facebook/facebook.php:384 +#: ../../addon/facebook/facebook.php:504 msgid "Post to Facebook by default" msgstr "" -#: ../../addon/facebook/facebook.php:388 +#: ../../addon/facebook/facebook.php:508 msgid "Link all your Facebook friends and conversations on this website" msgstr "" -#: ../../addon/facebook/facebook.php:390 +#: ../../addon/facebook/facebook.php:510 msgid "" "Facebook conversations consist of your profile wall and your friend " "stream." msgstr "" -#: ../../addon/facebook/facebook.php:391 +#: ../../addon/facebook/facebook.php:511 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "" -#: ../../addon/facebook/facebook.php:392 +#: ../../addon/facebook/facebook.php:512 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "" -#: ../../addon/facebook/facebook.php:396 +#: ../../addon/facebook/facebook.php:516 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "" -#: ../../addon/facebook/facebook.php:401 +#: ../../addon/facebook/facebook.php:521 msgid "Do not import your Facebook profile wall conversations" msgstr "" -#: ../../addon/facebook/facebook.php:403 +#: ../../addon/facebook/facebook.php:523 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 " @@ -3874,43 +4001,67 @@ msgid "" "who may see the conversations." msgstr "" -#: ../../addon/facebook/facebook.php:408 +#: ../../addon/facebook/facebook.php:528 msgid "Comma separated applications to ignore" msgstr "" -#: ../../addon/facebook/facebook.php:476 +#: ../../addon/facebook/facebook.php:599 +msgid "Problems with Facebook Real-Time Updates" +msgstr "" + +#: ../../addon/facebook/facebook.php:623 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:477 +#: ../../addon/facebook/facebook.php:624 msgid "Facebook Connector Settings" msgstr "" -#: ../../addon/facebook/facebook.php:491 +#: ../../addon/facebook/facebook.php:634 +msgid "Real-Time Updates are activated." +msgstr "" + +#: ../../addon/facebook/facebook.php:635 +msgid "Deactivate Real-Time Updates" +msgstr "" + +#: ../../addon/facebook/facebook.php:637 +msgid "Real-Time Updates not activated." +msgstr "" + +#: ../../addon/facebook/facebook.php:637 +msgid "Activate Real-Time Updates" +msgstr "" + +#: ../../addon/facebook/facebook.php:659 msgid "Post to Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:582 +#: ../../addon/facebook/facebook.php:751 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:651 -msgid "Image: " -msgstr "" - -#: ../../addon/facebook/facebook.php:728 +#: ../../addon/facebook/facebook.php:923 msgid "View on Friendica" msgstr "" -#: ../../addon/facebook/facebook.php:752 +#: ../../addon/facebook/facebook.php:948 msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886 -#: ../../include/bb2diaspora.php:102 +#: ../../addon/facebook/facebook.php:981 +msgid "Your Facebook connection became invalid. Please Re-authenticate." +msgstr "" + +#: ../../addon/facebook/facebook.php:982 +msgid "Facebook connection became invalid" +msgstr "" + +#: ../../addon/facebook/facebook.php:1107 +#: ../../addon/facebook/facebook.php:1116 ../../include/bb2diaspora.php:102 msgid "link" msgstr "" @@ -3928,15 +4079,15 @@ msgid_plural "%d people don't like this" msgstr[0] "" msgstr[1] "" -#: ../../addon/widgets/widgets.php:55 +#: ../../addon/widgets/widgets.php:56 msgid "Generate new key" msgstr "" -#: ../../addon/widgets/widgets.php:58 +#: ../../addon/widgets/widgets.php:59 msgid "Widgets key" msgstr "" -#: ../../addon/widgets/widgets.php:60 +#: ../../addon/widgets/widgets.php:61 msgid "Widgets available" msgstr "" @@ -3968,27 +4119,27 @@ msgstr "" msgid "yourls Settings saved." msgstr "" -#: ../../addon/ljpost/ljpost.php:38 +#: ../../addon/ljpost/ljpost.php:39 msgid "Post to LiveJournal" msgstr "" -#: ../../addon/ljpost/ljpost.php:69 +#: ../../addon/ljpost/ljpost.php:70 msgid "LiveJournal Post Settings" msgstr "" -#: ../../addon/ljpost/ljpost.php:71 +#: ../../addon/ljpost/ljpost.php:72 msgid "Enable LiveJournal Post Plugin" msgstr "" -#: ../../addon/ljpost/ljpost.php:76 +#: ../../addon/ljpost/ljpost.php:77 msgid "LiveJournal username" msgstr "" -#: ../../addon/ljpost/ljpost.php:81 +#: ../../addon/ljpost/ljpost.php:82 msgid "LiveJournal password" msgstr "" -#: ../../addon/ljpost/ljpost.php:86 +#: ../../addon/ljpost/ljpost.php:87 msgid "Post to LiveJournal by default" msgstr "" @@ -4017,11 +4168,15 @@ msgstr "" msgid "%s - Click to open/close" msgstr "" +#: ../../addon/page/page.php:47 +msgid "Forums" +msgstr "" + #: ../../addon/communityhome/communityhome.php:28 #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:62 ../../boot.php:710 +#: ../../include/nav.php:64 ../../boot.php:760 msgid "Login" msgstr "" @@ -4031,6 +4186,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" msgstr "" @@ -4040,14 +4197,20 @@ 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" msgstr "" #: ../../addon/communityhome/communityhome.php:133 +#: ../../view/theme/diabook-blue/theme.php:52 +#: ../../view/theme/diabook/theme.php:55 msgid "Last likes" msgstr "" -#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224 +#: ../../addon/communityhome/communityhome.php:155 +#: ../../view/theme/diabook-blue/theme.php:74 +#: ../../view/theme/diabook/theme.php:77 ../../include/text.php:1286 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -4142,27 +4305,27 @@ msgstr "" msgid "Enable Randplace Plugin" msgstr "" -#: ../../addon/dwpost/dwpost.php:38 +#: ../../addon/dwpost/dwpost.php:39 msgid "Post to Dreamwidth" msgstr "" -#: ../../addon/dwpost/dwpost.php:69 +#: ../../addon/dwpost/dwpost.php:70 msgid "Dreamwidth Post Settings" msgstr "" -#: ../../addon/dwpost/dwpost.php:71 +#: ../../addon/dwpost/dwpost.php:72 msgid "Enable dreamwidth Post Plugin" msgstr "" -#: ../../addon/dwpost/dwpost.php:76 +#: ../../addon/dwpost/dwpost.php:77 msgid "dreamwidth username" msgstr "" -#: ../../addon/dwpost/dwpost.php:81 +#: ../../addon/dwpost/dwpost.php:82 msgid "dreamwidth password" msgstr "" -#: ../../addon/dwpost/dwpost.php:86 +#: ../../addon/dwpost/dwpost.php:87 msgid "Post to dreamwidth by default" msgstr "" @@ -4207,6 +4370,18 @@ msgstr "" 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 "" @@ -4395,7 +4570,31 @@ msgstr "" msgid "pageheader Settings saved." msgstr "" -#: ../../addon/viewsrc/viewsrc.php:25 +#: ../../addon/ijpost/ijpost.php:39 +msgid "Post to Insanejournal" +msgstr "" + +#: ../../addon/ijpost/ijpost.php:70 +msgid "InsaneJournal Post Settings" +msgstr "" + +#: ../../addon/ijpost/ijpost.php:72 +msgid "Enable InsaneJournal Post Plugin" +msgstr "" + +#: ../../addon/ijpost/ijpost.php:77 +msgid "InsaneJournal username" +msgstr "" + +#: ../../addon/ijpost/ijpost.php:82 +msgid "InsaneJournal password" +msgstr "" + +#: ../../addon/ijpost/ijpost.php:87 +msgid "Post to InsaneJournal by default" +msgstr "" + +#: ../../addon/viewsrc/viewsrc.php:37 msgid "View Source" msgstr "" @@ -4623,8 +4822,9 @@ msgstr "" msgid "Show More Settings saved." msgstr "" -#: ../../addon/showmore/showmore.php:86 -msgid "Show More" +#: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466 +#: ../../boot.php:489 +msgid "show more" msgstr "" #: ../../addon/piwik/piwik.php:79 @@ -4729,7 +4929,7 @@ msgstr "" msgid "Consumer secret" msgstr "" -#: ../../addon/irc/irc.php:20 +#: ../../addon/irc/irc.php:25 msgid "irc Chatroom" msgstr "" @@ -4757,6 +4957,70 @@ msgstr "" msgid "Post to Posterous by default" msgstr "" +#: ../../view/theme/diabook-blue/theme.php:142 +#: ../../view/theme/diabook/theme.php:145 ../../include/nav.php:103 +msgid "Directory" +msgstr "" + +#: ../../view/theme/diabook-blue/theme.php:143 +#: ../../view/theme/diabook/theme.php:146 ../../include/contact_widgets.php:34 +msgid "Similar Interests" +msgstr "" + +#: ../../view/theme/diabook-blue/theme.php:145 +#: ../../view/theme/diabook/theme.php:148 ../../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 +msgid "Community Pages" +msgstr "" + +#: ../../view/theme/diabook-blue/theme.php:215 +#: ../../view/theme/diabook/theme.php:221 ../../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 +msgid "Your profile page" +msgstr "" + +#: ../../view/theme/diabook-blue/theme.php:217 +#: ../../view/theme/diabook/theme.php:223 +msgid "Your contacts" +msgstr "" + +#: ../../view/theme/diabook-blue/theme.php:218 +#: ../../view/theme/diabook/theme.php:224 ../../include/nav.php:51 +#: ../../boot.php:1391 +msgid "Photos" +msgstr "" + +#: ../../view/theme/diabook-blue/theme.php:218 +#: ../../view/theme/diabook/theme.php:224 ../../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 +msgid "Your events" +msgstr "" + +#: ../../view/theme/diabook-blue/theme.php:220 +#: ../../view/theme/diabook/theme.php:226 ../../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 +msgid "Your personal photos" +msgstr "" + #: ../../view/theme/quattro/theme.php:17 msgid "Theme settings" msgstr "" @@ -4773,7 +5037,7 @@ msgstr "" msgid "Center" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:982 +#: ../../include/profile_advanced.php:17 ../../boot.php:1032 msgid "Gender:" msgstr "" @@ -4786,7 +5050,7 @@ msgid "j F" msgstr "" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:438 -#: ../../include/items.php:1349 +#: ../../include/items.php:1384 msgid "Birthday:" msgstr "" @@ -4794,11 +5058,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:985 +#: ../../include/profile_advanced.php:37 ../../boot.php:1035 msgid "Status:" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:987 +#: ../../include/profile_advanced.php:45 ../../boot.php:1037 msgid "Homepage:" msgstr "" @@ -5142,12 +5406,12 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:425 ../../include/notifier.php:638 +#: ../../include/delivery.php:426 ../../include/notifier.php:640 msgid "(no subject)" msgstr "" -#: ../../include/delivery.php:432 ../../include/enotify.php:17 -#: ../../include/notifier.php:645 +#: ../../include/delivery.php:433 ../../include/enotify.php:23 +#: ../../include/notifier.php:647 msgid "noreply" msgstr "" @@ -5178,119 +5442,143 @@ msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:643 ../../include/nav.php:87 +#: ../../include/text.php:645 ../../include/nav.php:91 msgid "Search" msgstr "" -#: ../../include/text.php:831 +#: ../../include/text.php:822 msgid "Monday" msgstr "" -#: ../../include/text.php:831 +#: ../../include/text.php:822 msgid "Tuesday" msgstr "" -#: ../../include/text.php:831 +#: ../../include/text.php:822 msgid "Wednesday" msgstr "" -#: ../../include/text.php:831 +#: ../../include/text.php:822 msgid "Thursday" msgstr "" -#: ../../include/text.php:831 +#: ../../include/text.php:822 msgid "Friday" msgstr "" -#: ../../include/text.php:831 +#: ../../include/text.php:822 msgid "Saturday" msgstr "" -#: ../../include/text.php:831 +#: ../../include/text.php:822 msgid "Sunday" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "January" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "February" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "March" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "April" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "May" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "June" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "July" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "August" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "September" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "October" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "November" msgstr "" -#: ../../include/text.php:835 +#: ../../include/text.php:826 msgid "December" msgstr "" -#: ../../include/text.php:905 +#: ../../include/text.php:910 msgid "bytes" msgstr "" -#: ../../include/text.php:1000 +#: ../../include/text.php:927 +msgid "Categories:" +msgstr "" + +#: ../../include/text.php:939 +msgid "remove" +msgstr "" + +#: ../../include/text.php:939 +msgid "[remove]" +msgstr "" + +#: ../../include/text.php:942 +msgid "Filed under:" +msgstr "" + +#: ../../include/text.php:958 ../../include/text.php:970 +msgid "Click to open/close" +msgstr "" + +#: ../../include/text.php:1062 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1012 +#: ../../include/text.php:1074 msgid "default" msgstr "" -#: ../../include/text.php:1228 +#: ../../include/text.php:1290 msgid "activity" msgstr "" -#: ../../include/text.php:1230 +#: ../../include/text.php:1292 msgid "comment" msgstr "" -#: ../../include/text.php:1231 +#: ../../include/text.php:1293 msgid "post" msgstr "" +#: ../../include/text.php:1335 +msgid "Item filed" +msgstr "" + #: ../../include/diaspora.php:570 msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:1911 +#: ../../include/diaspora.php:1953 msgid "Attachments:" msgstr "" -#: ../../include/diaspora.php:2094 +#: ../../include/diaspora.php:2136 #, php-format msgid "[Relayed] Comment authored by %s from network %s" msgstr "" @@ -5299,11 +5587,11 @@ msgstr "" msgid "view full size" msgstr "" -#: ../../include/oembed.php:128 +#: ../../include/oembed.php:132 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:137 +#: ../../include/oembed.php:141 msgid "Embedding disabled" msgstr "" @@ -5334,135 +5622,111 @@ msgstr "" msgid "Create a new group" msgstr "" -#: ../../include/nav.php:44 ../../boot.php:709 +#: ../../include/nav.php:46 ../../boot.php:759 msgid "Logout" msgstr "" -#: ../../include/nav.php:44 +#: ../../include/nav.php:46 msgid "End this session" msgstr "" -#: ../../include/nav.php:47 ../../boot.php:1331 +#: ../../include/nav.php:49 ../../boot.php:1381 msgid "Status" msgstr "" -#: ../../include/nav.php:47 ../../include/nav.php:111 -msgid "Your posts and conversations" -msgstr "" - -#: ../../include/nav.php:48 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:49 ../../boot.php:1341 -msgid "Photos" -msgstr "" - -#: ../../include/nav.php:49 -msgid "Your photos" -msgstr "" - -#: ../../include/nav.php:50 -msgid "Your events" -msgstr "" - -#: ../../include/nav.php:51 -msgid "Personal notes" -msgstr "" - -#: ../../include/nav.php:51 -msgid "Your personal photos" -msgstr "" - -#: ../../include/nav.php:62 +#: ../../include/nav.php:64 msgid "Sign in" msgstr "" -#: ../../include/nav.php:73 +#: ../../include/nav.php:77 msgid "Home Page" msgstr "" -#: ../../include/nav.php:77 +#: ../../include/nav.php:81 msgid "Create an account" msgstr "" -#: ../../include/nav.php:82 +#: ../../include/nav.php:86 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:85 +#: ../../include/nav.php:89 msgid "Apps" msgstr "" -#: ../../include/nav.php:85 +#: ../../include/nav.php:89 msgid "Addon applications, utilities, games" msgstr "" -#: ../../include/nav.php:87 +#: ../../include/nav.php:91 msgid "Search site content" msgstr "" -#: ../../include/nav.php:97 +#: ../../include/nav.php:101 msgid "Conversations on this site" msgstr "" -#: ../../include/nav.php:99 -msgid "Directory" -msgstr "" - -#: ../../include/nav.php:99 +#: ../../include/nav.php:103 msgid "People directory" msgstr "" -#: ../../include/nav.php:109 +#: ../../include/nav.php:113 msgid "Conversations from your friends" msgstr "" -#: ../../include/nav.php:117 +#: ../../include/nav.php:121 msgid "Friend Requests" msgstr "" -#: ../../include/nav.php:119 +#: ../../include/nav.php:123 msgid "See all notifications" msgstr "" -#: ../../include/nav.php:120 +#: ../../include/nav.php:124 msgid "Mark all system notifications seen" msgstr "" -#: ../../include/nav.php:124 +#: ../../include/nav.php:128 msgid "Private mail" msgstr "" -#: ../../include/nav.php:127 +#: ../../include/nav.php:129 +msgid "Inbox" +msgstr "" + +#: ../../include/nav.php:130 +msgid "Outbox" +msgstr "" + +#: ../../include/nav.php:134 msgid "Manage" msgstr "" -#: ../../include/nav.php:127 +#: ../../include/nav.php:134 msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:131 ../../boot.php:940 +#: ../../include/nav.php:138 ../../boot.php:990 msgid "Profiles" msgstr "" -#: ../../include/nav.php:131 ../../boot.php:940 +#: ../../include/nav.php:138 ../../boot.php:990 msgid "Manage/edit profiles" msgstr "" -#: ../../include/nav.php:132 +#: ../../include/nav.php:139 msgid "Manage/edit friends and contacts" msgstr "" -#: ../../include/nav.php:139 +#: ../../include/nav.php:146 msgid "Admin" msgstr "" -#: ../../include/nav.php:139 +#: ../../include/nav.php:146 msgid "Site setup and configuration" msgstr "" -#: ../../include/nav.php:162 +#: ../../include/nav.php:169 msgid "Nothing new here" msgstr "" @@ -5478,45 +5742,45 @@ msgstr "" msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../include/contact_widgets.php:18 -msgid "Invite Friends" -msgstr "" - -#: ../../include/contact_widgets.php:24 +#: ../../include/contact_widgets.php:22 #, php-format msgid "%d invitation available" msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:30 +#: ../../include/contact_widgets.php:28 msgid "Find People" msgstr "" -#: ../../include/contact_widgets.php:31 +#: ../../include/contact_widgets.php:29 msgid "Enter name or interest" msgstr "" -#: ../../include/contact_widgets.php:32 +#: ../../include/contact_widgets.php:30 msgid "Connect/Follow" msgstr "" -#: ../../include/contact_widgets.php:33 +#: ../../include/contact_widgets.php:31 msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:36 -msgid "Similar Interests" -msgstr "" - -#: ../../include/contact_widgets.php:68 +#: ../../include/contact_widgets.php:66 msgid "Networks" msgstr "" -#: ../../include/contact_widgets.php:71 +#: ../../include/contact_widgets.php:69 msgid "All Networks" msgstr "" +#: ../../include/contact_widgets.php:96 +msgid "Saved Folders" +msgstr "" + +#: ../../include/contact_widgets.php:99 +msgid "Everything" +msgstr "" + #: ../../include/auth.php:29 msgid "Logged out." msgstr "" @@ -5594,19 +5858,19 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/poller.php:513 +#: ../../include/poller.php:533 msgid "From: " msgstr "" -#: ../../include/bbcode.php:202 +#: ../../include/bbcode.php:203 ../../include/bbcode.php:223 msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:216 ../../include/bbcode.php:282 +#: ../../include/bbcode.php:237 ../../include/bbcode.php:303 msgid "Image/photo" msgstr "" -#: ../../include/dba.php:39 +#: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "" @@ -5615,211 +5879,211 @@ msgstr "" msgid "[no subject]" msgstr "" -#: ../../include/acl_selectors.php:284 +#: ../../include/acl_selectors.php:286 msgid "Visible to everybody" msgstr "" -#: ../../include/acl_selectors.php:285 +#: ../../include/acl_selectors.php:287 msgid "show" msgstr "" -#: ../../include/acl_selectors.php:286 +#: ../../include/acl_selectors.php:288 msgid "don't show" msgstr "" -#: ../../include/enotify.php:8 +#: ../../include/enotify.php:14 msgid "Friendica Notification" msgstr "" -#: ../../include/enotify.php:11 +#: ../../include/enotify.php:17 msgid "Thank You," msgstr "" -#: ../../include/enotify.php:13 +#: ../../include/enotify.php:19 #, php-format msgid "%s Administrator" msgstr "" -#: ../../include/enotify.php:29 +#: ../../include/enotify.php:35 #, php-format msgid "%s " msgstr "" -#: ../../include/enotify.php:33 +#: ../../include/enotify.php:39 #, php-format msgid "[Friendica:Notify] New mail received at %s" msgstr "" -#: ../../include/enotify.php:35 +#: ../../include/enotify.php:41 #, php-format msgid "%s sent you a new private message at %s." msgstr "" -#: ../../include/enotify.php:36 +#: ../../include/enotify.php:42 #, php-format msgid "%s sent you %s." msgstr "" -#: ../../include/enotify.php:36 +#: ../../include/enotify.php:42 msgid "a private message" msgstr "" -#: ../../include/enotify.php:37 +#: ../../include/enotify.php:43 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../include/enotify.php:67 +#: ../../include/enotify.php:73 #, php-format msgid "%s's" msgstr "" -#: ../../include/enotify.php:71 +#: ../../include/enotify.php:77 msgid "your" msgstr "" -#: ../../include/enotify.php:78 +#: ../../include/enotify.php:84 #, php-format msgid "[Friendica:Notify] Comment to conversation #%d by %s" msgstr "" -#: ../../include/enotify.php:79 +#: ../../include/enotify.php:85 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "" -#: ../../include/enotify.php:80 +#: ../../include/enotify.php:86 #, php-format msgid "%s commented on %s." msgstr "" -#: ../../include/enotify.php:82 ../../include/enotify.php:95 -#: ../../include/enotify.php:106 ../../include/enotify.php:117 +#: ../../include/enotify.php:88 ../../include/enotify.php:101 +#: ../../include/enotify.php:112 ../../include/enotify.php:123 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../include/enotify.php:89 +#: ../../include/enotify.php:95 #, php-format msgid "[Friendica:Notify] %s posted to your profile wall" msgstr "" -#: ../../include/enotify.php:91 +#: ../../include/enotify.php:97 #, php-format msgid "%s posted to your profile wall at %s" msgstr "" -#: ../../include/enotify.php:93 +#: ../../include/enotify.php:99 #, php-format msgid "%s posted to %s" msgstr "" -#: ../../include/enotify.php:93 +#: ../../include/enotify.php:99 msgid "your profile wall." msgstr "" -#: ../../include/enotify.php:102 +#: ../../include/enotify.php:108 #, php-format msgid "[Friendica:Notify] %s tagged you" msgstr "" -#: ../../include/enotify.php:103 +#: ../../include/enotify.php:109 #, php-format msgid "%s tagged you at %s" msgstr "" -#: ../../include/enotify.php:104 +#: ../../include/enotify.php:110 #, php-format msgid "%s %s." msgstr "" -#: ../../include/enotify.php:104 +#: ../../include/enotify.php:110 msgid "tagged you" msgstr "" -#: ../../include/enotify.php:113 +#: ../../include/enotify.php:119 #, php-format msgid "[Friendica:Notify] %s tagged your post" msgstr "" -#: ../../include/enotify.php:114 +#: ../../include/enotify.php:120 #, php-format msgid "%s tagged your post at %s" msgstr "" -#: ../../include/enotify.php:115 +#: ../../include/enotify.php:121 #, php-format msgid "%s tagged %s" msgstr "" -#: ../../include/enotify.php:115 +#: ../../include/enotify.php:121 msgid "your post" msgstr "" -#: ../../include/enotify.php:124 +#: ../../include/enotify.php:130 msgid "[Friendica:Notify] Introduction received" msgstr "" -#: ../../include/enotify.php:125 +#: ../../include/enotify.php:131 #, php-format msgid "You've received an introduction from '%s' at %s" msgstr "" -#: ../../include/enotify.php:126 +#: ../../include/enotify.php:132 #, php-format msgid "You've received %s from %s." msgstr "" -#: ../../include/enotify.php:126 +#: ../../include/enotify.php:132 msgid "an introduction" msgstr "" -#: ../../include/enotify.php:127 ../../include/enotify.php:144 +#: ../../include/enotify.php:133 ../../include/enotify.php:150 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../include/enotify.php:129 +#: ../../include/enotify.php:135 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../include/enotify.php:136 +#: ../../include/enotify.php:142 msgid "[Friendica:Notify] Friend suggestion received" msgstr "" -#: ../../include/enotify.php:137 +#: ../../include/enotify.php:143 #, php-format msgid "You've received a friend suggestion from '%s' at %s" msgstr "" -#: ../../include/enotify.php:138 +#: ../../include/enotify.php:144 #, php-format msgid "You've received %s for %s from %s." msgstr "" -#: ../../include/enotify.php:139 +#: ../../include/enotify.php:145 msgid "a friend suggestion" msgstr "" -#: ../../include/enotify.php:142 +#: ../../include/enotify.php:148 msgid "Name:" msgstr "" -#: ../../include/enotify.php:143 +#: ../../include/enotify.php:149 msgid "Photo:" msgstr "" -#: ../../include/enotify.php:146 +#: ../../include/enotify.php:152 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/items.php:2573 +#: ../../include/items.php:2648 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2573 +#: ../../include/items.php:2648 msgid "You have a new follower at " msgstr "" @@ -5828,37 +6092,43 @@ msgstr "" msgid "image/photo" msgstr "" -#: ../../include/security.php:20 +#: ../../include/security.php:21 msgid "Welcome " msgstr "" -#: ../../include/security.php:21 +#: ../../include/security.php:22 msgid "Please upload a profile photo." msgstr "" -#: ../../include/security.php:24 +#: ../../include/security.php:25 msgid "Welcome back " msgstr "" -#: ../../include/Contact.php:131 ../../include/conversation.php:788 +#: ../../include/security.php:329 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before subitting it." +msgstr "" + +#: ../../include/Contact.php:137 ../../include/conversation.php:813 msgid "View status" msgstr "" -#: ../../include/Contact.php:132 ../../include/conversation.php:789 +#: ../../include/Contact.php:138 ../../include/conversation.php:814 msgid "View profile" msgstr "" -#: ../../include/Contact.php:133 ../../include/conversation.php:790 +#: ../../include/Contact.php:139 ../../include/conversation.php:815 msgid "View photos" msgstr "" -#: ../../include/Contact.php:134 ../../include/Contact.php:147 -#: ../../include/conversation.php:791 +#: ../../include/Contact.php:140 ../../include/Contact.php:153 +#: ../../include/conversation.php:816 msgid "View recent" msgstr "" -#: ../../include/Contact.php:136 ../../include/Contact.php:147 -#: ../../include/conversation.php:793 +#: ../../include/Contact.php:142 ../../include/Contact.php:153 +#: ../../include/conversation.php:818 msgid "Send PM" msgstr "" @@ -5871,36 +6141,32 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:303 ../../include/conversation.php:572 +#: ../../include/conversation.php:317 ../../include/conversation.php:575 msgid "Select" msgstr "" -#: ../../include/conversation.php:320 ../../include/conversation.php:665 -#: ../../include/conversation.php:666 +#: ../../include/conversation.php:334 ../../include/conversation.php:672 +#: ../../include/conversation.php:673 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:330 ../../include/conversation.php:677 +#: ../../include/conversation.php:344 ../../include/conversation.php:684 #, php-format msgid "%s from %s" msgstr "" -#: ../../include/conversation.php:346 +#: ../../include/conversation.php:360 msgid "View in context" msgstr "" -#: ../../include/conversation.php:467 +#: ../../include/conversation.php:465 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:468 ../../boot.php:448 -msgid "show more" -msgstr "" - #: ../../include/conversation.php:529 msgid "like" msgstr "" @@ -5917,205 +6183,205 @@ msgstr "" msgid "share" msgstr "" -#: ../../include/conversation.php:582 +#: ../../include/conversation.php:588 msgid "add star" msgstr "" -#: ../../include/conversation.php:583 +#: ../../include/conversation.php:589 msgid "remove star" msgstr "" -#: ../../include/conversation.php:584 +#: ../../include/conversation.php:590 msgid "toggle star status" msgstr "" -#: ../../include/conversation.php:587 +#: ../../include/conversation.php:593 msgid "starred" msgstr "" -#: ../../include/conversation.php:588 +#: ../../include/conversation.php:594 msgid "add tag" msgstr "" -#: ../../include/conversation.php:667 +#: ../../include/conversation.php:598 +msgid "save to folder" +msgstr "" + +#: ../../include/conversation.php:674 msgid "to" msgstr "" -#: ../../include/conversation.php:668 +#: ../../include/conversation.php:675 msgid "Wall-to-Wall" msgstr "" -#: ../../include/conversation.php:669 +#: ../../include/conversation.php:676 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/conversation.php:713 +#: ../../include/conversation.php:721 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:845 +#: ../../include/conversation.php:872 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:845 +#: ../../include/conversation.php:872 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:849 +#: ../../include/conversation.php:876 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:851 +#: ../../include/conversation.php:878 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:857 +#: ../../include/conversation.php:884 msgid "and" msgstr "" -#: ../../include/conversation.php:860 +#: ../../include/conversation.php:887 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:861 +#: ../../include/conversation.php:888 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:861 +#: ../../include/conversation.php:888 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:886 +#: ../../include/conversation.php:913 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:888 +#: ../../include/conversation.php:915 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:889 +#: ../../include/conversation.php:916 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:890 +#: ../../include/conversation.php:917 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:891 +#: ../../include/conversation.php:919 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:892 -msgid "Enter a title for this item" -msgstr "" - -#: ../../include/conversation.php:935 +#: ../../include/conversation.php:962 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:937 +#: ../../include/conversation.php:964 msgid "attach file" msgstr "" -#: ../../include/conversation.php:939 +#: ../../include/conversation.php:966 msgid "web link" msgstr "" -#: ../../include/conversation.php:940 +#: ../../include/conversation.php:967 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:941 +#: ../../include/conversation.php:968 msgid "video link" msgstr "" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:969 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:970 msgid "audio link" msgstr "" -#: ../../include/conversation.php:945 +#: ../../include/conversation.php:972 msgid "set location" msgstr "" -#: ../../include/conversation.php:947 +#: ../../include/conversation.php:974 msgid "clear location" msgstr "" -#: ../../include/conversation.php:952 +#: ../../include/conversation.php:979 msgid "permissions" msgstr "" -#: ../../boot.php:446 +#: ../../boot.php:487 msgid "Delete this item?" msgstr "" -#: ../../boot.php:449 +#: ../../boot.php:490 msgid "show fewer" msgstr "" -#: ../../boot.php:692 +#: ../../boot.php:738 msgid "Create a New Account" msgstr "" -#: ../../boot.php:712 +#: ../../boot.php:762 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:713 +#: ../../boot.php:763 msgid "Password: " msgstr "" -#: ../../boot.php:716 +#: ../../boot.php:766 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:722 +#: ../../boot.php:772 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:879 +#: ../../boot.php:929 msgid "Edit profile" msgstr "" -#: ../../boot.php:1046 ../../boot.php:1117 +#: ../../boot.php:1096 ../../boot.php:1167 msgid "g A l F d" msgstr "" -#: ../../boot.php:1047 ../../boot.php:1118 +#: ../../boot.php:1097 ../../boot.php:1168 msgid "F d" msgstr "" -#: ../../boot.php:1072 +#: ../../boot.php:1122 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1073 +#: ../../boot.php:1123 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1096 ../../boot.php:1160 +#: ../../boot.php:1146 ../../boot.php:1210 msgid "[today]" msgstr "" -#: ../../boot.php:1141 +#: ../../boot.php:1191 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1142 +#: ../../boot.php:1192 msgid "Events this week:" msgstr "" -#: ../../boot.php:1154 +#: ../../boot.php:1204 msgid "[No description]" msgstr "" diff --git a/view/field_combobox.tpl b/view/field_combobox.tpl index 6581330714..a4dc8e5714 100644 --- a/view/field_combobox.tpl +++ b/view/field_combobox.tpl @@ -1,6 +1,6 @@
- + {# html5 don't work on Chrome, Safari and IE9 diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl index ed36a7bb20..75a4506f6a 100755 --- a/view/mail_conv.tpl +++ b/view/mail_conv.tpl @@ -1,13 +1,13 @@
- $from_name + $mail.from_name
-
$from_name
-
$date
-
$subject
-
$body
-
+
$mail.from_name
+
$mail.date
+
$mail.subject
+
$mail.body
+
diff --git a/view/mail_display.tpl b/view/mail_display.tpl new file mode 100644 index 0000000000..8fbc129299 --- /dev/null +++ b/view/mail_display.tpl @@ -0,0 +1,10 @@ + +{{ for $mails as $mail }} + {{ inc mail_conv.tpl }}{{endinc}} +{{ endfor }} + +{{ if $canreply }} +{{ inc prv_message.tpl }}{{ endinc }} +{{ else }} +$unknown_text +{{endif }} \ No newline at end of file diff --git a/view/message_side.tpl b/view/message_side.tpl new file mode 100644 index 0000000000..fce771bd5d --- /dev/null +++ b/view/message_side.tpl @@ -0,0 +1,10 @@ +
+ + +
    + {{ for $tabs as $t }} +
  • $t.label
    • + {{ endfor }} +
+ +
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl index 154f22363c..d1e6847951 100755 --- a/view/profile_vcard.tpl +++ b/view/profile_vcard.tpl @@ -38,6 +38,9 @@ {{ if $connect }}
  • $connect
    • {{ endif }} + {{ if $wallmessage }} +
  • $wallmessage
    • + {{ endif }}
    diff --git a/view/settings.tpl b/view/settings.tpl index 75225a0f1b..8753474afa 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -28,10 +28,7 @@ $nickname_block {{inc field_custom.tpl with $field=$timezone }}{{endinc}} {{inc field_input.tpl with $field=$defloc }}{{endinc}} {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}} -{{inc field_themeselect.tpl with $field=$theme }}{{endinc}} -{{inc field_input.tpl with $field=$ajaxint }}{{endinc}} -{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}} -{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}} +
    @@ -59,6 +56,10 @@ $blocktags $suggestme +$unkmail + +{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}} + {{inc field_input.tpl with $field=$expire.days }}{{endinc}}
    $expire.label diff --git a/view/settings_display.tpl b/view/settings_display.tpl new file mode 100644 index 0000000000..fc7a56c8ac --- /dev/null +++ b/view/settings_display.tpl @@ -0,0 +1,23 @@ +$tabs + +

    $ptitle

    + +
    + + +{{inc field_themeselect.tpl with $field=$theme }}{{endinc}} +{{inc field_input.tpl with $field=$ajaxint }}{{endinc}} +{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}} +{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}} + + +
    + +
    + +{{ if $theme_config }} +

    Theme settings

    +$theme_config +{{ endif }} + +
    diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl new file mode 100755 index 0000000000..917af49f1a --- /dev/null +++ b/view/theme/diabook-aerith/communityhome.tpl @@ -0,0 +1,92 @@ +
    +{{ if $page }} +
    $page
    +{{ endif }} +
    + +
    +{{ if $lastusers_title }} +

    Help or @NewHere ?

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

    Connectable Services

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

    Find Friends

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

    PostIt to Friendica

    +
    Post to Friendica from anywhere by bookmarking the Link.
    +{{ endif }} +
    + +
    +{{ if $lastusers_title }} +

    $lastusers_title

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

    $activeusers_title

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

    $photos_title

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

    $like_title

    +
      +{{ for $like_items as $i }} +
    • $i
      • +{{ endfor }} +
    +{{ endif }} +
    diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl new file mode 100755 index 0000000000..48930b48ab --- /dev/null +++ b/view/theme/diabook-aerith/contact_template.tpl @@ -0,0 +1,25 @@ + +
    +
    +
    + + $contact.name + + {{ if $contact.photo_menu }} + menu +
    +
      + $contact.photo_menu +
    +
    + {{ endif }} +
    + +
    +
    +
    $contact.name
    + +
    +
    diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl new file mode 100755 index 0000000000..db1936e4b7 --- /dev/null +++ b/view/theme/diabook-aerith/directory_item.tpl @@ -0,0 +1,10 @@ + +
    +
    +
    + + $alt-text + +
    +
    +
    diff --git a/view/theme/diabook-aerith/fpostit/README b/view/theme/diabook-aerith/fpostit/README new file mode 100644 index 0000000000..39b7c57613 --- /dev/null +++ b/view/theme/diabook-aerith/fpostit/README @@ -0,0 +1,8 @@ +fpostit + +original author: Devlon Duthied + +see his blog posting: +http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/ + +original published at github https://github.com/duthied/Friendika-Bookmarklet diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js new file mode 100755 index 0000000000..d183c75736 --- /dev/null +++ b/view/theme/diabook-aerith/fpostit/fpostit.js @@ -0,0 +1,6 @@ +javascript: (function() { + the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url}; + if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} + else {a_funct()}})()" \ No newline at end of file diff --git a/view/theme/diabook-aerith/fpostit/fpostit.php b/view/theme/diabook-aerith/fpostit/fpostit.php new file mode 100644 index 0000000000..65c43a2b9f --- /dev/null +++ b/view/theme/diabook-aerith/fpostit/fpostit.php @@ -0,0 +1,135 @@ + + + + + + + + $content); + + // echo "posting to: $url
    "; + + $c = curl_init(); + curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); + curl_setopt($c, CURLOPT_POSTFIELDS, $data); + curl_setopt($c, CURLOPT_RETURNTRANSFER, true); + curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); + $c_result = curl_exec($c); + if(curl_errno($c)){ + $error = curl_error($c); + showForm($error, $content); + } + + curl_close($c); + if (!isset($error)) { + echo ''; + } + + } else { + $error = "Missing account name and/or password...try again please"; + showForm($error, $content); + } + +} else { + showForm(null, $content); +} + +function showForm($error, $content) { + $username_cookie = $_COOKIE['username']; + $password_cookie = $_COOKIE['password']; + + echo << +

    + Friendika Bookmarklet

    +
    + +
    +
    + Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

    + Account ID:
    + Password:
    +
    +   $error +
    +

    +
    +EOF; + +} +?> + + + \ No newline at end of file diff --git a/view/theme/diabook-aerith/fpostit/friendika-32.png b/view/theme/diabook-aerith/fpostit/friendika-32.png new file mode 100644 index 0000000000..61764bf20a Binary files /dev/null and b/view/theme/diabook-aerith/fpostit/friendika-32.png differ diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl new file mode 100755 index 0000000000..af183d04da --- /dev/null +++ b/view/theme/diabook-aerith/group_side.tpl @@ -0,0 +1,29 @@ +
    +
    +

    $title

    + +
    + + +
    + diff --git a/view/theme/diabook-aerith/icons/StatusNet.png b/view/theme/diabook-aerith/icons/StatusNet.png new file mode 100644 index 0000000000..398bca716d Binary files /dev/null and b/view/theme/diabook-aerith/icons/StatusNet.png differ diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png new file mode 100755 index 0000000000..1958041cfa Binary files /dev/null and b/view/theme/diabook-aerith/icons/attach.png differ diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png new file mode 100755 index 0000000000..8d779a4097 Binary files /dev/null and b/view/theme/diabook-aerith/icons/audio.png differ diff --git a/view/theme/diabook-aerith/icons/bluebug.png b/view/theme/diabook-aerith/icons/bluebug.png new file mode 100644 index 0000000000..3979e7d8e7 Binary files /dev/null and b/view/theme/diabook-aerith/icons/bluebug.png differ diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png new file mode 100755 index 0000000000..a5c7f12364 Binary files /dev/null and b/view/theme/diabook-aerith/icons/camera.png differ diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png new file mode 100755 index 0000000000..28e2675b8c Binary files /dev/null and b/view/theme/diabook-aerith/icons/close_box.png differ diff --git a/view/theme/diabook-aerith/icons/com_side.png b/view/theme/diabook-aerith/icons/com_side.png new file mode 100644 index 0000000000..bc5969ef1a Binary files /dev/null and b/view/theme/diabook-aerith/icons/com_side.png differ diff --git a/view/theme/diabook-aerith/icons/community.png b/view/theme/diabook-aerith/icons/community.png new file mode 100644 index 0000000000..7c91e8b756 Binary files /dev/null and b/view/theme/diabook-aerith/icons/community.png differ diff --git a/view/theme/diabook-aerith/icons/contacts.png b/view/theme/diabook-aerith/icons/contacts.png new file mode 100644 index 0000000000..cd0e289a77 Binary files /dev/null and b/view/theme/diabook-aerith/icons/contacts.png differ diff --git a/view/theme/diabook-aerith/icons/contacts2.png b/view/theme/diabook-aerith/icons/contacts2.png new file mode 100644 index 0000000000..cd0e289a77 Binary files /dev/null and b/view/theme/diabook-aerith/icons/contacts2.png differ diff --git a/view/theme/diabook-aerith/icons/dislike.png b/view/theme/diabook-aerith/icons/dislike.png new file mode 100644 index 0000000000..23de426c5a Binary files /dev/null and b/view/theme/diabook-aerith/icons/dislike.png differ diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png new file mode 100755 index 0000000000..2abb82ef26 Binary files /dev/null and b/view/theme/diabook-aerith/icons/drop.png differ diff --git a/view/theme/diabook-aerith/icons/email.png b/view/theme/diabook-aerith/icons/email.png new file mode 100644 index 0000000000..240cef2c33 Binary files /dev/null and b/view/theme/diabook-aerith/icons/email.png differ diff --git a/view/theme/diabook-aerith/icons/events.png b/view/theme/diabook-aerith/icons/events.png new file mode 100644 index 0000000000..4a0b3f3f11 Binary files /dev/null and b/view/theme/diabook-aerith/icons/events.png differ diff --git a/view/theme/diabook-aerith/icons/facebook.png b/view/theme/diabook-aerith/icons/facebook.png new file mode 100644 index 0000000000..3e5dd39c36 Binary files /dev/null and b/view/theme/diabook-aerith/icons/facebook.png differ diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png new file mode 100755 index 0000000000..16713fa530 Binary files /dev/null and b/view/theme/diabook-aerith/icons/file_as.png differ diff --git a/view/theme/diabook-aerith/icons/ftdevs.gif b/view/theme/diabook-aerith/icons/ftdevs.gif new file mode 100644 index 0000000000..e0fc257434 Binary files /dev/null and b/view/theme/diabook-aerith/icons/ftdevs.gif differ diff --git a/view/theme/diabook-aerith/icons/globe.png b/view/theme/diabook-aerith/icons/globe.png new file mode 100644 index 0000000000..6bb9bc09d3 Binary files /dev/null and b/view/theme/diabook-aerith/icons/globe.png differ diff --git a/view/theme/diabook-aerith/icons/home.png b/view/theme/diabook-aerith/icons/home.png new file mode 100644 index 0000000000..be47a48fc3 Binary files /dev/null and b/view/theme/diabook-aerith/icons/home.png differ diff --git a/view/theme/diabook-aerith/icons/language.png b/view/theme/diabook-aerith/icons/language.png new file mode 100644 index 0000000000..8029c01553 Binary files /dev/null and b/view/theme/diabook-aerith/icons/language.png differ diff --git a/view/theme/diabook-aerith/icons/like.png b/view/theme/diabook-aerith/icons/like.png new file mode 100644 index 0000000000..b65edccc07 Binary files /dev/null and b/view/theme/diabook-aerith/icons/like.png differ diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png new file mode 100755 index 0000000000..0ef666a673 Binary files /dev/null and b/view/theme/diabook-aerith/icons/link.png differ diff --git a/view/theme/diabook-aerith/icons/livejournal.png b/view/theme/diabook-aerith/icons/livejournal.png new file mode 100644 index 0000000000..6d27d265ee Binary files /dev/null and b/view/theme/diabook-aerith/icons/livejournal.png differ diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png new file mode 100755 index 0000000000..7e34bf2791 Binary files /dev/null and b/view/theme/diabook-aerith/icons/lock.png differ diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png new file mode 100755 index 0000000000..f8b2283478 Binary files /dev/null and b/view/theme/diabook-aerith/icons/lupe.png differ diff --git a/view/theme/diabook-aerith/icons/mess_side.png b/view/theme/diabook-aerith/icons/mess_side.png new file mode 100644 index 0000000000..49ef896bc1 Binary files /dev/null and b/view/theme/diabook-aerith/icons/mess_side.png differ diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png new file mode 100755 index 0000000000..e2bf7d24d3 Binary files /dev/null and b/view/theme/diabook-aerith/icons/messages.png differ diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png new file mode 100755 index 0000000000..e2bf7d24d3 Binary files /dev/null and b/view/theme/diabook-aerith/icons/messages2.png differ diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png new file mode 100755 index 0000000000..7b5e25b905 Binary files /dev/null and b/view/theme/diabook-aerith/icons/next.png differ diff --git a/view/theme/diabook-aerith/icons/notes.png b/view/theme/diabook-aerith/icons/notes.png new file mode 100644 index 0000000000..7d4afca908 Binary files /dev/null and b/view/theme/diabook-aerith/icons/notes.png differ diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png new file mode 100755 index 0000000000..2b4fbb8187 Binary files /dev/null and b/view/theme/diabook-aerith/icons/notifications.png differ diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png new file mode 100755 index 0000000000..9765bfd53e Binary files /dev/null and b/view/theme/diabook-aerith/icons/notify.png differ diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png new file mode 100755 index 0000000000..9765bfd53e Binary files /dev/null and b/view/theme/diabook-aerith/icons/notify2.png differ diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png new file mode 100755 index 0000000000..772e49b175 Binary files /dev/null and b/view/theme/diabook-aerith/icons/pencil.png differ diff --git a/view/theme/diabook-aerith/icons/pencil2.png b/view/theme/diabook-aerith/icons/pencil2.png new file mode 100644 index 0000000000..3b47d1864b Binary files /dev/null and b/view/theme/diabook-aerith/icons/pencil2.png differ diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg new file mode 100755 index 0000000000..fde5eb5352 Binary files /dev/null and b/view/theme/diabook-aerith/icons/photo-menu.jpg differ diff --git a/view/theme/diabook-aerith/icons/posterous.png b/view/theme/diabook-aerith/icons/posterous.png new file mode 100644 index 0000000000..c8e86078e4 Binary files /dev/null and b/view/theme/diabook-aerith/icons/posterous.png differ diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png new file mode 100755 index 0000000000..55c1464ba0 Binary files /dev/null and b/view/theme/diabook-aerith/icons/prev.png differ diff --git a/view/theme/diabook-aerith/icons/pscontacts.png b/view/theme/diabook-aerith/icons/pscontacts.png new file mode 100644 index 0000000000..acf857f32f Binary files /dev/null and b/view/theme/diabook-aerith/icons/pscontacts.png differ diff --git a/view/theme/diabook-aerith/icons/pubgroups.png b/view/theme/diabook-aerith/icons/pubgroups.png new file mode 100644 index 0000000000..6d9539610e Binary files /dev/null and b/view/theme/diabook-aerith/icons/pubgroups.png differ diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png new file mode 100755 index 0000000000..c3b8d2bf47 Binary files /dev/null and b/view/theme/diabook-aerith/icons/recycle.png differ diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png new file mode 100755 index 0000000000..a560cc55e4 Binary files /dev/null and b/view/theme/diabook-aerith/icons/remote.png differ diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png new file mode 100755 index 0000000000..0e7f7ae6a6 Binary files /dev/null and b/view/theme/diabook-aerith/icons/scroll_top.png differ diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png new file mode 100755 index 0000000000..2a30ae2523 Binary files /dev/null and b/view/theme/diabook-aerith/icons/selected.png differ diff --git a/view/theme/diabook-aerith/icons/srch_bg.gif b/view/theme/diabook-aerith/icons/srch_bg.gif new file mode 100644 index 0000000000..6a523ba8fc Binary files /dev/null and b/view/theme/diabook-aerith/icons/srch_bg.gif differ diff --git a/view/theme/diabook-aerith/icons/srch_l.gif b/view/theme/diabook-aerith/icons/srch_l.gif new file mode 100644 index 0000000000..6d95bf35d9 Binary files /dev/null and b/view/theme/diabook-aerith/icons/srch_l.gif differ diff --git a/view/theme/diabook-aerith/icons/srch_r.gif b/view/theme/diabook-aerith/icons/srch_r.gif new file mode 100644 index 0000000000..89833a3167 Binary files /dev/null and b/view/theme/diabook-aerith/icons/srch_r.gif differ diff --git a/view/theme/diabook-aerith/icons/srch_r_f2.gif b/view/theme/diabook-aerith/icons/srch_r_f2.gif new file mode 100644 index 0000000000..6df457bede Binary files /dev/null and b/view/theme/diabook-aerith/icons/srch_r_f2.gif differ diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png new file mode 100755 index 0000000000..0b00cb1893 Binary files /dev/null and b/view/theme/diabook-aerith/icons/star.png differ diff --git a/view/theme/diabook-aerith/icons/star_dummy.png b/view/theme/diabook-aerith/icons/star_dummy.png new file mode 100644 index 0000000000..ce11f30d4d Binary files /dev/null and b/view/theme/diabook-aerith/icons/star_dummy.png differ diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png new file mode 100755 index 0000000000..2b82dfca31 Binary files /dev/null and b/view/theme/diabook-aerith/icons/starred.png differ diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png new file mode 100755 index 0000000000..144649ef8f Binary files /dev/null and b/view/theme/diabook-aerith/icons/tagged.png differ diff --git a/view/theme/diabook-aerith/icons/toogle_off.png b/view/theme/diabook-aerith/icons/toogle_off.png new file mode 100644 index 0000000000..0fcce4d5ab Binary files /dev/null and b/view/theme/diabook-aerith/icons/toogle_off.png differ diff --git a/view/theme/diabook-aerith/icons/toogle_on.png b/view/theme/diabook-aerith/icons/toogle_on.png new file mode 100644 index 0000000000..79ce07f0e3 Binary files /dev/null and b/view/theme/diabook-aerith/icons/toogle_on.png differ diff --git a/view/theme/diabook-aerith/icons/tumblr.png b/view/theme/diabook-aerith/icons/tumblr.png new file mode 100644 index 0000000000..1dc7fa0722 Binary files /dev/null and b/view/theme/diabook-aerith/icons/tumblr.png differ diff --git a/view/theme/diabook-aerith/icons/twitter.png b/view/theme/diabook-aerith/icons/twitter.png new file mode 100644 index 0000000000..b7a687b9f2 Binary files /dev/null and b/view/theme/diabook-aerith/icons/twitter.png differ diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png new file mode 100755 index 0000000000..a0cda0ae55 Binary files /dev/null and b/view/theme/diabook-aerith/icons/unlock.png differ diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png new file mode 100755 index 0000000000..ba3183f5c7 Binary files /dev/null and b/view/theme/diabook-aerith/icons/unstarred.png differ diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png new file mode 100755 index 0000000000..a03d1d8182 Binary files /dev/null and b/view/theme/diabook-aerith/icons/video.png differ diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png new file mode 100755 index 0000000000..216e78344e Binary files /dev/null and b/view/theme/diabook-aerith/icons/weblink.png differ diff --git a/view/theme/diabook-aerith/icons/wordpress.png b/view/theme/diabook-aerith/icons/wordpress.png new file mode 100644 index 0000000000..f564c4300f Binary files /dev/null and b/view/theme/diabook-aerith/icons/wordpress.png differ diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl new file mode 100755 index 0000000000..59066a19c5 --- /dev/null +++ b/view/theme/diabook-aerith/jot.tpl @@ -0,0 +1,84 @@ + +
    +
    +
     
    +
    +
    +
    + +
    + + + + + + + + + + + + +
    + +
    +
    +
    +
    +
    +
    + + +
    + +
    +
    + +
    +
    + +
    + + + + + $preview + +
    + $bang +
    + + +
    + $jotplugins +
    + +
    + +
    + +
    +
    + + + +
    +
    + $acl +
    +
    $emailcc
    +
    + $jotnets +
    +
    + + + + +
    +
    + {{ if $content }}{{ endif }} diff --git a/view/theme/diabook-aerith/js/jquery.cookie.js b/view/theme/diabook-aerith/js/jquery.cookie.js new file mode 100644 index 0000000000..6d5974a2c5 --- /dev/null +++ b/view/theme/diabook-aerith/js/jquery.cookie.js @@ -0,0 +1,47 @@ +/*! + * jQuery Cookie Plugin + * https://github.com/carhartl/jquery-cookie + * + * Copyright 2011, Klaus Hartl + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://www.opensource.org/licenses/mit-license.php + * http://www.opensource.org/licenses/GPL-2.0 + */ +(function($) { + $.cookie = function(key, value, options) { + + // key and at least value given, set cookie... + if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) { + options = $.extend({}, options); + + if (value === null || value === undefined) { + options.expires = -1; + } + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setDate(t.getDate() + days); + } + + value = String(value); + + return (document.cookie = [ + encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } + + // key and possibly options given, get cookie... + options = value || {}; + var decode = options.raw ? function(s) { return s; } : decodeURIComponent; + + var pairs = document.cookie.split('; '); + for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) { + if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined + } + return null; + }; +})(jQuery); diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl new file mode 100644 index 0000000000..f84b902d5b --- /dev/null +++ b/view/theme/diabook-aerith/nav.tpl @@ -0,0 +1,188 @@ +
    +
    $sitelocation
    + +
    + + + +
    +
    $langselector
    +
    + + + + + + + +{# + +{{ if $nav.logout }}$nav.logout.1 {{ endif }} +{{ if $nav.login }} {{ endif }} + + + +{{ if $nav.register }}$nav.register.1{{ endif }} + +$nav.help.1 + +{{ if $nav.apps }}$nav.apps.1{{ endif }} + +$nav.search.1 +$nav.directory.1 + +{{ if $nav.admin }}$nav.admin.1{{ endif }} + +{{ if $nav.notifications }} +$nav.notifications.1 + +{{ endif }} +{{ if $nav.messages }} +$nav.messages.1 + +{{ endif }} + +{{ if $nav.manage }}$nav.manage.1{{ endif }} + +{{ if $nav.settings }}$nav.settings.1{{ endif }} +{{ if $nav.profiles }}$nav.profiles.1{{ endif }} + + + + + +#} diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl new file mode 100755 index 0000000000..511fc73acb --- /dev/null +++ b/view/theme/diabook-aerith/photo_view.tpl @@ -0,0 +1,27 @@ +
    +

    $album.1

    + + + +
    + {{ if $prevlink }}{{ endif }} + + {{ if $nextlink }}{{ endif }} +
    + +
    +
    $desc
    +{{ if $tags }} +
    $tags.0
    +
    $tags.1
    +{{ endif }} +{{ if $tags.2 }}{{ endif }} + +{{ if $edit }}$edit{{ endif }} \ No newline at end of file diff --git a/view/theme/diabook-aerith/profile_side.tpl b/view/theme/diabook-aerith/profile_side.tpl new file mode 100644 index 0000000000..94396300fe --- /dev/null +++ b/view/theme/diabook-aerith/profile_side.tpl @@ -0,0 +1,21 @@ + + + diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl new file mode 100644 index 0000000000..918cfc97cb --- /dev/null +++ b/view/theme/diabook-aerith/profile_vcard.tpl @@ -0,0 +1,64 @@ +
    + +
    +
    $profile.name
    + {{ if $profile.edit }} +
    + $profile.edit.1 + +
    + {{ endif }} +
    + + + {{ if $pdesc }}
    $profile.pdesc
    {{ endif }} +
    $profile.name
    + + + + {{ if $location }} +
    $location

    +
    + {{ if $profile.address }}
    $profile.address
    {{ endif }} + + $profile.locality{{ if $profile.locality }}, {{ endif }} + $profile.region + $profile.postal-code + + {{ if $profile.country-name }}$profile.country-name{{ endif }} +
    +
    + {{ endif }} + + {{ if $gender }}
    $gender
    $profile.gender
    {{ endif }} + + {{ if $profile.pubkey }}{{ endif }} + + {{ if $marital }}
    ♥$marital
    $profile.marital
    {{ endif }} + + {{ if $homepage }}
    $homepage
    $profile.homepage
    {{ endif }} + + {{ inc diaspora_vcard.tpl }}{{ endinc }} + + +
    + +$contact_block + + diff --git a/view/theme/diabook-aerith/right_aside.tpl b/view/theme/diabook-aerith/right_aside.tpl new file mode 100644 index 0000000000..a65677696a --- /dev/null +++ b/view/theme/diabook-aerith/right_aside.tpl @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl new file mode 100755 index 0000000000..6a1c5c71bd --- /dev/null +++ b/view/theme/diabook-aerith/rs_common_tabs.tpl @@ -0,0 +1,6 @@ +

    Settings Menu

    +
      + {{ for $tabs as $tab }} +
    • $tab.label
      • + {{ endfor }} +
    diff --git a/view/theme/diabook-aerith/screenshot.png b/view/theme/diabook-aerith/screenshot.png new file mode 100644 index 0000000000..0c2f508942 Binary files /dev/null and b/view/theme/diabook-aerith/screenshot.png differ diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css new file mode 100644 index 0000000000..bcba4c3be5 --- /dev/null +++ b/view/theme/diabook-aerith/style-network.css @@ -0,0 +1,2619 @@ +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ + +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#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 #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#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: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ + +.icon.contacts { + background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");} +.icon.notifications { + background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");} +.icon.notify { + background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");} +.icon.messages { + background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");} +.icon.community { + background-image: url("../../../view/theme/diabook-aerith/icons/community.png");} + +.icon.drop { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");} +.icon.drophide { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");} +.icon.dislike { background-image: url("../../../view/theme/diabook-aerith/icons/dislike.png");} +.icon.like { background-image: url("../../../view/theme/diabook-aerith/icons/like.png");} +.icon.pencil { background-image: url("../../../view/theme/diabook-aerith/icons/pencil.png");} +.icon.recycle { background-image: url("../../../view/theme/diabook-aerith/icons/recycle.png");} +.icon.remote-link { background-image: url("../../../view/theme/diabook-aerith/icons/remote.png");} +.icon.tagged { background-image: url("../../../view/theme/diabook-aerith/icons/tagged.png");} +.icon.file-as { background-image: url("../../../view/theme/diabook-aerith/icons/file_as.png");} +.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-aerith/icons/unstarred.png");} +.star-item.icon.starred { background-image: url("../../../view/theme/diabook-aerith/icons/starred.png");} +.icon.link { background-image: url("../../../view/theme/diabook-aerith/icons/link.png");} +.icon.lock { background-image: url("../../../view/theme/diabook-aerith/icons/lock.png");} +.icon.unlock { background-image: url("../../../view/theme/diabook-aerith/icons/unlock.png");} +.icon.language { background-image: url("../../../view/theme/diabook-aerith/icons/language.png");} + + +.camera { background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../../../view/theme/diabook-aerith/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video2 { background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); + display: block; width: 100%; height: 28px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../../../view/theme/diabook-aerith/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../../../view/theme/diabook-aerith/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.edit {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} + + + + +.article { background-position: -50px 0px;} +/*.audio { background-position: -70px 0px;}*/ +.block { background-position: -90px 0px;} +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +/*.edit { background-position: -150px 0px;}*/ +/*.camera { background-position: -170px 0px;}*/ +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +/*.link { background-position: -230px 0px;}*/ + +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +/*.lock { background-position: -70px -40px;}*/ + +/*.video { background-position: -110px -40px;}*/ +.youtube { background-position: -130px -40px;} + +/*.attach { background-position: -190px -40px;}*/ +/*.language { background-position: -210px -40px;}*/ + + +.icon.on { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;} +.icon.off { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;} +.prev { background-position: -90px -60px;} +.next { background-position: -110px -60px;} +/*.tagged { background-position: -130px -60px;}*/ + +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../images/content-types.png'); +} + +.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; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + /*background-image: url('icons.png');*/ +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.border.camera{ + background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + +.icon.border.link{ + background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + margin-left: 10px; + } + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s10.menu { + background-image: url("../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../images/icons/16/delete.png"); +} +/*.icon.s16.edit { + background-image: url("../../../images/icons/16/edit.png"); +}*/ +.icon.s16.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s16.menu { + background-image: url("../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s22.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s48.menu { + background-image: url("../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 1px; + width: 484px; + border-bottom: 1px solid #BDCDD4; + background-color: #fff; + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12.5px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px auto auto; + display: table; +} + +h4 { + font-size: 1.1em; +} + +a { + color: #333333; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*color: #005c94; */ + text-decoration: underline; +} +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; +} +#panel { + position: absolute; + width: 12em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} +#saved-search-ul .tool:hover, +#nets-sidebar .tool:hover, +#sidebar-group-list .tool:hover { + background: #EEE; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool a { + color: #3465A4; +} +.tool a:hover { + text-decoration: none; +} +/* popup notifications */ +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +/* header */ +header { + position: fixed; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 22%; + height: 32px; + background: #ff500f; + background-color: #ff500f; + z-index: 100; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; + background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); + +background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0.26, rgb(215,227,241)), + color-stop(0.82, rgb(255,255,255)) +); +} +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: left; + width: 82%%; + margin-left: 25%; +} +header #banner a, +header #banner a:active, +header #banner a:visited, +header #banner a:link, +header #banner a:hover { + color: black; + text-decoration: none; + outline: none; + vertical-align: middle; + font-weight: bolder; + margin-left: 3px; +} +header #banner #logo-img { + height: 25px; + margin-top: 3px; +} +header #banner #logo-text { + font-size: 20px; + position: absolute; + top: 10%; +} +/* nav */ +nav { + width: 80%; + height: 32px; + position: fixed; + left: 22%; + top: 0px; + padding: 0px; + background: #ff500f; + color: #000; + z-index: 99; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; + background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); + +background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0.26, rgb(215,227,241)), + color-stop(0.82, rgb(255,255,255)) +); +} +nav a, +nav a:active, +nav a:visited, +nav a:link, +nav a:hover { + /*color: #1f1f1f;*/ + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} +nav #banner a, +nav #banner a:active, +nav #banner a:visited, +nav #banner a:link, +nav #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; +} + +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} + +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} +nav .nav-menu-search { + position: relative; + + margin: 4px 17px; + margin-right: 0px; + height: 17px; + width: 180px; + +} + +nav #search-box #search-text { + background-image: url('icons/lupe.png'); + background-repeat:no-repeat; + padding-left:20px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; + } + + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +nav .nav-menu-icon:hover { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} + +nav .nav-menu-icon.selected { + background-color: #fff; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #fff; + /* background-color: #19aeff; */ + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + font-weight: 900; + padding: 1px 4px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; + border: 1px solid black; +} +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } +nav #nav-home-link, #nav-directory-link, #nav-apps-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 5px; + font-size: 14px; + } +nav #nav-directory-link{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; +} + +nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ + background-image: url("../../../view/theme/diabook-aerith/icons/messages.png"); + } + +/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ + background-image: url("../../../view/theme/diabook-aerith/icons/notify.png"); + } + +nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ + background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png"); + } + +nav #nav-apps-link.selected { + background-color: #fff; + moz-border-radius: 5px 5px 0 0; +-webkit-border-radius: 5px 5px 0 0; +border-radius: 5px 5px 0 0; +} + +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #fff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #3465A4; /*bdcdd4;*/ + color: #fff; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ + +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} + +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/*profile_side*/ +#profile_side { + margin-bottom: 30px; + +} +#profile_side a{ + color: #333; +} +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + word-wrap: break-word; + width: 130px; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 0px; + min-height: 0px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 16px; + min-height: 16px; + list-style: none; + } +.menu-profile-list:hover{ + background: #EEE; + } +.menu-profile-list-item{ + padding-left: 5px; + } +.menu-profile-list-item:hover{ + text-decoration: none; + } +/*http://prothemedesign.com/circular-icons/*/ +.menu-profile-list.home{ + background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat; + } +.menu-profile-list.photos{ + background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat; + } +.menu-profile-list.events{ + background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat; + } +.menu-profile-list.notes{ + background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat; + } +.menu-profile-list.foren{ + background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat; + } +.menu-profile-list.com_side{ + background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat; + } +.menu-profile-list.pscontacts{ + background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat; + } +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 160px; + padding: 0px 10px 0px 10px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +aside #page-sidebar{display: none;} +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + /*width: 35%;*/ + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 5px; + /*width: 60%;*/ +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +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; +border-bottom-left-radius: 15px; +} +aside #side-follow-url { + width: 150px; + } +aside #side-peoplefind-url { + width: 150px; + } +#contact-block { + overflow: auto; + height: auto; +} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 55px; + height: 55px; +} +#lost-password-link { + float: left; + margin-right: 20px; + } +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget input.action { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget:hover .title .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action.ticked { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums ul li a{ + color: #3465A4; +} +.widget .tool.selected { + background: url("../../../view/theme/diabook-aerith/icons/selected.png") no-repeat left center; +} +/* widget: search */ +span.sbox_l { + background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-left: 10px; + margin-top: 5px; + +} + +span.sbox_r { + background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-top: 5px; +} + +span.sbox input { + background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left; + float: left; + margin-top: 5px; + border: 0; + height: 13px; width: 100px; + padding: 3px; + font: 11px/13px arial; + color: #000; +} +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: auto; + padding: 0px 0px 0px 12px; +} + +body .pageheader{ + text-align: center; + margin-top: 25px; + font-size: 0px; + } + +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } +.pager { + padding: 10px; + text-align: center; + font-size: 1.0em; + clear: both; + display: block; +} + +.tabs { + + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.tab.button { + margin-right: 5px; + margin-left: 5px; + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: normal; + padding: 3px; + color: #333333; + } + +#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ + margin-bottom: 10px; + } +#birthday-wrapper a { + color: #3465A4; + } + +right_aside { + display: table-cell; + vertical-align: top; + width: 170px; + + /*border-left: 1px solid #D2D2D2;*/ + + /* background: #F1F1F1; */ +} +right_aside a{color: #3465A4;} +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; 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; } +right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } +right_aside #likes { margin: 0px; padding: 0px; list-style: none; } +right_aside .items-wrapper{ overflow: auto; width: 100%; } +right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } +right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} +#page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} +right_aside .icon {width: 10px; height: 10px;} +.close_box { + background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 0.1; + } +.close_box:hover { + background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } + + +/* wall item */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 575px; +} +.tread-wrapper a{ + color: #3465A4; +} + +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} + +.wall-item-container { + display: table; + width: 580px; +} + + +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} + +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { +/* opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container:hover .wall-item-bottom { +/* opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} +.wall-item-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + + clear: both; + overflow: hidden; + + margin-bottom: 5px; +} + +.wall-item-container .wall-item-content { + font-size: 12.5px; + max-width: 420px; + word-wrap: break-word; + line-height: 1.2; +} + +.wall-item-container .wall-item-content img { + max-width: 400px; +} +.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-name { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-actions-social a { + float: left; +} +.wall-item-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell; +} +.wall-item-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 500px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} + +.wall-item-comment-wrapper { + margin: 1px 0px 0px 80px; + background-color: #fff; + width: 500px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 2.0em; + width: 93%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + font-size: 14px; + margin-left: 20px; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 710px; + border: 1px solid #2d2d2d; + margin-top: 10px; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} + +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} + +#jot-preview-content{ + margin-top: 30px;} + +#jot-preview-content .tread-wrapper { + background-color: #fff797; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + /*background: url("../../../images/tag_b.png") repeat-x center left;*/ + color: #999; + padding-left: 3px; + font-size: 12px; +} +.tag a { + padding-right: 5px; + /*background: url("../../../images/tag.png") no-repeat center right;*/ + color: #999; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 585px; + margin: 0px 2em 20px 0px; +} +#profile-jot-form #profile-jot-text { + height: 2.0em; + width: 99%; + font-size: 15px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + margin-bottom: 10px; +} +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 583px; + background-color: #fff; + border-bottom: 2px solid #9eabb0; +} + +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#profile-jot-form #jot-title { + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #ffffff; +} +#profile-jot-form #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#profile-jot-form #jot-title:-moz-placeholder { + font-weight: normal; +} +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 585px; + height: 100px; + } +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 585px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 585px; +} + +#profile-jot-submit { + float: right; + margin-top: 2px; + font-size: 14px; + +} +#profile-upload-wrapper { + float: left; + margin-top: 2px; + margin-left: 10px; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-rotator { + float: left; + margin-left: 30px; + margin-top: 2px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; + margin-top: 2px; +} +#jot-preview-link { + float: right; + margin-left: 10px; + margin-top: 2px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; +} +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } +/** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + cursor: pointer; + font-weight: bolder; +} +.button.creation2 { + background-color: #3465A4; + 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; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** 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: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#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-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; + background-position: 3px 3px; + background-repeat: no-repeat; + 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 **/ +/** tab buttons 14618a**/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 5px; +} +ul.tabs li .active { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + margin-left: 5px; +} +/** + * 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 .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: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} + +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } + +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ +.photo { +box-shadow: 2px 2px 5px 0px #000000; +margin: 2px 5px 2px 5px; +max-height: 85%; +max-width: 85%; +} +.lframe { + float: left; + /*margin: 0px 10px 10px 0px;*/ +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; +} + +.contact-photo-menu-button { + position: relative; + background-image: url("../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -20px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} + +/* page footer */ +footer { + height: 100px; + display: table-row; +} + +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; +} +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } +/* ================== */ +/* = Contacts Block = */ +/* ================== */ + +.contact-block-img { + width: 55px; + height: 55px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} +#group-edit-desc { + margin-top: 15px; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: right; + margin-top: 10px; +} + +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } + +#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; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*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.4em; + margin: 10px 0; +} + +.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-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.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-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} +.calendar.eventcal a { + color: #3465A4; + } +.today { + font-weight: bold; + 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; +} +.lightbox{ + float: left; + } + +#photo-photo { + float: left; +} +#photo-like-div .wall-item-like-buttons { + float: left; + margin-right: 5px; + margin-top: 30px; + } +.comment-edit-text-empty { + margin: 10px 0 0; + width: 85%; +} +.comment-edit-photo { + margin: 10px 0 0; +} +.wall-item-like-buttons .icon.like { +float: left; +} + +#photo-photo-end { + clear: both; +} + +.tabs .comment-wwedit-wrapper { + display: block; + margin-top: 30px; + margin-left: 50px; + } + +.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-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: -2px; + top: -20px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: left; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums{ + margin-top: 15px; + } +.photo-top-photo, .photo-album-photo { + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.photo-album-image-wrapper, .photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #000; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 20px; + position: relative; + margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + position: absolute; + bottom: 0px; + padding-left: 3px; + background-color: #EEE; +} +.photo-top-album-link{ + color: #3465A4; + } +.photo-top-album-img{ + + } +/*.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +}*/ +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css new file mode 100644 index 0000000000..9c9f8b4e69 --- /dev/null +++ b/view/theme/diabook-aerith/style-profile.css @@ -0,0 +1,2607 @@ +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ + +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#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 #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#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: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ + +.icon.contacts { + background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");} +.icon.notifications { + background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");} +.icon.notify { + background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");} +.icon.messages { + background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");} +.icon.community { + background-image: url("../../../view/theme/diabook-aerith/icons/community.png");} + +.icon.drop { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");} +.icon.drophide { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");} +.icon.dislike { background-image: url("../../../view/theme/diabook-aerith/icons/dislike.png");} +.icon.like { background-image: url("../../../view/theme/diabook-aerith/icons/like.png");} +.icon.pencil { background-image: url("../../../view/theme/diabook-aerith/icons/pencil.png");} +.icon.recycle { background-image: url("../../../view/theme/diabook-aerith/icons/recycle.png");} +.icon.remote-link { background-image: url("../../../view/theme/diabook-aerith/icons/remote.png");} +.icon.tagged { background-image: url("../../../view/theme/diabook-aerith/icons/tagged.png");} +.icon.file-as { background-image: url("../../../view/theme/diabook-aerith/icons/file_as.png");} +.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-aerith/icons/unstarred.png");} +.star-item.icon.starred { background-image: url("../../../view/theme/diabook-aerith/icons/starred.png");} +.icon.link { background-image: url("../../../view/theme/diabook-aerith/icons/link.png");} +.icon.lock { background-image: url("../../../view/theme/diabook-aerith/icons/lock.png");} +.icon.unlock { background-image: url("../../../view/theme/diabook-aerith/icons/unlock.png");} +.icon.language { background-image: url("../../../view/theme/diabook-aerith/icons/language.png");} + + +.camera { background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../../../view/theme/diabook-aerith/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video2 { background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); + display: block; width: 100%; height: 28px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../../../view/theme/diabook-aerith/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../../../view/theme/diabook-aerith/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.edit {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} + + + + +.article { background-position: -50px 0px;} +/*.audio { background-position: -70px 0px;}*/ +.block { background-position: -90px 0px;} +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +/*.edit { background-position: -150px 0px;}*/ +/*.camera { background-position: -170px 0px;}*/ +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +/*.link { background-position: -230px 0px;}*/ + +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +/*.lock { background-position: -70px -40px;}*/ + +/*.video { background-position: -110px -40px;}*/ +.youtube { background-position: -130px -40px;} + +/*.attach { background-position: -190px -40px;}*/ +/*.language { background-position: -210px -40px;}*/ + + +.icon.on { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;} +.icon.off { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;} +.prev { background-position: -90px -60px;} +.next { background-position: -110px -60px;} +/*.tagged { background-position: -130px -60px;}*/ + +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../images/content-types.png'); +} + +.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; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + /*background-image: url('icons.png');*/ +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.border.camera{ + background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + +.icon.border.link{ + background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + margin-left: 10px; + } + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s10.menu { + background-image: url("../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../images/icons/16/delete.png"); +} +/*.icon.s16.edit { + background-image: url("../../../images/icons/16/edit.png"); +}*/ +.icon.s16.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s16.menu { + background-image: url("../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s22.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s48.menu { + background-image: url("../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 5px; + width: 484px; + border-bottom: 1px solid #BDCDD4; + border-top: 1px solid #BDCDD4; + + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12.5px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px auto auto; + display: table; +} + +h4 { + font-size: 1.1em; +} + +a { + color: #333333; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*color: #005c94; */ + text-decoration: underline; +} +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; +} +#panel { + position: absolute; + width: 12em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} +#saved-search-ul .tool:hover, +#nets-sidebar .tool:hover, +#sidebar-group-list .tool:hover { + background: #EEE; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool a { + color: ##3F8FBA; +} +.tool a:hover { + text-decoration: none; +} +/* popup notifications */ +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +/* header */ +header { + position: fixed; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 22%; + height: 32px; + background: #ff500f; + background-color: #ff500f; + z-index: 100; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; + background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); + +background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0.26, rgb(215,227,241)), + color-stop(0.82, rgb(255,255,255)) +); +} +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: left; + width: 82%%; + margin-left: 25%; +} +header #banner a, +header #banner a:active, +header #banner a:visited, +header #banner a:link, +header #banner a:hover { + color: #1f1f1f; + text-decoration: none; + outline: none; + vertical-align: middle; + font-weight: bolder; + margin-left: 3px; +} +header #banner #logo-img { + height: 25px; + margin-top: 3px; +} +header #banner #logo-text { + font-size: 20px; + position: absolute; + top: 10%; +} +/* nav */ +nav { + width: 80%; + height: 32px; + position: fixed; + left: 22%; + top: 0px; + padding: 0px; + background: #ff500f; + color: #1f1f1f; + z-index: 99; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; + background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); + +background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0.26, rgb(215,227,241)), + color-stop(0.82, rgb(255,255,255)) +); +} +nav a, +nav a:active, +nav a:visited, +nav a:link, +nav a:hover { + color: #1f1f1f; + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} +nav #banner a, +nav #banner a:active, +nav #banner a:visited, +nav #banner a:link, +nav #banner a:hover { + color: #1f1f1f; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; +} + +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} + +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} +nav .nav-menu-search { + position: relative; + + margin: 4px 17px; + margin-right: 0px; + height: 17px; + width: 180px; + +} + +nav #search-box #search-text { + background-image: url('icons/lupe.png'); + background-repeat:no-repeat; + padding-left:20px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; + } + + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +nav .nav-menu-icon:hover { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} + +nav .nav-menu-icon.selected { + background-color: #fff; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border-bottom: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #fff; + /* background-color: #19aeff; */ + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + font-weight: 900; + padding: 1px 4px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; + border: 1px solid black; +} +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } +nav #nav-home-link, #nav-directory-link, #nav-apps-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 5px; + font-size: 14px; + } +nav #nav-directory-link{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; +} + +nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ + background-image: url("../../../view/theme/diabook-aerith/icons/messages.png"); + } + +/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ + background-image: url("../../../view/theme/diabook-aerith/icons/notify.png"); + } + +nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ + background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png"); + } + +nav #nav-apps-link.selected { + background-color: #fff; + moz-border-radius: 5px 5px 0 0; +-webkit-border-radius: 5px 5px 0 0; +border-radius: 5px 5px 0 0; +} + +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #fff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #3465A4; /*bdcdd4;*/ + color: #fff; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ + +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} + +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/*profile_side*/ +#profile_side { + margin-bottom: 30px; +} +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + word-wrap: break-word; + width: 130px; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 0px; + min-height: 0px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 16px; + min-height: 16px; + list-style: none; + } +.menu-profile-list:hover{ + background: #EEE; + } +.menu-profile-list-item{ + padding-left: 5px; + } +.menu-profile-list-item:hover{ + text-decoration: none; + } +/*http://prothemedesign.com/circular-icons/*/ +.menu-profile-list.home{ + background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat; + } +.menu-profile-list.photos{ + background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat; + } +.menu-profile-list.events{ + background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat; + } +.menu-profile-list.notes{ + background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat; + } +.menu-profile-list.foren{ + background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat; + } +.menu-profile-list.com_side{ + background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat; + } + +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 160px; + padding: 0px 10px 0px 10px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} + +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + /*width: 35%;*/ + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 5px; + /*width: 60%;*/ +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +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; +border-bottom-left-radius: 15px; +} +aside #side-follow-url { + width: 150px; + } +aside #side-peoplefind-url { + width: 150px; + } +#contact-block { + overflow: auto; + height: auto; +} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 48px; + height: 48px; +} +#lost-password-link { + float: left; + margin-right: 20px; + } +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget input.action { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget:hover .title .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action.ticked { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums ul li a{ + color: #3465A4; +} +.widget .tool.selected { + background: url("../../../view/theme/diabook-aerith/icons/selected.png") no-repeat left center; +} +/* widget: search */ +span.sbox_l { + background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-left: 10px; + margin-top: 5px; + +} + +span.sbox_r { + background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-top: 5px; +} + +span.sbox input { + background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left; + float: left; + margin-top: 5px; + border: 0; + height: 13px; width: 100px; + padding: 3px; + font: 11px/13px arial; + color: #000; +} +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 611px; + padding: 0px 0px 0px 12px; +} + +body .pageheader{ + text-align: center; + margin-top: 25px; + font-size: 0px; + } + +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } +.pager { + padding: 10px; + text-align: center; + font-size: 1.0em; + clear: both; + display: block; +} + +.tabs { + + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.tab.button { + margin-right: 5px; + margin-left: 5px; + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: normal; + padding: 3px; + color: #333333; + } + +#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ + margin-bottom: 10px; + } +#birthday-wrapper a { + color: #3465A4; + } + +right_aside { + display: table-cell; + vertical-align: top; + width: 170px; + /*padding-right: 10px;*/ + /*border-left: 1px solid #D2D2D2;*/ + + /* background: #F1F1F1; */ +} +right_aside a{color: #3465A4;} +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; 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; } +right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } +right_aside #likes { margin: 0px; padding: 0px; list-style: none; } +right_aside .items-wrapper{ overflow: auto; width: 100%; } +right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } +right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} +#page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} +right_aside .icon {width: 10px; height: 10px;} +.close_box { + background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 0.1; + } +.close_box:hover { + background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +/* wall item */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 575px; +} +.tread-wrapper a{ + color: #3465A4; +} + +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} + +.wall-item-container { + display: table; + width: 580px; +} + + +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} + +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { +/* opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container:hover .wall-item-bottom { +/* opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} +.wall-item-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + + clear: both; + overflow: hidden; + + margin-bottom: 5px; +} + +.wall-item-container .wall-item-content { + font-size: 12.5px; + max-width: 420px; + word-wrap: break-word; + line-height: 1.2; +} + +.wall-item-container .wall-item-content img { + max-width: 400px; +} +.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-name { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-actions-social a { + float: left; +} +.wall-item-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell; +} +.wall-item-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 500px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} +.wall-item-comment-wrapper { + margin: 1px 5px 1px 80px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 2.0em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + font-size: 14px; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 710px; + border: 1px solid #2d2d2d; + margin-top: 10px; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} + +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} + +#jot-preview-content{ + margin-top: 30px;} + +#jot-preview-content .tread-wrapper { + background-color: #fff797; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + /*background: url("../../../images/tag_b.png") repeat-x center left;*/ + color: #999; + padding-left: 3px; + font-size: 12px; +} +.tag a { + padding-right: 5px; + /*background: url("../../../images/tag.png") no-repeat center right;*/ + color: #999; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 585px; + margin: 0px 2em 20px 0px; +} +#profile-jot-form #profile-jot-text { + height: 2.0em; + width: 99%; + font-size: 15px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + margin-bottom: 10px; +} +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 583px; + background-color: #fff; + border-bottom: 2px solid #9eabb0; +} + +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#profile-jot-form #jot-title { + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #ffffff; +} +#profile-jot-form #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#profile-jot-form #jot-title:-moz-placeholder { + font-weight: normal; +} +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 585px; + height: 100px; + } +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 585px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 585px; +} + +#profile-jot-submit { + float: right; + margin-top: 2px; + font-size: 14px; +} +#profile-upload-wrapper { + float: left; + margin-top: 2px; + margin-left: 10px; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-rotator { + float: left; + margin-left: 30px; + margin-top: 2px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; + margin-top: 2px; +} +#jot-preview-link { + float: right; + margin-left: 10px; + margin-top: 2px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; +} +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } +/** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + font-weight: bolder; + cursor: pointer; +} +.button.creation2 { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; + font-weight: bolder; + cursor: pointer; +} +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** 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: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#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-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; + background-position: 3px 3px; + background-repeat: no-repeat; + 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 **/ +/** tab buttons 14618a**/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 5px; +} +ul.tabs li .active { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + margin-left: 5px; +} +/** + * 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 .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: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} + +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } + +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ +.photo { +box-shadow: 2px 2px 5px 0px #000000; +margin: 2px 5px 2px 5px; +max-height: 85%; +max-width: 85%; +} +.lframe { + float: left; + /*margin: 0px 10px 10px 0px;*/ +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; +} + +.contact-photo-menu-button { + position: relative; + background-image: url("../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -20px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} + +/* page footer */ +footer { + height: 100px; + display: table-row; +} + +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; +} +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } +/* ================== */ +/* = Contacts Block = */ +/* ================== */ + +.contact-block-img { + width: 48px; + height: 48px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} +#group-edit-desc { + margin-top: 15px; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: right; + margin-top: 10px; +} + +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } + +#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; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*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.4em; + margin: 10px 0; +} + +.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-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.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-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} +.calendar.eventcal a { + color: #3465A4; + } +.today { + font-weight: bold; + 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; +} +.lightbox{ + float: left; + } + +#photo-photo { + float: left; +} +#photo-like-div .wall-item-like-buttons { + float: left; + margin-right: 5px; + margin-top: 30px; + } +.comment-edit-text-empty { + margin: 10px 0 0; + width: 85%; +} +.comment-edit-photo { + margin: 10px 0 0; +} +.wall-item-like-buttons .icon.like { +float: left; +} + +#photo-photo-end { + clear: both; +} + +.tabs .comment-wwedit-wrapper { + display: block; + margin-top: 30px; + margin-left: 50px; + } + +.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-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: -2px; + top: -20px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: left; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums{ + margin-top: 15px; + } +.photo-top-photo, .photo-album-photo { + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.photo-album-image-wrapper, .photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #000; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 20px; + position: relative; + margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + position: absolute; + bottom: 0px; + padding-left: 3px; + background-color: #EEE; +} +.photo-top-album-link{ + color: #3465A4; + } +.photo-top-album-img{ + + } +/*.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +}*/ +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + diff --git a/view/theme/diabook-aerith/style-settings.css b/view/theme/diabook-aerith/style-settings.css new file mode 100644 index 0000000000..0326dbcfca --- /dev/null +++ b/view/theme/diabook-aerith/style-settings.css @@ -0,0 +1,2613 @@ +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ + +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#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 #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#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: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ + +.icon.contacts { + background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");} +.icon.notifications { + background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");} +.icon.notify { + background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");} +.icon.messages { + background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");} +.icon.community { + background-image: url("../../../view/theme/diabook-aerith/icons/community.png");} + +.icon.drop { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");} +.icon.drophide { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");} +.icon.dislike { background-image: url("../../../view/theme/diabook-aerith/icons/dislike.png");} +.icon.like { background-image: url("../../../view/theme/diabook-aerith/icons/like.png");} +.icon.pencil { background-image: url("../../../view/theme/diabook-aerith/icons/pencil.png");} +.icon.recycle { background-image: url("../../../view/theme/diabook-aerith/icons/recycle.png");} +.icon.remote-link { background-image: url("../../../view/theme/diabook-aerith/icons/remote.png");} +.icon.tagged { background-image: url("../../../view/theme/diabook-aerith/icons/tagged.png");} +.icon.file-as { background-image: url("../../../view/theme/diabook-aerith/icons/file_as.png");} +.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-aerith/icons/unstarred.png");} +.star-item.icon.starred { background-image: url("../../../view/theme/diabook-aerith/icons/starred.png");} +.icon.link { background-image: url("../../../view/theme/diabook-aerith/icons/link.png");} +.icon.lock { background-image: url("../../../view/theme/diabook-aerith/icons/lock.png");} +.icon.unlock { background-image: url("../../../view/theme/diabook-aerith/icons/unlock.png");} +.icon.language { background-image: url("../../../view/theme/diabook-aerith/icons/language.png");} + + +.camera { background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../../../view/theme/diabook-aerith/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video2 { background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); + display: block; width: 100%; height: 28px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../../../view/theme/diabook-aerith/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../../../view/theme/diabook-aerith/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.edit {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} + + + + +.article { background-position: -50px 0px;} +/*.audio { background-position: -70px 0px;}*/ +.block { background-position: -90px 0px;} +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +/*.edit { background-position: -150px 0px;}*/ +/*.camera { background-position: -170px 0px;}*/ +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +/*.link { background-position: -230px 0px;}*/ + +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +/*.lock { background-position: -70px -40px;}*/ + +/*.video { background-position: -110px -40px;}*/ +.youtube { background-position: -130px -40px;} + +/*.attach { background-position: -190px -40px;}*/ +/*.language { background-position: -210px -40px;}*/ + + +.icon.on { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;} +.icon.off { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;} +.prev { background-position: -90px -60px;} +.next { background-position: -110px -60px;} +/*.tagged { background-position: -130px -60px;}*/ + +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../images/content-types.png'); +} + +.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; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + /*background-image: url('icons.png');*/ +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.border.camera{ + background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + +.icon.border.link{ + background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + margin-left: 10px; + } + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s10.menu { + background-image: url("../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../images/icons/16/delete.png"); +} +/*.icon.s16.edit { + background-image: url("../../../images/icons/16/edit.png"); +}*/ +.icon.s16.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s16.menu { + background-image: url("../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s22.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s48.menu { + background-image: url("../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 1px; + width: 484px; + border-bottom: 1px solid #BDCDD4; + background-color: #fff; + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12.5px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px auto auto; + display: table; +} + +h4 { + font-size: 1.1em; +} + +a { + color: #333333; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*color: #005c94; */ + text-decoration: underline; +} +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; +} +#panel { + position: absolute; + width: 12em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} +#saved-search-ul .tool:hover, +#nets-sidebar .tool:hover, +#sidebar-group-list .tool:hover { + background: #EEE; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool a { + color: #3465A4; +} +.tool a:hover { + text-decoration: none; +} +/* popup notifications */ +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +/* header */ +header { + position: fixed; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 22%; + height: 32px; + background: #ff500f; + background-color: #ff500f; + z-index: 100; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; + background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); + +background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0.26, rgb(215,227,241)), + color-stop(0.82, rgb(255,255,255)) +); +} +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: left; + width: 82%%; + margin-left: 25%; +} +header #banner a, +header #banner a:active, +header #banner a:visited, +header #banner a:link, +header #banner a:hover { + color: black; + text-decoration: none; + outline: none; + vertical-align: middle; + font-weight: bolder; + margin-left: 3px; +} +header #banner #logo-img { + height: 25px; + margin-top: 3px; +} +header #banner #logo-text { + font-size: 20px; + position: absolute; + top: 10%; +} +/* nav */ +nav { + width: 80%; + height: 32px; + position: fixed; + left: 22%; + top: 0px; + padding: 0px; + background: #ff500f; + color: #000; + z-index: 99; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; + background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); + +background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0.26, rgb(215,227,241)), + color-stop(0.82, rgb(255,255,255)) +); +} +nav a, +nav a:active, +nav a:visited, +nav a:link, +nav a:hover { + /*color: #1f1f1f;*/ + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} +nav #banner a, +nav #banner a:active, +nav #banner a:visited, +nav #banner a:link, +nav #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; +} + +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} + +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} +nav .nav-menu-search { + position: relative; + + margin: 4px 17px; + margin-right: 0px; + height: 17px; + width: 180px; + +} + +nav #search-box #search-text { + background-image: url('icons/lupe.png'); + background-repeat:no-repeat; + padding-left:20px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; + } + + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +nav .nav-menu-icon:hover { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} + +nav .nav-menu-icon.selected { + background-color: #fff; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #fff; + /* background-color: #19aeff; */ + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + font-weight: 900; + padding: 1px 4px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; + border: 1px solid black; +} +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } +nav #nav-home-link, #nav-directory-link, #nav-apps-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 5px; + font-size: 14px; + } +nav #nav-directory-link{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; +} + +nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ + background-image: url("../../../view/theme/diabook-aerith/icons/messages.png"); + } + +/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ + background-image: url("../../../view/theme/diabook-aerith/icons/notify.png"); + } + +nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ + background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png"); + } + +nav #nav-apps-link.selected { + background-color: #fff; + moz-border-radius: 5px 5px 0 0; +-webkit-border-radius: 5px 5px 0 0; +border-radius: 5px 5px 0 0; +} + +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #fff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #3465A4; /*bdcdd4;*/ + color: #fff; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ + +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} + +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/*profile_side*/ +#profile_side { + margin-bottom: 30px; + +} +#profile_side a{ + color: #333; +} +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + word-wrap: break-word; + width: 130px; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 0px; + min-height: 0px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 16px; + min-height: 16px; + list-style: none; + } +.menu-profile-list:hover{ + background: #EEE; + } +.menu-profile-list-item{ + padding-left: 5px; + } +.menu-profile-list-item:hover{ + text-decoration: none; + } +/*http://prothemedesign.com/circular-icons/*/ +.menu-profile-list.home{ + background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat; + } +.menu-profile-list.photos{ + background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat; + } +.menu-profile-list.events{ + background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat; + } +.menu-profile-list.notes{ + background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat; + } +.menu-profile-list.foren{ + background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat; + } +.menu-profile-list.com_side{ + background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat; + } +.menu-profile-list.pscontacts{ + background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat; + } +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 200px; + padding: 0px 10px 0px 10px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +aside #page-sidebar{display: none;} +aside .vcard {display: none;} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + /*width: 35%;*/ + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 5px; + /*width: 60%;*/ +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +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; +border-bottom-left-radius: 15px; +} +aside #side-follow-url { + width: 150px; + } +aside #side-peoplefind-url { + width: 150px; + } +#contact-block {display: none;} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 55px; + height: 55px; +} +#lost-password-link { + float: left; + margin-right: 20px; + } +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget input.action { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget:hover .title .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action.ticked { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums ul li a{ + color: #3465A4; +} +.widget .tool.selected { + background: url("../../../view/theme/diabook-aerith/icons/selected.png") no-repeat left center; +} +/* widget: search */ +span.sbox_l { + background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-left: 10px; + margin-top: 5px; + +} + +span.sbox_r { + background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-top: 5px; +} + +span.sbox input { + background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left; + float: left; + margin-top: 5px; + border: 0; + height: 13px; width: 100px; + padding: 3px; + font: 11px/13px arial; + color: #000; +} +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 650px; + padding: 0px 0px 0px 20px; +} + +body .pageheader{ + text-align: center; + margin-top: 25px; + font-size: 0px; + } + +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } +.pager { + padding: 10px; + text-align: center; + font-size: 1.0em; + clear: both; + display: block; +} +.tabs {display: none;} +.tab.button{display: none;} +.rs_tabs { + + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.rs_tab.button { + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: bolder; + padding: 3px; + color: #333333; + text-decoration: none; + } + +#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ + margin-bottom: 10px; + } +#birthday-wrapper a { + color: #3465A4; + } + +right_aside { + display: table-cell; + vertical-align: top; + width: 170px; + + /*border-left: 1px solid #D2D2D2;*/ + + /* background: #F1F1F1; */ +} +right_aside a{color: #3465A4;} +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; 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; } +right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } +right_aside #likes { margin: 0px; padding: 0px; list-style: none; } +right_aside .items-wrapper{ overflow: auto; width: 100%; } +right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } +right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} +#page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} +right_aside .icon {width: 10px; height: 10px;} +.close_box { + background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 0.1; + } +.close_box:hover { + background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } + + +/* wall item */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 575px; +} +.tread-wrapper a{ + color: #3465A4; +} + +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} + +.wall-item-container { + display: table; + width: 580px; +} + + +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} + +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { +/* opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container:hover .wall-item-bottom { +/* opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} +.wall-item-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + + clear: both; + overflow: hidden; + + margin-bottom: 5px; +} + +.wall-item-container .wall-item-content { + font-size: 12.5px; + max-width: 420px; + word-wrap: break-word; + line-height: 1.2; +} + +.wall-item-container .wall-item-content img { + max-width: 400px; +} +.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-name { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-actions-social a { + float: left; +} +.wall-item-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell; +} +.wall-item-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 500px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} + +.wall-item-comment-wrapper { + margin: 1px 0px 0px 80px; + background-color: #fff; + width: 500px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 2.0em; + width: 93%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + font-size: 14px; + margin-left: 20px; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 710px; + border: 1px solid #2d2d2d; + margin-top: 10px; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} + +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} + +#jot-preview-content{ + margin-top: 30px;} + +#jot-preview-content .tread-wrapper { + background-color: #fff797; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + /*background: url("../../../images/tag_b.png") repeat-x center left;*/ + color: #999; + padding-left: 3px; + font-size: 12px; +} +.tag a { + padding-right: 5px; + /*background: url("../../../images/tag.png") no-repeat center right;*/ + color: #999; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 585px; + margin: 0px 2em 20px 0px; +} +#profile-jot-form #profile-jot-text { + height: 2.0em; + width: 99%; + font-size: 15px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + margin-bottom: 10px; +} +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 583px; + background-color: #fff; + border-bottom: 2px solid #9eabb0; +} + +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#profile-jot-form #jot-title { + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #ffffff; +} +#profile-jot-form #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#profile-jot-form #jot-title:-moz-placeholder { + font-weight: normal; +} +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 585px; + height: 100px; + } +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 585px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 585px; +} + +#profile-jot-submit { + float: right; + margin-top: 2px; + font-size: 14px; + +} +#profile-upload-wrapper { + float: left; + margin-top: 2px; + margin-left: 10px; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-rotator { + float: left; + margin-left: 30px; + margin-top: 2px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; + margin-top: 2px; +} +#jot-preview-link { + float: right; + margin-left: 10px; + margin-top: 2px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; +} +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } +/** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + cursor: pointer; + font-weight: bolder; +} +.button.creation2 { + background-color: #3465A4; + 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; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** 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: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#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-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; + background-position: 3px 3px; + background-repeat: no-repeat; + 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 **/ +/** tab buttons 14618a**/ +ul.rs_tabs { + list-style-type: none; + + font-size: 11px; +} +ul.rs_tabs li { + float: left; + margin-bottom: 30px; + clear: both; +} +ul.rs_tabs li .active { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + font-size: 13px; +} +/** + * 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 .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: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} + +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } + +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ +.photo { +box-shadow: 2px 2px 5px 0px #000000; +margin: 2px 5px 2px 5px; +max-height: 85%; +max-width: 85%; +} +.lframe { + float: left; + /*margin: 0px 10px 10px 0px;*/ +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; +} + +.contact-photo-menu-button { + position: relative; + background-image: url("../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -20px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} + +/* page footer */ +footer { + height: 100px; + display: table-row; +} + +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; +} +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } +/* ================== */ +/* = Contacts Block = */ +/* ================== */ + +.contact-block-img { + width: 55px; + height: 55px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} +#group-edit-desc { + margin-top: 15px; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: right; + margin-top: 10px; +} + +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } + +#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; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*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.4em; + margin: 10px 0; +} + +.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-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.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-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} +.calendar.eventcal a { + color: #3465A4; + } +.today { + font-weight: bold; + 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; +} +.lightbox{ + float: left; + } + +#photo-photo { + float: left; +} +#photo-like-div .wall-item-like-buttons { + float: left; + margin-right: 5px; + margin-top: 30px; + } +.comment-edit-text-empty { + margin: 10px 0 0; + width: 85%; +} +.comment-edit-photo { + margin: 10px 0 0; +} +.wall-item-like-buttons .icon.like { +float: left; +} + +#photo-photo-end { + clear: both; +} + +.tabs .comment-wwedit-wrapper { + display: block; + margin-top: 30px; + margin-left: 50px; + } + +.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-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: -2px; + top: -20px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: left; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums{ + margin-top: 15px; + } +.photo-top-photo, .photo-album-photo { + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.photo-album-image-wrapper, .photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #000; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 20px; + position: relative; + margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + position: absolute; + bottom: 0px; + padding-left: 3px; + background-color: #EEE; +} +.photo-top-album-link{ + color: #3465A4; + } +.photo-top-album-img{ + + } +/*.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +}*/ +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css new file mode 100644 index 0000000000..1802c914d5 --- /dev/null +++ b/view/theme/diabook-aerith/style.css @@ -0,0 +1,2617 @@ +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ + +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#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 #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#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: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ + +.icon.contacts { + background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png");} +.icon.notifications { + background-image: url("../../../view/theme/diabook-aerith/icons/notifications.png");} +.icon.notify { + background-image: url("../../../view/theme/diabook-aerith/icons/notify.png");} +.icon.messages { + background-image: url("../../../view/theme/diabook-aerith/icons/messages.png");} +.icon.community { + background-image: url("../../../view/theme/diabook-aerith/icons/community.png");} + +.icon.drop { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");} +.icon.drophide { background-image: url("../../../view/theme/diabook-aerith/icons/drop.png");} +.icon.dislike { background-image: url("../../../view/theme/diabook-aerith/icons/dislike.png");} +.icon.like { background-image: url("../../../view/theme/diabook-aerith/icons/like.png");} +.icon.pencil { background-image: url("../../../view/theme/diabook-aerith/icons/pencil.png");} +.icon.recycle { background-image: url("../../../view/theme/diabook-aerith/icons/recycle.png");} +.icon.remote-link { background-image: url("../../../view/theme/diabook-aerith/icons/remote.png");} +.icon.tagged { background-image: url("../../../view/theme/diabook-aerith/icons/tagged.png");} +.icon.file-as { background-image: url("../../../view/theme/diabook-aerith/icons/file_as.png");} +.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-aerith/icons/unstarred.png");} +.star-item.icon.starred { background-image: url("../../../view/theme/diabook-aerith/icons/starred.png");} +.icon.link { background-image: url("../../../view/theme/diabook-aerith/icons/link.png");} +.icon.lock { background-image: url("../../../view/theme/diabook-aerith/icons/lock.png");} +.icon.unlock { background-image: url("../../../view/theme/diabook-aerith/icons/unlock.png");} +.icon.language { background-image: url("../../../view/theme/diabook-aerith/icons/language.png");} + + +.camera { background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../../../view/theme/diabook-aerith/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video2 { background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../../../view/theme/diabook-aerith/icons/video.png"); + display: block; width: 100%; height: 28px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../../../view/theme/diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../../../view/theme/diabook-aerith/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../../../view/theme/diabook-aerith/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.edit {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} + + + + +.article { background-position: -50px 0px;} +/*.audio { background-position: -70px 0px;}*/ +.block { background-position: -90px 0px;} +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +/*.edit { background-position: -150px 0px;}*/ +/*.camera { background-position: -170px 0px;}*/ +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +/*.link { background-position: -230px 0px;}*/ + +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +/*.lock { background-position: -70px -40px;}*/ + +/*.video { background-position: -110px -40px;}*/ +.youtube { background-position: -130px -40px;} + +/*.attach { background-position: -190px -40px;}*/ +/*.language { background-position: -210px -40px;}*/ + + +.icon.on { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;} +.icon.off { background-image: url("../../../view/theme/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;} +.icon.prev { background-image: url("../../../view/theme/diabook-aerith/icons/prev.png"); background-repeat: no-repeat;} +.icon.next { background-image: url("../../../view/theme/diabook-aerith/icons/next.png"); background-repeat: no-repeat;} +/*.tagged { background-position: -130px -60px;}*/ + +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../images/content-types.png'); +} + +.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; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + /*background-image: url('icons.png');*/ +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.border.camera{ + background-image: url("../../../view/theme/diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + +.icon.border.link{ + background-image: url("../../../view/theme/diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + margin-left: 10px; + } + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s10.menu { + background-image: url("../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../images/icons/16/delete.png"); +} +/*.icon.s16.edit { + background-image: url("../../../images/icons/16/edit.png"); +}*/ +.icon.s16.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s16.menu { + background-image: url("../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s22.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s48.menu { + background-image: url("../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 5px; + width: 684px; + border-bottom: 1px solid #BDCDD4; + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12.5px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px auto auto; + display: table; +} +h4 { + font-size: 1.1em; +} + +a { + color: #333333; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*color: #005c94; */ + text-decoration: underline; +} +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; +} +#panel { + position: absolute; + width: 12em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} +#saved-search-ul .tool:hover, +#nets-sidebar .tool:hover, +#sidebar-group-list .tool:hover { + background: #EEE; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool a { + color: ##3F8FBA; +} +.tool a:hover { + text-decoration: none; +} +/* popup notifications */ +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +/* header */ +header { + position: fixed; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 22%; + height: 32px; + background: #ff500f; + background-color: #ff500f; + z-index: 100; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; + background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); + +background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0.26, rgb(215,227,241)), + color-stop(0.82, rgb(255,255,255)) +); +} +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: banner; + width: 82%; + margin-left: 25%; +} +header #banner a, +header #banner a:active, +header #banner a:visited, +header #banner a:link, +header #banner a:hover { + color: #1f1f1f; + text-decoration: none; + outline: none; + vertical-align: middle; + font-weight: bolder; + margin-left: 3px; +} +header #banner #logo-img { + height: 25px; + margin-top: 3px; +} +header #banner #logo-text { + font-size: 20px; + position: absolute; + top: 10%; +} +/* nav */ +nav { + width: 80%; + height: 32px; + position: fixed; + left: 22%; + top: 0px; + padding: 0px; + background: #ff500f; + color: #1f1f1f; + z-index: 99; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; + background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); +background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); + +background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0.26, rgb(215,227,241)), + color-stop(0.82, rgb(255,255,255)) +); +} +nav a, +nav a:active, +nav a:visited, +nav a:link, +nav a:hover { + color: #1f1f1f; + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} +nav #banner a, +nav #banner a:active, +nav #banner a:visited, +nav #banner a:link, +nav #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; +} + +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} + +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} +nav .nav-menu-search { + position: relative; + + margin: 4px 17px; + margin-right: 0px; + height: 17px; + width: 180px; + +} + +nav #search-box #search-text { + background-image: url('icons/lupe.png'); + background-repeat:no-repeat; + padding-left:20px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; + } + + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +nav .nav-menu-icon:hover { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} + +nav .nav-menu-icon.selected { + background-color: #fff; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border-bottom: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #fff; + /* background-color: #19aeff; */ + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + font-weight: 900; + padding: 1px 4px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; + border: 1px solid black; +} +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } +nav #nav-home-link, #nav-directory-link, #nav-apps-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 5px; + font-size: 14px; + } +nav #nav-directory-link{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; +} + +nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ + background-image: url("../../../view/theme/diabook-aerith/icons/messages.png"); + } + +/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ + background-image: url("../../../view/theme/diabook-aerith/icons/notify.png"); + } + +nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ + background-image: url("../../../view/theme/diabook-aerith/icons/contacts.png"); + } + +nav #nav-apps-link.selected { + background-color: #fff; + moz-border-radius: 5px 5px 0 0; +-webkit-border-radius: 5px 5px 0 0; +border-radius: 5px 5px 0 0; +} + +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #fff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #3465A4; /*bdcdd4;*/ + color: #fff; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ + +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} + +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/*profile_side*/ +#profile_side { + margin-bottom: 30px; +} +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + word-wrap: break-word; + width: 130px; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 0px; + min-height: 0px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 16px; + min-height: 16px; + list-style: none; + } +.menu-profile-list:hover{ + background: #EEE; + } +.menu-profile-list-item{ + padding-left: 5px; + } +.menu-profile-list-item:hover{ + text-decoration: none; + } +/*http://prothemedesign.com/circular-icons/*/ +.menu-profile-list.home{ + background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat; + } +.menu-profile-list.photos{ + background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat; + } +.menu-profile-list.events{ + background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat; + } +.menu-profile-list.notes{ + background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat; + } +.menu-profile-list.foren{ + background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat; + } +.menu-profile-list.com_side{ + background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat; + } +.menu-profile-list.pscontacts{ + background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat; + } +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 180px; + padding: 0px 10px 0px 20px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + /*width: 35%;*/ + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 5px; + /*width: 60%;*/ +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +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; +border-bottom-left-radius: 15px; +} +aside #side-follow-url { + width: 173px; + } +aside #side-peoplefind-url { + width: 173px; + } +#contact-block { + overflow: auto; + height: auto; +} +aside #likes a, a:visited, a:link { + color: #3465A4; + text-decoration: none; + cursor: pointer; + +} +aside #likes a:hover{ + text-decoration: underline; + } + +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 55px; + height: 55px; +} +#lost-password-link { + float: left; + margin-right: 20px; + } +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget input.action { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget:hover .title .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget .tool:hover .action.ticked { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums ul li a{ + color: #3465A4; +} +.widget .tool.selected { + background: url("../../../view/theme/diabook-aerith/icons/selected.png") no-repeat left center; +} +/* widget: search */ +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 800px; + padding: 0px 0px 0px 12px; +} +body .pageheader{ + text-align: center; + margin-top: 25px; + font-size: 0px; + } + +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } +.pager { + padding: 10px; + text-align: center; + font-size: 1.0em; + clear: both; + display: block; +} + +.tabs { + + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.tab.button { + margin-right: 5px; + margin-left: 5px; + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: normal; + padding: 3px; + color: #333333; + } + +#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ + margin-bottom: 10px; + } + +#birthday-wrapper a { + color: #3465A4; + } +/* wall item */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 775px; +} +.tread-wrapper a{ + color: #3465A4; +} +.wall-item-photo-menu-button { +display: block; +position: absolute; +background-image: url("../../../view/theme/diabook-aerith/icons/photo-menu.jpg"); +background-position: top left; +background-repeat: no-repeat; +margin: 0px; +padding: 0px; +width: 16px; +height: 16px; +top: 90px; +left: 17px; +overflow: hidden; +text-indent: 40px; +display: none; +} +.wall-item-content-wrapper { +margin-top: 10px; +border: 1px solid #CCC; +-moz-border-radius: 3px; +border-radius: 3px; +display: table; +width: 775px; +} +.wall-item-info { +/*display: block; +float: left; +width: 110px; +margin-right: 10px;*/ + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-content { + font-size: 12.5px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.2; +} +.wrapper-end { + clear: both; +} +.wall-item-photo-wrapper { +margin-top: 10px; +margin-left: 10px; +margin-bottom: 10px; +width: 100px; +} +.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-wrapper { +margin-left: 10px; +} +.wall-item-title-end { + clear: both; +} + +.wall-item-body { + float: left; + /*width: 450px;*/ + margin-top: 10px; +} + +.wall-item-tools { + clear: both; + background-image: url("head.jpg"); + background-position: 0 -20px; + background-repeat: repeat-x; + padding: 5px 10px 0px; +} +.wall-item-author { + margin-top: 10px; +} +.wall-item-photo-menu { +width: auto; +border: 2px solid #444; +background: white; +position: absolute; +left: 10px; +top: 90px; +display: none; +z-index: 10000; +} + +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} + +.wall-item-container { + display: table; + width: 780px; +} + + +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { +/* opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container:hover .wall-item-bottom { +/* opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; */ +} +.wall-item-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} +.wall-item-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + + clear: both; + overflow: hidden; + + margin-bottom: 5px; +} + +.wall-item-container .wall-item-content { + font-size: 12.5px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.2; +} + +.wall-item-container .wall-item-content img { + max-width: 700px; +} +.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-name { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-actions-social a { + float: left; +} +.wall-item-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell;done +} +.wall-item-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 700px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} +.wall-item-comment-wrapper { + margin: 1px 5px 1px 80px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 2.0em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + font-size: 14px; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 710px; + border: 1px solid #2d2d2d; + margin-top: 10px; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} + +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} + +#jot-preview-content{ + margin-top: 30px;} + +#jot-preview-content .tread-wrapper { + background-color: #fff797; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + /*background: url("../../../images/tag_b.png") repeat-x center left;*/ + color: #999; + padding-left: 3px; + font-size: 12px; +} +.tag a { + padding-right: 5px; + /*background: url("../../../images/tag.png") no-repeat center right;*/ + color: #999; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 785px; + margin: 0px 2em 20px 0px; +} +#profile-jot-form #profile-jot-text { + height: 2.0em; + width: 99%; + font-size: 15px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + margin-bottom: 10px; +} +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 783px; + background-color: #fff; + border-bottom: 2px solid #9eabb0; +} + +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#profile-jot-form #jot-title { + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #ffffff; +} +#profile-jot-form #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#profile-jot-form #jot-title:-moz-placeholder { + font-weight: normal; +} +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 785px; + height: 100px; + } +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 785px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 785px; +} + +#profile-jot-submit { + float: right; + margin-top: 2px; + font-size: 14px; + +} +#profile-upload-wrapper { + float: left; + margin-top: 2px; + margin-left: 10px; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-rotator { + float: left; + margin-left: 30px; + margin-top: 2px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; + margin-top: 2px; +} +#jot-preview-link { + float: right; + margin-left: 10px; + margin-top: 2px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; +} +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } +/** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + font-weight: bolder; + cursor: pointer; +} +.button.creation2 { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; + font-weight: bolder; + cursor: pointer; +} +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** 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: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#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-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; + background-position: 3px 3px; + background-repeat: no-repeat; + 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 **/ +/** tab buttons 14618a**/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 5px; +} +ul.tabs li .active { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + margin-left: 5px; +} +/** + * 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 .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: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} + +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } + +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ +.photo { +box-shadow: 2px 2px 5px 0px #000000; +margin: 2px 5px 2px 5px; +max-height: 85%; +max-width: 85%; +} +.lframe { + float: left; + /*margin: 0px 10px 10px 0px;*/ +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; +} + +.contact-photo-menu-button { + position: relative; + background-image: url("../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -20px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} + +/* page footer */ +footer { + height: 100px; + display: table-row; +} + +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; +} +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } +/* ================== */ +/* = Contacts Block = */ +/* ================== */ + +.contact-block-img { + width: 55px; + height: 55px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} +#group-edit-desc { + margin-top: 15px; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: right; + margin-top: 10px; +} + +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } + +#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; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*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.4em; + margin: 10px 0; +} + +.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-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.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-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} +.calendar.eventcal a { + color: #3465A4; + } +.today { + font-weight: bold; + 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; +} +.lightbox{ + float: left; + } +#photo-photo { + float: left; +} +#photo-like-div .wall-item-like-buttons { + float: left; + margin-right: 10px; + } +.wall-item-like-buttons .icon.like { +float: left; +} + +#photo-photo-end { + clear: both; +} + +.tabs .comment-wwedit-wrapper { + display: block; + margin-top: 30px; + margin-left: 50px; + } + +.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-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: -2px; + top: -20px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: left; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} +#side-bar-photos-albums{ + margin-top: 15px; + } +.photo-top-photo, .photo-album-photo { + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.photo-album-image-wrapper, .photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #000; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 20px; + position: relative; + margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + position: absolute; + bottom: 0px; + padding-left: 3px; + background-color: #EEE; +} +.photo-top-album-link{ + color: #3465A4; + } +.photo-top-album-img{ + + } +/*.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +}*/ +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php new file mode 100755 index 0000000000..2b135878a6 --- /dev/null +++ b/view/theme/diabook-aerith/theme.php @@ -0,0 +1,429 @@ +get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); + $entry = replace_macros($tpl,array( + '$id' => $rr['id'], + '$profile-link' => $profile_link, + '$photo' => $rr[$photo], + '$alt-text' => $rr['name'], + )); + $aside['$lastusers_items'][] = $entry; + } + } + + + // last 10 liked items + $aside['$like_title'] = t('Last likes'); + $aside['$like_items'] = array(); + $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM + (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` + FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 + INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` + WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' + GROUP BY `uri` + ORDER BY `T1`.`created` DESC + LIMIT 0,5", + $a->get_baseurl(),$a->get_baseurl() + ); + + foreach ($r as $rr) { + $author = '' . $rr['liker'] . ''; + $objauthor = '' . $rr['author-name'] . ''; + + //var_dump($rr['verb'],$rr['object-type']); killme(); + switch($rr['verb']){ + case 'http://activitystrea.ms/schema/1.0/post': + switch ($rr['object-type']){ + case 'http://activitystrea.ms/schema/1.0/event': + $post_type = t('event'); + break; + default: + $post_type = t('status'); + } + break; + default: + if ($rr['resource-id']){ + $post_type = t('photo'); + $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); + $rr['plink'] = $m[1]; + } else { + $post_type = t('status'); + } + } + $plink = '' . $post_type . ''; + + $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); + + } + + + // last 12 photos + $aside['$photos_title'] = t('Last photos'); + $aside['$photos_items'] = array(); + $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM + (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` + WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') + AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` + INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, + `user` + WHERE `user`.`uid` = `photo`.`uid` + AND `user`.`blockwall`=0 + AND `user`.`hidewall`=0 + ORDER BY `photo`.`edited` DESC + LIMIT 0, 9", + dbesc(t('Contact Photos')), + dbesc(t('Profile Photos')) + ); + if(count($r)) { + $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); + foreach($r as $rr) { + $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; + $photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; + + $entry = replace_macros($tpl,array( + '$id' => $rr['id'], + '$profile-link' => $photo_page, + '$photo' => $photo_url, + '$alt-text' => $rr['username']." : ".$rr['desc'], + )); + + $aside['$photos_items'][] = $entry; + } + } + + $fostitJS = "javascript: (function() { + the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url}; + if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} + else {a_funct()}})()" ; + + $aside['$fostitJS'] = $fostitJS; + + //nav FIND FRIENDS + if(local_user()) { + $nv = array(); + $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['match'] = Array('match', t('Similar Interests'), "", ""); + $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); + $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); + + $nv['search'] = '
    + + + + + '; + + $aside['$nv'] = $nv; + }; + //Community Page + if(local_user()) { + $page = '
    +
    +

    '.t("Community Pages").'

    +
      '; + + $pagelist = array(); + + $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + intval($a->user['uid']) + ); + + $pageD = array(); + + // Look if the profile is a community page + foreach($contacts as $contact) { + $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); + }; + + + $contacts = $pageD; + + foreach($contacts as $contact) { + $page .= '
    • ' . $contact['url'] . ' '. + $contact["name"]."
      • "; + } + $page .= '
    '; + //if (sizeof($contacts) > 0) + + $aside['$page'] = $page; + } + //END Community Page + + + + $url = $a->get_baseurl($ssl_state); + $aside['$url'] = $url; + + $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); + $a->page['right_aside'] = replace_macros($tpl, $aside); + +} + + +//profile_side at networkpages +if ($a->argv[0] === "network" && local_user()){ + + // USER MENU + if(local_user()) { + + $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); + + $userinfo = array( + 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), + 'name' => $a->user['username'], + ); + $ps = array('usermenu'=>array()); + $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); + $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); + $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); + $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); + $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); + $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); + $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); + $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", ""); + + $tpl = get_markup_template('profile_side.tpl'); + + $a->page['aside'] .= replace_macros($tpl, array( + '$userinfo' => $userinfo, + '$ps' => $ps, + )); + + } + + $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; + + if($ccCookie != "8") { + // COMMUNITY + diabook_aerith_community_info(); + + // CUSTOM CSS + $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css"; + } +} + + + +//right_aside at profile pages +if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ + if($ccCookie != "8") { + // COMMUNITY + diabook_aerith_community_info(); + + // CUSTOM CSS + $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css"; + } +} + +//tabs at right_aside on settings page +if ($a->argv[0] === "settings"){ + + $tabs = array( + array( + 'label' => t('Account settings'), + 'url' => $a->get_baseurl(true).'/settings', + 'sel' => (($a->argc == 1)?'active':''), + ), + array( + 'label' => t('Display settings'), + 'url' => $a->get_baseurl(true).'/settings/display', + 'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), + ), + array( + 'label' => t('Edit/Manage Profiles'), + 'url' => $a->get_baseurl(true).'/profiles', + ), + array( + 'label' => t('Connector settings'), + 'url' => $a->get_baseurl(true).'/settings/connectors', + 'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''), + ), + array( + 'label' => t('Plugin settings'), + 'url' => $a->get_baseurl(true).'/settings/addon', + 'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''), + ), + array( + 'label' => t('Connections'), + 'url' => $a->get_baseurl(true) . '/settings/oauth', + 'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''), + ), + array( + 'label' => t('Export personal data'), + 'url' => $a->get_baseurl(true) . '/uexport', + 'sel' => '' + ) + ); + $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ; + $a->page['aside'] = replace_macros($tabtpl, array( + '$tabs' => $tabs, + )); + + + // CUSTOM CSS + $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-settings.css"; + +} + + +// custom css +if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); + +//load jquery.cookie.js +$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; +$a->page['htmlhead'] .= sprintf(' + + + +EOT; + diff --git a/view/theme/diabook-aerith/wall_item.tpl b/view/theme/diabook-aerith/wall_item.tpl new file mode 100644 index 0000000000..1238340647 --- /dev/null +++ b/view/theme/diabook-aerith/wall_item.tpl @@ -0,0 +1,100 @@ +{{ if $item.indent }}{{ else }} +
    + +
    +{{ endif }} +
    +
    +
    +
    + + $item.name + + menu + + +
    +
    +
    + $item.name + - + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - $item.lock {{ endif }} + +
    +
    + {{ if $item.title }}

    $item.title

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

    $item.title

    {{ endif }} + $item.body +
    +
    +
    +
    +
    +
    + {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
    +
    +
    +
    + +
    +
    + +
    + + + {{ if $item.vote }} + + + {{ endif }} + + {{ if $item.vote.share }} + + {{ endif }} + + + {{ if $item.star }} + + $item.star.do + + {{ endif }} + + {{ if $item.plink }}$item.plink.title{{ endif }} + + + +
    + +
    + + {{ if $item.drop.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
    +
    $item.location 
    +
    +
    +
    +
    + +
    $item.dislike
    +
    +
    + +
    + $item.comment +
    \ No newline at end of file diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 1e3da21993..cff75cd40a 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -6,17 +6,17 @@
    {{ if $lastusers_title }} -

    Help or @NewHere ?

    +

    Help or @NewHere ?

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

    Connectable Services

    +

    Connectable Services

    Facebook StatusNet @@ -30,26 +30,27 @@ {{ endif }}
    -
    +
    {{ if $nv }} -

    Find Friends

    +

    Find Friends

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

    PostIt to Friendica

    +

    PostIt to Friendica

    Post to Friendica from anywhere by bookmarking the Link.
    {{ endif }}
    {{ if $lastusers_title }} -

    $lastusers_title

    +

    $lastusers_title

    {{ for $lastusers_items as $i }} $i @@ -70,7 +71,7 @@
    {{ if $photos_title }} -

    $photos_title

    +

    $photos_title

    {{ for $photos_items as $i }} $i @@ -81,7 +82,7 @@
    {{ if $like_title }} -

    $like_title

    +

    $like_title

      {{ for $like_items as $i }}
    • $i
      • diff --git a/view/theme/diabook-blue/icons/srch_bg.gif b/view/theme/diabook-blue/icons/srch_bg.gif new file mode 100644 index 0000000000..6a523ba8fc Binary files /dev/null and b/view/theme/diabook-blue/icons/srch_bg.gif differ diff --git a/view/theme/diabook-blue/icons/srch_l.gif b/view/theme/diabook-blue/icons/srch_l.gif new file mode 100644 index 0000000000..6d95bf35d9 Binary files /dev/null and b/view/theme/diabook-blue/icons/srch_l.gif differ diff --git a/view/theme/diabook-blue/icons/srch_r.gif b/view/theme/diabook-blue/icons/srch_r.gif new file mode 100644 index 0000000000..89833a3167 Binary files /dev/null and b/view/theme/diabook-blue/icons/srch_r.gif differ diff --git a/view/theme/diabook-blue/icons/srch_r_f2.gif b/view/theme/diabook-blue/icons/srch_r_f2.gif new file mode 100644 index 0000000000..6df457bede Binary files /dev/null and b/view/theme/diabook-blue/icons/srch_r_f2.gif differ diff --git a/view/theme/diabook-blue/jot.tpl b/view/theme/diabook-blue/jot.tpl index 387eb1f91a..9aef997873 100755 --- a/view/theme/diabook-blue/jot.tpl +++ b/view/theme/diabook-blue/jot.tpl @@ -21,23 +21,23 @@
      -
      +
      -
      +
      -
    {{ endif }} @@ -81,4 +80,3 @@ $contact_block - diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 3616489992..5f9b38f8c4 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -54,10 +54,14 @@ select { border: 1px #555 dotted; padding: 3px; margin: 2px; + color: #eec; + background: #2e2f2e; } option { padding: 3px; vertical-align: middle; + color: #eec; + background: #2e2f2e; } li { padding: 0 0 0 2px; @@ -211,39 +215,51 @@ input[type=submit] { /** * login */ +aside .field { + overflow: hidden; + width: 200px; +} #login-extra-links { - overflow: auto; - padding-top: 140px !important; - width: 100%; + overflow: auto !important; + padding-top: 60px !important; + width: 100% !important; } #login-extra-links a { margin-right: 20px; } #login_standard { - display: block; - float: none; - height: 100px; - position: absolute; - width: 100%; + display: block !important; + float: none !important; + height: 100% !important; + position: relative !important; + width: 100% !important; } #login_standard .field label { - width: 200px; + width: 200px !important; } #login_standard input, #login_standard input[type="text"] { - margin: 0 0 8px; - width: 210px; + margin: 0 0 8px !important; + width: 210px !important; } #login-submit-wrapper { - margin: 0; + margin: 0 !important; } #login-submit-button { margin-left: 0px !important; } +aside #login_openid { + position: relative !important; + float: none !important; + margin-left: 0px !important; + height: auto !important; + width: 200px !important; +} #login_openid #id_openid_url { - width: 200px; + width: 180px !important; + overflow: hidden !important; } #login_openid label { - width: 208px; + width: 180px !important; } @@ -525,7 +541,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 10em; color: #eec; } -nav #user-menu { +#user-menu { display: block; width: 75%; margin: 3px 0 0 0; @@ -538,8 +554,12 @@ nav #user-menu { clear: both; top: 4px; left: 10px; + padding: 2px; } -nav #user-menu-label { +#user-menu > a { + vertical-align: top; +} +#user-menu-label { font-size: 12px; padding: 3px 20px 9px 5px; height: 10px; @@ -1031,6 +1051,7 @@ section { font-size: 0.8em; padding-right: 230px; min-width: 475px; + width: 65%; } /** tabs **/ @@ -1041,6 +1062,8 @@ section { } .tabs li { display: inline; + font-size: smaller; + font-weight: bold; } .tab { border: 1px solid #729fcf; @@ -1099,6 +1122,7 @@ section { } .wall-item-content { overflow-x: auto; + margin: 0px 15px 0px 5px; } /* removing it from here, vs. putting it in .wall-item-content * might break things for people. we shall see ;) */ @@ -1161,10 +1185,18 @@ section { transition: all 1s ease-in-out; } .wall-item-subtools1 { - list-style: none; + height: 30px; + list-style: none outside none; + margin: 20px 0 30px -20px; + padding: 0; + width: 30px; } .wall-item-subtools2 { - list-style: none; + height: 25px; + list-style: none outside none; + margin: -75px 0 0 5px; + padding: 0; + width: 25px; } .wall-item-title { font-size: 1.2em; @@ -1172,11 +1204,16 @@ section { margin-bottom: 1em; } .wall-item-body { - margin: 10px 10px 10px 0px; + margin: 20px 20px 10px 0px; text-align: left; + overflow-x: auto; } .wall-item-lock-wrapper { float: right; + height: 22px; + margin: 0 -5px 0 0; + width: 22px; + opacity: 1; } .wall-item-dislike, .wall-item-like { @@ -2039,6 +2076,9 @@ div[id$="wrapper"] br { float:left; font-size:20px; } +.event { + background: #2e2f2e; +} .vevent { border:1px solid #ccc; } @@ -2050,15 +2090,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'); @@ -2067,6 +2106,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; @@ -2141,8 +2181,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; @@ -2168,6 +2207,10 @@ div[id$="wrapper"] br { #item-delete-selected-desc:hover { text-decoration: underline; } +.fc-state-highlight { + background: #eec; + color: #2e2f2e; +} /** @@ -2862,13 +2905,7 @@ footer { } .qcomment-wrapper { padding: 0px; - margin: 2px; - list-style-type: none; -} -.qcomment, .qcomment:hover { - display: inline; - padding: 5px; - margin: 5px; + margin: 5px 5px 5px 81%; } .qcomment { opacity: 0.5; diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index cebe9eb4fc..17d31feda2 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -6,14 +6,9 @@ * Version: 1.0 * Author: Simon * Maintainer: Simon - * Screenshot: screenshot + * Screenshot: Screenshot */ - -$a->theme_info = array( - 'extends' => 'dispy-dark' -); - $a->page['htmlhead'] .= <<< EOT EOT; @@ -132,6 +113,10 @@ EOT; function dispydark_community_info() { $a = get_app(); + $aside['$lastusers_title'] = t('Last users'); + $aside['$lastusers_items'] = array(); + $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); + $fostitJS = "javascript: (function() { the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + @@ -157,6 +142,7 @@ function dispydark_community_info() { } // aside on profile page -if ($a->argv[0] === "profile") { +//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { dispydark_community_info(); -} +//} + diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl index 4b973bf93e..b54f753d3f 100644 --- a/view/theme/dispy-dark/wall_item.tpl +++ b/view/theme/dispy-dark/wall_item.tpl @@ -16,11 +16,11 @@
    {{ if $item.location }}$item.location {{ endif }}
    -
      -
    • +
      {{ if $item.lock }}
      $item.lock
      {{ else }}
      {{ endif }} -
      • +
    +
      {{ if $item.star }}
    • @@ -37,7 +37,7 @@
      • {{ endif }} -
    +
      {{ if $item.filer }}
      • diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl index 85176732b7..adf2772af0 100644 --- a/view/theme/dispy/comment_item.tpl +++ b/view/theme/dispy/comment_item.tpl @@ -12,14 +12,15 @@
    - {{ if $qcomment }} -
      - {{ for $qcomment as $qc }} -
    • $qc
      • +
      + +
      {{ endif }}
      diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index c2c7467671..49148eed4b 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -54,10 +54,14 @@ select { border: 1px #555 dotted; padding: 3px; margin: 2px; + color: #222; + background: #efefef; } option { padding: 3px; vertical-align: middle; + color: #222; + background: #efefef; } li { padding: 0 0 0 2px; @@ -142,7 +146,7 @@ a:hover { } .required { display: inline; - color: #ff0; + color: #f00; font-size: 16px; font-weight: bold; margin: 3px; @@ -211,39 +215,51 @@ input[type=submit] { /** * login */ +aside .field { + overflow: hidden; + width: 200px; +} #login-extra-links { - overflow: auto; - padding-top: 140px !important; - width: 100%; + overflow: auto !important; + padding-top: 60px !important; + width: 100% !important; } #login-extra-links a { margin-right: 20px; } #login_standard { - display: block; - float: none; - height: 100px; - position: absolute; - width: 100%; + display: block !important; + float: none !important; + height: 100% !important; + position: relative !important; + width: 100% !important; } #login_standard .field label { - width: 200px; + width: 200px !important; } #login_standard input, #login_standard input[type="text"] { - margin: 0 0 8px; - width: 210px; + margin: 0 0 8px !important; + width: 210px !important; } #login-submit-wrapper { - margin: 0; + margin: 0 !important; } #login-submit-button { margin-left: 0px !important; } +aside #login_openid { + position: relative !important; + float: none !important; + margin-left: 0px !important; + height: auto !important; + width: 200px !important; +} #login_openid #id_openid_url { - width: 200px; + width: 180px !important; + overflow: hidden !important; } #login_openid label { - width: 208px; + width: 180px !important; } @@ -525,7 +541,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 10em; color: #eec; } -nav #user-menu { +#user-menu { display: block; width: 75%; margin: 3px 0 0 0; @@ -538,8 +554,12 @@ nav #user-menu { clear: both; top: 4px; left: 10px; + padding: 2px; } -nav #user-menu-label { +#user-menu > a { + vertical-align: top; +} +#user-menu-label { font-size: 12px; padding: 3px 20px 9px 5px; height: 10px; @@ -1031,6 +1051,7 @@ section { font-size: 0.8em; padding-right: 230px; min-width: 475px; + width: 65%; } /** tabs **/ @@ -1041,6 +1062,8 @@ section { } .tabs li { display: inline; + font-size: smaller; + font-weight: bold; } .tab { border: 1px solid #729fcf; @@ -1099,6 +1122,7 @@ section { } .wall-item-content { overflow-x: auto; + margin: 0px 15px 0px 5px; } /* removing it from here, vs. putting it in .wall-item-content * might break things for people. we shall see ;) */ @@ -1161,10 +1185,18 @@ section { transition: all 1s ease-in-out; } .wall-item-subtools1 { - list-style: none; + height: 30px; + list-style: none outside none; + margin: 20px 0 30px -20px; + padding: 0; + width: 30px; } .wall-item-subtools2 { - list-style: none; + height: 25px; + list-style: none outside none; + margin: -75px 0 0 5px; + padding: 0; + width: 25px; } .wall-item-title { font-size: 1.2em; @@ -1172,11 +1204,16 @@ section { margin-bottom: 1em; } .wall-item-body { - margin: 10px 10px 10px 0px; + margin: 20px 20px 10px 0px; text-align: left; + overflow-x: auto; } .wall-item-lock-wrapper { float: right; + height: 22px; + margin: 0 -5px 0 0; + width: 22px; + opacity: 1; } .wall-item-dislike, .wall-item-like { @@ -2142,7 +2179,6 @@ div[id$="wrapper"] br { filter:alpha(opacity=10); float: right; margin-right: 10px; - } .item-select:hover, .checkeditem { opacity: 1; @@ -2862,13 +2898,7 @@ footer { } .qcomment-wrapper { padding: 0px; - margin: 2px; - list-style-type: none; -} -.qcomment, .qcomment:hover { - display: inline; - padding: 5px; - margin: 5px; + margin: 5px 5px 5px 81%; } .qcomment { opacity: 0.5; diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 9789fd0fa3..f3c54caf9e 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -9,11 +9,6 @@ * Screenshot: Screenshot */ - -$a->theme_info = array( - 'extends' => 'dispy' -); - $a->page['htmlhead'] .= <<< EOT EOT; @@ -157,6 +138,6 @@ function dispy_community_info() { } // aside on profile page -if ($a->argv[0] === "profile") { +if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { dispy_community_info(); } diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 4b973bf93e..b54f753d3f 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -16,11 +16,11 @@
      {{ if $item.location }}$item.location {{ endif }}
    -
      -
    • +
      {{ if $item.lock }}
      $item.lock
      {{ else }}
      {{ endif }} -
      • +
    +
      {{ if $item.star }}
    • @@ -37,7 +37,7 @@
      • {{ endif }} -
    +
      {{ if $item.filer }}
      • diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index c86df75f59..1f897f3b05 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -194,6 +194,16 @@ aside { font-weight: bold; background: #3465a4 url('friendika-16.png') no-repeat 95% center; } +#wallmessage-link { + display: block; + color: #FFFFFF; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 5px; + font-weight: bold; + background-color: #3465a4; +} /* section */ section { @@ -2979,6 +2989,14 @@ div.jGrowl div.info { padding: 3px; margin-top: 15px; margin-left: 25px; + width: 125px; + overflow-y: auto; +} + + +.qcomment option { + width: 125px; + overflow-x: hidden; } .qcomment { @@ -3059,3 +3077,10 @@ ul.menu-popup { .notify-seen { background: #DDDDDD; } + +#id_term_label { + width:75px; +} +#id_term { + width:100px; +} \ No newline at end of file diff --git a/view/theme/quattro-green/experimental b/view/theme/quattro-green/experimental deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/view/theme/quattro-green/screenshot.png b/view/theme/quattro-green/screenshot.png deleted file mode 100644 index a764f4f9a7..0000000000 Binary files a/view/theme/quattro-green/screenshot.png and /dev/null differ diff --git a/view/theme/quattro-green/theme.php b/view/theme/quattro-green/theme.php deleted file mode 100644 index 7a0a869f83..0000000000 --- a/view/theme/quattro-green/theme.php +++ /dev/null @@ -1,11 +0,0 @@ - - * Maintainer: Tobias Diekershoff - */ -$a->theme_info = array( - 'extends' => 'quattro', -); -EOT; diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php new file mode 100644 index 0000000000..c9ab3a4a14 --- /dev/null +++ b/view/theme/quattro/config.php @@ -0,0 +1,39 @@ +"Quattro", + "green"=>"Green" + ); + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))), + '$color' => array('quattro_color', t('Color scheme'), $color, '', $colors), + )); + return $o; +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['quattro-settings-submit'])){ + set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']); + set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']); + } +} + diff --git a/view/theme/quattro/dark/Makefile b/view/theme/quattro/dark/Makefile new file mode 100644 index 0000000000..989da60c72 --- /dev/null +++ b/view/theme/quattro/dark/Makefile @@ -0,0 +1,4 @@ +## + +style.css : style.less colors.less ../icons.less ../quattro.less + lessc style.less > style.css diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/dark/colors.less similarity index 91% rename from view/theme/quattro/colors.less rename to view/theme/quattro/dark/colors.less index 9183b2e777..b6d487f92b 100755 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/dark/colors.less @@ -96,3 +96,12 @@ @JotPermissionLockBackgroundColor: @Grey4; @JotLoadingBackgroundColor: @Grey1; @JotPreviewBackgroundColor: @Yellow1; + +@MessageNewBackgroundColor: @Blue1; +@MessageNewBorderColor: @Blue3; +@MessageNewColor: @Grey1; + +@MailListBackgroundColor: #f6f7f8; + +@MailDisplaySubjectColor: @Grey5; +@MailDisplaySubjectBackgroundColor: #f6f7f8; diff --git a/view/theme/quattro/style.css b/view/theme/quattro/dark/style.css similarity index 91% rename from view/theme/quattro/style.css rename to view/theme/quattro/dark/style.css index 8f0abe86df..1d951aba84 100755 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/dark/style.css @@ -231,7 +231,8 @@ body { h4 { font-size: 1.1em; } -a, a:link { +a, +a:link { color: #005c94; text-decoration: none; } @@ -449,7 +450,8 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { +nav #nav-notifications-linkmenu.on .icon.s22.notify, +nav #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png"); } nav #nav-apps-link.selected { @@ -626,41 +628,16 @@ aside #profiles-menu { width: 48px; height: 48px; } -/* mail view */ -.mail-conv-sender, .mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} -.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-break { - clear: both; -} -.mail-conv-delete-icon { - border: none; -} /* group member */ -#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { +#contact-edit-drop-link, +.mail-list-delete-wrapper, +.group-delete-wrapper { float: right; margin-right: 50px; } -#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide { +#contact-edit-drop-link .drophide, +.mail-list-delete-wrapper .drophide, +.group-delete-wrapper .drophide { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -669,7 +646,9 @@ aside #profiles-menu { position: relative; top: -50px; } -#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop { +#contact-edit-drop-link .drop, +.mail-list-delete-wrapper .drop, +.group-delete-wrapper .drop { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -798,7 +777,8 @@ section { display: table; width: 780px; } -.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { +.wall-item-container .wall-item-item, +.wall-item-container .wall-item-bottom { display: table-row; } .wall-item-container .wall-item-bottom { @@ -836,11 +816,13 @@ section { .wall-item-container .wall-item-content img { max-width: 710px; } -.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { +.wall-item-container .wall-item-links, +.wall-item-container .wall-item-actions { display: table-cell; vertical-align: middle; } -.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { +.wall-item-container .wall-item-links .icon, +.wall-item-container .wall-item-actions .icon { opacity: 0.5; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -848,7 +830,8 @@ section { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { +.wall-item-container .wall-item-links .icon:hover, +.wall-item-container .wall-item-actions .icon:hover { opacity: 1; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -973,9 +956,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -1193,7 +1173,9 @@ section { height: 18px; }*/ /** acl **/ -#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { +#photo-edit-perms-select, +#photos-upload-permissions-wrapper, +#profile-jot-acl-wrapper { display: block!important; } #acl-wrapper { @@ -1352,9 +1334,14 @@ ul.tabs li .active { float: left; width: 200px; } -.field input, .field textarea { +.field input, +.field textarea { width: 400px; } +.field input[type="checkbox"], +.field input[type="radio"] { + width: auto; +} .field textarea { height: 100px; } @@ -1503,6 +1490,123 @@ ul.tabs li .active { left: 0px; top: 63px; } +/* messages */ +#message-new { + background: #19aeff; + border: 1px solid #005c94; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +/* mail view */ +/* +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.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-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +*/ /* page footer */ footer { height: 100px; diff --git a/view/theme/quattro/style.less b/view/theme/quattro/dark/style.less similarity index 80% rename from view/theme/quattro/style.less rename to view/theme/quattro/dark/style.less index c3dbae7778..7d81e788a9 100755 --- a/view/theme/quattro/style.less +++ b/view/theme/quattro/dark/style.less @@ -6,8 +6,8 @@ // $ lessc style.less > style.css @import "colors"; -@import "icons"; -@import "quattro"; +@import "../icons"; +@import "../quattro"; diff --git a/view/theme/quattro/fileas_widget.tpl b/view/theme/quattro/fileas_widget.tpl new file mode 100644 index 0000000000..1e5a760449 --- /dev/null +++ b/view/theme/quattro/fileas_widget.tpl @@ -0,0 +1,12 @@ +
      +

      $title

      +
      $desc
      + + + +
      diff --git a/view/theme/quattro/green/Makefile b/view/theme/quattro/green/Makefile new file mode 100644 index 0000000000..989da60c72 --- /dev/null +++ b/view/theme/quattro/green/Makefile @@ -0,0 +1,4 @@ +## + +style.css : style.less colors.less ../icons.less ../quattro.less + lessc style.less > style.css diff --git a/view/theme/quattro-green/colors.less b/view/theme/quattro/green/colors.less similarity index 91% rename from view/theme/quattro-green/colors.less rename to view/theme/quattro/green/colors.less index 9eee19f4cd..bc78c3fdad 100755 --- a/view/theme/quattro-green/colors.less +++ b/view/theme/quattro/green/colors.less @@ -98,3 +98,11 @@ @JotLoadingBackgroundColor: @Grey1; @JotPreviewBackgroundColor: @Green4; +@MessageNewBackgroundColor: @Blue1; +@MessageNewBorderColor: @Blue3; +@MessageNewColor: @Grey1; + +@MailListBackgroundColor: #f6f7f8; + +@MailDisplaySubjectColor: @Grey5; +@MailDisplaySubjectBackgroundColor: #f6f7f8; diff --git a/view/theme/quattro-green/style.css b/view/theme/quattro/green/style.css similarity index 91% rename from view/theme/quattro-green/style.css rename to view/theme/quattro/green/style.css index 2f463c96c7..e7cc549d07 100755 --- a/view/theme/quattro-green/style.css +++ b/view/theme/quattro/green/style.css @@ -231,7 +231,8 @@ body { h4 { font-size: 1.1em; } -a, a:link { +a, +a:link { color: #009100; text-decoration: none; } @@ -449,7 +450,8 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { +nav #nav-notifications-linkmenu.on .icon.s22.notify, +nav #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png"); } nav #nav-apps-link.selected { @@ -626,41 +628,16 @@ aside #profiles-menu { width: 48px; height: 48px; } -/* mail view */ -.mail-conv-sender, .mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} -.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-break { - clear: both; -} -.mail-conv-delete-icon { - border: none; -} /* group member */ -#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { +#contact-edit-drop-link, +.mail-list-delete-wrapper, +.group-delete-wrapper { float: right; margin-right: 50px; } -#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide { +#contact-edit-drop-link .drophide, +.mail-list-delete-wrapper .drophide, +.group-delete-wrapper .drophide { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -669,7 +646,9 @@ aside #profiles-menu { position: relative; top: -50px; } -#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop { +#contact-edit-drop-link .drop, +.mail-list-delete-wrapper .drop, +.group-delete-wrapper .drop { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; @@ -798,7 +777,8 @@ section { display: table; width: 780px; } -.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { +.wall-item-container .wall-item-item, +.wall-item-container .wall-item-bottom { display: table-row; } .wall-item-container .wall-item-bottom { @@ -836,11 +816,13 @@ section { .wall-item-container .wall-item-content img { max-width: 710px; } -.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { +.wall-item-container .wall-item-links, +.wall-item-container .wall-item-actions { display: table-cell; vertical-align: middle; } -.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { +.wall-item-container .wall-item-links .icon, +.wall-item-container .wall-item-actions .icon { opacity: 0.5; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -848,7 +830,8 @@ section { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { +.wall-item-container .wall-item-links .icon:hover, +.wall-item-container .wall-item-actions .icon:hover { opacity: 1; -webkit-transition: all 0.2s ease-in-out; -moz-transition: all 0.2s ease-in-out; @@ -973,9 +956,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -1193,7 +1173,9 @@ section { height: 18px; }*/ /** acl **/ -#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { +#photo-edit-perms-select, +#photos-upload-permissions-wrapper, +#profile-jot-acl-wrapper { display: block!important; } #acl-wrapper { @@ -1352,9 +1334,14 @@ ul.tabs li .active { float: left; width: 200px; } -.field input, .field textarea { +.field input, +.field textarea { width: 400px; } +.field input[type="checkbox"], +.field input[type="radio"] { + width: auto; +} .field textarea { height: 100px; } @@ -1503,6 +1490,123 @@ ul.tabs li .active { left: 0px; top: 63px; } +/* messages */ +#message-new { + background: #19aeff; + border: 1px solid #005c94; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +#mail-display-subject:hover .mail-delete { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +/* mail view */ +/* +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.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-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +*/ /* page footer */ footer { height: 100px; diff --git a/view/theme/quattro-green/style.less b/view/theme/quattro/green/style.less similarity index 75% rename from view/theme/quattro-green/style.less rename to view/theme/quattro/green/style.less index f8b0bb31cc..7d81e788a9 100755 --- a/view/theme/quattro-green/style.less +++ b/view/theme/quattro/green/style.less @@ -6,8 +6,8 @@ // $ lessc style.less > style.css @import "colors"; -@import "../quattro/icons"; -@import "../quattro/quattro"; +@import "../icons"; +@import "../quattro"; diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl new file mode 100755 index 0000000000..989f178781 --- /dev/null +++ b/view/theme/quattro/mail_conv.tpl @@ -0,0 +1,60 @@ +
      +
      +
      + +
      +
      + $mail.body +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + $mail.from_name $mail.date +
      + +
      +
      + +
      + $mail.delete +
      + +
      +
      +
      +
      +
      + + +{# + + +
      +
      + $mail.from_name +
      +
      +
      $mail.from_name
      +
      $mail.date
      +
      $mail.subject
      +
      $mail.body
      +
      +
      +
      +
      +
      + +#} diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl new file mode 100644 index 0000000000..8b82e95c60 --- /dev/null +++ b/view/theme/quattro/mail_display.tpl @@ -0,0 +1,12 @@ +
      + $thread_subject + +
      + +{{ for $mails as $mail }} +
      + {{ inc mail_conv.tpl }}{{endinc}} +
      +{{ endfor }} + +{{ inc prv_message.tpl }}{{ endinc }} diff --git a/view/theme/quattro/mail_list.tpl b/view/theme/quattro/mail_list.tpl new file mode 100644 index 0000000000..6bc6c84f60 --- /dev/null +++ b/view/theme/quattro/mail_list.tpl @@ -0,0 +1,8 @@ +
      + $subject + $from_name + $date + $count + + +
      diff --git a/view/theme/quattro/message_side.tpl b/view/theme/quattro/message_side.tpl new file mode 100644 index 0000000000..9f15870964 --- /dev/null +++ b/view/theme/quattro/message_side.tpl @@ -0,0 +1,10 @@ +
      + + +
        + {{ for $tabs as $t }} +
      • $t.label
        • + {{ endfor }} +
      + +
      diff --git a/view/theme/quattro/msg-header.tpl b/view/theme/quattro/msg-header.tpl new file mode 100755 index 0000000000..2d1ea7a612 --- /dev/null +++ b/view/theme/quattro/msg-header.tpl @@ -0,0 +1,97 @@ + + + + + + diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index fca65c9076..c6352cfe99 100755 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -319,41 +319,6 @@ aside { img { width: 48px; height: 48px; } } } -/* mail view */ -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.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-break { - clear: both; -} - -.mail-conv-delete-icon { - border: none; -} /* group member */ #contact-edit-drop-link, @@ -938,6 +903,10 @@ ul.tabs { textarea { width: 400px; } + input[type="checkbox"], input[type="radio"]{ + width: auto; + } + textarea { height: 100px; } .field_help { display: block; @@ -981,6 +950,7 @@ ul.tabs { &.radio .field_help { margin-left: 0px; } } + #profile-edit-links li { list-style: none; margin-top: 10px; @@ -1085,6 +1055,90 @@ ul.tabs { } } +/* messages */ +#message-new { + background: @MessageNewBackgroundColor; + border: 1px solid @MessageNewBorderColor; + width: 150px; + a { + color: @MessageNewColor; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; + } +} + +.mail-list-wrapper { + background-color: @MailListBackgroundColor; + margin-bottom: 5px; + width: 100%; height: auto; overflow: hidden; + + span { display: block; float: left; width: 20%; overflow: hidden;} + + .mail-subject { + width: 30%; + padding:4px 0px 0px 4px; + a { display: block; } + &.unseen a { font-weight: bold; } + } + .mail-date { padding: 4px 4px 0px 4px; } + .mail-from { padding: 4px 4px 0px 4px; } + .mail-count { padding: 4px 4px 0px 4px; text-align: right;} + + .mail-delete { float: right; } +} + +#mail-display-subject { + background-color: @MailDisplaySubjectBackgroundColor; + color: @MailDisplaySubjectColor; + margin-bottom: 10px; + width: 100%; height: auto; overflow: hidden; + span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;} + .mail-delete { float: right; .opaque(0.5);} + &:hover .mail-delete { .opaque(1); } + +} + +/* mail view */ +/* +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.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-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +*/ + /* page footer */ footer { height: 100px; display: table-row; } diff --git a/view/theme/quattro/screenshot.jpg b/view/theme/quattro/screenshot.jpg index 7f50ec70e9..98fbfe2ea6 100644 Binary files a/view/theme/quattro/screenshot.jpg and b/view/theme/quattro/screenshot.jpg differ diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php new file mode 100644 index 0000000000..889ec1530e --- /dev/null +++ b/view/theme/quattro/style.php @@ -0,0 +1,9 @@ +hooks[] = array('plugin_settings', 'view/theme/quattro/theme.php', 'quattro_settings'); -$a->hooks[] = array('plugin_settings_post', 'view/theme/quattro/theme.php', 'quattro_settings_post'); -function quattro_settings(&$a, &$o){ - if(!local_user()) - return; - - $align = get_pconfig(local_user(), 'quattro', 'align' ); - - $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); - $o .= replace_macros($t, array( - '$submit' => t('Submit'), - '$baseurl' => $a->get_baseurl(), - '$title' => t("Theme settings"), - '$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))), - )); -} - -function quattro_settings_post(&$a){ - if(! local_user()) - return; - if (isset($_POST['quattro-settings-submit'])){ - set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']); - } - goaway($a->get_baseurl()."/settings/addon"); -} - $quattro_align = get_pconfig(local_user(), 'quattro', 'align' ); diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl index 25af042530..9771ae1621 100644 --- a/view/theme/quattro/theme_settings.tpl +++ b/view/theme/quattro/theme_settings.tpl @@ -1,11 +1,8 @@ -
      -

      $title

      - - {{inc field_select.tpl with $field=$align}}{{endinc}} - -
      - -
      +{{inc field_select.tpl with $field=$color}}{{endinc}} - +{{inc field_select.tpl with $field=$align}}{{endinc}} + +
      +
      + diff --git a/view/wallmessage.tpl b/view/wallmessage.tpl new file mode 100755 index 0000000000..66b2bc3a05 --- /dev/null +++ b/view/wallmessage.tpl @@ -0,0 +1,32 @@ + +

      $header

      + +

      $subheader

      + +
      + + +$parent + +
      $to
      +$recipname + +
      $subject
      + + +
      $yourmessage
      + + + +
      + + +
      + +
      +
      +
      + +
      diff --git a/view/wallmsg-header.tpl b/view/wallmsg-header.tpl new file mode 100755 index 0000000000..cb39225725 --- /dev/null +++ b/view/wallmsg-header.tpl @@ -0,0 +1,82 @@ + + + + +