diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-06-23 12:50:00 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-06-23 12:50:00 +0200 |
| commit | a81af2e042ae133bec3097488feeaa1318dc798b (patch) | |
| tree | 25d2103fb3ce9edf45c0f7d1142b5cd3f63f8591 | |
| parent | 7a4ad4564dc4fa49aa860a10949ffe8958305f3a (diff) | |
| parent | bf47bf5ba015a844919362a56903eb82c064bee9 (diff) | |
| download | volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.tar.gz volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.tar.bz2 volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.zip | |
Merge remote branch 'upstream/master'
Conflicts:
include/bb2diaspora.php
40 files changed, 5539 insertions, 4763 deletions
@@ -10,7 +10,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1377' ); +define ( 'FRIENDICA_VERSION', '3.0.1382' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1149 ); @@ -78,14 +78,6 @@ define ( 'CONTACT_IS_FRIEND', 3); /** - * Hook array order - */ - -define ( 'HOOK_HOOK', 0); -define ( 'HOOK_FILE', 1); -define ( 'HOOK_FUNCTION', 2); - -/** * DB update return values */ @@ -332,6 +324,9 @@ if(! class_exists('App')) { private $curl_code; private $curl_headers; + private $cached_profile_image; + private $cached_profile_picdate; + function __construct() { global $default_timezone; @@ -543,6 +538,28 @@ if(! class_exists('App')) { return $this->curl_headers; } + function get_cached_avatar_image($avatar_image){ + if($this->cached_profile_image[$avatar_image]) + return $this->cached_profile_image[$avatar_image]; + + $path_parts = explode("/",$avatar_image); + $common_filename = $path_parts[count($path_parts)-1]; + + if($this->cached_profile_picdate[$common_filename]){ + $this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename]; + } else { + $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like \"%%/%s\"", + $common_filename); + if(! count($r)){ + $this->cached_profile_image[$avatar_image] = $avatar_image; + } else { + $this->cached_profile_picdate[$common_filename] = "?rev=" . urlencode($r[0]['picdate']); + $this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename]; + } + } + return $this->cached_profile_image[$avatar_image]; + } + } } @@ -1130,9 +1147,9 @@ if(! function_exists('profile_sidebar')) { 'fullname' => $profile['name'], 'firstname' => $firstname, 'lastname' => $lastname, - 'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg', - 'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg', - 'photo50' => $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg', + 'photo300' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg'), + 'photo100' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg'), + 'photo50' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg'), ); if (!$block){ @@ -1367,7 +1384,7 @@ if(! function_exists('proc_run')) { if(! function_exists('current_theme')) { function current_theme(){ - $app_base_themes = array('duepuntozero', 'loozah'); + $app_base_themes = array('duepuntozero', 'dispy', 'quattro'); $a = get_app(); @@ -1385,7 +1402,7 @@ if(! function_exists('current_theme')) { return($t); } - $fallback = glob('view/theme/*/style.[css|php]'); + $fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php')); if(count($fallback)) return (str_replace('view/theme/','', substr($fallback[0],0,-10))); diff --git a/include/Photo.php b/include/Photo.php index aa6f5f113..3af1691ee 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -121,7 +121,70 @@ class Photo { $this->image = imagerotate($this->image,$degrees,0); $this->width = imagesx($this->image); $this->height = imagesy($this->image); - } + } + + public function flip($horiz = true, $vert = false) { + $w = imagesx($this->image); + $h = imagesy($this->image); + $flipped = imagecreate($w, $h); + if($horiz) { + for ($x = 0; $x < $w; $x++) { + imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h); + } + } + if($vert) { + for ($y = 0; $y < $h; $y++) { + imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1); + } + } + $this->image = $flipped; + } + + public function orient($filename) { + // based off comment on http://php.net/manual/en/function.imagerotate.php + + if(! function_exists('exif_read_data')) + return; + + $exif = exif_read_data($filename); + $ort = $exif['Orientation']; + + switch($ort) + { + case 1: // nothing + break; + + case 2: // horizontal flip + $this->flip(); + break; + + case 3: // 180 rotate left + $this->rotate(180); + break; + + case 4: // vertical flip + $this->flip(false, true); + break; + + case 5: // vertical flip + 90 rotate right + $this->flip(false, true); + $this->rotate(-90); + break; + + case 6: // 90 rotate right + $this->rotate(-90); + break; + + case 7: // horizontal flip + 90 rotate right + $this->flip(); + $this->rotate(-90); + break; + + case 8: // 90 rotate left + $this->rotate(90); + break; + } + } diff --git a/include/Scrape.php b/include/Scrape.php index ca8f6e83a..4f53effe9 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -352,10 +352,11 @@ function probe_url($url, $mode = PROBE_NORMAL) { $email_conversant = false; $twitter = ((strpos($url,'twitter.com') !== false) ? true : false); + $lastfm = ((strpos($url,'last.fm/user') !== false) ? true : false); $at_addr = ((strpos($url,'@') !== false) ? true : false); - if(! $twitter) { + if((! $twitter) && (! $lastfm)) { if(strpos($url,'mailto:') !== false && $at_addr) { $url = str_replace('mailto:','',$url); @@ -564,6 +565,14 @@ function probe_url($url, $mode = PROBE_NORMAL) { $vcard['fn'] = $tid . '@twitter'; } + if($lastfm) { + $profile = $url; + $poll = str_replace(array('www.','last.fm/'),array('','ws.audioscrobbler.com/1.0/'),$url) . '/recenttracks.rss'; + $vcard['nick'] = basename($url); + $vcard['fn'] = $vcard['nick'] . t(' on Last.fm'); + $network = NETWORK_FEED; + } + if(! x($vcard,'fn')) if(x($vcard,'nick')) $vcard['fn'] = $vcard['nick']; diff --git a/include/api.php b/include/api.php index 855e4efa3..b77156dfa 100644 --- a/include/api.php +++ b/include/api.php @@ -719,14 +719,18 @@ if ($page<0) $page=0; $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); + $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0); //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); $start = $page*$count; //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); + $sql_extra = ''; if ($max_id > 0) - $sql_extra = 'AND `item`.`id` <= '.intval($max_id); + $sql_extra .= ' AND `item`.`id` <= '.intval($max_id); + if ($exclude_replies > 0) + $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -860,6 +864,8 @@ logger('API: api_statuses_show: '.$id); //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); + //$sql_extra = ""; + if ($_GET["conversation"] == "true") $sql_extra .= " AND `item`.`parent` = %d ORDER BY `received` ASC "; else $sql_extra .= " AND `item`.`id` = %d"; $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -870,19 +876,24 @@ AND `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $sql_extra - AND `item`.`id`=%d", + ", intval($id) ); - +//var_dump($r); $ret = api_format_items($r,$user_info); - - $data = array('$status' => $ret[0]); - /*switch($type){ - case "atom": - case "rss": - $data = api_rss_extra($a, $data, $user_info); - }*/ - return api_apply_template("status", $type, $data); +//var_dump($ret); + if ($_GET["conversation"] == "true") { + $data = array('$statuses' => $ret); + return api_apply_template("timeline", $type, $data); + } else { + $data = array('$status' => $ret[0]); + /*switch($type){ + case "atom": + case "rss": + $data = api_rss_extra($a, $data, $user_info); + }*/ + return api_apply_template("status", $type, $data); + } } api_register_func('api/statuses/show','api_statuses_show', true); @@ -1061,11 +1072,14 @@ $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); if ($page<0) $page=0; $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); + $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0); //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); $start = $page*$count; - if ($user_info['self']==1) $sql_extra = "AND `item`.`wall` = 1 "; + $sql_extra = ''; + if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 "; + if ($exclude_replies > 0) $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 7b4caec46..96cc735bd 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -67,6 +67,22 @@ function stripdcode_br_cb($s) { } +function diaspora_ul($s) { + // Replace "[\\*]" followed by any number (including zero) of + // spaces by "* " to match Diaspora's list format + return preg_replace("/\[\\\\\*\]( *)/", "* ", $s[1]); +} + + +function diaspora_ol($s) { + // A hack: Diaspora will create a properly-numbered ordered list even + // if you use '1.' for each element of the list, like: + // 1. First element + // 1. Second element + // 1. Third element + return preg_replace("/\[\\\\\*\]( *)/", "1. ", $s[1]); +} + function bb2diaspora($Text,$preserve_nl = false) { @@ -95,6 +111,11 @@ function bb2diaspora($Text,$preserve_nl = false) { if($preserve_nl) $Text = str_replace(array("\n","\r"), array('',''),$Text); + else + // Remove the "return" character, as Diaspora uses only the "newline" + // character, so having the "return" character can cause signature + // failures + $Text = str_replace("\r", "", $Text); // Set up the parameters for a URL search string @@ -136,38 +157,45 @@ function bb2diaspora($Text,$preserve_nl = false) { // Check for bold text $Text = preg_replace("(\[b\](.*?)\[\/b\])is",'**$1**',$Text); - // Check for Italics text + // Check for italics text $Text = preg_replace("(\[i\](.*?)\[\/i\])is",'_$1_',$Text); - // Check for Underline text -// $Text = preg_replace("(\[u\](.*?)\[\/u\])is",'<u>$1</u>',$Text); + // Check for underline text + // Replace with italics since Diaspora doesn't have underline + $Text = preg_replace("(\[u\](.*?)\[\/u\])is",'_$1_',$Text); // Check for strike-through text -// $Text = preg_replace("(\[s\](.*?)\[\/s\])is",'<strike>$1</strike>',$Text); + $Text = preg_replace("(\[s\](.*?)\[\/s\])is",'**[strike]**$1**[/strike]**',$Text); // Check for over-line text // $Text = preg_replace("(\[o\](.*?)\[\/o\])is",'<span class="overline">$1</span>',$Text); // Check for colored text -// $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])is","<span style=\"color: $1;\">$2</span>",$Text); + // Remove color since Diaspora doesn't support it + $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])is","$2",$Text); // Check for sized text -// $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])is","<span style=\"font-size: $1;\">$2</span>",$Text); + // Remove it since Diaspora doesn't support sizes very well + $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])is","$2",$Text); // Check for list text -// $Text = preg_replace("/\[list\](.*?)\[\/list\]/is", '<ul class="listbullet">$1</ul>' ,$Text); -// $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/is", '<ul class="listdecimal">$1</ul>' ,$Text); -// $Text = preg_replace("/\[list=i\](.*?)\[\/list\]/s",'<ul class="listlowerroman">$1</ul>' ,$Text); -// $Text = preg_replace("/\[list=I\](.*?)\[\/list\]/s", '<ul class="listupperroman">$1</ul>' ,$Text); -// $Text = preg_replace("/\[list=a\](.*?)\[\/list\]/s", '<ul class="listloweralpha">$1</ul>' ,$Text); -// $Text = preg_replace("/\[list=A\](.*?)\[\/list\]/s", '<ul class="listupperalpha">$1</ul>' ,$Text); + $Text = preg_replace_callback("/\[list\](.*?)\[\/list\]/is", 'diaspora_ul', $Text); + $Text = preg_replace_callback("/\[ul\](.*?)\[\/ul\]/is", 'diaspora_ul', $Text); + $Text = preg_replace_callback("/\[list=1\](.*?)\[\/list\]/is", 'diaspora_ol', $Text); + $Text = preg_replace_callback("/\[list=i\](.*?)\[\/list\]/s",'diaspora_ol', $Text); + $Text = preg_replace_callback("/\[list=I\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); + $Text = preg_replace_callback("/\[list=a\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); + $Text = preg_replace_callback("/\[list=A\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); + $Text = preg_replace_callback("/\[ol\](.*?)\[\/ol\]/is", 'diaspora_ol', $Text); // $Text = preg_replace("/\[li\](.*?)\[\/li\]/s", '<li>$1</li>' ,$Text); -// $Text = preg_replace("/\[td\](.*?)\[\/td\]/s", '<td>$1</td>' ,$Text); -// $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/s", '<tr>$1</tr>' ,$Text); -// $Text = preg_replace("/\[table\](.*?)\[\/table\]/s", '<table>$1</table>' ,$Text); + // Just get rid of table tags since Diaspora doesn't support tables + $Text = preg_replace("/\[th\](.*?)\[\/th\]/s", '$1' ,$Text); + $Text = preg_replace("/\[td\](.*?)\[\/td\]/s", '$1' ,$Text); + $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/s", '$1' ,$Text); + $Text = preg_replace("/\[table\](.*?)\[\/table\]/s", '$1' ,$Text); -// $Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/s", '<table border="1" >$1</table>' ,$Text); + $Text = preg_replace("/\[table border=(.*?)\](.*?)\[\/table\]/s", '$2' ,$Text); // $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/s", '<table border="0" >$1</table>' ,$Text); @@ -177,7 +205,7 @@ function bb2diaspora($Text,$preserve_nl = false) { // $Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text); - $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripdcode_br_cb',$Text); + $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripdcode_br_cb',$Text); // Check for [code] text $Text = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/is","\t$2\n", $Text); @@ -189,6 +217,7 @@ function bb2diaspora($Text,$preserve_nl = false) { // $QuoteLayout = '<blockquote>$1</blockquote>'; // Check for [quote] text $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is",">$1\n\n", $Text); + $Text = preg_replace("/\[quote=(.*?)\](.*?)\[\/quote\]/is",">$2\n\n", $Text); // Images @@ -203,9 +232,9 @@ function bb2diaspora($Text,$preserve_nl = false) { // [img=widthxheight]image source[/img] // $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/", '<img src="$3" style="height:{$2}px; width:{$1}px;" >', $Text); - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); + $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", 'http://www.youtube.com/watch?v=$1', $Text); $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'http://vimeo.com/$1',$Text); @@ -235,6 +264,11 @@ function bb2diaspora($Text,$preserve_nl = false) { $Text = preg_replace_callback('/\[(.*?)\]\((.*?)\)/ism','unescape_underscores_in_links',$Text); */ + + // Remove any leading or trailing whitespace, as this will mess up + // the Diaspora signature verification and cause the item to disappear + $Text = trim($Text); + call_hooks('bb2diaspora',$Text); return $Text; diff --git a/include/conversation.php b/include/conversation.php index 1d5a92284..2244e8df7 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -308,7 +308,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if(($normalised != 'mailbox') && (x($a->contacts[$normalised]))) $profile_avatar = $a->contacts[$normalised]['thumb']; else - $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']); + $profile_avatar = ((strlen($item['author-avatar'])) ? $a->get_cached_avatar_image($item['author-avatar']) : $item['thumb']); $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); call_hooks('render_location',$locate); @@ -657,7 +657,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) $profile_avatar = $a->contacts[$normalised]['thumb']; else - $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb); + $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb)); $like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : ''); $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : ''); diff --git a/include/diaspora.php b/include/diaspora.php index a0a1df00e..80fb10404 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2162,7 +2162,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) { $a = get_app(); $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); - $theiraddr = $contact['addr']; +// $theiraddr = $contact['addr']; // The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always // return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent. @@ -2226,7 +2226,10 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $a = get_app(); $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); - $theiraddr = $contact['addr']; +// $theiraddr = $contact['addr']; + + $body = $item['body']; + $text = html_entity_decode(bb2diaspora($body)); // The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always @@ -2245,26 +2248,30 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $relay_retract = false; $sql_sign_id = 'iid'; if( $item['deleted']) { - $tpl = get_markup_template('diaspora_relayable_retraction.tpl'); $relay_retract = true; - $sql_sign_id = 'retract_iid'; + $target_type = ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment'); + $sender_signed_text = $item['guid'] . ';' . $target_type ; + + $sql_sign_id = 'retract_iid'; + $tpl = get_markup_template('diaspora_relayable_retraction.tpl'); } elseif($item['verb'] === ACTIVITY_LIKE) { - $tpl = get_markup_template('diaspora_like_relay.tpl'); $like = true; + $target_type = 'Post'; // $positive = (($item['deleted']) ? 'false' : 'true'); $positive = 'true'; + $sender_signed_text = $item['guid'] . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $myaddr; + + $tpl = get_markup_template('diaspora_like_relay.tpl'); } - else { + else { // item is a comment + $sender_signed_text = $item['guid'] . ';' . $parent_guid . ';' . $text . ';' . $myaddr; + $tpl = get_markup_template('diaspora_comment_relay.tpl'); } - $body = $item['body']; - - $text = html_entity_decode(bb2diaspora($body)); - // fetch the original signature if the relayable was created by a Diaspora // or DFRN user. Relayables for other networks are not supported. @@ -2285,51 +2292,20 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // function is called logger('diaspora_send_relay: original author signature not found, cannot send relayable'); return; -/* - $itemcontact = q("select * from contact where `id` = %d limit 1", - intval($item['contact-id']) - ); - if(count($itemcontact)) { - if(! $itemcontact[0]['self']) { - $prefix = sprintf( t('[Relayed] Comment authored by %s from network %s'), - '['. $item['author-name'] . ']' . '(' . $item['author-link'] . ')', - network_to_name($itemcontact['network'])) . "\n"; - // "$body" was assigned to "$text" above. It isn't used after that, so I don't think - // the following change will do anything - $body = $prefix . $body; - - // I think this comment will fail upon reaching Diaspora, because "$signed_text" is not defined - } - } - else { - // I'm confused about this "else." Since it sets "$handle = $myaddr," it seems like it should be for the case - // where the top-level post owner commented on his own post, i.e. "$itemcontact[0]['self']" is true. But it's - // positioned to be for the case where "count($itemcontact)" is 0. - - $handle = $myaddr; - - if($like) - $signed_text = $item['guid'] . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $handle; - elseif($relay_retract) - $signed_text = $item['guid'] . ';' . $target_type; - else - $signed_text = $item['guid'] . ';' . $parent_guid . ';' . $text . ';' . $handle; - - $authorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')); - - q("insert into sign (`" . $sql_sign_id . "`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", - intval($item['id']), - dbesc($signed_text), - dbesc($authorsig), - dbesc($handle) - ); - } -*/ } - // sign it with the top-level owner's signature + // Sign the relayable with the top-level owner's signature + // + // We'll use the $sender_signed_text that we just created, instead of the $signed_text + // stored in the database, because that provides the best chance that Diaspora will + // be able to reconstruct the signed text the same way we did. This is particularly a + // concern for the comment, whose signed text includes the text of the comment. The + // smallest change in the text of the comment, including removing whitespace, will + // make the signature verification fail. Since we translate from BB code to Diaspora's + // markup at the top of this function, which is AFTER we placed the original $signed_text + // in the database, it's hazardous to trust the original $signed_text. - $parentauthorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')); + $parentauthorsig = base64_encode(rsa_sign($sender_signed_text,$owner['uprvkey'],'sha256')); $msg = replace_macros($tpl,array( '$guid' => xmlify($item['guid']), diff --git a/include/enotify.php b/include/enotify.php index 81f3e11eb..134e42f8e 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -123,7 +123,7 @@ function notification($params) { if($params['type'] == NOTIFY_TAGSELF) { $subject = sprintf( t('[Friendica:Notify] %s tagged you') , $params['source_name']); $preamble = sprintf( t('%1$s tagged you at %2$s') , $params['source_name'], $sitename); - $epreamble = sprintf( t('%1$s [url=%2s]tagged you[/url].') , + $epreamble = sprintf( t('%1$s [url=%2$s]tagged you[/url].') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', $params['link']); diff --git a/include/items.php b/include/items.php index 3db1a2802..a0dd1c815 100755 --- a/include/items.php +++ b/include/items.php @@ -446,6 +446,8 @@ function get_atom_elements($feed,$item) { $res['body'] = $purifier->purify($res['body']); $res['body'] = @html2bbcode($res['body']); + + } elseif(! $have_real_body) { @@ -814,6 +816,12 @@ function item_store($arr,$force_parent = false) { if($r[0]['private']) $arr['private'] = 1; + // Edge case. We host a public forum that was originally posted to privately. + // The original author commented, but as this is a comment, the permissions + // weren't fixed up so it will still show the comment as private unless we fix it here. + + if((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) + $arr['private'] = 0; } else { @@ -1258,6 +1266,12 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { return 3; } + if($contact['term-date'] != '0000-00-00 00:00:00') { + logger("dfrn_deliver: $url back from the dead - removing mark for death"); + require_once('include/Contact.php'); + unmark_for_death($contact); + } + $res = parse_xml_string($xml); return $res->status; diff --git a/include/nav.php b/include/nav.php index d760cc8ae..a67a8b614 100644 --- a/include/nav.php +++ b/include/nav.php @@ -53,9 +53,9 @@ function nav(&$a) { $nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); // user info - $r = q("SELECT `micro`,`avatar-date` FROM `contact` WHERE uid=%d AND self=1", intval($a->user['uid'])); + $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']."?rev=".urlencode($r[0]['avatar-date']): $a->get_baseurl($ssl_state)."/images/person-48.jpg"), + 'icon' => (count($r) ? $a->get_cached_avatar_image($r[0]['micro']) : $a->get_baseurl($ssl_state)."/images/person-48.jpg"), 'name' => $a->user['username'], ); diff --git a/include/plugin.php b/include/plugin.php index ae8eee78a..c6b61ae6e 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -148,7 +148,9 @@ function load_hooks() { $r = q("SELECT * FROM `hook` WHERE 1"); if(count($r)) { foreach($r as $rr) { - $a->hooks[] = array($rr['hook'], $rr['file'], $rr['function']); + if(! array_key_exists($rr['hook'],$a->hooks)) + $a->hooks[$rr['hook']] = array(); + $a->hooks[$rr['hook']][] = array($rr['file'],$rr['function']); } } }} @@ -158,25 +160,24 @@ if(! function_exists('call_hooks')) { function call_hooks($name, &$data = null) { $a = get_app(); - if(count($a->hooks)) { - foreach($a->hooks as $hook) { - if($hook[HOOK_HOOK] === $name) { - @include_once($hook[HOOK_FILE]); - if(function_exists($hook[HOOK_FUNCTION])) { - $func = $hook[HOOK_FUNCTION]; - $func($a,$data); - } - else { - // remove orphan hooks - q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1", - dbesc($hook[HOOK_HOOK]), - dbesc($hook[HOOK_FILE]), - dbesc($hook[HOOK_FUNCTION]) - ); - } + if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) { + foreach($a->hooks[$name] as $hook) { + @include_once($hook[0]); + if(function_exists($hook[1])) { + $func = $hook[1]; + $func($a,$data); + } + else { + // remove orphan hooks + q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1", + dbesc($name), + dbesc($hook[0]), + dbesc($hook[1]) + ); } } } + }} @@ -246,7 +246,10 @@ if(! $install) if($a->module_loaded) { $a->page['page_title'] = $a->module; + $placeholder = ''; + if(function_exists($a->module . '_init')) { + call_hooks($a->module . '_mod_init', $placeholder); $func = $a->module . '_init'; $func($a); } @@ -266,18 +269,25 @@ if($a->module_loaded) { if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error) && (function_exists($a->module . '_post')) && (! x($_POST,'auth-params'))) { + call_hooks($a->module . '_mod_post', $_POST); $func = $a->module . '_post'; $func($a); } if((! $a->error) && (function_exists($a->module . '_afterpost'))) { + call_hooks($a->module . '_mod_afterpost',$placeholder); $func = $a->module . '_afterpost'; $func($a); } if((! $a->error) && (function_exists($a->module . '_content'))) { + $arr = array('content' => $a->page['content']); + call_hooks($a->module . '_mod_content', $arr); + $a->page['content'] = $arr['content']; $func = $a->module . '_content'; - $a->page['content'] .= $func($a); + $arr = array('content' => $func($a)); + call_hooks($a->module . '_mod_aftercontent', $arr); + $a->page['content'] .= $arr['content']; } } diff --git a/library/simplepie/simplepie.inc b/library/simplepie/simplepie.inc index 8a2739f52..96ad06678 100644 --- a/library/simplepie/simplepie.inc +++ b/library/simplepie/simplepie.inc @@ -709,7 +709,7 @@ class SimplePie * @see SimplePie::strip_htmltags() * @access private */ - var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'); + var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'); /** * The SimplePie class contains feed level data and options @@ -14803,7 +14803,7 @@ class SimplePie_Sanitize // Options var $remove_div = true; var $image_handler = ''; - var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'); + var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'); var $encode_instead_of_strip = false; var $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'); var $strip_comments = false; @@ -14892,7 +14892,7 @@ class SimplePie_Sanitize } } - function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style')) + function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style')) { if ($tags) { diff --git a/mod/contacts.php b/mod/contacts.php index f84a988c8..fb4595739 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -479,12 +479,13 @@ function contacts_content(&$a) { - + $searching = false; if($search) { $search_hdr = $search; - $search = dbesc($search.'*'); + $search_txt = dbesc(protect_sprintf(preg_quote($search))); + $searching = true; } - $sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : ""); + $sql_extra .= (($searching) ? " AND `name` REGEXP '$search_txt' " : ""); if($nets) $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets)); @@ -501,7 +502,6 @@ function contacts_content(&$a) { } - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ", intval($_SESSION['uid']), intval($a->pager['start']), @@ -568,7 +568,7 @@ function contacts_content(&$a) { '$total' => $total, '$search' => $search_hdr, '$desc' => t('Search your contacts'), - '$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""), + '$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""), '$submit' => t('Find'), '$cmd' => $a->cmd, '$contacts' => $contacts, diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 436727a78..f3c145410 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -443,7 +443,7 @@ function dfrn_poll_content(&$a) { $encrypted_id = ''; $id_str = $my_id . '.' . mt_rand(1000,9999); - if($r[0]['duplex'] && strlen($r[0]['pubkey'])) { + if(($r[0]['duplex'] && strlen($r[0]['pubkey'])) || (! strlen($r[0]['prvkey']))) { openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']); openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']); } diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 3c76034c3..cec2d7f8b 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -170,7 +170,7 @@ function dfrn_request_post(&$a) { info( t("Introduction complete.") . EOL); } - $r = q("select id from contact where uid = %d and url = '%s' and `site-pubkey` = '%s limit 1", + $r = q("select id from contact where uid = %d and url = '%s' and `site-pubkey` = '%s' limit 1", intval(local_user()), dbesc($dfrn_url), $parms['key'] // this was already escaped diff --git a/mod/directory.php b/mod/directory.php index 7f3a44ff4..930a575b6 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -73,7 +73,7 @@ function directory_content(&$a) { $order = " ORDER BY `name` ASC "; - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `contact`.`avatar-date` AS picdate, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `self` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", + $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", intval($a->pager['start']), intval($a->pager['itemspage']) ); @@ -116,7 +116,7 @@ function directory_content(&$a) { $entry = replace_macros($tpl,array( '$id' => $rr['id'], '$profile-link' => $profile_link, - '$photo' => $rr[$photo] . '?rev=' . urlencode($rr['picdate']), + '$photo' => $a->get_cached_avatar_image($rr[$photo]), '$alt-text' => $rr['name'], '$name' => $rr['name'], '$details' => $pdesc . $details diff --git a/mod/message.php b/mod/message.php index d5bb3dfe4..519634be5 100644 --- a/mod/message.php +++ b/mod/message.php @@ -407,6 +407,7 @@ function message_content(&$a) { '$parent' => $parent, '$upload' => t('Upload photo'), '$insert' => t('Insert web link'), + '$submit' => t('Submit'), '$wait' => t('Please wait') )); diff --git a/mod/photos.php b/mod/photos.php index a6552994e..d96bc135e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -16,7 +16,7 @@ function photos_init(&$a) { if($a->argc > 1) { $nick = $a->argv[1]; - $r = q("SELECT `user`.*, `contact`.`avatar-date` AS picdate FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 LIMIT 1", + $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", dbesc($nick) ); @@ -36,7 +36,7 @@ function photos_init(&$a) { $o .= '<div class="vcard">'; $o .= '<div class="fn">' . $a->data['user']['username'] . '</div>'; - $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg?rev=' . urlencode($a->data['user']['picdate']) . '" alt="' . $a->data['user']['username'] . '" /></div>'; + $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>'; $o .= '</div>'; if(! intval($a->data['user']['hidewall'])) { @@ -306,7 +306,8 @@ function photos_post(&$a) { $albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); - if((x($_POST,'rotate') !== false) && (intval($_POST['rotate']) == 1)) { + if((x($_POST,'rotate') !== false) && + ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) { logger('rotate'); $r = q("select * from photo where `resource-id` = '%s' and uid = %d and scale = 0 limit 1", @@ -316,7 +317,8 @@ function photos_post(&$a) { if(count($r)) { $ph = new Photo($r[0]['data'], $r[0]['type']); if($ph->is_valid()) { - $ph->rotate(270); + $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 ); + $ph->rotate($rotate_deg); $width = $ph->getWidth(); $height = $ph->getHeight(); @@ -325,8 +327,8 @@ function photos_post(&$a) { dbesc($ph->imageString()), intval($height), intval($width), - dbesc($resource_id), - intval($page_owner_uid) + dbesc($resource_id), + intval($page_owner_uid) ); if($width > 640 || $height > 640) { @@ -338,8 +340,8 @@ function photos_post(&$a) { dbesc($ph->imageString()), intval($height), intval($width), - dbesc($resource_id), - intval($page_owner_uid) + dbesc($resource_id), + intval($page_owner_uid) ); } @@ -352,8 +354,8 @@ function photos_post(&$a) { dbesc($ph->imageString()), intval($height), intval($width), - dbesc($resource_id), - intval($page_owner_uid) + dbesc($resource_id), + intval($page_owner_uid) ); } } @@ -718,6 +720,7 @@ function photos_post(&$a) { killme(); } + $ph->orient($src); @unlink($src); $width = $ph->getWidth(); @@ -1250,7 +1253,8 @@ function photos_content(&$a) { $edit_tpl = get_markup_template('photo_edit.tpl'); $edit = replace_macros($edit_tpl, array( '$id' => $ph[0]['id'], - '$rotate' => t('Rotate CW'), + '$rotatecw' => t('Rotate CW (right)'), + '$rotateccw' => t('Rotate CCW (left)'), '$album' => template_escape($ph[0]['album']), '$newalbum' => t('New album name'), '$nickname' => $a->data['user']['nickname'], diff --git a/mod/profiles.php b/mod/profiles.php index 7b6e61ad6..a9da5454c 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -635,7 +635,7 @@ function profiles_content(&$a) { } else { - $r = q("SELECT `profile`.*, `contact`.`avatar-date` AS picdate FROM `profile` LEFT JOIN `contact` on `contact`.`uid` = `profile`.`uid` WHERE `profile`.`uid` = %d and contact.self = 1", + $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); if(count($r)) { @@ -652,7 +652,7 @@ function profiles_content(&$a) { foreach($r as $rr) { $o .= replace_macros($tpl, array( - '$photo' => $rr['thumb'] . '?rev=' . urlencode($rr['picdate']), + '$photo' => $a->get_cached_avatar_image($rr['thumb']), '$id' => $rr['id'], '$alt' => t('Profile Image'), '$profile_name' => $rr['profile-name'], diff --git a/mod/share.php b/mod/share.php index 6c6098c83..08c63105e 100644 --- a/mod/share.php +++ b/mod/share.php @@ -8,26 +8,23 @@ function share_init(&$a) { if((! $post_id) || (! local_user())) killme(); - $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", - intval($post_id) + $r = q("SELECT item.*, contact.network FROM `item` + left join contact on `item`.`contact-id` = `contact`.`id` + WHERE `item`.`id` = %d AND `item`.`uid` = %d LIMIT 1", + + intval($post_id), + intval(local_user()) ); - if(! count($r) || $r[0]['private']) + if(! count($r) || ($r[0]['private'] && ($r[0]['network'] != NETWORK_FEED))) killme(); $o = ''; -// if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) { - $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n"; - if($r[0]['title']) - $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n"; - $o .= $r[0]['body'] . "\n"; -// } -// else { -// $o .= '♲ <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />'; -// if($r[0]['title']) -// $o .= '<strong>' . $r[0]['title'] . '</strong><br />'; -// $o .= $r[0]['body'] . "\n"; -// } + $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n"; + if($r[0]['title']) + $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n"; + $o .= $r[0]['body'] . "\n"; + echo $o; killme(); } diff --git a/spec/zot-2012.txt b/spec/zot-2012.txt new file mode 100644 index 000000000..2e1f3c3c4 --- /dev/null +++ b/spec/zot-2012.txt @@ -0,0 +1,182 @@ + +Initial cut at Zot-2012 protocol. This is a very rough draft of some very rough ideas and concepts. +It is not yet intended to be a definitive specification and many things like the security handshakes are yet to be specified precisely. + +All communications are https + + +First create a global unique userid + + +Site userid: +https://macgirvin.com/1 + +$guuid = base64url_encode(hash('whirlpool','https://macgirvin.com/1.' . mt_rand(1000000,9999999),1); + + +Then create a hashed site destination. + +$gduid = base64url_encode(hash('whirlpool', $guuid . 'https://macgirvin.com',1); + +These two keys will identify you as a person+site pair in the future. +You will also obtain a password upon introducing yourself to a site. +This can be used to edit locations in the future. You will always keep your global unique userid + + +The steps to connect with somebody are to first register your location with their site. +Then introduce yourself to the person. This contains flags for the desired relationship. +At some future time, they may confirm and adjust the relationship based on their comfort level. +Lack of confirmation is tantamount to denial. + +You can set either or both of FOLLOW and SHARE which indicates the relationship from your viewpoint. +They may do likewise. + +A relationship is based on you as a person and provided you register new locations with the site you can post from anywhere. +You do not need to register locations with each person, only with the site. + + +Introduce yourself to a site: + + +POST https://example.com/post + +{ +'type' => 'register' +'person' => $guuid +'address' => $gduid +'site' => 'https://macgirvin.com' +'info' => 'mike@macgirvin.com' +} + +Returns: + +{ +'success' => 'true' +'pass' => me_encrypt($random_string) +} + +--- +Add location +--- + +POST https://example.com/post + +{ +'type' => 'location' +'person' => $guuid +'address' => $new_gduid +'site' => 'https://newsite.com' +'info' => 'mike@newsite.com' +'pass' => me_encrypt($gduid . '.' . $pass) +} + +Returns: + +{ +'success' => 'true' +'pass' => me_encrypt($random_string) +} + +--- +Remove location +--- + +POST https://example.com/post + +{ +'type' => 'remove_location' +'person' => $guuid +'address' => $gduid +'pass' => me_encrypt($pass) +} + +Returns: + +{ +'success' => 'true' +'message' => 'OK' +} + + +------------ +Make friends +------------ +This message may be reversed/repeated by the destination site to confirm. +flags is the desired friendship bits. The same message may be used with different flags +to edit or remove a relationship. + + +POST https://example.com/post + +{ +'type' => 'contact' +'person' => $gduid +'address' => $guuid +'target' => 'bobjones@example.com' +'flags' => HIDDEN=0,FOLLOW=1,SHARE=1,NOHIDDEN=1,NOFOLLOW=0,NOSHARE=0 +'confirm' => me_encrypt($guuid . '.' . $pass) +} + +Returns: + +{ +'success' => 'true' +'message' => 'OK' +'flags' => PENDING=1 +} + + + + + + + +------- +Message +------- + +Passing messages is done asynchronously. This may (potentially) relieve a lot of the burden of distribution from the posting site. If you're on site 'A' and make a post, site 'A' just contacts any downstream sites and informs them that there is new content (via a $post_id). The downstream site initiates the actual data transfer. + + + + + +POST https://example.com/post + +{ +'type' => 'post' +'person' => $guuid +'address' => $gduid +'post' => $post_id +} + +Returns: +{ +'success' => 'true' +'message' => 'OK' +} + + +-------- +Callback +-------- + +POST https://macgirvin.com/post + +{ +'type' => 'retrieve' +'retrieve' => $post_id +'challenge' => you_encrypt('abc123') +'verify' => me_encrypt('xyz456' . '.' . $gduid) +} + +Returns: + +{ +'success' => 'true' +'message' => 'OK' +'response' => 'abc123' +'data' => encrypted or raw structured post +} + + diff --git a/util/messages.po b/util/messages.po index 152940341..416e30ef8 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1377\n" +"Project-Id-Version: 3.0.1382\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-17 10:00-0700\n" +"POT-Creation-Date: 2012-06-22 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -36,7 +36,7 @@ msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 #: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:928 +#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:931 #: ../../mod/editpost.php:10 ../../mod/install.php:151 #: ../../mod/notifications.php:66 ../../mod/contacts.php:145 #: ../../mod/settings.php:106 ../../mod/settings.php:537 @@ -55,8 +55,8 @@ msgstr "" #: ../../mod/profiles.php:385 ../../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:507 -#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3387 -#: ../../index.php:299 +#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3401 +#: ../../index.php:309 msgid "Permission denied." msgstr "" @@ -123,20 +123,21 @@ msgid "New photo from this URL" msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:428 ../../mod/photos.php:963 ../../mod/photos.php:1021 -#: ../../mod/photos.php:1266 ../../mod/photos.php:1306 -#: ../../mod/photos.php:1346 ../../mod/photos.php:1377 +#: ../../mod/events.php:428 ../../mod/photos.php:966 ../../mod/photos.php:1024 +#: ../../mod/photos.php:1270 ../../mod/photos.php:1310 +#: ../../mod/photos.php:1350 ../../mod/photos.php:1381 #: ../../mod/install.php:246 ../../mod/install.php:284 #: ../../mod/localtime.php:45 ../../mod/contacts.php:343 #: ../../mod/settings.php:555 ../../mod/settings.php:701 #: ../../mod/settings.php:762 ../../mod/settings.php:969 -#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/admin.php:420 -#: ../../mod/admin.php:656 ../../mod/admin.php:792 ../../mod/admin.php:991 -#: ../../mod/admin.php:1078 ../../mod/profiles.php:554 +#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/message.php:410 +#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792 +#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:609 #: ../../addon/snautofollow/snautofollow.php:64 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 -#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 +#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:164 +#: ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 @@ -226,7 +227,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1529 +#: ../../include/nav.php:52 ../../boot.php:1546 msgid "Events" msgstr "" @@ -277,7 +278,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:423 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:265 ../../boot.php:1109 +#: ../../include/bb2diaspora.php:265 ../../boot.php:1126 msgid "Location:" msgstr "" @@ -354,19 +355,19 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:44 ../../boot.php:1523 +#: ../../mod/photos.php:44 ../../boot.php:1540 msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:942 -#: ../../mod/photos.php:1013 ../../mod/photos.php:1028 -#: ../../mod/photos.php:1455 ../../mod/photos.php:1467 +#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:945 +#: ../../mod/photos.php:1016 ../../mod/photos.php:1031 +#: ../../mod/photos.php:1459 ../../mod/photos.php:1471 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:59 ../../mod/photos.php:1038 ../../mod/photos.php:1505 +#: ../../mod/photos.php:59 ../../mod/photos.php:1041 ../../mod/photos.php:1509 msgid "Upload New Photos" msgstr "" @@ -378,8 +379,8 @@ msgstr "" msgid "Contact information unavailable" msgstr "" -#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1013 -#: ../../mod/photos.php:1028 ../../mod/profile_photo.php:60 +#: ../../mod/photos.php:154 ../../mod/photos.php:658 ../../mod/photos.php:1016 +#: ../../mod/photos.php:1031 ../../mod/profile_photo.php:60 #: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254 #: ../../mod/profile_photo.php:263 @@ -393,19 +394,19 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:182 ../../mod/photos.php:1022 +#: ../../mod/photos.php:182 ../../mod/photos.php:1025 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:245 ../../mod/photos.php:1267 +#: ../../mod/photos.php:245 ../../mod/photos.php:1271 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:587 +#: ../../mod/photos.php:589 msgid "was tagged in a" msgstr "" -#: ../../mod/photos.php:587 ../../mod/like.php:185 ../../mod/tagger.php:70 +#: ../../mod/photos.php:589 ../../mod/like.php:185 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 #: ../../include/diaspora.php:1709 ../../include/conversation.php:53 @@ -413,172 +414,176 @@ msgstr "" msgid "photo" msgstr "" -#: ../../mod/photos.php:587 +#: ../../mod/photos.php:589 msgid "by" msgstr "" -#: ../../mod/photos.php:692 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:694 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/photos.php:700 +#: ../../mod/photos.php:702 msgid "Image file is empty." msgstr "" -#: ../../mod/photos.php:714 ../../mod/profile_photo.php:126 +#: ../../mod/photos.php:716 ../../mod/profile_photo.php:126 #: ../../mod/wall_upload.php:86 msgid "Unable to process image." msgstr "" -#: ../../mod/photos.php:734 ../../mod/profile_photo.php:259 +#: ../../mod/photos.php:737 ../../mod/profile_photo.php:259 #: ../../mod/wall_upload.php:105 msgid "Image upload failed." msgstr "" -#: ../../mod/photos.php:820 ../../mod/community.php:16 +#: ../../mod/photos.php:823 ../../mod/community.php:16 #: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:830 +#: ../../mod/photos.php:833 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:909 +#: ../../mod/photos.php:912 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:970 +#: ../../mod/photos.php:973 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:973 ../../mod/photos.php:1017 +#: ../../mod/photos.php:976 ../../mod/photos.php:1020 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:974 +#: ../../mod/photos.php:977 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:975 +#: ../../mod/photos.php:978 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:977 ../../mod/photos.php:1262 +#: ../../mod/photos.php:980 ../../mod/photos.php:1266 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:1032 +#: ../../mod/photos.php:1035 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:1056 ../../mod/photos.php:1488 +#: ../../mod/photos.php:1059 ../../mod/photos.php:1492 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:1091 +#: ../../mod/photos.php:1094 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:1093 +#: ../../mod/photos.php:1096 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:1143 +#: ../../mod/photos.php:1146 msgid "View photo" msgstr "" -#: ../../mod/photos.php:1143 +#: ../../mod/photos.php:1146 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1144 +#: ../../mod/photos.php:1147 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1150 ../../include/conversation.php:490 +#: ../../mod/photos.php:1153 ../../include/conversation.php:490 msgid "Private Message" msgstr "" -#: ../../mod/photos.php:1172 +#: ../../mod/photos.php:1175 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1240 +#: ../../mod/photos.php:1243 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1243 +#: ../../mod/photos.php:1246 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1253 -msgid "Rotate CW" +#: ../../mod/photos.php:1256 +msgid "Rotate CW (right)" +msgstr "" + +#: ../../mod/photos.php:1257 +msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1255 +#: ../../mod/photos.php:1259 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1258 +#: ../../mod/photos.php:1262 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1260 +#: ../../mod/photos.php:1264 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1264 +#: ../../mod/photos.php:1268 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1284 ../../include/conversation.php:554 +#: ../../mod/photos.php:1288 ../../include/conversation.php:554 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1285 ../../include/conversation.php:555 +#: ../../mod/photos.php:1289 ../../include/conversation.php:555 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1286 ../../include/conversation.php:989 +#: ../../mod/photos.php:1290 ../../include/conversation.php:989 msgid "Share" msgstr "" -#: ../../mod/photos.php:1287 ../../mod/editpost.php:104 +#: ../../mod/photos.php:1291 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:215 -#: ../../mod/message.php:410 ../../include/conversation.php:371 +#: ../../mod/message.php:411 ../../include/conversation.php:371 #: ../../include/conversation.php:731 ../../include/conversation.php:1008 msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1303 ../../mod/photos.php:1343 -#: ../../mod/photos.php:1374 ../../include/conversation.php:577 +#: ../../mod/photos.php:1307 ../../mod/photos.php:1347 +#: ../../mod/photos.php:1378 ../../include/conversation.php:577 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1305 ../../mod/photos.php:1345 -#: ../../mod/photos.php:1376 ../../include/conversation.php:579 -#: ../../boot.php:523 +#: ../../mod/photos.php:1309 ../../mod/photos.php:1349 +#: ../../mod/photos.php:1380 ../../include/conversation.php:579 +#: ../../boot.php:518 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1307 ../../mod/editpost.php:125 +#: ../../mod/photos.php:1311 ../../mod/editpost.php:125 #: ../../include/conversation.php:589 ../../include/conversation.php:1026 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1404 ../../mod/settings.php:618 +#: ../../mod/photos.php:1408 ../../mod/settings.php:618 #: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663 #: ../../include/conversation.php:328 ../../include/conversation.php:609 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1494 +#: ../../mod/photos.php:1498 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1503 +#: ../../mod/photos.php:1507 msgid "Recent Photos" msgstr "" @@ -821,7 +826,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:2783 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:2797 msgid "[Name Withheld]" msgstr "" @@ -1193,7 +1198,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1053 +#: ../../include/contact_widgets.php:9 ../../boot.php:1070 msgid "Connect" msgstr "" @@ -1723,8 +1728,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:692 #: ../../addon/facebook/facebook.php:1182 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2792 -#: ../../boot.php:703 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2806 +#: ../../boot.php:720 msgid "Administrator" msgstr "" @@ -1734,7 +1739,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:835 +#: ../../mod/lostpass.php:83 ../../boot.php:852 msgid "Password Reset" msgstr "" @@ -2409,7 +2414,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1535 +#: ../../mod/notes.php:44 ../../boot.php:1552 msgid "Personal Notes" msgstr "" @@ -2618,7 +2623,7 @@ msgstr "" msgid "Group name changed." msgstr "" -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:298 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308 msgid "Permission denied" msgstr "" @@ -2660,7 +2665,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:79 -#: ../../include/nav.php:50 ../../boot.php:1514 +#: ../../include/nav.php:50 ../../boot.php:1531 msgid "Profile" msgstr "" @@ -2764,7 +2769,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:801 +#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:818 msgid "Register" msgstr "" @@ -2798,7 +2803,7 @@ msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3234 +#: ../../mod/display.php:142 ../../include/items.php:3248 msgid "Item not found." msgstr "" @@ -2807,7 +2812,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1520 +#: ../../include/nav.php:51 ../../boot.php:1537 msgid "Photos" msgstr "" @@ -3610,7 +3615,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:966 +#: ../../mod/profile.php:21 ../../boot.php:983 msgid "Requested profile is not available." msgstr "" @@ -3985,23 +3990,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:645 ../../boot.php:1075 +#: ../../mod/profiles.php:645 ../../boot.php:1092 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:646 ../../boot.php:1076 +#: ../../mod/profiles.php:646 ../../boot.php:1093 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:657 ../../boot.php:1086 +#: ../../mod/profiles.php:657 ../../boot.php:1103 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:659 ../../boot.php:1089 +#: ../../mod/profiles.php:659 ../../boot.php:1106 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:660 ../../boot.php:1090 +#: ../../mod/profiles.php:660 ../../boot.php:1107 msgid "Edit visibility" msgstr "" @@ -4615,16 +4620,32 @@ msgstr "" msgid "%s - Click to open/close" msgstr "" -#: ../../addon/page/page.php:48 +#: ../../addon/page/page.php:58 ../../addon/page/page.php:88 msgid "Forums" msgstr "" -#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 -#: ../../include/contact_widgets.php:188 ../../include/conversation.php:476 -#: ../../boot.php:524 +#: ../../addon/page/page.php:73 ../../addon/page/page.php:107 +#: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188 +#: ../../include/conversation.php:476 ../../boot.php:519 msgid "show more" msgstr "" +#: ../../addon/page/page.php:125 +msgid "Page settings updated." +msgstr "" + +#: ../../addon/page/page.php:151 +msgid "Page Settings" +msgstr "" + +#: ../../addon/page/page.php:153 +msgid "How many forums to display on sidebar without paging" +msgstr "" + +#: ../../addon/page/page.php:156 +msgid "Randomise Page/Forum list" +msgstr "" + #: ../../addon/planets/planets.php:150 msgid "Planets Settings" msgstr "" @@ -4637,7 +4658,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:822 +#: ../../include/nav.php:64 ../../boot.php:839 msgid "Login" msgstr "" @@ -6051,7 +6072,7 @@ msgstr "" msgid "Set colour scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1111 +#: ../../include/profile_advanced.php:17 ../../boot.php:1128 msgid "Gender:" msgstr "" @@ -6064,7 +6085,7 @@ msgid "j F" msgstr "" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:450 -#: ../../include/items.php:1446 +#: ../../include/items.php:1460 msgid "Birthday:" msgstr "" @@ -6072,7 +6093,7 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1114 +#: ../../include/profile_advanced.php:37 ../../boot.php:1131 msgid "Status:" msgstr "" @@ -6081,7 +6102,7 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: ../../include/profile_advanced.php:48 ../../boot.php:1116 +#: ../../include/profile_advanced.php:48 ../../boot.php:1133 msgid "Homepage:" msgstr "" @@ -6454,6 +6475,10 @@ msgstr "" msgid "noreply" msgstr "" +#: ../../include/Scrape.php:572 +msgid " on Last.fm" +msgstr "" + #: ../../include/text.php:243 msgid "prev" msgstr "" @@ -6660,7 +6685,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:821 +#: ../../include/nav.php:46 ../../boot.php:838 msgid "Logout" msgstr "" @@ -6668,7 +6693,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1508 +#: ../../include/nav.php:49 ../../boot.php:1525 msgid "Status" msgstr "" @@ -6748,11 +6773,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1069 +#: ../../include/nav.php:138 ../../boot.php:1086 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1069 +#: ../../include/nav.php:138 ../../boot.php:1086 msgid "Manage/edit profiles" msgstr "" @@ -7039,7 +7064,7 @@ msgstr "" #: ../../include/enotify.php:126 #, php-format -msgid "%1$s [url=%2s]tagged you[/url]." +msgid "%1$s [url=%2$s]tagged you[/url]." msgstr "" #: ../../include/enotify.php:137 @@ -7163,15 +7188,15 @@ msgstr "" msgid "following" msgstr "" -#: ../../include/items.php:2790 +#: ../../include/items.php:2804 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2790 +#: ../../include/items.php:2804 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:3452 +#: ../../include/items.php:3466 msgid "Archives" msgstr "" @@ -7523,96 +7548,96 @@ msgstr "" msgid "permissions" msgstr "" -#: ../../boot.php:522 +#: ../../boot.php:517 msgid "Delete this item?" msgstr "" -#: ../../boot.php:525 +#: ../../boot.php:520 msgid "show fewer" msgstr "" -#: ../../boot.php:698 +#: ../../boot.php:715 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:700 +#: ../../boot.php:717 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:800 +#: ../../boot.php:817 msgid "Create a New Account" msgstr "" -#: ../../boot.php:824 +#: ../../boot.php:841 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:825 +#: ../../boot.php:842 msgid "Password: " msgstr "" -#: ../../boot.php:828 +#: ../../boot.php:845 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:834 +#: ../../boot.php:851 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1001 +#: ../../boot.php:1018 msgid "Edit profile" msgstr "" -#: ../../boot.php:1061 +#: ../../boot.php:1078 msgid "Message" msgstr "" -#: ../../boot.php:1177 ../../boot.php:1253 +#: ../../boot.php:1194 ../../boot.php:1270 msgid "g A l F d" msgstr "" -#: ../../boot.php:1178 ../../boot.php:1254 +#: ../../boot.php:1195 ../../boot.php:1271 msgid "F d" msgstr "" -#: ../../boot.php:1223 ../../boot.php:1294 +#: ../../boot.php:1240 ../../boot.php:1311 msgid "[today]" msgstr "" -#: ../../boot.php:1235 +#: ../../boot.php:1252 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1236 +#: ../../boot.php:1253 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1287 +#: ../../boot.php:1304 msgid "[No description]" msgstr "" -#: ../../boot.php:1305 +#: ../../boot.php:1322 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1306 +#: ../../boot.php:1323 msgid "Events this week:" msgstr "" -#: ../../boot.php:1511 +#: ../../boot.php:1528 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1517 +#: ../../boot.php:1534 msgid "Profile Details" msgstr "" -#: ../../boot.php:1532 +#: ../../boot.php:1549 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1538 +#: ../../boot.php:1555 msgid "Only You Can See This" msgstr "" diff --git a/view/de/messages.po b/view/de/messages.po index b784e615e..98ab65d61 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-06-05 10:00-0700\n" -"PO-Revision-Date: 2012-06-06 23:32+0000\n" -"Last-Translator: zottel <transifex@zottel.net>\n" +"POT-Creation-Date: 2012-06-17 10:00-0700\n" +"PO-Revision-Date: 2012-06-18 22:04+0000\n" +"Last-Translator: Fabian Dost <friends@dostmusik.de>\n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,9 +48,9 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 #: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920 +#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:928 #: ../../mod/editpost.php:10 ../../mod/install.php:151 -#: ../../mod/notifications.php:66 ../../mod/contacts.php:125 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:145 #: ../../mod/settings.php:106 ../../mod/settings.php:537 #: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 @@ -59,15 +59,16 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124 #: ../../mod/item.php:140 ../../mod/profile_photo.php:19 -#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 -#: ../../mod/profile_photo.php:163 ../../mod/message.php:44 -#: ../../mod/message.php:96 ../../mod/allfriends.php:9 +#: ../../mod/profile_photo.php:141 ../../mod/profile_photo.php:152 +#: ../../mod/profile_photo.php:165 ../../mod/message.php:45 +#: ../../mod/message.php:97 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7 #: ../../mod/profiles.php:385 ../../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:503 -#: ../../include/items.php:3332 ../../index.php:306 +#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:507 +#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3387 +#: ../../index.php:299 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -97,7 +98,7 @@ msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" #: ../../mod/crepair.php:148 ../../mod/settings.php:557 -#: ../../mod/settings.php:583 ../../mod/admin.php:656 ../../mod/admin.php:665 +#: ../../mod/settings.php:583 ../../mod/admin.php:659 ../../mod/admin.php:668 msgid "Name" msgstr "Name" @@ -134,28 +135,31 @@ msgid "New photo from this URL" msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:428 ../../mod/photos.php:955 ../../mod/photos.php:1013 -#: ../../mod/photos.php:1256 ../../mod/photos.php:1296 -#: ../../mod/photos.php:1336 ../../mod/photos.php:1367 +#: ../../mod/events.php:428 ../../mod/photos.php:963 ../../mod/photos.php:1021 +#: ../../mod/photos.php:1266 ../../mod/photos.php:1306 +#: ../../mod/photos.php:1346 ../../mod/photos.php:1377 #: ../../mod/install.php:246 ../../mod/install.php:284 -#: ../../mod/localtime.php:45 ../../mod/contacts.php:322 +#: ../../mod/localtime.php:45 ../../mod/contacts.php:343 #: ../../mod/settings.php:555 ../../mod/settings.php:701 #: ../../mod/settings.php:762 ../../mod/settings.php:969 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:215 -#: ../../mod/admin.php:417 ../../mod/admin.php:653 ../../mod/admin.php:789 -#: ../../mod/admin.php:988 ../../mod/admin.php:1075 ../../mod/profiles.php:554 -#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605 +#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/admin.php:420 +#: ../../mod/admin.php:656 ../../mod/admin.php:792 ../../mod/admin.php:991 +#: ../../mod/admin.php:1078 ../../mod/profiles.php:554 +#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:609 +#: ../../addon/snautofollow/snautofollow.php:64 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 -#: ../../addon/impressum/impressum.php:82 ../../addon/blockem/blockem.php:57 +#: ../../addon/impressum/impressum.php:82 +#: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 -#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 -#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:86 +#: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42 +#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98 +#: ../../addon/gravatar/gravatar.php:86 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 #: ../../addon/jappixmini/jappixmini.php:302 #: ../../addon/statusnet/statusnet.php:278 @@ -165,7 +169,7 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/statusnet/statusnet.php:353 #: ../../addon/statusnet/statusnet.php:561 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 -#: ../../addon/wppost/wppost.php:109 ../../addon/showmore/showmore.php:48 +#: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:381 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 @@ -182,15 +186,16 @@ msgstr "Senden" msgid "Help:" msgstr "Hilfe:" -#: ../../mod/help.php:34 ../../include/nav.php:86 +#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:116 +#: ../../include/nav.php:86 msgid "Help" msgstr "Hilfe" -#: ../../mod/help.php:38 ../../index.php:225 +#: ../../mod/help.php:38 ../../index.php:218 msgid "Not Found" msgstr "Nicht gefunden" -#: ../../mod/help.php:41 ../../index.php:228 +#: ../../mod/help.php:41 ../../index.php:221 msgid "Page not found." msgstr "Seite nicht gefunden." @@ -233,7 +238,7 @@ msgid "link to source" msgstr "Link zum Originalbeitrag" #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1520 +#: ../../include/nav.php:52 ../../boot.php:1529 msgid "Events" msgstr "Veranstaltungen" @@ -241,11 +246,12 @@ msgstr "Veranstaltungen" msgid "Create New Event" msgstr "Neue Veranstaltung erstellen" -#: ../../mod/events.php:326 +#: ../../mod/events.php:326 ../../addon/dav/layout.fnk.php:154 msgid "Previous" msgstr "Vorherige" #: ../../mod/events.php:327 ../../mod/install.php:205 +#: ../../addon/dav/layout.fnk.php:157 msgid "Next" msgstr "Nächste" @@ -283,7 +289,7 @@ msgid "Description:" msgstr "Beschreibung" #: ../../mod/events.php:423 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:265 ../../boot.php:1100 +#: ../../include/bb2diaspora.php:265 ../../boot.php:1109 msgid "Location:" msgstr "Ort:" @@ -292,7 +298,7 @@ msgid "Share this event" msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:830 ../../mod/settings.php:556 +#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:556 #: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Abbrechen" @@ -336,7 +342,7 @@ msgid "" " and/or create new posts for you?" msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:818 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:833 #: ../../mod/settings.php:879 ../../mod/settings.php:885 #: ../../mod/settings.php:893 ../../mod/settings.php:897 #: ../../mod/settings.php:902 ../../mod/settings.php:908 @@ -348,7 +354,7 @@ msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontak msgid "Yes" msgstr "Ja" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:819 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:834 #: ../../mod/settings.php:879 ../../mod/settings.php:885 #: ../../mod/settings.php:893 ../../mod/settings.php:897 #: ../../mod/settings.php:902 ../../mod/settings.php:908 @@ -360,232 +366,232 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: ../../mod/photos.php:43 ../../boot.php:1514 +#: ../../mod/photos.php:44 ../../boot.php:1523 msgid "Photo Albums" msgstr "Fotoalben" -#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:934 -#: ../../mod/photos.php:1005 ../../mod/photos.php:1020 -#: ../../mod/photos.php:1445 ../../mod/photos.php:1457 +#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:942 +#: ../../mod/photos.php:1013 ../../mod/photos.php:1028 +#: ../../mod/photos.php:1455 ../../mod/photos.php:1467 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "Kontaktbilder" -#: ../../mod/photos.php:58 ../../mod/photos.php:1030 ../../mod/photos.php:1494 +#: ../../mod/photos.php:59 ../../mod/photos.php:1038 ../../mod/photos.php:1505 msgid "Upload New Photos" msgstr "Weitere Fotos hochladen" -#: ../../mod/photos.php:69 ../../mod/settings.php:21 +#: ../../mod/photos.php:70 ../../mod/settings.php:21 msgid "everybody" msgstr "jeder" -#: ../../mod/photos.php:140 +#: ../../mod/photos.php:143 msgid "Contact information unavailable" msgstr "Kontaktinformationen nicht verfügbar" -#: ../../mod/photos.php:151 ../../mod/photos.php:652 ../../mod/photos.php:1005 -#: ../../mod/photos.php:1020 ../../mod/profile_photo.php:60 +#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1013 +#: ../../mod/photos.php:1028 ../../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 +#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254 +#: ../../mod/profile_photo.php:263 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:294 -#: ../../include/user.php:301 ../../include/user.php:308 +#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:298 +#: ../../include/user.php:305 ../../include/user.php:312 msgid "Profile Photos" msgstr "Profilbilder" -#: ../../mod/photos.php:161 +#: ../../mod/photos.php:164 msgid "Album not found." msgstr "Album nicht gefunden." -#: ../../mod/photos.php:179 ../../mod/photos.php:1014 +#: ../../mod/photos.php:182 ../../mod/photos.php:1022 msgid "Delete Album" msgstr "Album löschen" -#: ../../mod/photos.php:242 ../../mod/photos.php:1257 +#: ../../mod/photos.php:245 ../../mod/photos.php:1267 msgid "Delete Photo" msgstr "Foto löschen" -#: ../../mod/photos.php:583 +#: ../../mod/photos.php:587 msgid "was tagged in a" msgstr "wurde getaggt in einem" -#: ../../mod/photos.php:583 ../../mod/like.php:185 ../../mod/tagger.php:70 +#: ../../mod/photos.php:587 ../../mod/like.php:185 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 -#: ../../include/diaspora.php:1671 ../../include/conversation.php:53 +#: ../../include/diaspora.php:1709 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" msgstr "Foto" -#: ../../mod/photos.php:583 +#: ../../mod/photos.php:587 msgid "by" msgstr "von" -#: ../../mod/photos.php:686 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:692 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "Die Bildgröße übersteigt das Limit von " -#: ../../mod/photos.php:694 +#: ../../mod/photos.php:700 msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: ../../mod/photos.php:708 ../../mod/profile_photo.php:124 -#: ../../mod/wall_upload.php:83 +#: ../../mod/photos.php:714 ../../mod/profile_photo.php:126 +#: ../../mod/wall_upload.php:86 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: ../../mod/photos.php:728 ../../mod/profile_photo.php:257 -#: ../../mod/wall_upload.php:102 +#: ../../mod/photos.php:734 ../../mod/profile_photo.php:259 +#: ../../mod/wall_upload.php:105 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." -#: ../../mod/photos.php:814 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:744 ../../mod/viewcontacts.php:17 +#: ../../mod/photos.php:820 ../../mod/community.php:16 +#: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." -#: ../../mod/photos.php:824 +#: ../../mod/photos.php:830 msgid "No photos selected" msgstr "Keine Bilder ausgewählt" -#: ../../mod/photos.php:901 +#: ../../mod/photos.php:909 msgid "Access to this item is restricted." msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." -#: ../../mod/photos.php:962 +#: ../../mod/photos.php:970 msgid "Upload Photos" msgstr "Bilder hochladen" -#: ../../mod/photos.php:965 ../../mod/photos.php:1009 +#: ../../mod/photos.php:973 ../../mod/photos.php:1017 msgid "New album name: " msgstr "Name des neuen Albums: " -#: ../../mod/photos.php:966 +#: ../../mod/photos.php:974 msgid "or existing album name: " msgstr "oder existierender Albumname: " -#: ../../mod/photos.php:967 +#: ../../mod/photos.php:975 msgid "Do not show a status post for this upload" msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" -#: ../../mod/photos.php:969 ../../mod/photos.php:1252 +#: ../../mod/photos.php:977 ../../mod/photos.php:1262 msgid "Permissions" msgstr "Berechtigungen" -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1032 msgid "Edit Album" msgstr "Album bearbeiten" -#: ../../mod/photos.php:1046 ../../mod/photos.php:1477 +#: ../../mod/photos.php:1056 ../../mod/photos.php:1488 msgid "View Photo" msgstr "Fotos betrachten" -#: ../../mod/photos.php:1081 +#: ../../mod/photos.php:1091 msgid "Permission denied. Access to this item may be restricted." msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein." -#: ../../mod/photos.php:1083 +#: ../../mod/photos.php:1093 msgid "Photo not available" msgstr "Foto nicht verfügbar" -#: ../../mod/photos.php:1133 +#: ../../mod/photos.php:1143 msgid "View photo" msgstr "Fotos ansehen" -#: ../../mod/photos.php:1133 +#: ../../mod/photos.php:1143 msgid "Edit photo" msgstr "Foto bearbeiten" -#: ../../mod/photos.php:1134 +#: ../../mod/photos.php:1144 msgid "Use as profile photo" msgstr "Als Profilbild verwenden" -#: ../../mod/photos.php:1140 ../../include/conversation.php:490 +#: ../../mod/photos.php:1150 ../../include/conversation.php:490 msgid "Private Message" msgstr "Private Nachricht" -#: ../../mod/photos.php:1162 +#: ../../mod/photos.php:1172 msgid "View Full Size" msgstr "Betrachte Originalgröße" -#: ../../mod/photos.php:1230 +#: ../../mod/photos.php:1240 msgid "Tags: " msgstr "Tags: " -#: ../../mod/photos.php:1233 +#: ../../mod/photos.php:1243 msgid "[Remove any tag]" msgstr "[Tag entfernen]" -#: ../../mod/photos.php:1243 +#: ../../mod/photos.php:1253 msgid "Rotate CW" msgstr "Im Uhrzeigersinn rotieren" -#: ../../mod/photos.php:1245 +#: ../../mod/photos.php:1255 msgid "New album name" msgstr "Name des neuen Albums" -#: ../../mod/photos.php:1248 +#: ../../mod/photos.php:1258 msgid "Caption" msgstr "Bildunterschrift" -#: ../../mod/photos.php:1250 +#: ../../mod/photos.php:1260 msgid "Add a Tag" msgstr "Tag hinzufügen" -#: ../../mod/photos.php:1254 +#: ../../mod/photos.php:1264 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1274 ../../include/conversation.php:554 +#: ../../mod/photos.php:1284 ../../include/conversation.php:554 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: ../../mod/photos.php:1275 ../../include/conversation.php:555 +#: ../../mod/photos.php:1285 ../../include/conversation.php:555 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1276 ../../include/conversation.php:989 +#: ../../mod/photos.php:1286 ../../include/conversation.php:989 msgid "Share" msgstr "Teilen" -#: ../../mod/photos.php:1277 ../../mod/editpost.php:104 -#: ../../mod/wallmessage.php:145 ../../mod/message.php:214 -#: ../../mod/message.php:409 ../../include/conversation.php:371 +#: ../../mod/photos.php:1287 ../../mod/editpost.php:104 +#: ../../mod/wallmessage.php:145 ../../mod/message.php:215 +#: ../../mod/message.php:410 ../../include/conversation.php:371 #: ../../include/conversation.php:731 ../../include/conversation.php:1008 msgid "Please wait" msgstr "Bitte warten" -#: ../../mod/photos.php:1293 ../../mod/photos.php:1333 -#: ../../mod/photos.php:1364 ../../include/conversation.php:577 +#: ../../mod/photos.php:1303 ../../mod/photos.php:1343 +#: ../../mod/photos.php:1374 ../../include/conversation.php:577 msgid "This is you" msgstr "Das bist du" -#: ../../mod/photos.php:1295 ../../mod/photos.php:1335 -#: ../../mod/photos.php:1366 ../../include/conversation.php:579 -#: ../../boot.php:514 +#: ../../mod/photos.php:1305 ../../mod/photos.php:1345 +#: ../../mod/photos.php:1376 ../../include/conversation.php:579 +#: ../../boot.php:523 msgid "Comment" msgstr "Kommentar" -#: ../../mod/photos.php:1297 ../../mod/editpost.php:125 +#: ../../mod/photos.php:1307 ../../mod/editpost.php:125 #: ../../include/conversation.php:589 ../../include/conversation.php:1026 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1394 ../../mod/settings.php:618 -#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:660 +#: ../../mod/photos.php:1404 ../../mod/settings.php:618 +#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663 #: ../../include/conversation.php:328 ../../include/conversation.php:609 msgid "Delete" msgstr "Löschen" -#: ../../mod/photos.php:1483 +#: ../../mod/photos.php:1494 msgid "View Album" msgstr "Album betrachten" -#: ../../mod/photos.php:1492 +#: ../../mod/photos.php:1503 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -652,7 +658,7 @@ msgid "Edit" msgstr "Bearbeiten" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:212 ../../mod/message.php:407 +#: ../../mod/message.php:213 ../../mod/message.php:408 #: ../../include/conversation.php:990 msgid "Upload photo" msgstr "Foto hochladen" @@ -662,7 +668,7 @@ msgid "Attach file" msgstr "Datei anhängen" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:213 ../../mod/message.php:408 +#: ../../mod/message.php:214 ../../mod/message.php:409 #: ../../include/conversation.php:994 msgid "Insert web link" msgstr "einen Link einfügen" @@ -715,19 +721,19 @@ msgstr "Z.B.: bob@example.com, mary@example.com" msgid "This introduction has already been accepted." msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." -#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:497 +#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512 msgid "Profile location is not valid or does not contain profile information." msgstr "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung." -#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:502 +#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517 msgid "Warning: profile location has no identifiable owner name." msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:504 +#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519 msgid "Warning: profile location has no profile photo." msgstr "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:507 +#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522 #, 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" @@ -738,165 +744,165 @@ msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefund msgid "Introduction complete." msgstr "Kontaktanfrage abgeschlossen." -#: ../../mod/dfrn_request.php:194 +#: ../../mod/dfrn_request.php:209 msgid "Unrecoverable protocol error." msgstr "Nicht behebbarer Protokollfehler." -#: ../../mod/dfrn_request.php:222 +#: ../../mod/dfrn_request.php:237 msgid "Profile unavailable." msgstr "Profil nicht verfügbar." -#: ../../mod/dfrn_request.php:247 +#: ../../mod/dfrn_request.php:262 #, php-format msgid "%s has received too many connection requests today." msgstr "%s hat heute zu viele Freundschaftsanfragen erhalten." -#: ../../mod/dfrn_request.php:248 +#: ../../mod/dfrn_request.php:263 msgid "Spam protection measures have been invoked." msgstr "Maßnahmen zum Spamschutz wurden ergriffen." -#: ../../mod/dfrn_request.php:249 +#: ../../mod/dfrn_request.php:264 msgid "Friends are advised to please try again in 24 hours." msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen." -#: ../../mod/dfrn_request.php:311 +#: ../../mod/dfrn_request.php:326 msgid "Invalid locator" msgstr "Ungültiger Locator" -#: ../../mod/dfrn_request.php:320 +#: ../../mod/dfrn_request.php:335 msgid "Invalid email address." msgstr "Ungültige E-Mail Adresse." -#: ../../mod/dfrn_request.php:346 +#: ../../mod/dfrn_request.php:361 msgid "This account has not been configured for email. Request failed." msgstr "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen." -#: ../../mod/dfrn_request.php:442 +#: ../../mod/dfrn_request.php:457 msgid "Unable to resolve your name at the provided location." msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden." -#: ../../mod/dfrn_request.php:455 +#: ../../mod/dfrn_request.php:470 msgid "You have already introduced yourself here." msgstr "Du hast dich hier bereits vorgestellt." -#: ../../mod/dfrn_request.php:459 +#: ../../mod/dfrn_request.php:474 #, php-format msgid "Apparently you are already friends with %s." msgstr "Es scheint so, als ob du bereits mit %s befreundet bist." -#: ../../mod/dfrn_request.php:480 +#: ../../mod/dfrn_request.php:495 msgid "Invalid profile URL." msgstr "Ungültige Profil-URL." -#: ../../mod/dfrn_request.php:486 ../../include/follow.php:27 +#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27 msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." -#: ../../mod/dfrn_request.php:555 ../../mod/contacts.php:102 +#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:122 msgid "Failed to update contact record." msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." -#: ../../mod/dfrn_request.php:576 +#: ../../mod/dfrn_request.php:591 msgid "Your introduction has been sent." msgstr "Deine Kontaktanfrage wurde gesendet." -#: ../../mod/dfrn_request.php:629 +#: ../../mod/dfrn_request.php:644 msgid "Please login to confirm introduction." msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen." -#: ../../mod/dfrn_request.php:643 +#: ../../mod/dfrn_request.php:658 msgid "" "Incorrect identity currently logged in. Please login to " "<strong>this</strong> profile." msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an." -#: ../../mod/dfrn_request.php:654 +#: ../../mod/dfrn_request.php:669 msgid "Hide this contact" msgstr "Verberge diese Kontakt" -#: ../../mod/dfrn_request.php:657 +#: ../../mod/dfrn_request.php:672 #, php-format msgid "Welcome home %s." msgstr "Willkommen zurück %s." -#: ../../mod/dfrn_request.php:658 +#: ../../mod/dfrn_request.php:673 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "Bitte bestätige deine Kontaktanfrage bei %s." -#: ../../mod/dfrn_request.php:659 +#: ../../mod/dfrn_request.php:674 msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:700 ../../include/items.php:2733 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:2783 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" -#: ../../mod/dfrn_request.php:793 +#: ../../mod/dfrn_request.php:808 msgid "" "Please enter your 'Identity Address' from one of the following supported " "communications networks:" msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:" -#: ../../mod/dfrn_request.php:809 +#: ../../mod/dfrn_request.php:824 msgid "<strike>Connect as an email follower</strike> (Coming soon)" msgstr "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)" -#: ../../mod/dfrn_request.php:811 +#: ../../mod/dfrn_request.php:826 msgid "" "If you are not yet a member of the free social web, <a " "href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public" " Friendica site and join us today</a>." msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"http://dir.friendica.com/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten." -#: ../../mod/dfrn_request.php:814 +#: ../../mod/dfrn_request.php:829 msgid "Friend/Connection Request" msgstr "Freundschafts-/Kontaktanfrage" -#: ../../mod/dfrn_request.php:815 +#: ../../mod/dfrn_request.php:830 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" -#: ../../mod/dfrn_request.php:816 +#: ../../mod/dfrn_request.php:831 msgid "Please answer the following:" msgstr "Bitte beantworte Folgendes:" -#: ../../mod/dfrn_request.php:817 +#: ../../mod/dfrn_request.php:832 #, php-format msgid "Does %s know you?" msgstr "Kennt %s dich?" -#: ../../mod/dfrn_request.php:820 +#: ../../mod/dfrn_request.php:835 msgid "Add a personal note:" msgstr "Eine persönliche Notiz beifügen:" -#: ../../mod/dfrn_request.php:822 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:837 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "Friendica" -#: ../../mod/dfrn_request.php:823 +#: ../../mod/dfrn_request.php:838 msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:824 ../../mod/settings.php:652 +#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:652 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" -#: ../../mod/dfrn_request.php:825 +#: ../../mod/dfrn_request.php:840 #, php-format msgid "" " - please do not use this form. Instead, enter %s into your Diaspora search" " bar." msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste." -#: ../../mod/dfrn_request.php:826 +#: ../../mod/dfrn_request.php:841 msgid "Your Identity Address:" msgstr "Adresse deines Profils:" -#: ../../mod/dfrn_request.php:829 +#: ../../mod/dfrn_request.php:844 msgid "Submit Request" msgstr "Anfrage abschicken" @@ -1201,7 +1207,7 @@ msgid "is interested in:" msgstr "ist interessiert an:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1044 +#: ../../include/contact_widgets.php:9 ../../boot.php:1053 msgid "Connect" msgstr "Verbinden" @@ -1232,8 +1238,8 @@ msgid "Discard" msgstr "Verwerfen" #: ../../mod/notifications.php:51 ../../mod/notifications.php:160 -#: ../../mod/notifications.php:206 ../../mod/contacts.php:296 -#: ../../mod/contacts.php:348 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:316 +#: ../../mod/contacts.php:370 msgid "Ignore" msgstr "Ignorieren" @@ -1245,7 +1251,7 @@ msgstr "System" msgid "Network" msgstr "Netzwerk" -#: ../../mod/notifications.php:85 ../../mod/network.php:188 +#: ../../mod/notifications.php:85 ../../mod/network.php:300 msgid "Personal" msgstr "Persönlich" @@ -1258,7 +1264,7 @@ msgstr "Pinnwand" msgid "Introductions" msgstr "Kontaktanfragen" -#: ../../mod/notifications.php:100 ../../mod/message.php:104 +#: ../../mod/notifications.php:100 ../../mod/message.php:105 #: ../../include/nav.php:128 msgid "Messages" msgstr "Nachrichten" @@ -1285,7 +1291,7 @@ msgid "suggested by %s" msgstr "vorgeschlagen von %s" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:376 msgid "Hide this contact from others" msgstr "Verberge diesen Kontakt vor anderen" @@ -1298,7 +1304,7 @@ msgid "if applicable" msgstr "falls anwendbar" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:658 +#: ../../mod/admin.php:661 msgid "Approve" msgstr "Genehmigen" @@ -1407,303 +1413,307 @@ msgstr "Keine weiteren Pinnwand-Benachrichtigungen" msgid "Home Notifications" msgstr "Pinnwand Benachrichtigungen" -#: ../../mod/contacts.php:63 ../../mod/contacts.php:143 +#: ../../mod/contacts.php:83 ../../mod/contacts.php:163 msgid "Could not access contact record." msgstr "Konnte nicht auf die Kontaktdaten zugreifen." -#: ../../mod/contacts.php:77 +#: ../../mod/contacts.php:97 msgid "Could not locate selected profile." msgstr "Konnte das ausgewählte Profil nicht finden." -#: ../../mod/contacts.php:100 +#: ../../mod/contacts.php:120 msgid "Contact updated." msgstr "Kontakt aktualisiert." -#: ../../mod/contacts.php:165 +#: ../../mod/contacts.php:185 msgid "Contact has been blocked" msgstr "Kontakt wurde blockiert" -#: ../../mod/contacts.php:165 +#: ../../mod/contacts.php:185 msgid "Contact has been unblocked" msgstr "Kontakt wurde wieder freigegeben" -#: ../../mod/contacts.php:179 +#: ../../mod/contacts.php:199 msgid "Contact has been ignored" msgstr "Kontakt wurde ignoriert" -#: ../../mod/contacts.php:179 +#: ../../mod/contacts.php:199 msgid "Contact has been unignored" msgstr "Kontakt wird nicht mehr ignoriert" -#: ../../mod/contacts.php:195 +#: ../../mod/contacts.php:215 msgid "Contact has been archived" msgstr "Kontakt wurde archiviert" -#: ../../mod/contacts.php:195 +#: ../../mod/contacts.php:215 msgid "Contact has been unarchived" msgstr "Kontakt wurde aus dem Archiv geholt" -#: ../../mod/contacts.php:208 +#: ../../mod/contacts.php:228 msgid "Contact has been removed." msgstr "Kontakt wurde entfernt." -#: ../../mod/contacts.php:238 +#: ../../mod/contacts.php:258 #, php-format msgid "You are mutual friends with %s" msgstr "Du hast mit %s eine beidseitige Freundschaft" -#: ../../mod/contacts.php:242 +#: ../../mod/contacts.php:262 #, php-format msgid "You are sharing with %s" msgstr "Du teilst mit %s" -#: ../../mod/contacts.php:247 +#: ../../mod/contacts.php:267 #, php-format msgid "%s is sharing with you" msgstr "%s teilt mit Dir" -#: ../../mod/contacts.php:264 +#: ../../mod/contacts.php:284 msgid "Private communications are not available for this contact." msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:287 msgid "Never" msgstr "Niemals" -#: ../../mod/contacts.php:271 +#: ../../mod/contacts.php:291 msgid "(Update was successful)" msgstr "(Aktualisierung war erfolgreich)" -#: ../../mod/contacts.php:271 +#: ../../mod/contacts.php:291 msgid "(Update was not successful)" msgstr "(Aktualisierung war nicht erfolgreich)" -#: ../../mod/contacts.php:273 +#: ../../mod/contacts.php:293 msgid "Suggest friends" msgstr "Kontakte vorschlagen" -#: ../../mod/contacts.php:277 +#: ../../mod/contacts.php:297 #, php-format msgid "Network type: %s" msgstr "Netzwerk Typ: %s" -#: ../../mod/contacts.php:280 ../../include/contact_widgets.php:183 +#: ../../mod/contacts.php:300 ../../include/contact_widgets.php:183 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "%d gemeinsamer Kontakt" msgstr[1] "%d gemeinsame Kontakte" -#: ../../mod/contacts.php:285 +#: ../../mod/contacts.php:305 msgid "View all contacts" msgstr "Alle Kontakte anzeigen" -#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 -#: ../../mod/admin.php:662 +#: ../../mod/contacts.php:310 ../../mod/contacts.php:369 +#: ../../mod/admin.php:665 msgid "Unblock" msgstr "Entsperren" -#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 -#: ../../mod/admin.php:661 +#: ../../mod/contacts.php:310 ../../mod/contacts.php:369 +#: ../../mod/admin.php:664 msgid "Block" msgstr "Sperren" -#: ../../mod/contacts.php:293 +#: ../../mod/contacts.php:313 msgid "Toggle Blocked status" msgstr "Geblockt-Status ein-/ausschalten" -#: ../../mod/contacts.php:296 ../../mod/contacts.php:348 +#: ../../mod/contacts.php:316 ../../mod/contacts.php:370 msgid "Unignore" msgstr "Ignorieren aufheben" -#: ../../mod/contacts.php:299 +#: ../../mod/contacts.php:319 msgid "Toggle Ignored status" msgstr "Ignoriert-Status ein-/ausschalten" -#: ../../mod/contacts.php:303 +#: ../../mod/contacts.php:323 msgid "Unarchive" msgstr "Unarchivieren" -#: ../../mod/contacts.php:303 +#: ../../mod/contacts.php:323 msgid "Archive" msgstr "Archivieren" -#: ../../mod/contacts.php:306 +#: ../../mod/contacts.php:326 msgid "Toggle Archive status" msgstr "Archiviert-Status ein-/ausschalten" -#: ../../mod/contacts.php:309 +#: ../../mod/contacts.php:329 msgid "Repair" msgstr "Reparieren" -#: ../../mod/contacts.php:312 +#: ../../mod/contacts.php:332 msgid "Advanced Contact Settings" msgstr "Fortgeschrittene Kontakteinstellungen" -#: ../../mod/contacts.php:320 +#: ../../mod/contacts.php:338 +msgid "Communications lost with this contact!" +msgstr "Verbindungen mit diesem Kontakt verloren!" + +#: ../../mod/contacts.php:341 msgid "Contact Editor" msgstr "Kontakt Editor" -#: ../../mod/contacts.php:323 +#: ../../mod/contacts.php:344 msgid "Profile Visibility" msgstr "Profil-Sichtbarkeit" -#: ../../mod/contacts.php:324 +#: ../../mod/contacts.php:345 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft." -#: ../../mod/contacts.php:325 +#: ../../mod/contacts.php:346 msgid "Contact Information / Notes" msgstr "Kontakt Informationen / Notizen" -#: ../../mod/contacts.php:326 +#: ../../mod/contacts.php:347 msgid "Edit contact notes" msgstr "Notizen zum Kontakt bearbiten" -#: ../../mod/contacts.php:331 ../../mod/contacts.php:522 +#: ../../mod/contacts.php:352 ../../mod/contacts.php:544 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "Besuche %ss Profil [%s]" -#: ../../mod/contacts.php:332 +#: ../../mod/contacts.php:353 msgid "Block/Unblock contact" msgstr "Kontakt blockieren/freischalten" -#: ../../mod/contacts.php:333 +#: ../../mod/contacts.php:354 msgid "Ignore contact" msgstr "Ignoriere den Kontakt" -#: ../../mod/contacts.php:334 +#: ../../mod/contacts.php:355 msgid "Repair URL settings" msgstr "URL Einstellungen reparieren" -#: ../../mod/contacts.php:335 +#: ../../mod/contacts.php:356 msgid "View conversations" msgstr "Unterhaltungen anzeigen" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:358 msgid "Delete contact" msgstr "Lösche den Kontakt" -#: ../../mod/contacts.php:341 +#: ../../mod/contacts.php:362 msgid "Last update:" msgstr "letzte Aktualisierung:" -#: ../../mod/contacts.php:342 +#: ../../mod/contacts.php:364 msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:344 ../../mod/admin.php:1133 +#: ../../mod/contacts.php:366 ../../mod/admin.php:1136 msgid "Update now" msgstr "Jetzt aktualisieren" -#: ../../mod/contacts.php:351 +#: ../../mod/contacts.php:373 msgid "Currently blocked" msgstr "Derzeit geblockt" -#: ../../mod/contacts.php:352 +#: ../../mod/contacts.php:374 msgid "Currently ignored" msgstr "Derzeit ignoriert" -#: ../../mod/contacts.php:353 +#: ../../mod/contacts.php:375 msgid "Currently archived" msgstr "Momentan archiviert" -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:376 msgid "" "Replies/likes to your public posts <strong>may</strong> still be visible" msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein" -#: ../../mod/contacts.php:407 +#: ../../mod/contacts.php:429 msgid "Suggestions" msgstr "Kontaktvorschläge" -#: ../../mod/contacts.php:410 +#: ../../mod/contacts.php:432 msgid "Suggest potential friends" msgstr "Freunde vorschlagen" -#: ../../mod/contacts.php:413 ../../mod/group.php:191 +#: ../../mod/contacts.php:435 ../../mod/group.php:191 msgid "All Contacts" msgstr "Alle Kontakte" -#: ../../mod/contacts.php:416 +#: ../../mod/contacts.php:438 msgid "Show all contacts" msgstr "Alle Kontakte anzeigen" -#: ../../mod/contacts.php:419 +#: ../../mod/contacts.php:441 msgid "Unblocked" msgstr "Ungeblockt" -#: ../../mod/contacts.php:422 +#: ../../mod/contacts.php:444 msgid "Only show unblocked contacts" msgstr "Nur nicht-blockierte Kontakte anzeigen" -#: ../../mod/contacts.php:426 +#: ../../mod/contacts.php:448 msgid "Blocked" msgstr "Geblockt" -#: ../../mod/contacts.php:429 +#: ../../mod/contacts.php:451 msgid "Only show blocked contacts" msgstr "Nur blockierte Kontakte anzeigen" -#: ../../mod/contacts.php:433 +#: ../../mod/contacts.php:455 msgid "Ignored" msgstr "Ignoriert" -#: ../../mod/contacts.php:436 +#: ../../mod/contacts.php:458 msgid "Only show ignored contacts" msgstr "Nur ignorierte Kontakte anzeigen" -#: ../../mod/contacts.php:440 +#: ../../mod/contacts.php:462 msgid "Archived" msgstr "Archiviert" -#: ../../mod/contacts.php:443 +#: ../../mod/contacts.php:465 msgid "Only show archived contacts" msgstr "Nur archivierte Kontakte anzeigen" -#: ../../mod/contacts.php:447 +#: ../../mod/contacts.php:469 msgid "Hidden" msgstr "Verborgen" -#: ../../mod/contacts.php:450 +#: ../../mod/contacts.php:472 msgid "Only show hidden contacts" msgstr "Nur verborgene Kontakte anzeigen" -#: ../../mod/contacts.php:498 +#: ../../mod/contacts.php:520 msgid "Mutual Friendship" msgstr "Beidseitige Freundschaft" -#: ../../mod/contacts.php:502 +#: ../../mod/contacts.php:524 msgid "is a fan of yours" msgstr "ist ein Fan von dir" -#: ../../mod/contacts.php:506 +#: ../../mod/contacts.php:528 msgid "you are a fan of" msgstr "du bist Fan von" -#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:545 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:129 +#: ../../mod/contacts.php:566 ../../view/theme/diabook/theme.php:129 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" -#: ../../mod/contacts.php:548 +#: ../../mod/contacts.php:570 msgid "Search your contacts" msgstr "Suche in deinen Kontakten" -#: ../../mod/contacts.php:549 ../../mod/directory.php:57 +#: ../../mod/contacts.php:571 ../../mod/directory.php:57 msgid "Finding: " msgstr "Funde: " -#: ../../mod/contacts.php:550 ../../mod/directory.php:59 +#: ../../mod/contacts.php:572 ../../mod/directory.php:59 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "Finde" @@ -1724,11 +1734,11 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/register.php:90 ../../mod/register.php:144 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 -#: ../../addon/facebook/facebook.php:688 -#: ../../addon/facebook/facebook.php:1178 +#: ../../addon/facebook/facebook.php:692 +#: ../../addon/facebook/facebook.php:1182 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2742 -#: ../../boot.php:694 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2792 +#: ../../boot.php:703 msgid "Administrator" msgstr "Administrator" @@ -1738,7 +1748,7 @@ msgid "" "Password reset failed." msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." -#: ../../mod/lostpass.php:83 ../../boot.php:826 +#: ../../mod/lostpass.php:83 ../../boot.php:835 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -1810,8 +1820,9 @@ msgstr "Persönliche Daten exportieren" msgid "Remove account" msgstr "Konto löschen" -#: ../../mod/settings.php:89 ../../mod/admin.php:748 ../../mod/admin.php:953 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643 +#: ../../mod/settings.php:89 ../../mod/admin.php:751 ../../mod/admin.php:956 +#: ../../addon/dav/layout.fnk.php:116 ../../addon/mathjax/mathjax.php:36 +#: ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137 msgid "Settings" msgstr "Einstellungen" @@ -1872,7 +1883,7 @@ msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die vorein msgid "Private forum has no privacy permissions and no default privacy group." msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte." -#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:488 +#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:492 #: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 @@ -2131,7 +2142,7 @@ msgstr "Dürfen dir Unbekannte private Nachrichten schicken?" msgid "Profile is <strong>not published</strong>." msgstr "Profil ist <strong>nicht veröffentlicht</strong>." -#: ../../mod/settings.php:937 ../../mod/profile_photo.php:211 +#: ../../mod/settings.php:937 ../../mod/profile_photo.php:213 msgid "or" msgstr "oder" @@ -2317,67 +2328,67 @@ msgstr "Zwischen verschiedenen Identitäten oder Foren wechseln, die deine Zugan msgid "Select an identity to manage: " msgstr "Wähle eine Identität zum Verwalten: " -#: ../../mod/network.php:43 +#: ../../mod/network.php:97 msgid "Search Results For:" msgstr "Suchergebnisse für:" -#: ../../mod/network.php:82 ../../mod/search.php:16 +#: ../../mod/network.php:137 ../../mod/search.php:16 msgid "Remove term" msgstr "Begriff entfernen" -#: ../../mod/network.php:91 ../../mod/search.php:13 +#: ../../mod/network.php:146 ../../mod/search.php:13 msgid "Saved Searches" msgstr "Gespeicherte Suchen" -#: ../../mod/network.php:92 ../../include/group.php:244 +#: ../../mod/network.php:147 ../../include/group.php:244 msgid "add" msgstr "hinzufügen" -#: ../../mod/network.php:175 +#: ../../mod/network.php:287 msgid "Commented Order" msgstr "Neueste Kommentare" -#: ../../mod/network.php:178 +#: ../../mod/network.php:290 msgid "Sort by Comment Date" msgstr "Nach Kommentardatum sortieren" -#: ../../mod/network.php:181 +#: ../../mod/network.php:293 msgid "Posted Order" msgstr "Neueste Beiträge" -#: ../../mod/network.php:184 +#: ../../mod/network.php:296 msgid "Sort by Post Date" msgstr "Nach Beitragsdatum sortieren" -#: ../../mod/network.php:191 +#: ../../mod/network.php:303 msgid "Posts that mention or involve you" msgstr "Beiträge, in denen es um Dich geht" -#: ../../mod/network.php:194 +#: ../../mod/network.php:306 msgid "New" msgstr "Neue" -#: ../../mod/network.php:197 +#: ../../mod/network.php:309 msgid "Activity Stream - by date" msgstr "Aktivitäten-Stream - nach Datum" -#: ../../mod/network.php:200 +#: ../../mod/network.php:312 msgid "Starred" msgstr "Markierte" -#: ../../mod/network.php:203 +#: ../../mod/network.php:315 msgid "Favourite Posts" msgstr "Favorisierte Beiträge" -#: ../../mod/network.php:206 +#: ../../mod/network.php:318 msgid "Shared Links" msgstr "Geteilte Links" -#: ../../mod/network.php:209 +#: ../../mod/network.php:321 msgid "Interesting Links" msgstr "Interessante Links" -#: ../../mod/network.php:285 +#: ../../mod/network.php:388 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2385,42 +2396,42 @@ msgid_plural "" msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk." msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken." -#: ../../mod/network.php:288 +#: ../../mod/network.php:391 msgid "Private messages to this group are at risk of public disclosure." msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten." -#: ../../mod/network.php:333 +#: ../../mod/network.php:436 msgid "No such group" msgstr "Es gibt keine solche Gruppe" -#: ../../mod/network.php:344 +#: ../../mod/network.php:447 msgid "Group is empty" msgstr "Gruppe ist leer" -#: ../../mod/network.php:348 +#: ../../mod/network.php:451 msgid "Group: " msgstr "Gruppe: " -#: ../../mod/network.php:358 +#: ../../mod/network.php:461 msgid "Contact: " msgstr "Kontakt: " -#: ../../mod/network.php:360 +#: ../../mod/network.php:463 msgid "Private messages to this person are at risk of public disclosure." msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." -#: ../../mod/network.php:365 +#: ../../mod/network.php:468 msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1526 +#: ../../mod/notes.php:44 ../../boot.php:1535 msgid "Personal Notes" msgstr "Persönliche Notizen" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:756 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:150 -#: ../../include/text.php:652 +#: ../../addon/facebook/facebook.php:760 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:185 +#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652 msgid "Save" msgstr "Speichern" @@ -2429,7 +2440,7 @@ msgstr "Speichern" msgid "Number of daily wall messages for %s exceeded. Message failed." msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen." -#: ../../mod/wallmessage.php:56 ../../mod/message.php:65 +#: ../../mod/wallmessage.php:56 ../../mod/message.php:66 msgid "No recipient selected." msgstr "Kein Empfänger gewählt." @@ -2437,15 +2448,15 @@ msgstr "Kein Empfänger gewählt." msgid "Unable to check your home location." msgstr "Konnte deinen Heimatort nicht bestimmen." -#: ../../mod/wallmessage.php:62 ../../mod/message.php:72 +#: ../../mod/wallmessage.php:62 ../../mod/message.php:73 msgid "Message could not be sent." msgstr "Nachricht konnte nicht gesendet werden." -#: ../../mod/wallmessage.php:65 ../../mod/message.php:75 +#: ../../mod/wallmessage.php:65 ../../mod/message.php:76 msgid "Message collection failure." msgstr "Konnte Nachrichten nicht abrufen." -#: ../../mod/wallmessage.php:68 ../../mod/message.php:78 +#: ../../mod/wallmessage.php:68 ../../mod/message.php:79 msgid "Message sent." msgstr "Nachricht gesendet." @@ -2453,12 +2464,12 @@ msgstr "Nachricht gesendet." msgid "No recipient." msgstr "Kein Empfänger." -#: ../../mod/wallmessage.php:124 ../../mod/message.php:171 +#: ../../mod/wallmessage.php:124 ../../mod/message.php:172 #: ../../include/conversation.php:943 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" -#: ../../mod/wallmessage.php:131 ../../mod/message.php:199 +#: ../../mod/wallmessage.php:131 ../../mod/message.php:200 msgid "Send Private Message" msgstr "Private Nachricht senden" @@ -2469,18 +2480,18 @@ msgid "" "your site allow private mail from unknown senders." msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern." -#: ../../mod/wallmessage.php:133 ../../mod/message.php:200 -#: ../../mod/message.php:398 +#: ../../mod/wallmessage.php:133 ../../mod/message.php:201 +#: ../../mod/message.php:399 msgid "To:" msgstr "An:" -#: ../../mod/wallmessage.php:134 ../../mod/message.php:205 -#: ../../mod/message.php:400 +#: ../../mod/wallmessage.php:134 ../../mod/message.php:206 +#: ../../mod/message.php:401 msgid "Subject:" msgstr "Betreff:" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:209 -#: ../../mod/message.php:403 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:210 +#: ../../mod/message.php:404 ../../mod/invite.php:113 msgid "Your message:" msgstr "Deine Nachricht:" @@ -2622,7 +2633,7 @@ msgstr "Gruppe nicht gefunden." msgid "Group name changed." msgstr "Gruppenname geändert." -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:298 msgid "Permission denied" msgstr "Zugriff verweigert" @@ -2664,7 +2675,7 @@ msgstr "Editor für die Profil-Sichtbarkeit" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:79 -#: ../../include/nav.php:50 ../../boot.php:1505 +#: ../../include/nav.php:50 ../../boot.php:1514 msgid "Profile" msgstr "Profil" @@ -2745,7 +2756,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli msgid "Your invitation ID: " msgstr "ID deiner Einladung: " -#: ../../mod/register.php:255 ../../mod/admin.php:418 +#: ../../mod/register.php:255 ../../mod/admin.php:421 msgid "Registration" msgstr "Registrierung" @@ -2768,7 +2779,7 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:792 +#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:801 msgid "Register" msgstr "Registrieren" @@ -2777,19 +2788,19 @@ msgid "People Search" msgstr "Personen Suche" #: ../../mod/like.php:185 ../../mod/like.php:259 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1572 +#: ../../addon/facebook/facebook.php:1576 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1671 +#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1709 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" msgstr "Status" -#: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1576 +#: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1580 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1687 +#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1725 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2800,9 +2811,9 @@ msgstr "%1$s mag %2$ss %3$s" msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s nicht" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156 -#: ../../mod/admin.php:697 ../../mod/admin.php:896 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3179 +#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 +#: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3234 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -2810,12 +2821,12 @@ msgstr "Beitrag nicht gefunden." msgid "Access denied." msgstr "Zugriff verweigert." -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1511 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 +#: ../../include/nav.php:51 ../../boot.php:1520 msgid "Photos" msgstr "Bilder" -#: ../../mod/fbrowser.php:86 +#: ../../mod/fbrowser.php:96 msgid "Files" msgstr "Dateien" @@ -2840,8 +2851,8 @@ msgstr "Konnte den Originalbeitrag nicht finden." msgid "Empty post discarded." msgstr "Leerer Beitrag wurde verworfen." -#: ../../mod/item.php:379 ../../mod/wall_upload.php:99 -#: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115 +#: ../../mod/item.php:379 ../../mod/wall_upload.php:102 +#: ../../mod/wall_upload.php:111 ../../mod/wall_upload.php:118 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "Pinnwand-Bilder" @@ -2878,7 +2889,7 @@ msgid "Image uploaded but image cropping failed." msgstr "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen." #: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70 -#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264 +#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:266 #, php-format msgid "Image size reduction [%s] failed." msgstr "Verkleinern der Bildgröße von [%s] ist gescheitert." @@ -2893,44 +2904,44 @@ msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue msgid "Unable to process image" msgstr "Bild konnte nicht verarbeitet werden" -#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:74 +#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:77 #, php-format msgid "Image exceeds size limit of %d" msgstr "Bildgröße überschreitet das Limit von %d" -#: ../../mod/profile_photo.php:207 +#: ../../mod/profile_photo.php:209 msgid "Upload File:" msgstr "Datei hochladen:" -#: ../../mod/profile_photo.php:208 +#: ../../mod/profile_photo.php:210 msgid "Upload Profile Photo" msgstr "Profilbild hochladen" -#: ../../mod/profile_photo.php:209 +#: ../../mod/profile_photo.php:211 msgid "Upload" msgstr "Hochladen" -#: ../../mod/profile_photo.php:211 +#: ../../mod/profile_photo.php:213 msgid "skip this step" msgstr "diesen Schritt überspringen" -#: ../../mod/profile_photo.php:211 +#: ../../mod/profile_photo.php:213 msgid "select a photo from your photo albums" msgstr "wähle ein Foto von deinen Fotoalben" -#: ../../mod/profile_photo.php:224 +#: ../../mod/profile_photo.php:226 msgid "Crop Image" msgstr "Bild zurechtschneiden" -#: ../../mod/profile_photo.php:225 +#: ../../mod/profile_photo.php:227 msgid "Please adjust the image cropping for optimum viewing." msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." -#: ../../mod/profile_photo.php:227 +#: ../../mod/profile_photo.php:229 msgid "Done Editing" msgstr "Bearbeitung abgeschlossen" -#: ../../mod/profile_photo.php:255 +#: ../../mod/profile_photo.php:257 msgid "Image uploaded successfully." msgstr "Bild erfolgreich auf den Server geladen." @@ -2956,67 +2967,67 @@ msgstr "Bitte gib dein Passwort zur Verifikation ein:" msgid "New Message" msgstr "Neue Nachricht" -#: ../../mod/message.php:69 +#: ../../mod/message.php:70 msgid "Unable to locate contact information." msgstr "Konnte die Kontaktinformationen nicht finden." -#: ../../mod/message.php:119 +#: ../../mod/message.php:120 msgid "Message deleted." msgstr "Nachricht gelöscht." -#: ../../mod/message.php:149 +#: ../../mod/message.php:150 msgid "Conversation removed." msgstr "Unterhaltung gelöscht." -#: ../../mod/message.php:246 +#: ../../mod/message.php:247 msgid "No messages." msgstr "Keine Nachrichten." -#: ../../mod/message.php:253 +#: ../../mod/message.php:254 #, php-format msgid "Unknown sender - %s" msgstr "'Unbekannter Absender - %s" -#: ../../mod/message.php:256 +#: ../../mod/message.php:257 #, php-format msgid "You and %s" msgstr "Du und %s" -#: ../../mod/message.php:259 +#: ../../mod/message.php:260 #, php-format msgid "%s and You" msgstr "%s und Du" -#: ../../mod/message.php:269 ../../mod/message.php:391 +#: ../../mod/message.php:270 ../../mod/message.php:392 msgid "Delete conversation" msgstr "Unterhaltung löschen" -#: ../../mod/message.php:272 +#: ../../mod/message.php:273 msgid "D, d M Y - g:i A" msgstr "D, d. M Y - g:i A" -#: ../../mod/message.php:274 +#: ../../mod/message.php:275 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "%d Nachricht" msgstr[1] "%d Nachrichten" -#: ../../mod/message.php:309 +#: ../../mod/message.php:310 msgid "Message not available." msgstr "Nachricht nicht verfügbar." -#: ../../mod/message.php:374 +#: ../../mod/message.php:375 msgid "Delete message" msgstr "Nachricht löschen" -#: ../../mod/message.php:393 +#: ../../mod/message.php:394 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." msgstr "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten." -#: ../../mod/message.php:397 +#: ../../mod/message.php:398 msgid "Send Reply" msgstr "Antwort senden" @@ -3033,19 +3044,19 @@ msgstr "Keine Freunde zum Anzeigen." msgid "Theme settings updated." msgstr "Themeneinstellungen aktualisiert." -#: ../../mod/admin.php:96 ../../mod/admin.php:416 +#: ../../mod/admin.php:96 ../../mod/admin.php:419 msgid "Site" msgstr "Seite" -#: ../../mod/admin.php:97 ../../mod/admin.php:652 ../../mod/admin.php:664 +#: ../../mod/admin.php:97 ../../mod/admin.php:655 ../../mod/admin.php:667 msgid "Users" msgstr "Nutzer" -#: ../../mod/admin.php:98 ../../mod/admin.php:746 ../../mod/admin.php:788 +#: ../../mod/admin.php:98 ../../mod/admin.php:749 ../../mod/admin.php:791 msgid "Plugins" msgstr "Plugins" -#: ../../mod/admin.php:99 ../../mod/admin.php:951 ../../mod/admin.php:987 +#: ../../mod/admin.php:99 ../../mod/admin.php:954 ../../mod/admin.php:990 msgid "Themes" msgstr "Themen" @@ -3053,569 +3064,577 @@ msgstr "Themen" msgid "DB updates" msgstr "DB Updates" -#: ../../mod/admin.php:115 ../../mod/admin.php:1074 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1077 msgid "Logs" msgstr "Protokolle" -#: ../../mod/admin.php:120 +#: ../../mod/admin.php:120 ../../include/nav.php:146 +msgid "Admin" +msgstr "Administration" + +#: ../../mod/admin.php:121 +msgid "Plugin Features" +msgstr "Plugin Features" + +#: ../../mod/admin.php:123 msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: ../../mod/admin.php:180 ../../mod/admin.php:634 +#: ../../mod/admin.php:183 ../../mod/admin.php:637 msgid "Normal Account" msgstr "Normales Konto" -#: ../../mod/admin.php:181 ../../mod/admin.php:635 +#: ../../mod/admin.php:184 ../../mod/admin.php:638 msgid "Soapbox Account" msgstr "Marktschreier-Konto" -#: ../../mod/admin.php:182 ../../mod/admin.php:636 +#: ../../mod/admin.php:185 ../../mod/admin.php:639 msgid "Community/Celebrity Account" msgstr "Forum/Promi-Konto" -#: ../../mod/admin.php:183 ../../mod/admin.php:637 +#: ../../mod/admin.php:186 ../../mod/admin.php:640 msgid "Automatic Friend Account" msgstr "Automatisches Freundekonto" -#: ../../mod/admin.php:202 +#: ../../mod/admin.php:205 msgid "Message queues" msgstr "Nachrichten-Warteschlangen" -#: ../../mod/admin.php:207 ../../mod/admin.php:415 ../../mod/admin.php:651 -#: ../../mod/admin.php:745 ../../mod/admin.php:787 ../../mod/admin.php:950 -#: ../../mod/admin.php:986 ../../mod/admin.php:1073 +#: ../../mod/admin.php:210 ../../mod/admin.php:418 ../../mod/admin.php:654 +#: ../../mod/admin.php:748 ../../mod/admin.php:790 ../../mod/admin.php:953 +#: ../../mod/admin.php:989 ../../mod/admin.php:1076 msgid "Administration" msgstr "Administration" -#: ../../mod/admin.php:208 +#: ../../mod/admin.php:211 msgid "Summary" msgstr "Zusammenfassung" -#: ../../mod/admin.php:210 +#: ../../mod/admin.php:213 msgid "Registered users" msgstr "Registrierte Nutzer" -#: ../../mod/admin.php:212 +#: ../../mod/admin.php:215 msgid "Pending registrations" msgstr "Anstehende Anmeldungen" -#: ../../mod/admin.php:213 +#: ../../mod/admin.php:216 msgid "Version" msgstr "Version" -#: ../../mod/admin.php:215 +#: ../../mod/admin.php:218 msgid "Active plugins" msgstr "Aktive Plugins" -#: ../../mod/admin.php:354 +#: ../../mod/admin.php:357 msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:405 msgid "Closed" msgstr "Geschlossen" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:406 msgid "Requires approval" msgstr "Bedarf der Zustimmung" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:407 msgid "Open" msgstr "Offen" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:411 msgid "No SSL policy, links will track page SSL state" msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:412 msgid "Force all links to use SSL" msgstr "SSL für alle Links erzwingen" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:413 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:422 msgid "File upload" msgstr "Datei hochladen" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:423 msgid "Policies" msgstr "Regeln" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:424 msgid "Advanced" msgstr "Erweitert" -#: ../../mod/admin.php:425 ../../addon/statusnet/statusnet.php:552 +#: ../../mod/admin.php:428 ../../addon/statusnet/statusnet.php:552 msgid "Site name" msgstr "Seitenname" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:429 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:430 msgid "System language" msgstr "Systemsprache" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:431 msgid "System theme" msgstr "Systemweites Thema" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:431 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:432 msgid "SSL link policy" msgstr "Regeln für SSL Links" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:432 msgid "Determines whether generated links should be forced to use SSL" msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:433 msgid "Maximum image size" msgstr "Maximale Größe von Bildern" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:433 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit." -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:435 msgid "Register policy" msgstr "Registrierungsmethode" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:436 msgid "Register text" msgstr "Registrierungstext" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:436 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt." -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:437 msgid "Accounts abandoned after x days" msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:437 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit." -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:438 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:438 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:439 msgid "Allowed email domains" msgstr "Erlaubte Domains für Emails" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:439 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 "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:440 msgid "Block public" msgstr "Öffentlichen Zugriff blockieren" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:440 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist." -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:441 msgid "Force publish" msgstr "Erzwinge Veröffentlichung" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:441 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen." -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:442 msgid "Global directory update URL" msgstr "URL für Updates beim weltweiten Verzeichnis" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:442 msgid "" "URL to update the global directory. If this is not set, the global directory" " is completely unavailable to the application." msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar." -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:444 msgid "Block multiple registrations" msgstr "Unterbinde Mehrfachregistrierung" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:444 msgid "Disallow users to register additional accounts for use as pages." msgstr "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen." -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:445 msgid "OpenID support" msgstr "OpenID Unterstützung" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:445 msgid "OpenID support for registration and logins." msgstr "OpenID-Unterstützung für Registrierung und Login." -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:446 msgid "Fullname check" msgstr "Namen auf Vollständigkeit überprüfen" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:446 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden." -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:447 msgid "UTF-8 Regular expressions" msgstr "UTF-8 Reguläre Ausdrücke" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:447 msgid "Use PHP UTF8 regular expressions" msgstr "PHP UTF8 Ausdrücke verwenden" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:448 msgid "Show Community Page" msgstr "Gemeinschaftsseite anzeigen" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:448 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server." -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:449 msgid "Enable OStatus support" msgstr "OStatus Unterstützung aktivieren" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:449 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 "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt." -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:450 msgid "Enable Diaspora support" msgstr "Diaspora-Support aktivieren" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:450 msgid "Provide built-in Diaspora network compatibility." msgstr "Verwende die eingebaute Diaspora-Verknüpfung." -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:451 msgid "Only allow Friendica contacts" msgstr "Nur Friendica-Kontakte erlauben" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:451 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert." -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:452 msgid "Verify SSL" msgstr "SSL Ãœberprüfen" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:452 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 "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann." -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:453 msgid "Proxy user" msgstr "Proxy Nutzer" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:454 msgid "Proxy URL" msgstr "Proxy URL" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:455 msgid "Network timeout" msgstr "Netzwerk Wartezeit" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:455 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)." -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:456 msgid "Delivery interval" msgstr "Zustellungsintervall" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:456 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server." -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:457 msgid "Poll interval" msgstr "Abfrageintervall" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:457 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet." -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:458 msgid "Maximum Load Average" msgstr "Maximum Load Average" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:458 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:472 msgid "Update has been marked successful" msgstr "Update wurde als erfolgreich markiert" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:482 #, php-format msgid "Executing %s failed. Check system logs." msgstr "Ausführung von %s schlug fehl. Systemprotokolle prüfen." -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:485 #, php-format msgid "Update %s was successfully applied." msgstr "Update %s war erfolgreich." -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:489 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status." -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:492 #, php-format msgid "Update function %s could not be found." msgstr "Updatefunktion %s konnte nicht gefunden werden." -#: ../../mod/admin.php:504 +#: ../../mod/admin.php:507 msgid "No failed updates." msgstr "Keine fehlgeschlagenen Updates." -#: ../../mod/admin.php:508 +#: ../../mod/admin.php:511 msgid "Failed Updates" msgstr "Fehlgeschlagene Updates" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:512 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben." -#: ../../mod/admin.php:510 +#: ../../mod/admin.php:513 msgid "Mark success (if update was manually applied)" msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)" -#: ../../mod/admin.php:511 +#: ../../mod/admin.php:514 msgid "Attempt to execute this update step automatically" msgstr "Versuchen, diesen Schritt automatisch auszuführen" -#: ../../mod/admin.php:536 +#: ../../mod/admin.php:539 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s Benutzer geblockt/freigegeben" msgstr[1] "%s Benutzer geblockt/freigegeben" -#: ../../mod/admin.php:543 +#: ../../mod/admin.php:546 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s Nutzer gelöscht" msgstr[1] "%s Nutzer gelöscht" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:585 #, php-format msgid "User '%s' deleted" msgstr "Nutzer '%s' gelöscht" -#: ../../mod/admin.php:590 +#: ../../mod/admin.php:593 #, php-format msgid "User '%s' unblocked" msgstr "Nutzer '%s' entsperrt" -#: ../../mod/admin.php:590 +#: ../../mod/admin.php:593 #, php-format msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: ../../mod/admin.php:654 +#: ../../mod/admin.php:657 msgid "select all" msgstr "Alle auswählen" -#: ../../mod/admin.php:655 +#: ../../mod/admin.php:658 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf deine Bestätigung warten" -#: ../../mod/admin.php:656 +#: ../../mod/admin.php:659 msgid "Request date" msgstr "Anfragedatum" -#: ../../mod/admin.php:656 ../../mod/admin.php:665 +#: ../../mod/admin.php:659 ../../mod/admin.php:668 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "Email" -#: ../../mod/admin.php:657 +#: ../../mod/admin.php:660 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: ../../mod/admin.php:659 +#: ../../mod/admin.php:662 msgid "Deny" msgstr "Verwehren" -#: ../../mod/admin.php:665 +#: ../../mod/admin.php:668 msgid "Register date" msgstr "Anmeldedatum" -#: ../../mod/admin.php:665 +#: ../../mod/admin.php:668 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../mod/admin.php:665 +#: ../../mod/admin.php:668 msgid "Last item" msgstr "Letzter Beitrag" -#: ../../mod/admin.php:665 +#: ../../mod/admin.php:668 msgid "Account" msgstr "Nutzerkonto" -#: ../../mod/admin.php:667 +#: ../../mod/admin.php:670 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:668 +#: ../../mod/admin.php:671 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 "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:709 +#: ../../mod/admin.php:712 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: ../../mod/admin.php:713 +#: ../../mod/admin.php:716 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: ../../mod/admin.php:723 ../../mod/admin.php:921 +#: ../../mod/admin.php:726 ../../mod/admin.php:924 msgid "Disable" msgstr "Ausschalten" -#: ../../mod/admin.php:725 ../../mod/admin.php:923 +#: ../../mod/admin.php:728 ../../mod/admin.php:926 msgid "Enable" msgstr "Einschalten" -#: ../../mod/admin.php:747 ../../mod/admin.php:952 +#: ../../mod/admin.php:750 ../../mod/admin.php:955 msgid "Toggle" msgstr "Umschalten" -#: ../../mod/admin.php:755 ../../mod/admin.php:962 +#: ../../mod/admin.php:758 ../../mod/admin.php:965 msgid "Author: " msgstr "Autor:" -#: ../../mod/admin.php:756 ../../mod/admin.php:963 +#: ../../mod/admin.php:759 ../../mod/admin.php:966 msgid "Maintainer: " msgstr "Betreuer:" -#: ../../mod/admin.php:885 +#: ../../mod/admin.php:888 msgid "No themes found." msgstr "Keine Themen gefunden." -#: ../../mod/admin.php:944 +#: ../../mod/admin.php:947 msgid "Screenshot" msgstr "Bildschirmfoto" -#: ../../mod/admin.php:992 +#: ../../mod/admin.php:995 msgid "[Experimental]" msgstr "[Experimentell]" -#: ../../mod/admin.php:993 +#: ../../mod/admin.php:996 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../mod/admin.php:1020 +#: ../../mod/admin.php:1023 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: ../../mod/admin.php:1076 +#: ../../mod/admin.php:1079 msgid "Clear" msgstr "löschen" -#: ../../mod/admin.php:1082 +#: ../../mod/admin.php:1085 msgid "Debugging" msgstr "Protokoll führen" -#: ../../mod/admin.php:1083 +#: ../../mod/admin.php:1086 msgid "Log file" msgstr "Protokolldatei" -#: ../../mod/admin.php:1083 +#: ../../mod/admin.php:1086 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis." -#: ../../mod/admin.php:1084 +#: ../../mod/admin.php:1087 msgid "Log level" msgstr "Protokoll-Level" -#: ../../mod/admin.php:1134 +#: ../../mod/admin.php:1137 msgid "Close" msgstr "Schließen" -#: ../../mod/admin.php:1140 +#: ../../mod/admin.php:1143 msgid "FTP Host" msgstr "FTP Host" -#: ../../mod/admin.php:1141 +#: ../../mod/admin.php:1144 msgid "FTP Path" msgstr "FTP Pfad" -#: ../../mod/admin.php:1142 +#: ../../mod/admin.php:1145 msgid "FTP User" msgstr "FTP Nutzername" -#: ../../mod/admin.php:1143 +#: ../../mod/admin.php:1146 msgid "FTP Password" msgstr "FTP Passwort" -#: ../../mod/profile.php:21 ../../boot.php:957 +#: ../../mod/profile.php:21 ../../boot.php:966 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../mod/profile.php:126 ../../mod/display.php:75 +#: ../../mod/profile.php:141 ../../mod/display.php:75 msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." -#: ../../mod/profile.php:151 +#: ../../mod/profile.php:166 msgid "Tips for New Members" msgstr "Tipps für neue Nutzer" @@ -3760,7 +3779,7 @@ msgstr "Interessen" msgid "Address" msgstr "Adresse" -#: ../../mod/profiles.php:194 +#: ../../mod/profiles.php:194 ../../addon/dav/layout.fnk.php:310 msgid "Location" msgstr "Wohnort" @@ -3982,23 +4001,23 @@ msgstr "Alter: " msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:645 ../../boot.php:1066 +#: ../../mod/profiles.php:645 ../../boot.php:1075 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:646 ../../boot.php:1067 +#: ../../mod/profiles.php:646 ../../boot.php:1076 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:657 ../../boot.php:1077 +#: ../../mod/profiles.php:657 ../../boot.php:1086 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:659 ../../boot.php:1080 +#: ../../mod/profiles.php:659 ../../boot.php:1089 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:660 ../../boot.php:1081 +#: ../../mod/profiles.php:660 ../../boot.php:1090 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" @@ -4256,83 +4275,83 @@ msgstr "Auf %s wurde die Verbindung akzeptiert" msgid "%1$s has joined %2$s" msgstr "%1$s ist %2$s beigetreten" -#: ../../addon/facebook/facebook.php:509 +#: ../../addon/facebook/facebook.php:513 msgid "Facebook disabled" msgstr "Facebook deaktiviert" -#: ../../addon/facebook/facebook.php:514 +#: ../../addon/facebook/facebook.php:518 msgid "Updating contacts" msgstr "Aktualisiere Kontakte" -#: ../../addon/facebook/facebook.php:537 +#: ../../addon/facebook/facebook.php:541 msgid "Facebook API key is missing." msgstr "Facebook-API-Schlüssel nicht gefunden" -#: ../../addon/facebook/facebook.php:544 +#: ../../addon/facebook/facebook.php:548 msgid "Facebook Connect" msgstr "Mit Facebook verbinden" -#: ../../addon/facebook/facebook.php:550 +#: ../../addon/facebook/facebook.php:554 msgid "Install Facebook connector for this account." msgstr "Facebook-Connector für dieses Konto installieren." -#: ../../addon/facebook/facebook.php:557 +#: ../../addon/facebook/facebook.php:561 msgid "Remove Facebook connector" msgstr "Facebook-Connector entfernen" -#: ../../addon/facebook/facebook.php:562 +#: ../../addon/facebook/facebook.php:566 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]" -#: ../../addon/facebook/facebook.php:569 +#: ../../addon/facebook/facebook.php:573 msgid "Post to Facebook by default" msgstr "Veröffentliche standardmäßig bei Facebook" -#: ../../addon/facebook/facebook.php:575 +#: ../../addon/facebook/facebook.php:579 msgid "" "Facebook friend linking has been disabled on this site. The following " "settings will have no effect." msgstr "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt." -#: ../../addon/facebook/facebook.php:579 +#: ../../addon/facebook/facebook.php:583 msgid "" "Facebook friend linking has been disabled on this site. If you disable it, " "you will be unable to re-enable it." msgstr "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren." -#: ../../addon/facebook/facebook.php:582 +#: ../../addon/facebook/facebook.php:586 msgid "Link all your Facebook friends and conversations on this website" msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren" -#: ../../addon/facebook/facebook.php:584 +#: ../../addon/facebook/facebook.php:588 msgid "" "Facebook conversations consist of your <em>profile wall</em> and your friend" " <em>stream</em>." msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>." -#: ../../addon/facebook/facebook.php:585 +#: ../../addon/facebook/facebook.php:589 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen." -#: ../../addon/facebook/facebook.php:586 +#: ../../addon/facebook/facebook.php:590 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen." -#: ../../addon/facebook/facebook.php:590 +#: ../../addon/facebook/facebook.php:594 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen" -#: ../../addon/facebook/facebook.php:595 +#: ../../addon/facebook/facebook.php:599 msgid "Do not import your Facebook profile wall conversations" msgstr "Facebook-Pinnwand nicht importieren" -#: ../../addon/facebook/facebook.php:597 +#: ../../addon/facebook/facebook.php:601 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 " @@ -4340,120 +4359,120 @@ msgid "" "who may see the conversations." msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann." -#: ../../addon/facebook/facebook.php:602 +#: ../../addon/facebook/facebook.php:606 msgid "Comma separated applications to ignore" msgstr "Kommaseparierte Anwendungen, die ignoriert werden sollen" -#: ../../addon/facebook/facebook.php:686 +#: ../../addon/facebook/facebook.php:690 msgid "Problems with Facebook Real-Time Updates" msgstr "Probleme mit Facebook Echtzeit-Updates" -#: ../../addon/facebook/facebook.php:714 +#: ../../addon/facebook/facebook.php:718 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "Facebook" -#: ../../addon/facebook/facebook.php:715 +#: ../../addon/facebook/facebook.php:719 msgid "Facebook Connector Settings" msgstr "Facebook-Verbindungseinstellungen" -#: ../../addon/facebook/facebook.php:730 +#: ../../addon/facebook/facebook.php:734 msgid "Facebook API Key" msgstr "Facebook API Schlüssel" -#: ../../addon/facebook/facebook.php:740 +#: ../../addon/facebook/facebook.php:744 msgid "" "Error: it appears that you have specified the App-ID and -Secret in your " ".htconfig.php file. As long as they are specified there, they cannot be set " "using this form.<br><br>" msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>" -#: ../../addon/facebook/facebook.php:745 +#: ../../addon/facebook/facebook.php:749 msgid "" "Error: the given API Key seems to be incorrect (the application access token" " could not be retrieved)." msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)." -#: ../../addon/facebook/facebook.php:747 +#: ../../addon/facebook/facebook.php:751 msgid "The given API Key seems to work correctly." msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren." -#: ../../addon/facebook/facebook.php:749 +#: ../../addon/facebook/facebook.php:753 msgid "" "The correctness of the API Key could not be detected. Somthing strange's " "going on." msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange." -#: ../../addon/facebook/facebook.php:752 +#: ../../addon/facebook/facebook.php:756 msgid "App-ID / API-Key" msgstr "App-ID / API-Key" -#: ../../addon/facebook/facebook.php:753 +#: ../../addon/facebook/facebook.php:757 msgid "Application secret" msgstr "Anwendungs-Geheimnis" -#: ../../addon/facebook/facebook.php:754 +#: ../../addon/facebook/facebook.php:758 #, php-format msgid "Polling Interval in minutes (minimum %1$s minutes)" msgstr "Abfrageintervall in Minuten (min %1$s Minuten)" -#: ../../addon/facebook/facebook.php:755 +#: ../../addon/facebook/facebook.php:759 msgid "" "Synchronize comments (no comments on Facebook are missed, at the cost of " "increased system load)" msgstr "Kommentare synchronisieren (Kein Kommentar von Facebook geht verloren, verursacht höhere Last auf dem Server)" -#: ../../addon/facebook/facebook.php:759 +#: ../../addon/facebook/facebook.php:763 msgid "Real-Time Updates" msgstr "Echtzeit Aktualisierungen" -#: ../../addon/facebook/facebook.php:763 +#: ../../addon/facebook/facebook.php:767 msgid "Real-Time Updates are activated." msgstr "Echtzeit-Updates sind aktiviert." -#: ../../addon/facebook/facebook.php:764 +#: ../../addon/facebook/facebook.php:768 msgid "Deactivate Real-Time Updates" msgstr "Echtzeit-Updates deaktivieren" -#: ../../addon/facebook/facebook.php:766 +#: ../../addon/facebook/facebook.php:770 msgid "Real-Time Updates not activated." msgstr "Echtzeit-Updates nicht aktiviert." -#: ../../addon/facebook/facebook.php:766 +#: ../../addon/facebook/facebook.php:770 msgid "Activate Real-Time Updates" msgstr "Echtzeit-Updates aktivieren" -#: ../../addon/facebook/facebook.php:785 +#: ../../addon/facebook/facebook.php:789 ../../addon/dav/layout.fnk.php:360 msgid "The new values have been saved." msgstr "Die neuen Einstellungen wurden gespeichert." -#: ../../addon/facebook/facebook.php:809 +#: ../../addon/facebook/facebook.php:813 msgid "Post to Facebook" msgstr "Bei Facebook veröffentlichen" -#: ../../addon/facebook/facebook.php:907 +#: ../../addon/facebook/facebook.php:911 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen." -#: ../../addon/facebook/facebook.php:1127 +#: ../../addon/facebook/facebook.php:1131 msgid "View on Friendica" msgstr "In Friendica betrachten" -#: ../../addon/facebook/facebook.php:1160 +#: ../../addon/facebook/facebook.php:1164 msgid "Facebook post failed. Queued for retry." msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut." -#: ../../addon/facebook/facebook.php:1200 +#: ../../addon/facebook/facebook.php:1204 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich." -#: ../../addon/facebook/facebook.php:1201 +#: ../../addon/facebook/facebook.php:1205 msgid "Facebook connection became invalid" msgstr "Facebook Anmeldedaten sind ungültig geworden" -#: ../../addon/facebook/facebook.php:1202 +#: ../../addon/facebook/facebook.php:1206 #, php-format msgid "" "Hi %1$s,\n" @@ -4461,23 +4480,35 @@ msgid "" "The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." msgstr "Hallo %1$s,\n\ndie Verbindung zwischen deinem Account auf %2$s und Facebook funktioniert derzeit nicht. Dies ist normalerweise das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3$sden Facebook-Connector neu authentifizieren%4$s." -#: ../../addon/privacy_image_cache/privacy_image_cache.php:147 +#: ../../addon/snautofollow/snautofollow.php:32 +msgid "StatusNet AutoFollow settings updated." +msgstr "StatusNet AutoFollow Einstellungen aktualisiert." + +#: ../../addon/snautofollow/snautofollow.php:56 +msgid "StatusNet AutoFollow Settings" +msgstr "StatusNet AutoFollow Einstellungen" + +#: ../../addon/snautofollow/snautofollow.php:58 +msgid "Automatically follow any StatusNet followers/mentioners" +msgstr "Automatisch allen StatusNet Followern/Erwähnungen folgen" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:182 msgid "Lifetime of the cache (in hours)" msgstr "Lebenszeit des Caches (in Stunden)" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:152 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:187 msgid "Cache Statistics" msgstr "Cache Statistik" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:155 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:190 msgid "Number of items" msgstr "Anzahl der Einträge" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:157 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:192 msgid "Size of the cache" msgstr "Größe des Caches" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:159 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:194 msgid "Delete the whole cache" msgstr "Cache leeren" @@ -4604,7 +4635,7 @@ msgstr "Foren" #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:476 -#: ../../boot.php:515 +#: ../../boot.php:524 msgid "show more" msgstr "mehr anzeigen" @@ -4620,7 +4651,7 @@ msgstr "Aktiviere Planeten Plugin" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:813 +#: ../../include/nav.php:64 ../../boot.php:822 msgid "Login" msgstr "Anmeldung" @@ -4653,6 +4684,203 @@ msgstr "Neueste Favoriten" msgid "event" msgstr "Veranstaltung" +#: ../../addon/dav/common/wdcal_configuration.php:126 +msgid "U.S. Time Format (mm/dd/YYYY)" +msgstr "U.S. Datumsformat (mm/dd/YYYY)" + +#: ../../addon/dav/common/wdcal_configuration.php:205 +msgid "German Time Format (dd.mm.YYYY)" +msgstr "Deutsches Datumsformat (dd.mm.YYYY)" + +#: ../../addon/dav/common/calendar.fnk.php:517 +#: ../../addon/dav/common/calendar.fnk.php:533 +#: ../../addon/dav/layout.fnk.php:200 +msgid "Error" +msgstr "Fehler" + +#: ../../addon/dav/common/calendar.fnk.php:568 +#: ../../addon/dav/common/calendar.fnk.php:637 +#: ../../addon/dav/common/calendar.fnk.php:664 +#: ../../addon/dav/layout.fnk.php:231 +msgid "No access" +msgstr "Kein Zugriff" + +#: ../../addon/dav/layout.fnk.php:119 +msgid "New event" +msgstr "Neue Veranstaltung" + +#: ../../addon/dav/layout.fnk.php:123 +msgid "Today" +msgstr "Heute" + +#: ../../addon/dav/layout.fnk.php:132 +msgid "Day" +msgstr "Tag" + +#: ../../addon/dav/layout.fnk.php:139 +msgid "Week" +msgstr "Woche" + +#: ../../addon/dav/layout.fnk.php:146 +msgid "Month" +msgstr "Monat" + +#: ../../addon/dav/layout.fnk.php:151 +msgid "Reload" +msgstr "Neu Laden" + +#: ../../addon/dav/layout.fnk.php:162 +msgid "Date" +msgstr "Datum" + +#: ../../addon/dav/layout.fnk.php:224 +msgid "Not found" +msgstr "Nicht gefunden" + +#: ../../addon/dav/layout.fnk.php:292 ../../addon/dav/layout.fnk.php:365 +msgid "Go back to the calendar" +msgstr "Zurück zum Kalender" + +#: ../../addon/dav/layout.fnk.php:300 +msgid "Starts" +msgstr "Beginnt" + +#: ../../addon/dav/layout.fnk.php:305 +msgid "Ends" +msgstr "Endet" + +#: ../../addon/dav/layout.fnk.php:312 +msgid "Description" +msgstr "Beschreibung" + +#: ../../addon/dav/layout.fnk.php:315 +msgid "Notification" +msgstr "Benachrichtigung" + +#: ../../addon/dav/layout.fnk.php:324 +msgid "Minutes" +msgstr "Minuten" + +#: ../../addon/dav/layout.fnk.php:327 +msgid "Hours" +msgstr "Stunden" + +#: ../../addon/dav/layout.fnk.php:330 +msgid "Days" +msgstr "Tage" + +#: ../../addon/dav/layout.fnk.php:331 +msgid "before" +msgstr "vorher" + +#: ../../addon/dav/layout.fnk.php:367 +msgid "Calendar Settings" +msgstr "Kalender Einstellungen" + +#: ../../addon/dav/layout.fnk.php:373 +msgid "Date format" +msgstr "Datumsformat" + +#: ../../addon/dav/layout.fnk.php:382 +msgid "Time zone" +msgstr "Zeitzone" + +#: ../../addon/dav/layout.fnk.php:387 +msgid "Limitations" +msgstr "Einschränkungen" + +#: ../../addon/dav/layout.fnk.php:391 +msgid "Warning" +msgstr "Warnung" + +#: ../../addon/dav/layout.fnk.php:395 +msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)" +msgstr "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)" + +#: ../../addon/dav/layout.fnk.php:402 +msgid "Synchronizing this calendar with the iPhone" +msgstr "Diesen Kalender mit dem iPhone synchronisieren" + +#: ../../addon/dav/layout.fnk.php:413 +msgid "Synchronizing your Friendica-Contacts with the iPhone" +msgstr "Friendica-Kontakte mit dem iPhone synchronisieren" + +#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37 +msgid "Friendica-Contacts" +msgstr "Friendica-Kontakte" + +#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38 +msgid "Your Friendica-Contacts" +msgstr "Deine Friendica-Kontakte" + +#: ../../addon/dav/main.php:244 +msgid "Calendar" +msgstr "Kalender" + +#: ../../addon/dav/main.php:247 +msgid "Extended calendar with CalDAV-support" +msgstr "Erweiterter Kalender mit CalDAV Unterstützung." + +#: ../../addon/dav/main.php:263 +msgid "The database tables have been installed." +msgstr "Die Datenbank-Tabellen wurden installiert." + +#: ../../addon/dav/main.php:264 +msgid "An error occurred during the installation." +msgstr "Während der Installation trat ein Fehler auf." + +#: ../../addon/dav/main.php:280 +msgid "No system-wide settings yet." +msgstr "Momentan keine systemweiten Einstellungen." + +#: ../../addon/dav/main.php:283 +msgid "Database status" +msgstr "Datenbank Status" + +#: ../../addon/dav/main.php:286 +msgid "Installed" +msgstr "Installiert" + +#: ../../addon/dav/main.php:289 +msgid "Upgrade needed" +msgstr "Upgrade erforderlich" + +#: ../../addon/dav/main.php:289 +msgid "Upgrade" +msgstr "Upgrade" + +#: ../../addon/dav/main.php:292 +msgid "Not installed" +msgstr "Nicht installiert" + +#: ../../addon/dav/main.php:292 +msgid "Install" +msgstr "Installieren" + +#: ../../addon/dav/main.php:297 +msgid "Troubleshooting" +msgstr "Problembehebung" + +#: ../../addon/dav/main.php:298 +msgid "Manual creation of the database tables:" +msgstr "Manuelles anlegen der Datenbank Tabellen:" + +#: ../../addon/dav/main.php:299 +msgid "Show SQL-statements" +msgstr "SQL-Anweisungen anzeigen" + +#: ../../addon/dav/calendar.friendica.fnk.php:151 +msgid "Private Calendar" +msgstr "Privater Kalender" + +#: ../../addon/dav/calendar.friendica.fnk.php:158 +msgid "Friendica Events: Mine" +msgstr "Meine Friendica-Veranstaltungen" + +#: ../../addon/dav/calendar.friendica.fnk.php:161 +msgid "Friendica Events: Contacts" +msgstr "Friendica Veranstaltungen meiner Kontakte" + #: ../../addon/uhremotestorage/uhremotestorage.php:84 #, php-format msgid "" @@ -4800,8 +5028,8 @@ msgstr "Drupal Seite verwendet bereinigte URLs" msgid "Post to Drupal by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal" -#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:198 -#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192 +#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:199 +#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189 msgid "Post from Friendica" msgstr "Beitrag via Friendica" @@ -4956,6 +5184,18 @@ msgstr "Text für die Fußzeile. Du kannst BBCode verwenden." msgid "Report Bug" msgstr "Fehlerreport erstellen" +#: ../../addon/notimeline/notimeline.php:32 +msgid "No Timeline settings updated." +msgstr "Keine Timeline-Einstellungen aktualisiert." + +#: ../../addon/notimeline/notimeline.php:56 +msgid "No Timeline Settings" +msgstr "Keine Timeline-Einstellungen" + +#: ../../addon/notimeline/notimeline.php:58 +msgid "Disable Archive selector on profile wall" +msgstr "Deaktiviere Archiv-Auswahl auf Deiner Pinnwand" + #: ../../addon/blockem/blockem.php:51 msgid "\"Blockem\" Settings" msgstr "\"Blockem\"-Einstellungen" @@ -5033,6 +5273,30 @@ msgstr "Standard Zoom" msgid "The default zoom level. (1:world, 18:highest)" msgstr "Standard Zoomlevel (1: Welt; 18: höchstes)" +#: ../../addon/libertree/libertree.php:36 +msgid "Post to libertree" +msgstr "bei libertree veröffentlichen" + +#: ../../addon/libertree/libertree.php:67 +msgid "libertree Post Settings" +msgstr "libertree Post Einstellungen" + +#: ../../addon/libertree/libertree.php:69 +msgid "Enable Libertree Post Plugin" +msgstr "Libertree Post Plugin aktivieren" + +#: ../../addon/libertree/libertree.php:74 +msgid "Libertree API token" +msgstr "Libertree API Token" + +#: ../../addon/libertree/libertree.php:79 +msgid "Libertree site URL" +msgstr "Libertree URL" + +#: ../../addon/libertree/libertree.php:84 +msgid "Post to Libertree by default" +msgstr "Standardmäßig bei libertree veröffentlichen" + #: ../../addon/mathjax/mathjax.php:37 msgid "" "The MathJax addon renders mathematical formulae written using the LaTeX " @@ -5279,6 +5543,10 @@ msgstr "OAuth-Konfiguration löschen" msgid "API URL" msgstr "API-URL" +#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19 +msgid "Infinite Improbability Drive" +msgstr "Infinite Improbability Drive" + #: ../../addon/tumblr/tumblr.php:36 msgid "Post to Tumblr" msgstr "Bei Tumblr veröffentlichen" @@ -5366,11 +5634,11 @@ msgstr "WordPress-API-URL" msgid "Post to WordPress by default" msgstr "Standardmäßig auf WordPress veröffentlichen" -#: ../../addon/wppost/wppost.php:102 +#: ../../addon/wppost/wppost.php:103 msgid "Provide a backlink to the Friendica post" msgstr "Einen zurück zum Friendica-Beitrag hinzufügen" -#: ../../addon/wppost/wppost.php:204 +#: ../../addon/wppost/wppost.php:205 msgid "Read the original post and comment stream on Friendica" msgstr "Den Original-Beitrag samt Kommentaren bei Friendica lesen" @@ -5792,7 +6060,7 @@ msgstr "Mitte" msgid "Set colour scheme" msgstr "Farbschema wählen" -#: ../../include/profile_advanced.php:17 ../../boot.php:1102 +#: ../../include/profile_advanced.php:17 ../../boot.php:1111 msgid "Gender:" msgstr "Geschlecht:" @@ -5805,7 +6073,7 @@ msgid "j F" msgstr "j F" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:450 -#: ../../include/items.php:1423 +#: ../../include/items.php:1446 msgid "Birthday:" msgstr "Geburtstag:" @@ -5813,7 +6081,7 @@ msgstr "Geburtstag:" msgid "Age:" msgstr "Alter:" -#: ../../include/profile_advanced.php:37 ../../boot.php:1105 +#: ../../include/profile_advanced.php:37 ../../boot.php:1114 msgid "Status:" msgstr "Status:" @@ -5822,7 +6090,7 @@ msgstr "Status:" msgid "for %1$d %2$s" msgstr "für %1$d %2$s" -#: ../../include/profile_advanced.php:48 ../../boot.php:1107 +#: ../../include/profile_advanced.php:48 ../../boot.php:1116 msgid "Homepage:" msgstr "Homepage:" @@ -6350,19 +6618,19 @@ msgstr "Beitrag abgelegt" msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: ../../include/diaspora.php:2037 +#: ../../include/diaspora.php:2074 msgid "Attachments:" msgstr "Anhänge:" -#: ../../include/network.php:824 +#: ../../include/network.php:827 msgid "view full size" msgstr "Volle Größe anzeigen" -#: ../../include/oembed.php:132 +#: ../../include/oembed.php:134 msgid "Embedded content" msgstr "Eingebetteter Inhalt" -#: ../../include/oembed.php:141 +#: ../../include/oembed.php:143 msgid "Embedding disabled" msgstr "Einbettungen deaktiviert" @@ -6401,7 +6669,7 @@ msgstr "Neue Gruppe erstellen" msgid "Contacts not in any group" msgstr "Kontakte in keiner Gruppe" -#: ../../include/nav.php:46 ../../boot.php:812 +#: ../../include/nav.php:46 ../../boot.php:821 msgid "Logout" msgstr "Abmelden" @@ -6409,7 +6677,7 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:49 ../../boot.php:1499 +#: ../../include/nav.php:49 ../../boot.php:1508 msgid "Status" msgstr "Status" @@ -6489,11 +6757,11 @@ msgstr "Verwalten" msgid "Manage other pages" msgstr "Andere Seiten verwalten" -#: ../../include/nav.php:138 ../../boot.php:1060 +#: ../../include/nav.php:138 ../../boot.php:1069 msgid "Profiles" msgstr "Profile" -#: ../../include/nav.php:138 ../../boot.php:1060 +#: ../../include/nav.php:138 ../../boot.php:1069 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" @@ -6502,10 +6770,6 @@ msgid "Manage/edit friends and contacts" msgstr "Freunde und Kontakte verwalten/editieren" #: ../../include/nav.php:146 -msgid "Admin" -msgstr "Administration" - -#: ../../include/nav.php:146 msgid "Site setup and configuration" msgstr "Einstellungen der Seite und Konfiguration" @@ -6659,7 +6923,7 @@ msgstr "Sekunden" msgid "%1$d %2$s ago" msgstr "%1$d %2$s her" -#: ../../include/onepoll.php:406 +#: ../../include/onepoll.php:399 msgid "From: " msgstr "Von: " @@ -6709,13 +6973,13 @@ msgstr "[Friendica Meldung] Neue Nachricht erhalten von %s" #: ../../include/enotify.php:44 #, php-format -msgid "%s sent you a new private message at %s." -msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben." +msgid "%1$s sent you a new private message at %2$s." +msgstr "%1$s hat Dir eine neues private Nachricht geschickt auf %2$s." #: ../../include/enotify.php:45 #, php-format -msgid "%s sent you %s." -msgstr "%s hat Dir %s geschickt" +msgid "%1$s sent you %2$s." +msgstr "%1$s schickte Dir %2$s." #: ../../include/enotify.php:45 msgid "a private message" @@ -6726,148 +6990,130 @@ msgstr "eine private Nachricht" msgid "Please visit %s to view and/or reply to your private messages." msgstr "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten." -#: ../../include/enotify.php:76 +#: ../../include/enotify.php:73 #, php-format -msgid "%s's" -msgstr "%s's" +msgid "%1$s commented on [url=%2$s]a %3$s[/url]" +msgstr "%1$s kommentierte [url=%2$s]a %3$s[/url]" #: ../../include/enotify.php:80 -msgid "your" -msgstr "Dein" - -#: ../../include/enotify.php:87 #, php-format -msgid "[Friendica:Notify] Comment to conversation #%d by %s" -msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d von %s" +msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]" +msgstr "%1$s kommentierte [url=%2$s]%3$s's %4$s[/url]" #: ../../include/enotify.php:88 #, php-format -msgid "%s commented on an item/conversation you have been following." -msgstr "%s hat einen Beitrag kommentiert, dem du folgst." +msgid "%1$s commented on [url=%2$s]your %3$s[/url]" +msgstr "%1$s kommentierte [url=%2$s]Deinen Beitrag %3$s[/url]" -#: ../../include/enotify.php:89 +#: ../../include/enotify.php:98 #, php-format -msgid "%s commented on %s." -msgstr "%s kommentierte %s." +msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s" +msgstr "[Friendica Meldung] Kommentar zum Beitrag #%1$d von %2$s" -#: ../../include/enotify.php:91 ../../include/enotify.php:104 -#: ../../include/enotify.php:115 ../../include/enotify.php:126 +#: ../../include/enotify.php:99 +#, php-format +msgid "%s commented on an item/conversation you have been following." +msgstr "%s hat einen Beitrag kommentiert, dem du folgst." + +#: ../../include/enotify.php:102 ../../include/enotify.php:117 +#: ../../include/enotify.php:130 ../../include/enotify.php:143 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren." -#: ../../include/enotify.php:98 +#: ../../include/enotify.php:109 #, php-format msgid "[Friendica:Notify] %s posted to your profile wall" msgstr "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben" -#: ../../include/enotify.php:100 +#: ../../include/enotify.php:111 #, php-format -msgid "%s posted to your profile wall at %s" -msgstr "%s hat auf deine Pinnwand bei %s gepostet" +msgid "%1$s posted to your profile wall at %2$s" +msgstr "%1$s schrieb auf Deine Pinnwand auf %2$s" -#: ../../include/enotify.php:102 +#: ../../include/enotify.php:113 #, php-format -msgid "%s posted to %s" -msgstr "%s schrieb an %s" +msgid "%1$s posted to [url=%2s]your wall[/url]" +msgstr "%1$s schrieb auf [url=%2s]Deine Pinnwand[/url]" -#: ../../include/enotify.php:102 -msgid "your profile wall." -msgstr "Deine Pinnwand" - -#: ../../include/enotify.php:111 +#: ../../include/enotify.php:124 #, php-format msgid "[Friendica:Notify] %s tagged you" msgstr "[Friendica Meldung] %s hat Dich erwähnt" -#: ../../include/enotify.php:112 +#: ../../include/enotify.php:125 #, php-format -msgid "%s tagged you at %s" -msgstr "%s hat dich auf %s erwähnt" +msgid "%1$s tagged you at %2$s" +msgstr "%1$s erwähnte Dich auf %2$s" -#: ../../include/enotify.php:113 +#: ../../include/enotify.php:126 #, php-format -msgid "%s %s." -msgstr "%s %s." +msgid "%1$s [url=%2s]tagged you[/url]." +msgstr "%1$s [url=%2s]erwähnte Dich[/url]." -#: ../../include/enotify.php:113 -msgid "tagged you" -msgstr "erwähnte Dich" - -#: ../../include/enotify.php:122 +#: ../../include/enotify.php:137 #, php-format msgid "[Friendica:Notify] %s tagged your post" msgstr "[Friendica Meldung] %s markierte Deinen Beitrag" -#: ../../include/enotify.php:123 +#: ../../include/enotify.php:138 #, php-format -msgid "%s tagged your post at %s" -msgstr "%s hat deinen Beitrag auf %s getaggt" +msgid "%1$s tagged your post at %2$s" +msgstr "%1$s erwähnte Deinen Beitrag auf %2$s" -#: ../../include/enotify.php:124 +#: ../../include/enotify.php:139 #, php-format -msgid "%s tagged %s" -msgstr "%s markierte %s" +msgid "%1$s tagged [url=%2$s]your post[/url]" +msgstr "%1$s erwähnte [url=%2$s]Deinen Beitrag[/url]" -#: ../../include/enotify.php:124 -msgid "your post" -msgstr "deinen Beitrag" - -#: ../../include/enotify.php:133 +#: ../../include/enotify.php:150 msgid "[Friendica:Notify] Introduction received" msgstr "[Friendica Meldung] Kontaktanfrage erhalten" -#: ../../include/enotify.php:134 +#: ../../include/enotify.php:151 #, php-format -msgid "You've received an introduction from '%s' at %s" -msgstr "Du hast eine Kontaktanfrage von '%s' auf %s erhalten" +msgid "You've received an introduction from '%1$s' at %2$s" +msgstr "Du hast eine Kontaktanfrage erhalten von '%1$s' auf %2$s" -#: ../../include/enotify.php:135 +#: ../../include/enotify.php:152 #, php-format -msgid "You've received %s from %s." -msgstr "Du hast %s von %s erhalten." - -#: ../../include/enotify.php:135 -msgid "an introduction" -msgstr "eine Kontaktanfrage" +msgid "You've received [url=%1$s]an introduction[/url] from %2$s." +msgstr "Du hast eine [url=%1$s]Kontaktanfrage[/url] erhalten von %2$s." -#: ../../include/enotify.php:136 ../../include/enotify.php:153 +#: ../../include/enotify.php:155 ../../include/enotify.php:173 #, php-format msgid "You may visit their profile at %s" msgstr "Hier kannst du das Profil betrachten: %s" -#: ../../include/enotify.php:138 +#: ../../include/enotify.php:157 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen." -#: ../../include/enotify.php:145 +#: ../../include/enotify.php:164 msgid "[Friendica:Notify] Friend suggestion received" msgstr "[Friendica Meldung] Kontaktvorschlag erhalten" -#: ../../include/enotify.php:146 +#: ../../include/enotify.php:165 #, php-format -msgid "You've received a friend suggestion from '%s' at %s" -msgstr "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s" +msgid "You've received a friend suggestion from '%1$s' at %2$s" +msgstr "Du hast einen Freunde-Vorschlag erhalten von '%1$s' auf %2$s" -#: ../../include/enotify.php:147 +#: ../../include/enotify.php:166 #, php-format -msgid "You've received %s for %s from %s." -msgstr "Du hast %s für %s von %s erhalten." - -#: ../../include/enotify.php:148 -msgid "a friend suggestion" -msgstr "ein Freunde Vorschlag" +msgid "" +"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." +msgstr "Du hast einen [url=%1$s]Freunde-Vorschlag[/url] erhalten %2$s von %3$s." -#: ../../include/enotify.php:151 +#: ../../include/enotify.php:171 msgid "Name:" msgstr "Name:" -#: ../../include/enotify.php:152 +#: ../../include/enotify.php:172 msgid "Photo:" msgstr "Foto:" -#: ../../include/enotify.php:155 +#: ../../include/enotify.php:175 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen." @@ -6919,22 +7165,26 @@ msgid "" "notifications from you." msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können." -#: ../../include/follow.php:164 +#: ../../include/follow.php:169 msgid "Unable to retrieve contact information." msgstr "Konnte die Kontaktinformationen nicht empfangen." -#: ../../include/follow.php:218 +#: ../../include/follow.php:223 msgid "following" msgstr "folgen" -#: ../../include/items.php:2740 +#: ../../include/items.php:2790 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:2740 +#: ../../include/items.php:2790 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " +#: ../../include/items.php:3452 +msgid "Archives" +msgstr "Archiv" + #: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112 #: ../../include/bb2diaspora.php:113 msgid "image/photo" @@ -7034,29 +7284,29 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: ../../include/Contact.php:203 ../../include/conversation.php:842 +#: ../../include/Contact.php:218 ../../include/conversation.php:842 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:204 ../../include/conversation.php:843 +#: ../../include/Contact.php:219 ../../include/conversation.php:843 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:205 ../../include/conversation.php:844 +#: ../../include/Contact.php:220 ../../include/conversation.php:844 msgid "View Photos" msgstr "Bilder anschauen" -#: ../../include/Contact.php:206 ../../include/Contact.php:219 +#: ../../include/Contact.php:221 ../../include/Contact.php:234 #: ../../include/conversation.php:845 msgid "Network Posts" msgstr "Netzwerkbeiträge" -#: ../../include/Contact.php:207 ../../include/Contact.php:219 +#: ../../include/Contact.php:222 ../../include/Contact.php:234 #: ../../include/conversation.php:846 msgid "Edit Contact" msgstr "Kontakt bearbeiten" -#: ../../include/Contact.php:208 ../../include/Contact.php:219 +#: ../../include/Contact.php:223 ../../include/Contact.php:234 #: ../../include/conversation.php:847 msgid "Send PM" msgstr "Private Nachricht senden" @@ -7283,96 +7533,96 @@ msgstr "Ort löschen" msgid "permissions" msgstr "Zugriffsrechte" -#: ../../boot.php:513 +#: ../../boot.php:522 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: ../../boot.php:516 +#: ../../boot.php:525 msgid "show fewer" msgstr "weniger anzeigen" -#: ../../boot.php:689 +#: ../../boot.php:698 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: ../../boot.php:691 +#: ../../boot.php:700 #, php-format msgid "Update Error at %s" msgstr "Updatefehler bei %s" -#: ../../boot.php:791 +#: ../../boot.php:800 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: ../../boot.php:815 +#: ../../boot.php:824 msgid "Nickname or Email address: " msgstr "Spitzname oder Email-Adresse: " -#: ../../boot.php:816 +#: ../../boot.php:825 msgid "Password: " msgstr "Passwort: " -#: ../../boot.php:819 +#: ../../boot.php:828 msgid "Or login using OpenID: " msgstr "Oder melde dich mit deiner OpenID an: " -#: ../../boot.php:825 +#: ../../boot.php:834 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:992 +#: ../../boot.php:1001 msgid "Edit profile" msgstr "Profil bearbeiten" -#: ../../boot.php:1052 +#: ../../boot.php:1061 msgid "Message" msgstr "Nachricht" -#: ../../boot.php:1168 ../../boot.php:1244 +#: ../../boot.php:1177 ../../boot.php:1253 msgid "g A l F d" msgstr "l, d. F G \\U\\h\\r" -#: ../../boot.php:1169 ../../boot.php:1245 +#: ../../boot.php:1178 ../../boot.php:1254 msgid "F d" msgstr "d. F" -#: ../../boot.php:1214 ../../boot.php:1285 +#: ../../boot.php:1223 ../../boot.php:1294 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1226 +#: ../../boot.php:1235 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: ../../boot.php:1227 +#: ../../boot.php:1236 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: ../../boot.php:1278 +#: ../../boot.php:1287 msgid "[No description]" msgstr "[keine Beschreibung]" -#: ../../boot.php:1296 +#: ../../boot.php:1305 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1297 +#: ../../boot.php:1306 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: ../../boot.php:1502 +#: ../../boot.php:1511 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: ../../boot.php:1508 +#: ../../boot.php:1517 msgid "Profile Details" msgstr "Profildetails" -#: ../../boot.php:1523 +#: ../../boot.php:1532 msgid "Events and Calendar" msgstr "Ereignisse und Kalender" -#: ../../boot.php:1529 +#: ../../boot.php:1538 msgid "Only You Can See This" msgstr "Nur Du Kannst Das Sehen" diff --git a/view/de/strings.php b/view/de/strings.php index f3d1f23a7..206f4da95 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -331,6 +331,7 @@ $a->strings["Archive"] = "Archivieren"; $a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; $a->strings["Repair"] = "Reparieren"; $a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen"; +$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!"; $a->strings["Contact Editor"] = "Kontakt Editor"; $a->strings["Profile Visibility"] = "Profil-Sichtbarkeit"; $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft."; @@ -678,6 +679,8 @@ $a->strings["Plugins"] = "Plugins"; $a->strings["Themes"] = "Themen"; $a->strings["DB updates"] = "DB Updates"; $a->strings["Logs"] = "Protokolle"; +$a->strings["Admin"] = "Administration"; +$a->strings["Plugin Features"] = "Plugin Features"; $a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten"; $a->strings["Normal Account"] = "Normales Konto"; $a->strings["Soapbox Account"] = "Marktschreier-Konto"; @@ -1001,6 +1004,9 @@ $a->strings["Facebook post failed. Queued for retry."] = "Veröffentlichung bei $a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."; $a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden"; $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hallo %1\$s,\n\ndie Verbindung zwischen deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist normalerweise das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3\$sden Facebook-Connector neu authentifizieren%4\$s."; +$a->strings["StatusNet AutoFollow settings updated."] = "StatusNet AutoFollow Einstellungen aktualisiert."; +$a->strings["StatusNet AutoFollow Settings"] = "StatusNet AutoFollow Einstellungen"; +$a->strings["Automatically follow any StatusNet followers/mentioners"] = "Automatisch allen StatusNet Followern/Erwähnungen folgen"; $a->strings["Lifetime of the cache (in hours)"] = "Lebenszeit des Caches (in Stunden)"; $a->strings["Cache Statistics"] = "Cache Statistik"; $a->strings["Number of items"] = "Anzahl der Einträge"; @@ -1049,6 +1055,54 @@ $a->strings["Most active users"] = "Aktivste Nutzer"; $a->strings["Latest photos"] = "Neueste Fotos"; $a->strings["Latest likes"] = "Neueste Favoriten"; $a->strings["event"] = "Veranstaltung"; +$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "U.S. Datumsformat (mm/dd/YYYY)"; +$a->strings["German Time Format (dd.mm.YYYY)"] = "Deutsches Datumsformat (dd.mm.YYYY)"; +$a->strings["Error"] = "Fehler"; +$a->strings["No access"] = "Kein Zugriff"; +$a->strings["New event"] = "Neue Veranstaltung"; +$a->strings["Today"] = "Heute"; +$a->strings["Day"] = "Tag"; +$a->strings["Week"] = "Woche"; +$a->strings["Month"] = "Monat"; +$a->strings["Reload"] = "Neu Laden"; +$a->strings["Date"] = "Datum"; +$a->strings["Not found"] = "Nicht gefunden"; +$a->strings["Go back to the calendar"] = "Zurück zum Kalender"; +$a->strings["Starts"] = "Beginnt"; +$a->strings["Ends"] = "Endet"; +$a->strings["Description"] = "Beschreibung"; +$a->strings["Notification"] = "Benachrichtigung"; +$a->strings["Minutes"] = "Minuten"; +$a->strings["Hours"] = "Stunden"; +$a->strings["Days"] = "Tage"; +$a->strings["before"] = "vorher"; +$a->strings["Calendar Settings"] = "Kalender Einstellungen"; +$a->strings["Date format"] = "Datumsformat"; +$a->strings["Time zone"] = "Zeitzone"; +$a->strings["Limitations"] = "Einschränkungen"; +$a->strings["Warning"] = "Warnung"; +$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)"; +$a->strings["Synchronizing this calendar with the iPhone"] = "Diesen Kalender mit dem iPhone synchronisieren"; +$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Friendica-Kontakte mit dem iPhone synchronisieren"; +$a->strings["Friendica-Contacts"] = "Friendica-Kontakte"; +$a->strings["Your Friendica-Contacts"] = "Deine Friendica-Kontakte"; +$a->strings["Calendar"] = "Kalender"; +$a->strings["Extended calendar with CalDAV-support"] = "Erweiterter Kalender mit CalDAV Unterstützung."; +$a->strings["The database tables have been installed."] = "Die Datenbank-Tabellen wurden installiert."; +$a->strings["An error occurred during the installation."] = "Während der Installation trat ein Fehler auf."; +$a->strings["No system-wide settings yet."] = "Momentan keine systemweiten Einstellungen."; +$a->strings["Database status"] = "Datenbank Status"; +$a->strings["Installed"] = "Installiert"; +$a->strings["Upgrade needed"] = "Upgrade erforderlich"; +$a->strings["Upgrade"] = "Upgrade"; +$a->strings["Not installed"] = "Nicht installiert"; +$a->strings["Install"] = "Installieren"; +$a->strings["Troubleshooting"] = "Problembehebung"; +$a->strings["Manual creation of the database tables:"] = "Manuelles anlegen der Datenbank Tabellen:"; +$a->strings["Show SQL-statements"] = "SQL-Anweisungen anzeigen"; +$a->strings["Private Calendar"] = "Privater Kalender"; +$a->strings["Friendica Events: Mine"] = "Meine Friendica-Veranstaltungen"; +$a->strings["Friendica Events: Contacts"] = "Friendica Veranstaltungen meiner Kontakte"; $a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"; $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})"; $a->strings["OAuth end-point"] = "OAuth end-point"; @@ -1118,6 +1172,9 @@ $a->strings["How to contact the operator via email. (will be displayed obfuscate $a->strings["Footer note"] = "Fußnote"; $a->strings["Text for the footer. You can use BBCode here."] = "Text für die Fußzeile. Du kannst BBCode verwenden."; $a->strings["Report Bug"] = "Fehlerreport erstellen"; +$a->strings["No Timeline settings updated."] = "Keine Timeline-Einstellungen aktualisiert."; +$a->strings["No Timeline Settings"] = "Keine Timeline-Einstellungen"; +$a->strings["Disable Archive selector on profile wall"] = "Deaktiviere Archiv-Auswahl auf Deiner Pinnwand"; $a->strings["\"Blockem\" Settings"] = "\"Blockem\"-Einstellungen"; $a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die blockiert werden sollen (durch Kommas getrennt)"; $a->strings["BLOCKEM Settings saved."] = "BLOCKEM-Einstellungen gesichert."; @@ -1136,6 +1193,12 @@ $a->strings["Tile Server URL"] = "Tile Server URL"; $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>"; $a->strings["Default zoom"] = "Standard Zoom"; $a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)"; +$a->strings["Post to libertree"] = "bei libertree veröffentlichen"; +$a->strings["libertree Post Settings"] = "libertree Post Einstellungen"; +$a->strings["Enable Libertree Post Plugin"] = "Libertree Post Plugin aktivieren"; +$a->strings["Libertree API token"] = "Libertree API Token"; +$a->strings["Libertree site URL"] = "Libertree URL"; +$a->strings["Post to Libertree by default"] = "Standardmäßig bei libertree veröffentlichen"; $a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert."; $a->strings["Use the MathJax renderer"] = "MathJax verwenden"; $a->strings["MathJax Base URL"] = "MathJax Basis-URL"; @@ -1190,6 +1253,7 @@ $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche à $a->strings["Send linked #-tags and @-names to StatusNet"] = "Sende verlinkte #-Tags und @-Namen nach StatusNet"; $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen"; $a->strings["API URL"] = "API-URL"; +$a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive"; $a->strings["Post to Tumblr"] = "Bei Tumblr veröffentlichen"; $a->strings["Tumblr Post Settings"] = "Tumblr-Beitragseinstellungen"; $a->strings["Enable Tumblr Post Plugin"] = "Tumblr-Plugin aktivieren"; @@ -1478,7 +1542,6 @@ $a->strings["Manage other pages"] = "Andere Seiten verwalten"; $a->strings["Profiles"] = "Profile"; $a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; $a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalten/editieren"; -$a->strings["Admin"] = "Administration"; $a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration"; $a->strings["Nothing new here"] = "Keine Neuigkeiten."; $a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen"; @@ -1530,38 +1593,33 @@ $a->strings["Thank You,"] = "Danke,"; $a->strings["%s Administrator"] = "der Administrator von %s"; $a->strings["%s <!item_type!>"] = "%s <!item_type!>"; $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s"; -$a->strings["%s sent you a new private message at %s."] = "%s hat dir eine neue private Nachricht auf %s geschrieben."; -$a->strings["%s sent you %s."] = "%s hat Dir %s geschickt"; +$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat Dir eine neues private Nachricht geschickt auf %2\$s."; +$a->strings["%1\$s sent you %2\$s."] = "%1\$s schickte Dir %2\$s."; $a->strings["a private message"] = "eine private Nachricht"; $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten."; -$a->strings["%s's"] = "%s's"; -$a->strings["your"] = "Dein"; -$a->strings["[Friendica:Notify] Comment to conversation #%d by %s"] = "[Friendica Meldung] Kommentar zum Beitrag #%d von %s"; +$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]"; +$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$s's %4\$s[/url]"; +$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]Deinen Beitrag %3\$s[/url]"; +$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica Meldung] Kommentar zum Beitrag #%1\$d von %2\$s"; $a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst."; -$a->strings["%s commented on %s."] = "%s kommentierte %s."; $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."; $a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben"; -$a->strings["%s posted to your profile wall at %s"] = "%s hat auf deine Pinnwand bei %s gepostet"; -$a->strings["%s posted to %s"] = "%s schrieb an %s"; -$a->strings["your profile wall."] = "Deine Pinnwand"; +$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s schrieb auf Deine Pinnwand auf %2\$s"; +$a->strings["%1\$s posted to [url=%2s]your wall[/url]"] = "%1\$s schrieb auf [url=%2s]Deine Pinnwand[/url]"; $a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica Meldung] %s hat Dich erwähnt"; -$a->strings["%s tagged you at %s"] = "%s hat dich auf %s erwähnt"; -$a->strings["%s %s."] = "%s %s."; -$a->strings["tagged you"] = "erwähnte Dich"; +$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte Dich auf %2\$s"; +$a->strings["%1\$s [url=%2s]tagged you[/url]."] = "%1\$s [url=%2s]erwähnte Dich[/url]."; $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag"; -$a->strings["%s tagged your post at %s"] = "%s hat deinen Beitrag auf %s getaggt"; -$a->strings["%s tagged %s"] = "%s markierte %s"; -$a->strings["your post"] = "deinen Beitrag"; +$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s erwähnte Deinen Beitrag auf %2\$s"; +$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s erwähnte [url=%2\$s]Deinen Beitrag[/url]"; $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten"; -$a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten"; -$a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten."; -$a->strings["an introduction"] = "eine Kontaktanfrage"; +$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Du hast eine Kontaktanfrage erhalten von '%1\$s' auf %2\$s"; +$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Kontaktanfrage[/url] erhalten von %2\$s."; $a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s"; $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."; $a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica Meldung] Kontaktvorschlag erhalten"; -$a->strings["You've received a friend suggestion from '%s' at %s"] = "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s"; -$a->strings["You've received %s for %s from %s."] = "Du hast %s für %s von %s erhalten."; -$a->strings["a friend suggestion"] = "ein Freunde Vorschlag"; +$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Du hast einen Freunde-Vorschlag erhalten von '%1\$s' auf %2\$s"; +$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Du hast einen [url=%1\$s]Freunde-Vorschlag[/url] erhalten %2\$s von %3\$s."; $a->strings["Name:"] = "Name:"; $a->strings["Photo:"] = "Foto:"; $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."; @@ -1579,6 +1637,7 @@ $a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinfo $a->strings["following"] = "folgen"; $a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf "; $a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf "; +$a->strings["Archives"] = "Archiv"; $a->strings["image/photo"] = "Bild/Foto"; $a->strings["link"] = "Verweis"; $a->strings["An invitation is required."] = "Du benötigst eine Einladung."; diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl index f6059a7ec..85d5fb8e2 100644 --- a/view/photo_edit.tpl +++ b/view/photo_edit.tpl @@ -18,8 +18,12 @@ <div id="photo-edit-tags-end"></div> <div id="photo-edit-rotate-wrapper"> - <div id="photo-edit-rotate-label">$rotate</div> - <input type="checkbox" name="rotate" value="1" /> + <div id="photo-edit-rotate-label"> + $rotatecw<br> + $rotateccw + </div> + <input type="radio" name="rotate" value="1" /><br> + <input type="radio" name="rotate" value="2" /> </div> <div id="photo-edit-rotate-end"></div> diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css index 6dc788f35..9c15329da 100644 --- a/view/theme/darkzero-NS/style.css +++ b/view/theme/darkzero-NS/style.css @@ -151,6 +151,10 @@ blockquote { overflow: none; } -.editicon:hover { - background-color: #ccc; +.editicon { + background-color: #333; +} + +#datebrowse-sidebar select { +color:#99CCFF !important; }
\ No newline at end of file diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index 77650a91a..8a6099ee8 100644 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -149,4 +149,8 @@ blockquote { /* This seems okay to me...we might not need a new iconset, lets see how people react */ .editicon { background-color: #333; +} + +#datebrowse-sidebar select { +color:#99CCFF !important; }
\ No newline at end of file diff --git a/view/theme/dispy/dark/icons.png b/view/theme/dispy/dark/icons.png Binary files differindex 2ee1a5ecb..67c8f3f0b 100644 --- a/view/theme/dispy/dark/icons.png +++ b/view/theme/dispy/dark/icons.png diff --git a/view/theme/dispy/dark/icons.svg b/view/theme/dispy/dark/icons.svg index 2c4b3abd3..7cbbd3574 100644 --- a/view/theme/dispy/dark/icons.svg +++ b/view/theme/dispy/dark/icons.svg @@ -14,9 +14,9 @@ height="200" id="svg3403" version="1.1" - inkscape:version="0.48+devel r" + inkscape:version="0.48.3.1 r9886" sodipodi:docname="icons.svg" - inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy-dark/icons.png" + inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/dark/icons.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <defs @@ -52,8 +52,8 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="1.9403009" - inkscape:cx="95.950174" - inkscape:cy="115.58345" + inkscape:cx="127.81563" + inkscape:cy="128.63003" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -1127,16 +1127,16 @@ inkscape:connector-curvature="0" id="path4319" d="m -44.467884,1107.2152 0,17.7252 1.161165,3.7983 c 1.200046,4.2782 1.065706,4.1105 2.322331,0 l 1.161165,-3.7983 0,-17.7252 z" - style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" + style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-miterlimit:4;stroke-dasharray:none" transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" /> <path inkscape:connector-curvature="0" id="path4321" d="m -44.467884,1124.9404 4.644661,0" - style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" /> <path - style="fill:none;stroke:#999999;stroke-width:0.66930836;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" d="m -42.239747,1107.2336 0,17.6813" id="path4323" inkscape:connector-curvature="0" @@ -1146,7 +1146,7 @@ inkscape:connector-curvature="0" id="path4325" d="m -43.348187,1128.4959 c 1.108441,-0.8952 1.929509,-0.3581 2.381097,0.045 -0.328428,1.1191 -1.190549,3.9391 -1.190549,3.9391 z" - style="fill:#999999;stroke:#999999;stroke-width:0.66930836;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" + style="fill:#999999;stroke:#e6e6e6;stroke-width:0.66930836000000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" /> <rect ry="0.42804927" @@ -1156,7 +1156,7 @@ height="1.8614606" width="5.1800866" id="rect4327" - style="fill:#999999;fill-opacity:1;stroke:#999999" + style="fill:#999999;fill-opacity:1;stroke:#e6e6e6" transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" /> <path style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none" diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index b94e5ec34..327b053ab 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -78,16 +78,19 @@ h6{font-size:xx-small;} #login_openid label{width:180px !important;} nav{height:60px;background-color:#1d1f1d;color:#eeeeee;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeee;border:0px;}nav a:hover{text-decoration:none;color:#eeeeee;border:0px;} nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;} -ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeee;background-color:#555753;}ul#user-menu-popup li a:hover{color:#2e2f2e;background-color:#eeeeee;} +#site-location{font-weight:bold;font-style:italic;font-size:small;width:30em;position:relative;left:-3.5em;top:3em;} +ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:3px 0 0;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeee;background-color:#555753;}ul#user-menu-popup li a:hover{color:#2e2f2e;background-color:#eeeeee;} ul#user-menu-popup li a.nav-sep{border-top:1px solid #2e302e;} nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(dark/icons.png) 0 0 no-repeat;} +#nav-admin-link{background-position:0 -154px;}#nav-admin-link:hover{background-position:-22px -154px;} #nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;} #nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;} #nav-directory-link{background-position:-44px -154px;}#nav-directory-link:hover{background-position:-66px -154px;} #nav-help-link{background-position:0 -110px;}#nav-help-link:hover{background-position:-22px -110px;} #nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;} -#nav-intro-link{background-position:0px -190px;}#nav-intro-link:hover{background-position:-44px -190px;} +#nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;} #nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;} +#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;} #nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;} #nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;} #nav-notify-link:hover{background-position:-66px -110px;} @@ -105,14 +108,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;} #nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;} #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} +#nav-buttons-2{clear:both;list-style:none;padding:0px;margin:0px;left:136px;top:-20px;position:relative;width:6em;height:25px;}#nav-buttons-2>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} #search-text,#mini-search-text{background:white;color:#2e2f2e;} #search-text{border:1px solid #eeeeee;margin:5px 0;} #mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} -#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:80%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} -#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;} +#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:35%;margin:5px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;top:4px;left:7px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} +#user-menu-label{font-size:small;padding:0px 20px 10px 5px;height:10px;display:block;} .nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;} .nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;} #net-update{background-position:0px 0px;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index c15706c36..e3966683b 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -24,93 +24,93 @@ header, hgroup, nav, section { - display: block; + display: block; } audio, canvas, video, time { - display: inline-block; - *display: inline; - *zoom: 1; + display: inline-block; + *display: inline; + *zoom: 1; } audio:not([controls]), [hidden] { - display: none; + display: none; } ///* // * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units // * 2. Force vertical scrollbar in non-IE // * 3. Prevent iOS text size adjust on device orientation change, -// * without disabling user zoom: h5bp.com/g +// * without disabling user zoom: h5bp.com/g // */ html { - font-size: 100%; - overflow-y: scroll; - .font_size_adjust; + font-size: 100%; + overflow-y: scroll; + .font_size_adjust; } body { - margin: 0; - padding: 0; - .default_font; - color: @main_colour; - background-color: @bg_colour; + margin: 0; + padding: 0; + .default_font; + color: @main_colour; + background-color: @bg_colour; } button, input, select, textarea { - color: @main_colour; - background-color: @bg_colour; + color: @main_colour; + background-color: @bg_colour; } select { - .borders(1px, dotted, darken(@main_alt_colour, 60%)); - padding: 1px; - margin: 3px; - color: @main_colour; - background: @bg_colour; + .borders(1px, dotted, darken(@main_alt_colour, 60%)); + padding: 1px; + margin: 3px; + color: @main_colour; + background: @bg_colour; max-width: 85%; min-width: 85px; } option { - padding: 1px; - color: @main_colour; - background: @bg_colour; - &[selected="selected"] { - color: @bg_colour; - background: @main_colour; - } + padding: 1px; + color: @main_colour; + background: @bg_colour; + &[selected="selected"] { + color: @bg_colour; + background: @main_colour; + } } tr:nth-child(even) { - background-color: lighten(@bg_colour, 10%); + background-color: lighten(@bg_colour, 10%); } ///* remember to define focus styles! */ -//outline Sets all the outline properties in one declaration -//outline-color Sets the color of an outline color_name,hex_number,rgb_number,invert,inherit -//outline-style Sets the style of an outline dotted,dashed,solid,double,groove,ridge,inset,outset,inherit -//outline-width Sets the width of an outline thin,medium,thick,length,inherit +//outline Sets all the outline properties in one declaration +//outline-color Sets the color of an outline color_name,hex_number,rgb_number,invert,inherit +//outline-style Sets the style of an outline dotted,dashed,solid,double,groove,ridge,inset,outset,inherit +//outline-width Sets the width of an outline thin,medium,thick,length,inherit :focus { - outline: none; + outline: none; } a:focus { - outline: invert, dashed, thin; + outline: invert, dashed, thin; } [disabled="disabled"] { - background: @med_bg_colour; - color: @disabled_colour; + background: @med_bg_colour; + color: @disabled_colour; } ///* remember to highlight inserts somehow! */ ins, mark { - background-color: @bg_alt_colour; - color: @lt_main_colour; + background-color: @bg_alt_colour; + color: @lt_main_colour; } ins { - text-decoration: none; + text-decoration: none; } mark { - font-style: italic; - font-weight: bold; + font-style: italic; + font-weight: bold; } ///* Redeclare monospace font family: h5bp.com/j */ pre, @@ -118,157 +118,157 @@ code, kbd, samp, .wall-item-body code { - font-family: monospace, monospace; - _font-family: monospace; - font-size: 1em; + font-family: monospace, monospace; + _font-family: monospace; + font-size: 1em; } ///* Improve readability of pre-formatted text in all browsers */ pre, .wall-item-body code { - .wrap; + .wrap; } q { - quotes: none; - &:before, &:after { - content: ""; - content: none; - } + quotes: none; + &:before, &:after { + content: ""; + content: none; + } } em { - font-style: italic; + font-style: italic; } strong { - font-weight: bold; + font-weight: bold; } strike { - text-decoration: line-through; + text-decoration: line-through; } small { - font-size: 85%; + font-size: 85%; } ///* Position subscript and superscript content without affecting // * line-height: h5bp.com/k */ sub, sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } sub { - bottom: -0.25em; + bottom: -0.25em; } sup { - top: -0.5em; + top: -0.5em; } img { - border: 0 none; + border: 0 none; } a { - color: @link_colour; - text-decoration: none; - margin-bottom: 1px; - &:hover { - color: @hover_colour; - border-bottom: 1px dotted @hover_colour; - } - &:hover img { - text-decoration: none; - } + color: @link_colour; + text-decoration: none; + margin-bottom: 1px; + &:hover { + color: @hover_colour; + border-bottom: 1px dotted @hover_colour; + } + &:hover img { + text-decoration: none; + } } blockquote { - background: darken(@main_alt_colour, 66.5%); - color: @main_colour; - text-indent: 5px; - padding: 5px; - .borders(1px, solid, darken(@main_alt_colour, 33%)); - .rounded_corners; + background: darken(@main_alt_colour, 66.5%); + color: @main_colour; + text-indent: 5px; + padding: 5px; + .borders(1px, solid, darken(@main_alt_colour, 33%)); + .rounded_corners; } .label () { - width: 38%; - display: inline-block; - font-size: small; - margin: 0 10px 1em 0; - .borders(1px, solid, @bg_colour); - padding: 3px 5px; - background: @main_colour; - color: darken(@main_alt_colour, 86.5%); - .box_shadow(3px, 3px, 5px); + width: 38%; + display: inline-block; + font-size: small; + margin: 0 10px 1em 0; + .borders(1px, solid, @bg_colour); + padding: 3px 5px; + background: @main_colour; + color: darken(@main_alt_colour, 86.5%); + .box_shadow(3px, 3px, 5px); } label { - .label; + .label; } input { - .box(250px, 25px); - .borders(1px, solid, darken(@main_alt_colour, 33.5%)); - width: 17em; - &[type="checkbox"], - &[type="radio"] { - .box(15px, 15px); - margin: 0; - } - &[type="radio"] { - margin: 5px 0; - } - &[type="submit"], - &[type="button"] { - background-color: @main_alt_colour; - .borders(2px, outset, darken(@main_alt_colour, 24%)); - .rounded_corners; - .box_shadow(1px, 3px, 4px, 0); - color: @bg_alt_colour; - cursor: pointer; - font-weight: bold; - width: auto; - .text_shadow; - } - &[type="submit"]:active, - &[type="button"]:active { - .box_shadow(0, 0, 0, 0); - } + .box(250px, 25px); + .borders(1px, solid, darken(@main_alt_colour, 33.5%)); + width: 17em; + &[type="checkbox"], + &[type="radio"] { + .box(15px, 15px); + margin: 0; + } + &[type="radio"] { + margin: 5px 0; + } + &[type="submit"], + &[type="button"] { + background-color: @main_alt_colour; + .borders(2px, outset, darken(@main_alt_colour, 24%)); + .rounded_corners; + .box_shadow(1px, 3px, 4px, 0); + color: @bg_alt_colour; + cursor: pointer; + font-weight: bold; + width: auto; + .text_shadow; + } + &[type="submit"]:active, + &[type="button"]:active { + .box_shadow(0, 0, 0, 0); + } } h1, h2, h3, h4, h5, h6 { - margin: 10px 0px; - font-weight: bold; - border-bottom: 1px solid @hover_colour; + margin: 10px 0px; + font-weight: bold; + border-bottom: 1px solid @hover_colour; } h1 { - font-size: x-large; + font-size: x-large; } h2 { - font-size: large; + font-size: large; } h3 { - font-size: medium; + font-size: medium; } h4 { - font-size: small; + font-size: small; } h5 { - font-size: x-small; + font-size: x-small; } h6 { - font-size: xx-small; + font-size: xx-small; } // .required { - display: inline; - color: red; - font-size: 16px; - font-weight: bold; - margin: 3px; + display: inline; + color: red; + font-size: 16px; + font-weight: bold; + margin: 3px; } .fakelink, .lockview { - color: @link_colour; - cursor: pointer; + color: @link_colour; + cursor: pointer; } .fakelink:hover { - color: @hover_colour; + color: @hover_colour; } .smalltext { - font-size: 0.7em; + font-size: 0.7em; } @@ -277,89 +277,89 @@ h6 { */ /* .tool .action */ .action { - margin: 5px 0; + margin: 5px 0; } .tool { - margin: 5px 0; - list-style: none; + margin: 5px 0; + list-style: none; } #articlemain { - .box(100%, 100%); - margin: 0 auto; + .box(100%, 100%); + margin: 0 auto; } .button { - // .box(25%, auto); - // background: @menu_bg_colour; - color: @main_colour; - // .borders(2px, outset, darken(@menu_bg_colour, 20%)); - .rounded_corners; - padding: 5px; - // font-size: smaller; - cursor: pointer; - // &.active { - // .box_shadow(4px, 4px, 7px); - // } - a { - color: @main_colour; - // font-size: smaller; - font-weight: bold; - } + // .box(25%, auto); + // background: @menu_bg_colour; + color: @main_colour; + // .borders(2px, outset, darken(@menu_bg_colour, 20%)); + .rounded_corners; + padding: 5px; + // font-size: smaller; + cursor: pointer; + // &.active { + // .box_shadow(4px, 4px, 7px); + // } + a { + color: @main_colour; + // font-size: smaller; + font-weight: bold; + } } #profile-listing-desc { - a { - color: @main_colour; - font-weight: bold; - } + a { + color: @main_colour; + font-weight: bold; + } } [class$="-desc"], [id$="-desc"] { - color: @main_colour; - background: @bg_colour; - .borders(2px, outset, @dk_main_colour); - .rounded_corners; - // .box_shadow(3px, 3px, 5px); + color: @main_colour; + background: @bg_colour; + .borders(2px, outset, @dk_main_colour); + .rounded_corners; + // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; padding: 5px; - font-weight: bold; - font-size: smaller; + font-weight: bold; + font-size: smaller; } #item-delete-selected-desc { - float: left; - margin-right: 5px; - &:hover { - text-decoration: underline; - } + float: left; + margin-right: 5px; + &:hover { + text-decoration: underline; + } } .intro-approve-as-friend-desc { - margin-top: 10px; + margin-top: 10px; } .intro-desc { - margin-bottom: 20px; - font-weight: bold; + margin-bottom: 20px; + font-weight: bold; } #group-edit-desc { - margin: 10px 0px; + margin: 10px 0px; } #settings-nickname-desc { - background: @main_colour; - .rounded_corners; - .borders; - padding: 5px; - color: @bg_colour; + background: @main_colour; + .rounded_corners; + .borders; + padding: 5px; + color: @bg_colour; } .contactname, .contact-name { - font-weight: bold; - font-size: smaller; + font-weight: bold; + font-size: smaller; } .contact-details { - font-style: italic; - font-size: smaller; + font-style: italic; + font-size: smaller; } .like-rotator { - vertical-align: middle; - text-align: center; - margin: 1px; + vertical-align: middle; + text-align: center; + margin: 1px; } @@ -367,54 +367,54 @@ h6 { * login */ #asidemain .field { - overflow: hidden; - width: 200px; + overflow: hidden; + width: 200px; } #login-extra-links { - overflow: auto !important; - padding-top: 60px !important; - width: 100% !important; - a { - margin-right: 20px; - } + overflow: auto !important; + padding-top: 60px !important; + width: 100% !important; + a { + margin-right: 20px; + } } #login_standard { - display: block !important; - float: none !important; - height: 100% !important; - position: relative !important; - width: 100% !important; - .field label { - width: 200px !important; - } - input { - margin: 0 0 8px !important; - width: 210px !important; - &[type="text"] { - margin: 0 0 8px !important; - width: 210px !important; } - } + display: block !important; + float: none !important; + height: 100% !important; + position: relative !important; + width: 100% !important; + .field label { + width: 200px !important; + } + input { + margin: 0 0 8px !important; + width: 210px !important; + &[type="text"] { + margin: 0 0 8px !important; + width: 210px !important; } + } } #login-submit-wrapper { - margin: 0 !important; + margin: 0 !important; } #login-submit-button { - margin-left: 0px !important; + margin-left: 0px !important; } #asidemain #login_openid { - position: relative !important; - float: none !important; - margin-left: 0px !important; - height: auto !important; - width: 200px !important; + position: relative !important; + float: none !important; + margin-left: 0px !important; + height: auto !important; + width: 200px !important; } #login_openid { - #id_openid_url { - width: 180px !important; - overflow: hidden !important; } - label { - width: 180px !important; - } + #id_openid_url { + width: 180px !important; + overflow: hidden !important; } + label { + width: 180px !important; + } } @@ -422,133 +422,154 @@ h6 { * nav */ nav { - height: 60px; - background-color: @dk_bg_colour; - color: @main_alt_colour; - position: relative; - padding: 20px 20px 10px 95px; - a { - text-decoration: none; - color: @main_alt_colour; - border: 0px; - &:hover { - text-decoration: none; - color: @main_alt_colour; - border: 0px; } } - #banner { - display: block; - position: absolute; - left: 51px; - top: 25px; - #logo-text a { - font-size: 40px; - font-weight: bold; - margin-left: 3px; } } + height: 60px; + background-color: @dk_bg_colour; + color: @main_alt_colour; + position: relative; + padding: 20px 20px 10px 95px; + a { + text-decoration: none; + color: @main_alt_colour; + border: 0px; + &:hover { + text-decoration: none; + color: @main_alt_colour; + border: 0px; } } + #banner { + display: block; + position: absolute; + left: 51px; + top: 25px; + #logo-text a { + font-size: 40px; + font-weight: bold; + margin-left: 3px; } } +} +#site-location { + font-weight: bold; + font-style: italic; + font-size: small; + width: 30em; + position: relative; + left: -3.5em; + top: 3em; } ul#user-menu-popup { - display: none; - position: absolute; - background-color: @menu_bg_colour; - width: 100%; - padding: 10px 0px; - margin: 0px; - top: 20px; - left: 0; - font-size: small; - line-height: 1; - .rounded_corners(0 0 5px 5px); - .box_shadow(5px, 5px, 10px, 0px); - z-index: 10000; - li { - display: block; - a { - display: block; - padding: 5px; - color: @main_alt_colour; - background-color: @menu_bg_colour; - &:hover { - color: @bg_colour; - background-color: @main_alt_colour; - } - &.nav-sep { - border-top: 1px solid @bg_alt_colour; } } } + display: none; + position: absolute; + background-color: @menu_bg_colour; + width: 100%; + padding: 10px 0px; + margin: 3px 0 0; + top: 20px; + left: 0; + font-size: small; + line-height: 1; + .rounded_corners(0 0 5px 5px); + .box_shadow(5px, 5px, 10px, 0px); + z-index: 10000; + li { + display: block; + a { + display: block; + padding: 5px; + color: @main_alt_colour; + background-color: @menu_bg_colour; + &:hover { + color: @bg_colour; + background-color: @main_alt_colour; + } + &.nav-sep { + border-top: 1px solid @bg_alt_colour; } } } } nav .nav-link { - display: inline-block; - .box(22px, 22px); - overflow: hidden; - margin: 0px 5px 5px; - text-indent: 50px; - background: transparent url(dark/icons.png) 0 0 no-repeat; + display: inline-block; + .box(22px, 22px); + overflow: hidden; + margin: 0px 5px 5px; + text-indent: 50px; + background: transparent url(dark/icons.png) 0 0 no-repeat; +} +#nav-admin-link { + background-position: 0 -154px; + &:hover { + background-position: -22px -154px; + } } #nav-apps-link { - background-position: 0 -66px; - &:hover { - background-position: -22px -66px; - } + background-position: 0 -66px; + &:hover { + background-position: -22px -66px; + } } #nav-community-link, #nav-contacts-link { - background-position: 0 -22px; - &:hover { - background-position: -22px -22px; - } + background-position: 0 -22px; + &:hover { + background-position: -22px -22px; + } } #nav-directory-link { - background-position: -44px -154px; - &:hover { - background-position: -66px -154px; - } + background-position: -44px -154px; + &:hover { + background-position: -66px -154px; + } } #nav-help-link { - background-position: 0 -110px; - &:hover { - background-position: -22px -110px; - } + background-position: 0 -110px; + &:hover { + background-position: -22px -110px; + } } #nav-home-link { - background-position: -44px -132px; - &:hover { - background-position: -66px -132px; - } + background-position: -44px -132px; + &:hover { + background-position: -66px -132px; + } } #nav-intro-link { - background-position: 0px -190px; - &:hover { - background-position: -44px -190px; - } + background-position: 0px -88px; + &:hover { + background-position: -22px -88px; + } } #nav-login-link, #nav-logout-link { - background-position: 0 -88px; - &:hover { - background-position: -22px -88px; - } + background-position: 0 -88px; + &:hover { + background-position: -22px -88px; + } +} +#nav-manage-link { + background-position: 0px -22px; + &:hover { + background-position: -22px -22px; + } } #nav-messages-link { - background-position: -44px -88px; - &:hover { - background-position: -66px -88px; - } + background-position: -44px -88px; + &:hover { + background-position: -66px -88px; + } } #nav-notify-link, #nav-notifications-linkmenu { - background-position: -44px -110px; + background-position: -44px -110px; } #nav-notify-link:hover { - background-position: -66px -110px; + background-position: -66px -110px; } #nav-network-link { - background-position: 0px -177px; - &:hover { - background-position: -22px -177px; - } + background-position: 0px -177px; + &:hover { + background-position: -22px -177px; + } } #nav-search-link { - background-position: 0 -44px; - &:hover { - background-position: -22px -44px; - } + background-position: 0 -44px; + &:hover { + background-position: -22px -44px; + } } #jot-title, #profile-link, @@ -570,266 +591,282 @@ nav .nav-link { .hover, .focus, .pointer { - cursor: pointer; + cursor: pointer; } //* popup notifications */ div.jGrowl div { - &.notice { - background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center; - color: white; - padding-left: 58px; - margin-top: 50px; - } - &.info { - background: @info url("../../../images/icons/48/info.png") no-repeat 5px center; - color: white; - padding-left: 58px; - margin-top: 50px; - } - // &.jGrowl-message { - - // } + &.notice { + background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: white; + padding-left: 58px; + margin-top: 50px; + } + &.info { + background: @info url("../../../images/icons/48/info.png") no-repeat 5px center; + color: white; + padding-left: 58px; + margin-top: 50px; + } + // &.jGrowl-message { + + // } } #nav-notifications-menu { - margin: 30px 0 0 -20px; - width: 275px; - max-height: 300px; - overflow-y: auto; - font-size: 9pt; - img { - float: left; - margin-right: 5px; } - .notif-when { - font-size: 0.8em; - display: block; } - li { - word-wrap: normal; - border-bottom: 1px solid black; - &:hover { - color: black; } - } - a:hover { - color: black; - text-decoration: underline; - } + margin: 30px 0 0 -20px; + width: 275px; + max-height: 300px; + overflow-y: auto; + font-size: 9pt; + img { + float: left; + margin-right: 5px; } + .notif-when { + font-size: 0.8em; + display: block; } + li { + word-wrap: normal; + border-bottom: 1px solid black; + &:hover { + color: black; } + } + a:hover { + color: black; + text-decoration: underline; + } } nav #nav-notifications-linkmenu { - &.on .icon.s22.notify, - &.selected .icon.s22.notify { - // background-image: url("../../../images/icons/22/notify_on.png"); - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg=="); - } + &.on .icon.s22.notify, + &.selected .icon.s22.notify { + // background-image: url("../../../images/icons/22/notify_on.png"); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg=="); + } } .show { - display: block; + display: block; } #notifications { - .box(170px, 20px); - font-size: small; - top: -19px; - left: 4px; - position: absolute; + .box(170px, 20px); + font-size: small; + top: -19px; + left: 4px; + position: absolute; } #nav-floater { - position: fixed; - top: 20px; - right: 1%; - padding: 5px; - background: @dk_bg_colour; - color: transparent; - .rounded_corners; - z-index: 100; - .box(270px, 60px); + position: fixed; + top: 20px; + right: 1%; + padding: 5px; + background: @dk_bg_colour; + color: transparent; + .rounded_corners; + z-index: 100; + .box(270px, 60px); } #nav-buttons { - clear: both; - list-style: none; - padding: 0px; - margin: 0px; - height: 25px; - > li { - padding: 0; - display: inline-block; - margin: 0px -4px 0px 0px; - } + clear: both; + list-style: none; + padding: 0px; + margin: 0px; + height: 25px; + > li { + padding: 0; + display: inline-block; + margin: 0px -4px 0px 0px; + } +} +#nav-buttons-2 { + clear: both; + list-style: none; + padding: 0px; + margin: 0px; + left: 136px; + top: -20px; + position: relative; + .box(6em, 25px); + > li { + padding: 0; + display: inline-block; + margin: 0px -4px 0px 0px; + } } .floaterflip { - display: block; - position: fixed; - z-index: 110; - top: 56px; - right: 19px; - .box(22px, 22px); - overflow: hidden; - margin: 0px; - background: transparent url(dark/icons.png) -190px -60px no-repeat; + display: block; + position: fixed; + z-index: 110; + top: 56px; + right: 19px; + .box(22px, 22px); + overflow: hidden; + margin: 0px; + background: transparent url(dark/icons.png) -190px -60px no-repeat; } .search-box { - display: inline-block; - margin: 5px; - position: fixed; - right: 0px; - bottom: 0px; - z-index: 100; - background: @dk_bg_colour; - .rounded_corners; + display: inline-block; + margin: 5px; + position: fixed; + right: 0px; + bottom: 0px; + z-index: 100; + background: @dk_bg_colour; + .rounded_corners; } #search-text, #mini-search-text { - background: white; - color: @bg_colour; + background: white; + color: @bg_colour; } #search-text { - .borders(1px, solid, @main_alt_colour); - margin: 5px 0; + .borders(1px, solid, @main_alt_colour); + margin: 5px 0; } #mini-search-text { - font-size: 8pt; - height: 14px; - width: 10em; - margin: 5px; + font-size: 8pt; + height: 14px; + width: 10em; + margin: 5px; } #scrollup { - position: fixed; - right: 5px; - bottom: 40px; - z-index: 100; - a:hover { - text-decoration: none; - border: 0; - } + position: fixed; + right: 5px; + bottom: 40px; + z-index: 100; + a:hover { + text-decoration: none; + border: 0; + } } #user-menu { - .box_shadow(5px, 0, 10px, 0); - display: block; - width: 80%; - margin: 3px 0 0 0; - position: relative; - .rounded_corners; - background-color: @menu_bg_colour; - background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q=="); - background-position: 98% center; - background-repeat: no-repeat; - clear: both; - top: 4px; - left: 10px; - padding: 2px; - > a { - vertical-align: top; - outline: 0 none; - } + .box_shadow(5px, 0, 10px, 0); + display: block; + width: 35%; + margin: 5px 0 0 0; + position: relative; + .rounded_corners; + background-color: @menu_bg_colour; + background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q=="); + background-position: 98% center; + background-repeat: no-repeat; +/* clear: both;*/ + top: 4px; + left: 7px; + padding: 2px; + > a { + vertical-align: top; + outline: 0 none; + } } #user-menu-label { - font-size: small; - padding: 3px 20px 9px 5px; - height: 10px; + font-size: small; + padding: 0px 20px 10px 5px; + height: 10px; + display: block; } .nav-ajax-update, .nav-ajax-left { - .box(30px, 19px); - background: transparent url(dark/notifications.png) 0 0 no-repeat; - color: @shadow_colour; - font-weight: bold; - font-size: 0.8em; - padding-top: 0.2em; - text-align: center; - float: left; - margin: 0 -1px 0 3px; - display: block; - visibility: hidden; + .box(30px, 19px); + background: transparent url(dark/notifications.png) 0 0 no-repeat; + color: @shadow_colour; + font-weight: bold; + font-size: 0.8em; + padding-top: 0.2em; + text-align: center; + float: left; + margin: 0 -1px 0 3px; + display: block; + visibility: hidden; } .nav-ajax-update.show, .nav-ajax-left.show { - visibility: visible; + visibility: visible; } #net-update { - background-position: 0px 0px; + background-position: 0px 0px; } #mail-update { - background-position: -30px 0; + background-position: -30px 0; } #notify-update { - background-position: -60px 0px; + background-position: -60px 0px; } #home-update { - background-position: -90px 0px; + background-position: -90px 0px; } #intro-update { - background-position: -120px 0px; + background-position: -120px 0px; } #lang-select-icon { - cursor: pointer; - position: fixed; - left: 28px; - bottom: 6px; - z-index: 10; + cursor: pointer; + position: fixed; + left: 28px; + bottom: 6px; + z-index: 10; } #language-selector { - position: fixed; - bottom: 2px; - left: 52px; - z-index: 10; + position: fixed; + bottom: 2px; + left: 52px; + z-index: 10; } .menu-popup { - position: absolute; - display: none; - // width: 11em; - background: white; - color: @bg_colour; - margin: 0px; - padding: 0px; - font-size: small; - line-height: 1.2; - .borders(3px, solid, @link_colour); - .rounded_corners; - z-index: 100000; - .box_shadow; - a { - display: block; - color: @bg_colour; - padding: 5px 10px; - text-decoration: none; - &:hover { - color: @main_colour; - background-color: @link_colour; - } - } - .menu-sep { - border-top: 1px solid @med_bg_colour; - } - li { - float: none; - overflow: auto; - height: auto; - display: block; - img { - float: left; - .box(16px, 16px); - padding-right: 5px; - } - } - .empty { - padding: 5px; - text-align: center; - color: lighten(@shiny_colour, 45%); - } + position: absolute; + display: none; + // width: 11em; + background: white; + color: @bg_colour; + margin: 0px; + padding: 0px; + font-size: small; + line-height: 1.2; + .borders(3px, solid, @link_colour); + .rounded_corners; + z-index: 100000; + .box_shadow; + a { + display: block; + color: @bg_colour; + padding: 5px 10px; + text-decoration: none; + &:hover { + color: @main_colour; + background-color: @link_colour; + } + } + .menu-sep { + border-top: 1px solid @med_bg_colour; + } + li { + float: none; + overflow: auto; + height: auto; + display: block; + img { + float: left; + .box(16px, 16px); + padding-right: 5px; + } + } + .empty { + padding: 5px; + text-align: center; + color: lighten(@shiny_colour, 45%); + } } .notif-item { - font-size: small; - a { - vertical-align: middle; - } + font-size: small; + a { + vertical-align: middle; + } } .notif-image { - .box(32px, 32px); - padding: 7px 7px 0px 0px; + .box(32px, 32px); + padding: 7px 7px 0px 0px; } .notify-seen { - background: @disabled_colour; - color: @main_colour; + background: @disabled_colour; + color: @main_colour; } .notify-unseen { - color: @main_colour; + color: @main_colour; } @@ -837,32 +874,32 @@ nav #nav-notifications-linkmenu { * sysmsg */ #sysmsg_info { - position: fixed; - bottom: 0; - .box_shadow(@main_shadow); - padding: 10px; - background-color: @lt_orange; - .borders(2px, solid, @orange); - border-bottom: 0; - padding-bottom: 50px; - z-index: 1000; + position: fixed; + bottom: 0; + .box_shadow(@main_shadow); + padding: 10px; + background-color: @lt_orange; + .borders(2px, solid, @orange); + border-bottom: 0; + padding-bottom: 50px; + z-index: 1000; } #sysmsg { - position: fixed; - bottom: 0; - .box_shadow(@main_shadow); - padding: 10px; - background-color: @lt_orange; - .borders(2px, solid, @orange); - border-bottom: 0; - padding-bottom: 50px; - z-index: 1000; + position: fixed; + bottom: 0; + .box_shadow(@main_shadow); + padding: 10px; + background-color: @lt_orange; + .borders(2px, solid, @orange); + border-bottom: 0; + padding-bottom: 50px; + z-index: 1000; } #sysmsg_info br, #sysmsg br { - display: block; - margin: 2px 0px; - border-top: 1px solid @main_colour; + display: block; + margin: 2px 0px; + border-top: 1px solid @main_colour; } @@ -870,85 +907,85 @@ nav #nav-notifications-linkmenu { * aside */ #asidemain { - float: left; - font-size: small; - margin: 1em; - width: 25%; - display: inline; + float: left; + font-size: small; + margin: 1em; + width: 25%; + display: inline; } /* for now, disappear these */ #asideright, #asideleft { - display: none; + display: none; } .vcard { - .fn { - font-size: 1.5em; - font-weight: bold; - border-bottom: 1px solid @hover_colour; - padding-bottom: 3px; - } - #profile-photo-wrapper { - margin: 20px 0; - background-color: @menu_bg_colour; - padding: 5px; - .box(175px, 175px); - .rounded_corners; - .box_shadow(3px, 3px, 10px, 0); - } + .fn { + font-size: 1.5em; + font-weight: bold; + border-bottom: 1px solid @hover_colour; + padding-bottom: 3px; + } + #profile-photo-wrapper { + margin: 20px 0; + background-color: @menu_bg_colour; + padding: 5px; + .box(175px, 175px); + .rounded_corners; + .box_shadow(3px, 3px, 10px, 0); + } } #asidemain { - h4 { - font-size: 1.2em; } - #viewcontacts { - text-align: right; - } - #contact-block { - width: 99%; - .contact-block-content { - width: 99%; - .contact-block-div { - float: left; - margin: 0 5px 5px 0; - .box(50px, 50px); - padding: 3px; - position: relative; } } } + h4 { + font-size: 1.2em; } + #viewcontacts { + text-align: right; + } + #contact-block { + width: 99%; + .contact-block-content { + width: 99%; + .contact-block-div { + float: left; + margin: 0 5px 5px 0; + .box(50px, 50px); + padding: 3px; + position: relative; } } } } .aprofile dt { - background: @main_colour; - color: @bg_colour; - font-weight: bold; - .box_shadow(3px, 3px, 5px); - .rounded_corners; - margin: 15px 0 5px; - padding-left: 5px; + background: @main_colour; + color: @bg_colour; + font-weight: bold; + .box_shadow(3px, 3px, 5px); + .rounded_corners; + margin: 15px 0 5px; + padding-left: 5px; } #profile-extra-links ul { - margin-left: 0px; - padding-left: 0px; - list-style: none; + margin-left: 0px; + padding-left: 0px; + list-style: none; } #dfrn-request-link { - .rounded_corners; - color: @main_colour; - display: block; - font-size: 1.2em; - padding: 0.2em 0.5em; - background-color: @friendica_blue; - // background-image: url(icons/connect.png); - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII="); - background-repeat: no-repeat; - background-position: 95% center; + .rounded_corners; + color: @main_colour; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; + background-color: @friendica_blue; + // background-image: url(icons/connect.png); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII="); + background-repeat: no-repeat; + background-position: 95% center; } #wallmessage-link { - ///*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/ - ///*border-radius: 5px 5px 5px 5px;*/ - color: @main_alt_colour; - display: block; - font-size: 1.2em; - padding: 0.2em 0.5em; + ///*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/ + ///*border-radius: 5px 5px 5px 5px;*/ + color: @main_alt_colour; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; } .ttright { - margin: 0px; + margin: 0px; } @@ -956,12 +993,12 @@ nav #nav-notifications-linkmenu { * contacts block */ .contact-block-div { - .box(50px, 50px); - float: left; + .box(50px, 50px); + float: left; } .contact-block-textdiv { - .box(150px, 34px); - float: left; + .box(150px, 34px); + float: left; } @@ -969,96 +1006,96 @@ nav #nav-notifications-linkmenu { * jot */ #jot { - margin: 10px 0 20px 0px; - width: 100%; - #jot-tools { - margin: 0px; - padding: 0px; - .box(100%, 35px); - overflow: none; - span { - float: left; - margin: 10px 20px 2px 0px; - a { - display: block; - } - } - .perms { - float: right; - width: 40px; - } - li.loading { - float: right; - background-color: white; - .box(20px, 38px); - vertical-align: center; - text-align: center; - border-top: 2px solid #9eabb0; - img { - margin-top: 10px; - } - } - } - #jot-title { - .borders(1px, solid, darken(@main_alt_colour, 13%)); - margin: 0 0 5px; - .box(90%, 20px); - font-weight: bold; - .rounded_corners; - vertical-align: middle; - } + margin: 10px 0 20px 0px; + width: 100%; + #jot-tools { + margin: 0px; + padding: 0px; + .box(100%, 35px); + overflow: none; + span { + float: left; + margin: 10px 20px 2px 0px; + a { + display: block; + } + } + .perms { + float: right; + width: 40px; + } + li.loading { + float: right; + background-color: white; + .box(20px, 38px); + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + img { + margin-top: 10px; + } + } + } + #jot-title { + .borders(1px, solid, darken(@main_alt_colour, 13%)); + margin: 0 0 5px; + .box(90%, 20px); + font-weight: bold; + .rounded_corners; + vertical-align: middle; + } } #jot-category { - margin: 5px 0; - .rounded_corners; - .borders(1px, solid, darken(@main_alt_colour, 33%)); - color: darken(@main_alt_colour, 27%); - font-size: smaller; - &:focus { - color: @main_alt_colour; - } + margin: 5px 0; + .rounded_corners; + .borders(1px, solid, darken(@main_alt_colour, 33%)); + color: darken(@main_alt_colour, 27%); + font-size: smaller; + &:focus { + color: @main_alt_colour; + } } #jot #character-counter { - .box(6%, 15px); - float: right; - text-align: right; - line-height: 20px; - padding: 2px 20px 5px 0; + .box(6%, 15px); + float: right; + text-align: right; + line-height: 20px; + padding: 2px 20px 5px 0; } #profile-jot-text_parent { - .box_shadow(5px, 0, 10px, 0); + .box_shadow(5px, 0, 10px, 0); } #profile-jot-text_tbl { - margin-bottom: 10px; - background: darken(@main_alt_colour, 46.8%); + margin-bottom: 10px; + background: darken(@main_alt_colour, 46.8%); } #profile-jot-text_ifr { - width: 99.900002% !important; + width: 99.900002% !important; } #profile-jot-text_toolbargroup, .mceCenter tr { - background: darken(@main_alt_colour, 46.8%); + background: darken(@main_alt_colour, 46.8%); } [id$="jot-text_ifr"] { - // width: 99.900002% !important; - color: @bg_colour; - background: @main_colour; - .mceContentBody { - color: @bg_colour; - background: @main_colour; - } + // width: 99.900002% !important; + color: @bg_colour; + background: @main_colour; + .mceContentBody { + color: @bg_colour; + background: @main_colour; + } } .defaultSkin { - tr.mceFirst { - background: darken(@main_alt_colour, 46.8%); - } - td { - &.mceFirst, &.mceLast { - background-color: @main_colour; - } - } - span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon { - background-color: @main_colour; - } + tr.mceFirst { + background: darken(@main_alt_colour, 46.8%); + } + td { + &.mceFirst, &.mceLast { + background-color: @main_colour; + } + } + span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon { + background-color: @main_colour; + } } #profile-attach-wrapper, #profile-audio-wrapper, @@ -1068,92 +1105,92 @@ nav #nav-notifications-linkmenu { #profile-title-wrapper, #profile-upload-wrapper, #profile-video-wrapper { - float: left; - margin: 0 20px 0 0; + float: left; + margin: 0 20px 0 0; } #profile-rotator-wrapper { - float: right; + float: right; } #profile-jot-email-wrapper { - margin: 10px 10% 0; - .borders(1px, solid, @menu_bg_colour); - border-bottom: 0; + margin: 10px 10% 0; + .borders(1px, solid, @menu_bg_colour); + border-bottom: 0; } #profile-jot-email-label { - background-color: @menu_bg_colour; - color: @main_colour; - padding: 5px; + background-color: @menu_bg_colour; + color: @main_colour; + padding: 5px; } #profile-jot-email { - width: 90%; - margin: 5px; + width: 90%; + margin: 5px; } #profile-jot-networks { - margin: 0 10%; - border: 1px solid @menu_bg_colour; - border-top: 0; - border-bottom: 0; - padding: 5px; + margin: 0 10%; + border: 1px solid @menu_bg_colour; + border-top: 0; + border-bottom: 0; + padding: 5px; } #profile-jot-net { - margin: 5px 0; + margin: 5px 0; } #jot-preview-link { - margin: 0 0 0 10px; - border: 0; - text-decoration: none; - float: right; + margin: 0 0 0 10px; + border: 0; + text-decoration: none; + float: right; } .icon-text-preview { - margin: 0 0 -18px 0; - display: block; - .box(20px, 20px); - background: url(dark/icons.png) no-repeat -128px -40px; - border: 0; - text-decoration: none; - float: right; - cursor: pointer; + margin: 0 0 -18px 0; + display: block; + .box(20px, 20px); + background: url(dark/icons.png) no-repeat -128px -40px; + border: 0; + text-decoration: none; + float: right; + cursor: pointer; } #profile-jot-perms { - float: right; - color: @menu_bg_colour; - .box(20px, 20px); - .rounded_corners; - .box_shadow(3px, 3px, 5px, 0); - .borders(2px, outset, @menu_bg_colour); - overflow: hidden; - margin: 0 10px 0 10px; + float: right; + color: @menu_bg_colour; + .box(20px, 20px); + .rounded_corners; + .box_shadow(3px, 3px, 5px, 0); + .borders(2px, outset, @menu_bg_colour); + overflow: hidden; + margin: 0 10px 0 10px; } #profile-jot-plugin-wrapper { - width: 1px; - margin: 10px 0 0 0; - float: right; + width: 1px; + margin: 10px 0 0 0; + float: right; } #profile-jot-submit-wrapper { - float: right; - width: 100%; - margin: 10px 0 0 0; - padding: 0; + float: right; + width: 100%; + margin: 10px 0 0 0; + padding: 0; } #profile-jot-submit { - height: auto; - background-color: @menu_bg_colour; - color: @main_alt_colour; - .rounded_corners; - .borders(2px, outset, @shiny_colour); - margin: 0; - float: right; - .text_shadow; - width: auto; - &:active { - .box_shadow(0, 0, 0, 0); - } + height: auto; + background-color: @menu_bg_colour; + color: @main_alt_colour; + .rounded_corners; + .borders(2px, outset, @shiny_colour); + margin: 0; + float: right; + .text_shadow; + width: auto; + &:active { + .box_shadow(0, 0, 0, 0); + } } #jot-perms-icon { - .box(22px, 22px); - .rounded_corners; - overflow: hidden; - background: @menu_bg_colour url("dark/icons.png") -88px -40px; + .box(22px, 22px); + .rounded_corners; + overflow: hidden; + background: @menu_bg_colour url("dark/icons.png") -88px -40px; } #group_allow_wrapper, #group_deny_wrapper, @@ -1161,67 +1198,67 @@ nav #nav-notifications-linkmenu { #contact_allow_wrapper, #contact_deny_wrapper, #acl-deny-outer-wrapper { - width: 47%; + width: 47%; } #group_allow_wrapper, #group_deny_wrapper, #acl-permit-outer-wrapper { - float: left; + float: left; } #contact_allow_wrapper, #contact_deny_wrapper, #acl-deny-outer-wrapper { - float: right; + float: right; } #acl-permit-text { - background-color: darken(@main_alt_colour, 60%); - color: @main_colour; - padding: 5px; - float: left; + background-color: darken(@main_alt_colour, 60%); + color: @main_colour; + padding: 5px; + float: left; } #jot-public { - background-color: darken(@main_alt_colour, 60%); - color: @alert; - padding: 5px; - float: left; + background-color: darken(@main_alt_colour, 60%); + color: @alert; + padding: 5px; + float: left; } #acl-deny-text { - background-color: darken(@main_alt_colour, 60%); - color: @main_colour; - padding: 5px; - float: left; + background-color: darken(@main_alt_colour, 60%); + color: @main_colour; + padding: 5px; + float: left; } #jot-title-desc { - color: darken(@main_alt_colour, 13%); + color: darken(@main_alt_colour, 13%); } #profile-jot-desc { - background: @bg_colour; - .borders; - .rounded_corners; - color: @red_orange; - margin: 5px 0; + background: @bg_colour; + .borders; + .rounded_corners; + color: @red_orange; + margin: 5px 0; } #jot-title-wrapper { - margin-bottom: 5px; + margin-bottom: 5px; } #jot-title-display { - font-weight: bold; + font-weight: bold; } .jothidden { - display: none; + display: none; } #jot-preview-content { - background-color: @shiny_colour; - color: @main_colour; - .borders(1px, solid, @bg_colour); - .rounded_corners; - .box_shadow(5px, 0, 10px); - padding: 3px 3px 6px 10px; - .wall-item-outside-wrapper { - border: 0; - .rounded_corners(0px 0px 0px 0px); - .box_shadow(0, 0, 0, 0); - } + background-color: @shiny_colour; + color: @main_colour; + .borders(1px, solid, @bg_colour); + .rounded_corners; + .box_shadow(5px, 0, 10px); + padding: 3px 3px 6px 10px; + .wall-item-outside-wrapper { + border: 0; + .rounded_corners(0px 0px 0px 0px); + .box_shadow(0, 0, 0, 0); + } } @@ -1229,12 +1266,12 @@ nav #nav-notifications-linkmenu { * section */ #sectionmain { - margin: 1em; - font-size: 0.8em; - min-width: 475px; - width: 69%; - float: left; - display: inline; + margin: 1em; + font-size: 0.8em; + min-width: 475px; + width: 69%; + float: left; + display: inline; } @@ -1242,51 +1279,51 @@ nav #nav-notifications-linkmenu { * tabs */ .tabs { - .list_reset; - margin: 10px 0; - li { - display: inline; - font-size: smaller; - } + .list_reset; + margin: 10px 0; + li { + display: inline; + font-size: smaller; + } } .multibutton () { - .borders(1px, solid, @hover_colour); - padding: 4px; - .rounded_corners; - &:active, - &:hover { - background: @shiny_colour; - color: @main_colour; - .borders(1px, solid, @hover_colour); - } - a { - border: 0; - text-decoration: none; - } + .borders(1px, solid, @hover_colour); + padding: 4px; + .rounded_corners; + &:active, + &:hover { + background: @shiny_colour; + color: @main_colour; + .borders(1px, solid, @hover_colour); + } + a { + border: 0; + text-decoration: none; + } } .multibutton_active () { - background: @main_colour; - color: @bg_colour; - .borders(1px, solid, @hover_colour); - padding: 4px; - .rounded_corners; - &:hover { - background: @shiny_colour; - color: @main_colour; - .borders(1px, solid, @hover_colour); - } - a { - color: @bg_colour; - text-decoration: none; - } + background: @main_colour; + color: @bg_colour; + .borders(1px, solid, @hover_colour); + padding: 4px; + .rounded_corners; + &:hover { + background: @shiny_colour; + color: @main_colour; + .borders(1px, solid, @hover_colour); + } + a { + color: @bg_colour; + text-decoration: none; + } } .tab { - .multibutton; + .multibutton; } .tab { - &.active { - .multibutton_active; - } + &.active { + .multibutton_active; + } } @@ -1294,223 +1331,223 @@ nav #nav-notifications-linkmenu { * items */ .wall-item-outside-wrapper { - .borders(1px, solid, darken(@main_alt_colour, 27%)); - .rounded_corners; - .box_shadow(6px, 1px, 10px, -2px);//@lt_shadow_colour - &.comment { - margin-top: 5px; - } + .borders(1px, solid, darken(@main_alt_colour, 27%)); + .rounded_corners; + .box_shadow(6px, 1px, 10px, -2px);//@lt_shadow_colour + &.comment { + margin-top: 5px; + } } .wall-item-content-wrapper { - position: relative; - padding: 0.75em; - width: auto; + position: relative; + padding: 0.75em; + width: auto; } .wall-item-outside-wrapper .wall-item-comment-wrapper { - /*margin-left: 90px;*/ - .preview { - border: 0; - .rounded_corners(0px); - } + /*margin-left: 90px;*/ + .preview { + border: 0; + .rounded_corners(0px); + } } .shiny { - background: @shiny_colour; - .rounded_corners; + background: @shiny_colour; + .rounded_corners; } .wall-outside-wrapper .shiny { - .rounded_corners; + .rounded_corners; } .heart { - color: red; + color: red; } .wall-item-content { - overflow-x: auto; - margin: 0px 4em 1em 5px; + overflow-x: auto; + margin: 0px 4em 1em 5px; } [id^="tread-wrapper"], [class^="tread-wrapper"] { - margin: 1.2em 0 0 0; - padding: 0px; + margin: 1.2em 0 0 0; + padding: 0px; } .wall-item-photo-menu { - display: none; + display: none; } .wall-item-photo-menu-button { - display: none; - text-indent: -99999px; - background: @menu_bg_colour url(dark/menu-user-pin.jpg) no-repeat 75px center; - position: absolute; - overflow: hidden; - .box(90px, 20px); - top: 85px; - left: 0; - .rounded_corners(0 0 5px 5px); + display: none; + text-indent: -99999px; + background: @menu_bg_colour url(dark/menu-user-pin.jpg) no-repeat 75px center; + position: absolute; + overflow: hidden; + .box(90px, 20px); + top: 85px; + left: 0; + .rounded_corners(0 0 5px 5px); } .wall-item-info { - float: left; - width: 7em; - position: relative; + float: left; + width: 7em; + position: relative; } .wall-item-photo-wrapper { - .box(80px, 80px); - position: relative; - padding: 5px; - background-color: @menu_bg_colour; - .rounded_corners; + .box(80px, 80px); + position: relative; + padding: 5px; + background-color: @menu_bg_colour; + .rounded_corners; } [class^="wall-item-tools"] * { - /*margin: 0 0 5px 0;*/ - > * { - /*margin: 0 0 5px 0;*/ - } + /*margin: 0 0 5px 0;*/ + > * { + /*margin: 0 0 5px 0;*/ + } } .wall-item-tools { - float: right; - opacity: 0.4; - .transition; - &:hover { - opacity: 1; - .transition; - } + float: right; + opacity: 0.4; + .transition; + &:hover { + opacity: 1; + .transition; + } } .wall-item-subtools1 { - .box(30px, 30px); - list-style: none outside none; - margin: 18px 0 30px -20px; - padding: 0; + .box(30px, 30px); + list-style: none outside none; + margin: 18px 0 30px -20px; + padding: 0; } .wall-item-subtools2 { - .box(25px, 25px); - list-style: none outside none; - margin: -78px 0 0 5px; - padding: 0; + .box(25px, 25px); + list-style: none outside none; + margin: -78px 0 0 5px; + padding: 0; } .wall-item-title { - font-size: 1.2em; - font-weight: bold; - margin-bottom: 1.4em; + font-size: 1.2em; + font-weight: bold; + margin-bottom: 1.4em; } .wall-item-body { - margin: 15px 10px 10px 0px; - text-align: left; - overflow-x: auto; + margin: 15px 10px 10px 0px; + text-align: left; + overflow-x: auto; } .wall-item-lock-wrapper { - float: right; - .box(22px, 22px); - margin: 0 -5px 0 0; - opacity: 1; + float: right; + .box(22px, 22px); + margin: 0 -5px 0 0; + opacity: 1; } .wall-item-dislike, .wall-item-like { - clear: left; - font-size: 0.8em; - color: lighten(@menu_bg_colour, 20%); - margin: 5px 0 5px 10.2em; - .transition; - opacity: 0.5; - &:hover { - opacity: 1; - } + clear: left; + font-size: 0.8em; + color: lighten(@menu_bg_colour, 20%); + margin: 5px 0 5px 10.2em; + .transition; + opacity: 0.5; + &:hover { + opacity: 1; + } } .wall-item-author, .wall-item-actions-author, .wall-item-ago { - color: @main_colour; - line-height: 1; - display: inline-block; - font-size: x-small; - margin: 0.5em auto; - font-weight: bold; + color: @main_colour; + line-height: 1; + display: inline-block; + font-size: x-small; + margin: 0.5em auto; + font-weight: bold; } .comment-edit-preview { - width: auto; - margin: auto auto auto -2em; - &.wall-item-author, - &.wall-item-actions-author, - &.wall-item-ago { - font-size: smaller; - } + width: auto; + margin: auto auto auto -2em; + &.wall-item-author, + &.wall-item-actions-author, + &.wall-item-ago { + font-size: smaller; + } } .wall-item-location { - margin-top: 2em; - width: 6em; - overflow: hidden; - .text_overflow; - .icon { - float: left; - } - > a, - .smalltext { - margin-left: 25px; - font-size: 0.7em; - display: block; - } - > br { - display: none; - } + margin-top: 2em; + width: 6em; + overflow: hidden; + .text_overflow; + .icon { + float: left; + } + > a, + .smalltext { + margin-left: 25px; + font-size: 0.7em; + display: block; + } + > br { + display: none; + } } .wallwall { - .wwto { - left: 5px; - margin: 0; - position: absolute; - top: 75px; - z-index: 10001; - .box(30px, 30px); - img { - width: 30px !important; - height: 30px !important; - } - } - .wall-item-photo-end { - clear: both; - } + .wwto { + left: 5px; + margin: 0; + position: absolute; + top: 75px; + z-index: 10001; + .box(30px, 30px); + img { + width: 30px !important; + height: 30px !important; + } + } + .wall-item-photo-end { + clear: both; + } } .wall-item-arrowphoto-wrapper { - position: absolute; - left: 35px; - top: 80px; - z-index: 10002; + position: absolute; + left: 35px; + top: 80px; + z-index: 10002; } .wall-item-photo-menu { - min-width: 92px; - font-size: 0.75em; - .borders(2px, solid, @menu_bg_colour); - border-top: 0px; - background: @menu_bg_colour; - position: absolute; - left: -2px; - top: 101px; - display: none; - z-index: 10003; - .rounded_corners(0 5px 5px 5px); - li a { - white-space: nowrap; - display: block; - padding: 5px 6px; - color: @main_alt_colour; - &:hover { - color: @menu_bg_colour; - background: @main_alt_colour; - } - } + min-width: 92px; + font-size: 0.75em; + .borders(2px, solid, @menu_bg_colour); + border-top: 0px; + background: @menu_bg_colour; + position: absolute; + left: -2px; + top: 101px; + display: none; + z-index: 10003; + .rounded_corners(0 5px 5px 5px); + li a { + white-space: nowrap; + display: block; + padding: 5px 6px; + color: @main_alt_colour; + &:hover { + color: @menu_bg_colour; + background: @main_alt_colour; + } + } } #item-delete-selected { - overflow: auto; - width: 100%; + overflow: auto; + width: 100%; } #connect-services-header, #extra-help-header { - margin: 1.5em 0 0 0; + margin: 1.5em 0 0 0; } #connect-services, #extra-help { - .list_reset; - margin: 1em 0 0 0; - li { - display: inline; - } + .list_reset; + margin: 1em 0 0 0; + li { + display: inline; + } } @@ -1518,36 +1555,36 @@ nav #nav-notifications-linkmenu { * comment */ .ccollapse-wrapper { - font-size: 0.9em; - margin-left: 5em; + font-size: 0.9em; + margin-left: 5em; } .hide-comments-outer { - font-size: small; + font-size: small; } .wall-item-outside-wrapper.comment { - margin-left: 5em; - .wall-item-info { - width: 5em; - } - .wall-item-photo { - width: 40px !important; - height: 40px !important; - } - .wall-item-photo-wrapper { - .box(40px, 40px); - } - .wall-item-photo-menu-button { - width: 3.35em; - top: 3.2em; - background-position: 35px center; - } - .wall-item-author { - margin-left: 0.2em; - } - .wall-item-photo-menu { - min-width: 4.5em; - top: 5.5em; - } + margin-left: 5em; + .wall-item-info { + width: 5em; + } + .wall-item-photo { + width: 40px !important; + height: 40px !important; + } + .wall-item-photo-wrapper { + .box(40px, 40px); + } + .wall-item-photo-menu-button { + width: 3.35em; + top: 3.2em; + background-position: 35px center; + } + .wall-item-author { + margin-left: 0.2em; + } + .wall-item-photo-menu { + min-width: 4.5em; + top: 5.5em; + } } .comment-wwedit-wrapper { .borders(1px, solid, @main_colour); @@ -1555,61 +1592,61 @@ nav #nav-notifications-linkmenu { margin: 5px; } .comment-edit-wrapper { - border-top: 1px #aaa solid; + border-top: 1px #aaa solid; } [class^="comment-edit-bb"] { - .list_reset; - display: none; - margin: -40px 0 5px 60px; - width: 75%; - > li { - display: inline-block; - margin: 0 10px 0 0; - visibility: none; - } + .list_reset; + display: none; + margin: -40px 0 5px 60px; + width: 75%; + > li { + display: inline-block; + margin: 0 10px 0 0; + visibility: none; + } } .comment-wwedit-wrapper img, .comment-edit-wrapper img { - .box; + .box; } .comment-edit-photo-link, .comment-edit-photo { - margin-left: 10px; + margin-left: 10px; } .my-comment-photo { - .box(40px, 40px); - padding: 5px; + .box(40px, 40px); + padding: 5px; } [class^="comment-edit-text"] { - margin: 5px 0 10px 20px; - width: 94%; + margin: 5px 0 10px 20px; + width: 94%; } .comment-edit-text-empty { - height: 20px; - .med_borders; - .rounded_corners; - color: @med_border_colour; - .transition; - &:hover { - color: darken(@main_alt_colour, 33.5%); - } + height: 20px; + .med_borders; + .rounded_corners; + color: @med_border_colour; + .transition; + &:hover { + color: darken(@main_alt_colour, 33.5%); + } } .comment-edit-text-full { - height: 10em; - .rounded_corners; - .transition; + height: 10em; + .rounded_corners; + .transition; } .comment-edit-submit-wrapper { - width: 90%; - margin: 5px 5px 10px 50px; - text-align: right; + width: 90%; + margin: 5px 5px 10px 50px; + text-align: right; } .comment-edit-submit { - height: 22px; - background-color: @menu_bg_colour; - color: @main_alt_colour; - .rounded_corners; - border: 0; + height: 22px; + background-color: @menu_bg_colour; + color: @main_alt_colour; + .rounded_corners; + border: 0; } @@ -1621,14 +1658,14 @@ nav #nav-notifications-linkmenu { border-bottom: 1px dashed darken(@main_alt_colour, 13.5%); border-left: 5px solid darken(@main_alt_colour, 13.5%); border-top: 1px dashed darken(@main_alt_colour, 13.5%); - color: @main_colour; + color: @main_colour; display: block; overflow-x: auto; padding: 5px 0 15px 10px; width: 95%; - a { - color: @lt_link_colour; - } + a { + color: @lt_link_colour; + } } @@ -1636,47 +1673,47 @@ nav #nav-notifications-linkmenu { * profile */ div { - &[id$="text"] { - font-weight: bold; - border-bottom: 1px solid darken(@main_alt_colour, 13.5%); - } - &[id$="wrapper"] { - height: 100%; - br { - clear: left; - } - } + &[id$="text"] { + font-weight: bold; + border-bottom: 1px solid darken(@main_alt_colour, 13.5%); + } + &[id$="wrapper"] { + height: 100%; + br { + clear: left; + } + } } .profile-match-wrapper { - float: left; - margin: 0 5px 40px 0; - .box(120px, 120px); - padding: 3px; - position: relative; + float: left; + margin: 0 5px 40px 0; + .box(120px, 120px); + padding: 3px; + position: relative; } .icon.drophide.profile-match-ignore { - margin: 0 6px 0 -3px; + margin: 0 6px 0 -3px; } .profile-match-photo { - + } [id$="-end"], [class$="-end"] { - clear: both; - margin: 0 0 10px 0; + clear: both; + margin: 0 0 10px 0; } .profile-match-end { - margin: 0 0 5px 0; + margin: 0 0 5px 0; } .profile-match-name { - font-weight: bold; - margin: auto auto auto 23px; + font-weight: bold; + margin: auto auto auto 23px; } .profile-match-connect { - font-style: italic; - margin: auto auto auto 23px; + font-style: italic; + margin: auto auto auto 23px; } #advanced-profile-with { - margin-left: 200px; + margin-left: 200px; } @@ -1684,98 +1721,98 @@ div { * photos */ .photos { - height: auto; - overflow: auto; + height: auto; + overflow: auto; } #photo-top-links { - margin-bottom: 30px; + margin-bottom: 30px; } .photo-album-image-wrapper, .photo-top-image-wrapper { - float: left; - .box_shadow(3px, 3px, 10px, 0); - background-color: darken(@main_alt_colour, 80%); - color: @bg_colour; - .rounded_corners; - padding-bottom: 30px; - position: relative; - margin: 0 10px 10px 0; + float: left; + .box_shadow(3px, 3px, 10px, 0); + background-color: darken(@main_alt_colour, 80%); + color: @bg_colour; + .rounded_corners; + padding-bottom: 30px; + position: relative; + margin: 0 10px 10px 0; } #photo-photo { - margin: auto auto 5em 20%; - img { - max-width: 50%; - } + margin: auto auto 5em 20%; + img { + max-width: 50%; + } } .photo-top-image-wrapper a:hover, #photo-photo a:hover, .photo-album-image-wrapper a:hover { - border-bottom: 0; + border-bottom: 0; } .photo-top-photo, .photo-album-photo { - .rounded_corners(5px 5px 0 0); + .rounded_corners(5px 5px 0 0); } .photo-top-album-name, .caption { - position: absolute; - bottom: 0; - padding: 0 5px; + position: absolute; + bottom: 0; + padding: 0 5px; } #photo-prev-link, #photo-next-link { - position: absolute; - // .box(30%, 100%); - .box(50px, 200px); - background: white center center no-repeat; - opacity: 0; - .transition(all, 0.5s); - z-index: 10; - top: 15em; - .rounded_corners; - &:hover { - opacity: 0.6; - .transition(all, 0.5s); - } - .icon { - display: none; - } + position: absolute; + // .box(30%, 100%); + .box(50px, 200px); + background: white center center no-repeat; + opacity: 0; + .transition(all, 0.5s); + z-index: 10; + top: 15em; + .rounded_corners; + &:hover { + opacity: 0.6; + .transition(all, 0.5s); + } + .icon { + display: none; + } } #photo-prev-link { - // background-image: url(dark/prev.png); - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII="); + // background-image: url(dark/prev.png); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII="); left: 5%; } #photo-next-link { - // background-image: url(dark/next.png); - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII="); + // background-image: url(dark/next.png); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII="); left: 50%; } #photo-prev-link a, #photo-next-link a { - display: block; - .box(100%, 100%); - .rounded_corners; - overflow: hidden; - text-indent: -900000px; + display: block; + .box(100%, 100%); + .rounded_corners; + overflow: hidden; + text-indent: -900000px; } #photos-upload-spacer, #photos-upload-new-wrapper, #photos-upload-exist-wrapper { - margin-bottom: 1em; + margin-bottom: 1em; } #photos-upload-existing-album-text, #photos-upload-newalbum-div { - background-color: @menu_bg_colour; - color: @main_alt_colour; - padding: 1px; + background-color: @menu_bg_colour; + color: @main_alt_colour; + padding: 1px; } #photos-upload-album-select, #photos-upload-newalbum { - width: 99%; + width: 99%; } #photos-upload-perms-menu { - text-align: right; + text-align: right; } #photo-edit-caption, #photo-edit-newtag, @@ -1783,45 +1820,45 @@ div { } #photo-edit-link-wrap { - margin-bottom: 15px; + margin-bottom: 15px; } #photo-edit-caption, #photo-edit-newtag { } #photo-edit-perms { - width: auto; + width: auto; } #photo-edit-rotate-label { - .label; + .label; } #photo-like-div { - float: left; - margin: auto 0 0; - width: 2em; - .rounded_corners; - .borders; + float: left; + margin: auto 0 0; + width: 2em; + .rounded_corners; + .borders; } .wall-item-like-buttons { - > * { - display: inline; - } + > * { + display: inline; + } } #photo-edit-delete-button { - margin: auto auto auto 1em; + margin: auto auto auto 1em; } #photo-edit-end { - margin-bottom: 35px; + margin-bottom: 35px; } #photo-caption { - font-size: 110%; - font-weight: bold; - margin-top: 15px; - margin-bottom: 15px; + font-size: 110%; + font-weight: bold; + margin-top: 15px; + margin-bottom: 15px; } #wall-photo-container { - margin: 0 auto 1em 4em; - width: 90%; + margin: 0 auto 1em 4em; + width: 90%; } @@ -1829,79 +1866,79 @@ div { * message */ .prvmail-text { - width: 100%; + width: 100%; } #prvmail-subject { - width: 100%; - color: @bg_colour; - background: @main_colour; + width: 100%; + color: @bg_colour; + background: @main_colour; } #prvmail-submit-wrapper { - margin-top: 10px; + margin-top: 10px; } #prvmail-submit { - float: right; - margin-top: 0; + float: right; + margin-top: 0; } #prvmail-submit-wrapper div { - margin-right: 5px; - float: left; + margin-right: 5px; + float: left; } .mail-list-outside-wrapper { - margin-top: 20px; + margin-top: 20px; } .mail-list-sender { - float: left; + float: left; } .mail-list-detail { - margin-left: 90px; + margin-left: 90px; } .mail-list-sender-name { - display: inline; - font-size: 1.1em; + display: inline; + font-size: 1.1em; } .mail-list-date { - display: inline; - font-size: 0.9em; - padding-left: 10px; + display: inline; + font-size: 0.9em; + padding-left: 10px; } .mail-list-sender-name, .mail-list-date { - font-style: italic; + font-style: italic; } .mail-list-subject { - font-size: 1.2em; + font-size: 1.2em; } .mail-list-delete-wrapper { - float: right; + float: right; } .mail-list-outside-wrapper-end { - clear: both; - border-bottom: 1px @main_colour dotted; + clear: both; + border-bottom: 1px @main_colour dotted; } .mail-conv-sender { - float: left; - margin: 0px 5px 5px 0px; + float: left; + margin: 0px 5px 5px 0px; } .mail-conv-sender-photo { - .box(32px, 32px) + .box(32px, 32px) } .mail-conv-sender-name { - float: left; + float: left; } .mail-conv-date { - float: right; + float: right; } .mail-conv-subject { - clear: right; - font-weight: bold; - font-size: 1.2em; + clear: right; + font-weight: bold; + font-size: 1.2em; } .mail-conv-body { - clear: both; + clear: both; } .mail-conv-delete-wrapper { - margin-top: 5px; + margin-top: 5px; } @@ -1910,129 +1947,129 @@ div { */ .view-contact-wrapper, .contact-entry-wrapper { - float: left; - margin: 0 5px 40px 0; - .box(120px, 135px); - padding: 3px; - position: relative; + float: left; + margin: 0 5px 40px 0; + .box(120px, 135px); + padding: 3px; + position: relative; } .contact-direction-wrapper { - position: absolute; - top: 20px; + position: absolute; + top: 20px; } .contact-edit-links { - position: absolute; - top: 60px; + position: absolute; + top: 60px; } .contact-entry-photo-wrapper {} .contact-entry-photo { - margin-left: 20px; + margin-left: 20px; } .contact-entry-name { - width: 120px; - font-weight: bold; - font-size: small; + width: 120px; + font-weight: bold; + font-size: small; } .contact-entry-details { - font-size: x-small; + font-size: x-small; } .contact-entry-photo { - position: relative; + position: relative; } .contact-entry-edit-links .icon { - .borders(1px, solid, #babdb6); - .rounded_corners(3px); - background-color: white; + .borders(1px, solid, #babdb6); + .rounded_corners(3px); + background-color: white; } #contact-entry-url, [id^="contact-entry-url"], #contact-entry-network, [id^="contact-entry-network"] { - font-size: smaller; + font-size: smaller; } #contact-entry-network, [id^="contact-entry-network"] { - font-style: italic; + font-style: italic; } #contact-edit-banner-name { - font-size: 1.5em; + font-size: 1.5em; } #contact-edit-photo-wrapper { - position: relative; - float: left; - padding: 20px; + position: relative; + float: left; + padding: 20px; } #contact-edit-direction-icon { - position: absolute; - top: 60px; - left: 0; + position: absolute; + top: 60px; + left: 0; } #contact-edit-nav-wrapper { - margin-left: 0px; + margin-left: 0px; } #contact-edit-links { - margin-top: 23px; + margin-top: 23px; } #contact-drop-links { - margin-left: 5px; + margin-left: 5px; } #contact-edit-nav-wrapper .icon { - .borders(1px, solid, #babdb6); - .rounded_corners(3px); + .borders(1px, solid, #babdb6); + .rounded_corners(3px); } #contact-edit-poll-wrapper { - margin-left: 0px; + margin-left: 0px; } #contact-edit-last-update-text { - margin-bottom: 15px; + margin-bottom: 15px; } #contact-edit-last-updated { - font-weight: bold; + font-weight: bold; } #contact-edit-poll-text { - display: inline; + display: inline; } #contact-edit-end { - clear: both; - margin-bottom: 65px; + clear: both; + margin-bottom: 65px; } .contact-photo-menu-button { - position: absolute; - background: url("dark/photo-menu.jpg") top left no-repeat transparent; - margin: 0px; - padding: 0px; - .box(16px, 16px); - top: 64px; - left: 0px; - overflow: hidden; - text-indent: 40px; - display: none; + position: absolute; + background: url("dark/photo-menu.jpg") top left no-repeat transparent; + margin: 0px; + padding: 0px; + .box(16px, 16px); + top: 64px; + left: 0px; + overflow: hidden; + text-indent: 40px; + display: none; } .contact-photo-menu { - width: auto; - .borders(2px, solid, @link_colour); - background: @bg_colour; - color: @main_colour; - position: absolute; - font-size: smaller; - .rounded_corners; - left: 0px; - top: 90px; - display: none; - z-index: 10000; - li a { - display: block; - padding: 4px; - color: @link_colour; - background: @main_colour; - line-height: 1; - &:hover { - background: @link_colour; - color: @main_colour; - text-decoration: none; - } - } + width: auto; + .borders(2px, solid, @link_colour); + background: @bg_colour; + color: @main_colour; + position: absolute; + font-size: smaller; + .rounded_corners; + left: 0px; + top: 90px; + display: none; + z-index: 10000; + li a { + display: block; + padding: 4px; + color: @link_colour; + background: @main_colour; + line-height: 1; + &:hover { + background: @link_colour; + color: @main_colour; + text-decoration: none; + } + } } @@ -2041,23 +2078,23 @@ div { */ .openid {} #id_openid_url { - background: url(dark/login-bg.gif) no-repeat; - background-position: 0 50%; - padding-left: 18px; + background: url(dark/login-bg.gif) no-repeat; + background-position: 0 50%; + padding-left: 18px; } #settings-default-perms { - margin-bottom: 20px; + margin-bottom: 20px; } #register-form div, #profile-edit-form div { - clear: both; + clear: both; } .settings-block { - label { - clear: left; - } - input { - margin: 10px 5px; - } + label { + clear: left; + } + input { + margin: 10px 5px; + } } #register-form label, #profile-edit-form label { @@ -2070,53 +2107,53 @@ div { margin-bottom: 20px; } #profile-edit-marital-label span { - margin: -4px; + margin: -4px; } .settings-submit-wrapper, .profile-edit-submit-wrapper { - margin: 0 0 30px; + margin: 0 0 30px; } .profile-edit-side-div { - display: none; + display: none; } #profiles-menu-trigger { - margin: 0px 0px 0px 25px; + margin: 0px 0px 0px 25px; } .profile-listing { - float: left; - margin: 20px 20px 0px 0px; + float: left; + margin: 20px 20px 0px 0px; } .icon-profile-edit { - background: url("dark/icons.png") -150px 0px no-repeat; - border: 0; - cursor: pointer; - display: block; - .box(20px, 20px); - margin: 0 0 -18px; - text-decoration: none; - top: 113px; - right: 260px; + background: url("dark/icons.png") -150px 0px no-repeat; + border: 0; + cursor: pointer; + display: block; + .box(20px, 20px); + margin: 0 0 -18px; + text-decoration: none; + top: 113px; + right: 260px; } #profile-edit-links ul { - .list_reset; - margin: 20px 0; + .list_reset; + margin: 20px 0; } .marital { - margin-top: 5px; + margin-top: 5px; } #register-sitename { - display: inline; - font-weight: bold; + display: inline; + font-weight: bold; } #advanced-expire-popup { - background: @bg_colour; - color: @main_colour; + background: @bg_colour; + color: @main_colour; } #id_ssl_policy { - width: 374px; + width: 374px; } #theme-preview img { - margin: 10px 10px 10px 288px; + margin: 10px 10px 10px 288px; } @@ -2124,39 +2161,39 @@ div { * contacts selector */ .group-delete-wrapper { - margin: -31px 50px 0 0; - float: right; + margin: -31px 50px 0 0; + float: right; } /*.group-delete-icon { margin: 0 0 0 10px; }*/ #group-edit-submit-wrapper { - margin: 0 0 10px 0; - display: inline; + margin: 0 0 10px 0; + display: inline; } #group-members, #prof-members { - height: 200px; - overflow: auto; - .borders(1px, solid, @menu_bg_colour); - .rounded_corners(5px 5px 0 0); + height: 200px; + overflow: auto; + .borders(1px, solid, @menu_bg_colour); + .rounded_corners(5px 5px 0 0); } #group-all-contacts, #prof-all-contacts { - height: 200px; - overflow: auto; - .borders(1px, solid, @menu_bg_colour); - .rounded_corners(0 0 5px 5px); + height: 200px; + overflow: auto; + .borders(1px, solid, @menu_bg_colour); + .rounded_corners(0 0 5px 5px); } #group-members h3, #group-all-contacts h3, #prof-members h3, #prof-all-contacts h3 { - color: @main_alt_colour; - background-color: @menu_bg_colour; - margin: 0; - padding: 5px; + color: @main_alt_colour; + background-color: @menu_bg_colour; + margin: 0; + padding: 5px; } #group-separator, #prof-separator { - display: none; + display: none; } @@ -2164,10 +2201,10 @@ div { * profile */ #cropimage-wrapper { - float: left; + float: left; } #crop-image-form { - clear: both; + clear: both; } @@ -2175,47 +2212,47 @@ div { * intros */ .intro-wrapper { - margin-top: 20px; + margin-top: 20px; } .intro-fullname { - font-size: 1.1em; - font-weight: bold; + font-size: 1.1em; + font-weight: bold; } .intro-note { - padding: 10px; + padding: 10px; } .intro-end { - padding: 30px; + padding: 30px; } .intro-form { - float: left; + float: left; } .intro-approve-form { - clear: both; + clear: both; } .intro-submit-approve, .intro-submit-ignore { - margin-right: 20px; + margin-right: 20px; } .intro-submit-approve { - margin-top: 15px; + margin-top: 15px; } .intro-approve-as-friend-label, .intro-approve-as-fan-label, .intro-approve-as-friend, .intro-approve-as-fan { - float: left; + float: left; } .intro-form-end { - clear: both; - margin-bottom: 10px; + clear: both; + margin-bottom: 10px; } .intro-approve-as-end { - clear: both; - margin-bottom: 10px; + clear: both; + margin-bottom: 10px; } .clear { - clear: both; + clear: both; } @@ -2223,23 +2260,23 @@ div { * events */ .eventcal { - float: left; - font-size: 20px; + float: left; + font-size: 20px; } .event { - background: @bg_colour; + background: @bg_colour; } .vevent { - border: 1px solid darken(@main_alt_colour, 13.5%); - .event-description, - .event-location, - .event-start { - margin-left: 10px; - margin-right: 10px; - } + border: 1px solid darken(@main_alt_colour, 13.5%); + .event-description, + .event-location, + .event-start { + margin-left: 10px; + margin-right: 10px; + } } #new-event-link { - margin-bottom: 10px; + margin-bottom: 10px; } .edit-event-link, .plink-event-link { @@ -2249,105 +2286,105 @@ div { /*margin-bottom: 15px;*/ } .event-description:before { - content: url('../../../images/calendar.png'); - margin-right: 15px; + content: url('../../../images/calendar.png'); + margin-right: 15px; } .event-start, .event-end { - margin-left: 10px; - width: 330px; - font-size: smaller; + margin-left: 10px; + width: 330px; + font-size: smaller; } .event-start .dtstart, .event-end .dtend { - float: right; + float: right; } .event-list-date { - margin-bottom: 10px; + margin-bottom: 10px; } .prevcal, .nextcal { - float: left; - margin: 64px 32px auto 32px; + float: left; + margin: 64px 32px auto 32px; } .calendar { - font-family: monospace; + font-family: monospace; } .today { - font-weight: bold; - color: red; + font-weight: bold; + color: red; } #event-start-text, #event-finish-text { - margin-top: 10px; - margin-bottom: 5px; + margin-top: 10px; + margin-bottom: 5px; } #event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text, #event-share-checkbox { - float: left; + float: left; } #event-datetime-break { - margin-bottom: 10px; + margin-bottom: 10px; } #event-nofinish-break, #event-adjust-break, #event-share-break { - clear: both; + clear: both; } #event-desc-text, #event-location-text { - margin-top: 10px; - margin-bottom: 5px; + margin-top: 10px; + margin-bottom: 5px; } #event-submit { - margin-top: 10px; + margin-top: 10px; } .body-tag { - margin: 10px 0; - opacity: 0.5; - &:hover { - opacity: 1.0 !important; - } + margin: 10px 0; + opacity: 0.5; + &:hover { + opacity: 1.0 !important; + } } .filesavetags, .categorytags { - margin: 20px 0; - opacity: 0.5; + margin: 20px 0; + opacity: 0.5; } .filesavetags:hover, .categorytags:hover { - margin: 20px 0; - opacity: 1.0 !important; + margin: 20px 0; + opacity: 1.0 !important; } .item-select { - opacity: 0.1; - margin: 5px 0 0 6px !important; - &:hover { - opacity: 1; - } + opacity: 0.1; + margin: 5px 0 0 6px !important; + &:hover { + opacity: 1; + } } .checkeditem { - opacity: 1; + opacity: 1; } #item-delete-selected { - margin-top: 30px; + margin-top: 30px; } /* was tired of having no way of moving it around, so * here's a little 'hook' to do so */ .delete-checked { - position: absolute; - left: 35px; - margin-top: 20px; + position: absolute; + left: 35px; + margin-top: 20px; } #item-delete-selected-icon { - float: left; - margin-right: 5px; + float: left; + margin-right: 5px; } .fc-state-highlight { - background: @main_colour; - color: @bg_colour; + background: @main_colour; + color: @bg_colour; } @@ -2355,12 +2392,12 @@ div { * directory */ .directory-item { - float: left; - margin: 0 5px 4px 0; - padding: 3px; - width: 180px; - height: 250px; - position: relative; + float: left; + margin: 0 5px 4px 0; + padding: 3px; + width: 180px; + height: 250px; + position: relative; } @@ -2368,93 +2405,93 @@ div { * sidebar */ #group-sidebar { - margin-bottom: 10px; + margin-bottom: 10px; } .categories-selected, .group-selected, .nets-selected, .fileas-selected { - // padding: 4px; - color: @bg_colour; - // background: @main_colour; - // .borders(1px, solid, @link_colour); - .multibutton_active; + // padding: 4px; + color: @bg_colour; + // background: @main_colour; + // .borders(1px, solid, @link_colour); + .multibutton_active; } .categories-selected:hover, .group-selected:hover, .nets-selected:hover, .fileas-selected:hover { // padding: 4px; - // color: @bg_colour; + // color: @bg_colour; // background: @bg_colour; // .borders(1px, solid, @link_colour); } .groupsideedit { - margin-right: 10px; + margin-right: 10px; } #sidebar-group-ul { - padding-left: 0; + padding-left: 0; } #sidebar-group-list { - margin: 0 0 5px 0; - li { - margin-top: 10px; - } - .icon { - display: inline-block; - .box(12px, 12px); - } + margin: 0 0 5px 0; + li { + margin-top: 10px; + } + .icon { + display: inline-block; + .box(12px, 12px); + } } .sidebar-group-element { - .multibutton; - .rounded_corners; + .multibutton; + .rounded_corners; } #sidebar-new-group { - margin: auto; - display: inline-block; - color: @main_alt_colour; - text-decoration: none; - text-align: center; + margin: auto; + display: inline-block; + color: @main_alt_colour; + text-decoration: none; + text-align: center; } #peoplefind-sidebar form { - margin-bottom: 10px; + margin-bottom: 10px; } #sidebar-new-group { - &:hover { - /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/ - /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/ - /*background-color: #b20202;*/ - } - &:active { - position: relative; - top: 1px; - } + &:hover { + /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/ + /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/ + /*background-color: #b20202;*/ + } + &:active { + position: relative; + top: 1px; + } } #side-peoplefind-url { - .borders(1px, solid, darken(@main_alt_colour, 33.5%)); - margin-right: 3px; - width: 75%; + .borders(1px, solid, darken(@main_alt_colour, 33.5%)); + margin-right: 3px; + width: 75%; } .categories-ul, .nets-ul { - .list_reset; - li { - margin: 10px 0 0; - } + .list_reset; + li { + margin: 10px 0 0; + } } .categories-link, .nets-link, .nets-all { - .multibutton; - .rounded_corners; - margin-left: 0px; + .multibutton; + .rounded_corners; + margin-left: 0px; } #netsearch-box { - margin: 20px 0px 30px; - width: 135px; - #search-submit { - margin: 5px 5px 0px 0px; - } + margin: 20px 0px 30px; + width: 135px; + #search-submit { + margin: 5px 5px 0px 0px; + } } @@ -2462,98 +2499,98 @@ div { * admin */ #pending-update { - float: right; - color: white; - font-weight: bold; - background-color: red; - padding: 0 0.3em; + float: right; + color: white; + font-weight: bold; + background-color: red; + padding: 0 0.3em; } .admin { - &.linklist { - border: 0; - padding: 0; - } - &.link { - .list_reset; - } + &.linklist { + border: 0; + padding: 0; + } + &.link { + .list_reset; + } } #adminpage { - color: @main_colour; - background: @bg_colour; - margin: 5px; - padding: 10px; - font-size: smaller; - dl { - clear: left; - margin-bottom: 2px; - padding-bottom: 2px; - border-bottom: 1px solid @shadow_colour; - } - dt { - width: 250px; - float: left; - font-weight: bold; - } - dd { - margin-left: 250px; - } - h3 { - border-bottom: 1px solid darken(@main_alt_colour, 13.5%); - } - .submit { - clear: left; - } - #pluginslist { - margin: 0; - padding: 0; - } - .plugin { - display: block; - .borders(1px, solid, darken(@main_alt_colour, 40%)); - padding: 1em; - margin-bottom: 5px; - clear: left; - } - .toggleplugin { - float: left; - margin-right: 1em; - } - table { - width: 100%; - border-bottom: 1px solid @shadow_colour; - margin: 5px 0; - th { - font-weight: bold; - text-align: left; - } - td { - padding: 5px; - vertical-align: middle; - } - &#users { - padding: 5px; - img { - .box(16px, 16px); - } + color: @main_colour; + background: @bg_colour; + margin: 5px; + padding: 10px; + font-size: smaller; + dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid @shadow_colour; + } + dt { + width: 250px; + float: left; + font-weight: bold; + } + dd { + margin-left: 250px; + } + h3 { + border-bottom: 1px solid darken(@main_alt_colour, 13.5%); + } + .submit { + clear: left; + } + #pluginslist { + margin: 0; + padding: 0; + } + .plugin { + display: block; + .borders(1px, solid, darken(@main_alt_colour, 40%)); + padding: 1em; + margin-bottom: 5px; + clear: left; + } + .toggleplugin { + float: left; + margin-right: 1em; + } + table { + width: 100%; + border-bottom: 1px solid @shadow_colour; + margin: 5px 0; + th { + font-weight: bold; + text-align: left; + } + td { + padding: 5px; + vertical-align: middle; + } + &#users { + padding: 5px; + img { + .box(16px, 16px); + } a { - color: @main_colour; - text-decoration: underline; + color: @main_colour; + text-decoration: underline; } - } - } - td .icon { - float: left; - } - .selectall { - text-align: right; - } + } + } + td .icon { + float: left; + } + .selectall { + text-align: right; + } } #users .name { - color: @main_colour; + color: @main_colour; } #users .tools { - padding: 5px 0; - vertical-align: middle; + padding: 5px 0; + vertical-align: middle; } @@ -2561,50 +2598,50 @@ div { * form fields */ .field { - overflow: auto; + overflow: auto; } .field .onoff { - float: right; - margin: 0 330px 0 auto; - width: 80px; - a { - display: block; - .borders(1px, solid, darken(@main_alt_colour, 53.5%)); - padding: 3px 6px 4px 10px; - height: 16px; - text-decoration: none; - } - .on, .off { - background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q=='); - background-repeat: no-repeat; - } - .on { - background-position: 42px 1px; - background-color: darken(@main_alt_colour, 33.5%); - color: darken(@main_alt_colour, 86.5%); - text-align: left; - } - .off { - background-position: 2px 1px; - background-color: darken(@main_alt_colour, 13.5%); - color: darken(@main_alt_colour, 73.5%); - text-align: right; - } + float: right; + margin: 0 330px 0 auto; + width: 80px; + a { + display: block; + .borders(1px, solid, darken(@main_alt_colour, 53.5%)); + padding: 3px 6px 4px 10px; + height: 16px; + text-decoration: none; + } + .on, .off { + background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q=='); + background-repeat: no-repeat; + } + .on { + background-position: 42px 1px; + background-color: darken(@main_alt_colour, 33.5%); + color: darken(@main_alt_colour, 86.5%); + text-align: left; + } + .off { + background-position: 2px 1px; + background-color: darken(@main_alt_colour, 13.5%); + color: darken(@main_alt_colour, 73.5%); + text-align: right; + } } .hidden { - display: none !important; + display: none !important; } .field textarea { - .box(80%, 100px); + .box(80%, 100px); } .field_help { - display: block; - margin-left: 297px; - color: darken(@main_alt_colour, 24%); - font-size: small; + display: block; + margin-left: 297px; + color: darken(@main_alt_colour, 24%); + font-size: small; } .field.radio .field_help { - margin-left: 297px; + margin-left: 297px; } @@ -2612,95 +2649,95 @@ div { * update */ .popup { - .box(100%, 100%); - top: 0px; - left: 0px; - position: absolute; - display: none; - .background { - background-color: darken(@main_alt_colour, 86.5%); - opacity: 0.5; - .box(100%, 100%); - position: absolute; - top: 0px; - left: 0px; - } - .panel { - top: 25%; - left: 25%; - .box(50%, 50%); - padding: 1em; - position: absolute; - .borders(4px, solid, black); - background-color: white; - } + .box(100%, 100%); + top: 0px; + left: 0px; + position: absolute; + display: none; + .background { + background-color: darken(@main_alt_colour, 86.5%); + opacity: 0.5; + .box(100%, 100%); + position: absolute; + top: 0px; + left: 0px; + } + .panel { + top: 25%; + left: 25%; + .box(50%, 50%); + padding: 1em; + position: absolute; + .borders(4px, solid, black); + background-color: white; + } } #panel { - position: absolute; - font-size: small; - .rounded_corners; - .borders(1px, solid, @main_alt_colour); - background-color: @bg_alt_colour; - color: @main_colour; - padding: 1em; - z-index: 100; + position: absolute; + font-size: small; + .rounded_corners; + .borders(1px, solid, @main_alt_colour); + background-color: @bg_alt_colour; + color: @main_colour; + padding: 1em; + z-index: 100; } .pager { - margin-top: 60px; - display: block; - clear: both; - text-align: center; - font-size: small; - font-weight: bold; - span { - padding: 4px; - margin: 4px; - } + margin-top: 60px; + display: block; + clear: both; + text-align: center; + font-size: small; + font-weight: bold; + span { + padding: 4px; + margin: 4px; + } } .pager_current { - background-color: @link_colour; - color: @bg_colour; + background-color: @link_colour; + color: @bg_colour; } .grey, .gray { - color: gray; + color: gray; } .orange { - color: orange; + color: orange; } .red { - color: red; + color: red; } .popup .panel { - .panel_text { - display: block; - overflow: auto; - height: 80%; - } - .panel_in { - .box(100%, 100%); - position: relative; - } - .panel_actions { - width: 100%; - bottom: 4px; - left: 0px; - position: absolute; - } + .panel_text { + display: block; + overflow: auto; + height: 80%; + } + .panel_in { + .box(100%, 100%); + position: relative; + } + .panel_actions { + width: 100%; + bottom: 4px; + left: 0px; + position: absolute; + } } .panel_text .progress { - width: 50%; - overflow: hidden; - height: auto; - .borders(1px, solid, darken(@main_alt_colour, 13.5%)); - margin-bottom: 5px; - span { - float: right; - display: block; - width: 25%; - background-color: @main_alt_colour; - text-align: right; - } + width: 50%; + overflow: hidden; + height: auto; + .borders(1px, solid, darken(@main_alt_colour, 13.5%)); + margin-bottom: 5px; + span { + float: right; + display: block; + width: 25%; + background-color: @main_alt_colour; + text-align: right; + } } @@ -2708,24 +2745,24 @@ div { * OAuth */ .oauthapp { - height: auto; - overflow: auto; - border-bottom: 2px solid darken(@main_alt_colour, 13.5%); - padding-bottom: 1em; - margin-bottom: 1em; - img { - float: left; - .box(48px, 48px); - margin: 10px; - &.noicon { - background-image: url("../../../images/icons/48/plugin.png"); - background-position: center center; - background-repeat: no-repeat; - } - } - a { - float: left; - } + height: auto; + overflow: auto; + border-bottom: 2px solid darken(@main_alt_colour, 13.5%); + padding-bottom: 1em; + margin-bottom: 1em; + img { + float: left; + .box(48px, 48px); + margin: 10px; + &.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; + } + } + a { + float: left; + } } @@ -2733,251 +2770,251 @@ div { * icons */ .iconspacer { - display: block; - .box(16px, 16px); + display: block; + .box(16px, 16px); } .icon { - display: block; - .box; - background: transparent url("dark/icons.png") no-repeat; - border: 0; - text-decoration: none; - .rounded_corners; - &:hover { - border: 0; - text-decoration: none; - } + display: block; + .box; + background: transparent url("dark/icons.png") no-repeat; + border: 0; + text-decoration: none; + .rounded_corners; + &:hover { + border: 0; + text-decoration: none; + } } .editicon { - display: inline-block; - .box(21px, 21px); - background: url("dark/editicons.png") no-repeat; - border: 0; - text-decoration: none; + display: inline-block; + .box(21px, 21px); + background: url("dark/editicons.png") no-repeat; + border: 0; + text-decoration: none; } .shadow { - .box_shadow(2px, 2px, 5px, 2px); - &:active, &:focus, &:hover { - .box_shadow(0, 0, 0, 0); - } + .box_shadow(2px, 2px, 5px, 2px); + &:active, &:focus, &:hover { + .box_shadow(0, 0, 0, 0); + } } .editicon:hover { - border: 0; + border: 0; } .boldbb { - background-position: 0px 0px; - &:hover { - background-position: -22px 0px; } + background-position: 0px 0px; + &:hover { + background-position: -22px 0px; } } .italicbb { - background-position: 0px -22px; - &:hover { - background-position: -22px -22px; } + background-position: 0px -22px; + &:hover { + background-position: -22px -22px; } } .underlinebb { - background-position: 0px -44px; - &:hover { - background-position: -22px -44px; } + background-position: 0px -44px; + &:hover { + background-position: -22px -44px; } } .quotebb { - background-position: 0px -66px; - &:hover { - background-position: -22px -66px; } + background-position: 0px -66px; + &:hover { + background-position: -22px -66px; } } .codebb { - background-position: 0px -88px; - &:hover { - background-position: -22px -88px; } + background-position: 0px -88px; + &:hover { + background-position: -22px -88px; } } .imagebb { - background-position: -44px 0px; - &:hover { - background-position: -66px 0px; } + background-position: -44px 0px; + &:hover { + background-position: -66px 0px; } } .urlbb { - background-position: -44px -22px; - &:hover { - background-position: -66px -22px; } + background-position: -44px -22px; + &:hover { + background-position: -66px -22px; } } .videobb { - background-position: -44px -44px; - &:hover { - background-position: -66px -44px; } + background-position: -44px -44px; + &:hover { + background-position: -66px -44px; } } .icon { - &.drop, &.drophide, &.delete { - float: left; - margin: 0 2px; - } - &.s22 { - &.delete { - display: block; - background-position: -110px 0; - } - &.text { - padding: 10px 0px 0px 25px; - width: 200px; - } - } - &.text { - text-indent: 0px; - } - &.s16 { - min-width: 16px; - height: 16px; - } + &.drop, &.drophide, &.delete { + float: left; + margin: 0 2px; + } + &.s22 { + &.delete { + display: block; + background-position: -110px 0; + } + &.text { + padding: 10px 0px 0px 25px; + width: 200px; + } + } + &.text { + text-indent: 0px; + } + &.s16 { + min-width: 16px; + height: 16px; + } } // special case for wall items .wall-item-delete-wrapper.icon.delete, .wall-item-delete-wrapper.icon.drophide { - margin: 0; + margin: 0; } .s16 .add { - background: url("../../../images/icons/16/add.png") no-repeat; + background: url("../../../images/icons/16/add.png") no-repeat; } .add { - margin: 0px 5px; + margin: 0px 5px; } .article { - background-position: -50px 0; + background-position: -50px 0; } .audio { - background-position: -70px 0; + background-position: -70px 0; } .block { - background-position: -90px 0px; + background-position: -90px 0px; } .drop, .delete { - background-position: -110px 0; + background-position: -110px 0; } .drophide { - background-position: -130px 0; + background-position: -130px 0; } .edit { - background-position: -150px 0; + background-position: -150px 0; } .camera { - background-position: -170px 0; + background-position: -170px 0; } .dislike { - background-position: -190px 0; + background-position: -190px 0; } .file-as { - background-position: -230px -60px; + background-position: -230px -60px; } .like { - background-position: -211px 0; + background-position: -211px 0; } .link { - background-position: -230px 0; + background-position: -230px 0; } .globe, .location { - background-position: -50px -20px; + background-position: -50px -20px; } .noglobe, .nolocation { - background-position: -70px -20px; + background-position: -70px -20px; } .no { - background-position: -90px -20px; + background-position: -90px -20px; } .pause { - background-position: -110px -20px; + background-position: -110px -20px; } .play { - background-position: -130px -20px; + background-position: -130px -20px; } .pencil { - background-position: -151px -18px; + background-position: -151px -18px; } .small-pencil { - background-position: -170px -20px; + background-position: -170px -20px; } .recycle { - background-position: -190px -20px; + background-position: -190px -20px; } .remote-link { - background-position: -210px -20px; + background-position: -210px -20px; } .share { - background-position: -230px -20px; + background-position: -230px -20px; } .tools { - background-position: -50px -40px; + background-position: -50px -40px; } .lock { - background-position: -70px -40px; + background-position: -70px -40px; } .unlock { - background-position: -88px -40px; + background-position: -88px -40px; } .video { - background-position: -110px -40px; + background-position: -110px -40px; } .attach { - background-position: -191px -40px; + background-position: -191px -40px; } .language { - background-position: -210px -40px; + background-position: -210px -40px; } .starred { - background-position: -130px -60px; + background-position: -130px -60px; } .unstarred { - background-position: -150px -60px; + background-position: -150px -60px; } .tagged { - background-position: -170px -60px; + background-position: -170px -60px; } .on { - background-position: -50px -60px; + background-position: -50px -60px; } .off { - background-position: -70px -60px; + background-position: -70px -60px; } .prev { - background-position: -90px -60px; + background-position: -90px -60px; } .next { - background-position: -110px -60px; + background-position: -110px -60px; } .icon.dim { - opacity: 0.3; + opacity: 0.3; } #pause { - position: fixed; - bottom: 40px; - right: 30px; - z-index: 10; + position: fixed; + bottom: 40px; + right: 30px; + z-index: 10; } .border { - .borders(1px, solid, @border2); - .rounded_corners; - &:hover { - .borders(1px, solid, @border2); - .rounded_corners; - } + .borders(1px, solid, @border2); + .rounded_corners; + &:hover { + .borders(1px, solid, @border2); + .rounded_corners; + } } .attachtype { - display: block; - .box(20px, 23px); - background-image: url(../../../images/content-types.png); + display: block; + .box(20px, 23px); + background-image: url(../../../images/content-types.png); } .type-video { - background-position: 0px 0px; + background-position: 0px 0px; } .type-image { - background-position: -20px 0; + background-position: -20px 0; } .type-audio { - background-position: -40px 0; + background-position: -40px 0; } .type-text { - background-position: -60px 0px; + background-position: -60px 0px; } .type-unkn { - background-position: -80px 0; + background-position: -80px 0; } @@ -2985,23 +3022,23 @@ div { * footer */ .cc-license { - margin-top: 100px; - font-size: 0.7em; + margin-top: 100px; + font-size: 0.7em; } footer { - display: block; - clear: both; + display: block; + clear: both; } #sectionfooter { - margin: 1em 0 1em 0; + margin: 1em 0 1em 0; } #profile-jot-text { - height: 20px; - color: @main_colour; - background: @bg_colour; - .borders; - .rounded_corners; - width: 99.5%; + height: 20px; + color: @main_colour; + background: @bg_colour; + .borders; + .rounded_corners; + width: 99.5%; } @@ -3011,167 +3048,167 @@ footer { #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { - display: block !important; - background: @bg_colour; - color: @main_colour; + display: block !important; + background: @bg_colour; + color: @main_colour; } #profile-jot-acl-wrapper { - margin: 0 10px; - .borders(1px, solid, @menu_bg_colour); - border-top: 0; - font-size: small; - // .box_shadow; + margin: 0 10px; + .borders(1px, solid, @menu_bg_colour); + border-top: 0; + font-size: small; + // .box_shadow; } #acl-wrapper { - width: 660px; - margin: 0 auto; + width: 660px; + margin: 0 auto; } #acl-search { - float: right; - background: white url("../../../images/search_18.png") no-repeat right center; - padding-right: 20px; - margin: 6px; - color: @shadow_colour; + float: right; + background: white url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; + margin: 6px; + color: @shadow_colour; } #acl-showall { - float: left; - display: block; - .box(auto, 18px); - background: @main_colour url("../../../images/show_all_off.png") 8px 8px no-repeat; - padding: 7px 10px 7px 30px; - .rounded_corners; - color: darken(@main_alt_colour, 33.5%); - margin: 5px 0; - &.selected { - color: black; - background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; - } + float: left; + display: block; + .box(auto, 18px); + background: @main_colour url("../../../images/show_all_off.png") 8px 8px no-repeat; + padding: 7px 10px 7px 30px; + .rounded_corners; + color: darken(@main_alt_colour, 33.5%); + margin: 5px 0; + &.selected { + color: black; + background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; + } } #acl-list { - height: 210px; - .borders(1px, solid, darken(@main_alt_colour, 13.5%); - clear: both; - margin-top: 30px; - overflow: auto; + height: 210px; + .borders(1px, solid, darken(@main_alt_colour, 13.5%); + clear: both; + margin-top: 30px; + overflow: auto; } /*#acl-list-content { }*/ .acl-list-item { - .borders; - .box(120px, 110px); - display: block; - float: left; - margin: 3px 0 5px 5px; - img { - .box(22px, 22px); - float: left; - margin: 5px 5px 20px; - } - p { - height: 12px; - font-size: 10px; - margin: 0 0 22px; - padding: 2px 0 1px; - } - a { - background: @main_colour 3px 3px no-repeat; - .rounded_corners; - .box(55px, 20px); - clear: both; - font-size: 10px; - display: block; - color: @bg_colour; - margin: 5px auto 0; - padding: 0 3px; - text-align: center; - vertical-align: middle; - } + .borders; + .box(120px, 110px); + display: block; + float: left; + margin: 3px 0 5px 5px; + img { + .box(22px, 22px); + float: left; + margin: 5px 5px 20px; + } + p { + height: 12px; + font-size: 10px; + margin: 0 0 22px; + padding: 2px 0 1px; + } + a { + background: @main_colour 3px 3px no-repeat; + .rounded_corners; + .box(55px, 20px); + clear: both; + font-size: 10px; + display: block; + color: @bg_colour; + margin: 5px auto 0; + padding: 0 3px; + text-align: center; + vertical-align: middle; + } } #acl-wrapper a:hover { - text-decoration: none; - color: @bg_colour; - border: 0; + text-decoration: none; + color: @bg_colour; + border: 0; } //data URI: // data:[<MIME-type>][;charset=<encoding>][;base64],<data> .acl-button-show { - // background-image: url('../../../images/show_off.png'); - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg=='); - margin: 0 auto; + // background-image: url('../../../images/show_off.png'); + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg=='); + margin: 0 auto; } .acl-button-hide { - // background-image: url('../../../images/hide_off.png'); - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII='); - margin: 0 auto; + // background-image: url('../../../images/hide_off.png'); + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII='); + margin: 0 auto; } .acl-button-show.selected { - // background: #9ade00 url(../../../images/show_on.png); - background: #9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII='); - color: @bg_colour; + // background: #9ade00 url(../../../images/show_on.png); + background: #9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII='); + color: @bg_colour; } .acl-button-hide.selected { - // background: #ff4141 url(../../../images/hide_on.png); - background: #ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg=='); - color: @bg_colour; + // background: #ff4141 url(../../../images/hide_on.png); + background: #ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg=='); + color: @bg_colour; } .acl-list-item { - &.groupshow { - border-color: @group_show; - } - &.grouphide { - border-color: @group_hide; - } + &.groupshow { + border-color: @group_show; + } + &.grouphide { + border-color: @group_hide; + } } /** /acl **/ /* autocomplete popup */ .acpopup { - max-height: 175px; - max-width: 42%; - background-color: @menu_bg_colour; - color: white; - overflow: auto; - z-index: 100000; - border: 1px solid darken(@main_alt_colour, 13.5%); + max-height: 175px; + max-width: 42%; + background-color: @menu_bg_colour; + color: white; + overflow: auto; + z-index: 100000; + border: 1px solid darken(@main_alt_colour, 13.5%); } .acpopupitem { - background-color: @menu_bg_colour; - padding: 4px; - clear: left; - img { - float: left; - margin-right: 4px; - } - &.selected { - color: @bg_alt_colour; - background-color: @main_alt_colour; - } + background-color: @menu_bg_colour; + padding: 4px; + clear: left; + img { + float: left; + margin-right: 4px; + } + &.selected { + color: @bg_alt_colour; + background-color: @main_alt_colour; + } } .qcomment-wrapper { - padding: 0px; - margin: 5px 5px 5px 81%; + padding: 0px; + margin: 5px 5px 5px 81%; } .qcomment { - opacity: 0.5; - &:hover { - opacity: 1.0; - } + opacity: 0.5; + &:hover { + opacity: 1.0; + } } #network-star-link { - margin-top: 10px; + margin-top: 10px; } .network-star { - float: left; - margin-right: 5px; - &.icon.starred { - display: inline-block; - } + float: left; + margin-right: 5px; + &.icon.starred { + display: inline-block; + } } #fileas-sidebar {} .fileas-ul { - padding: 0; + padding: 0; } @@ -3179,21 +3216,21 @@ footer { * addons theming */ #sidebar-page-list { - ul { - padding: 0; - margin: 5px 0; - } - li { - list-style: none; - } + ul { + padding: 0; + margin: 5px 0; + } + li { + list-style: none; + } } #jappix_mini { - margin-left: 130px; - position: fixed; - bottom: 0; - /* override the jappix css */ - right: 175px !important; - z-index: 999; + margin-left: 130px; + position: fixed; + bottom: 0; + /* override the jappix css */ + right: 175px !important; + z-index: 999; } @import "../css/media"; diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 0e7fc1f8d..194609428 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -78,16 +78,19 @@ h6{font-size:xx-small;} #login_openid label{width:180px !important;} nav{height:60px;background-color:#2e3436;color:#eeeeec;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeec;border:0px;}nav a:hover{text-decoration:none;color:#eeeeec;border:0px;} nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;} -ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeec;background-color:#555753;}ul#user-menu-popup li a:hover{color:#eeeeec;background-color:#111111;} +#site-location{font-weight:bold;font-style:italic;font-size:small;width:30em;position:relative;left:-3.5em;top:3em;} +ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:3px 0 0;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeec;background-color:#555753;}ul#user-menu-popup li a:hover{color:#eeeeec;background-color:#111111;} ul#user-menu-popup li a.nav-sep{border-top:1px solid #2e302e;} nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(light/icons.png) 0 0 no-repeat;} +#nav-admin-link{background-position:0 -154px;}#nav-admin-link:hover{background-position:-22px -154px;} #nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;} #nav-community-link,#nav-contacts-link{background-position:0 -22px;}#nav-community-link:hover,#nav-contacts-link:hover{background-position:-22px -22px;} #nav-directory-link{background-position:-44px -154px;}#nav-directory-link:hover{background-position:-66px -154px;} #nav-help-link{background-position:0 -110px;}#nav-help-link:hover{background-position:-22px -110px;} #nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;} -#nav-intro-link{background-position:0px -190px;}#nav-intro-link:hover{background-position:-44px -190px;} +#nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;} #nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;} +#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;} #nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;} #nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;} #nav-notify-link:hover{background-position:-66px -110px;} @@ -105,14 +108,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;} #nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;} #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} +#nav-buttons-2{clear:both;list-style:none;padding:0px;margin:0px;left:136px;top:-20px;position:relative;width:6em;height:25px;}#nav-buttons-2>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} #search-text,#mini-search-text{background:white;color:#111111;} #search-text{border:1px solid #999999;margin:5px 0;} #mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} -#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:80%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} -#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;} +#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:35%;margin:5px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;top:4px;left:7px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} +#user-menu-label{font-size:small;padding:0px 20px 10px 5px;height:10px;display:block;} .nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(light/notifications.png) 0 0 no-repeat;color:#111111;font-weight:bold;font-size:0.8em;padding-top:0.2em;text-align:center;float:left;margin:0 -1px 0 3px;display:block;visibility:hidden;} .nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;} #net-update{background-position:0px 0px;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index ba8e0093b..b0fab994c 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -25,93 +25,93 @@ header, hgroup, nav, section { - display: block; + display: block; } audio, canvas, video, time { - display: inline-block; - *display: inline; - *zoom: 1; + display: inline-block; + *display: inline; + *zoom: 1; } audio:not([controls]), [hidden] { - display: none; + display: none; } ///* // * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units // * 2. Force vertical scrollbar in non-IE // * 3. Prevent iOS text size adjust on device orientation change, -// * without disabling user zoom: h5bp.com/g +// * without disabling user zoom: h5bp.com/g // */ html { - font-size: 100%; - overflow-y: scroll; - .font_size_adjust; + font-size: 100%; + overflow-y: scroll; + .font_size_adjust; } body { - margin: 0; - padding: 0; - .default_font; - color: @main_colour; - background-color: @bg_colour; + margin: 0; + padding: 0; + .default_font; + color: @main_colour; + background-color: @bg_colour; } button, input, select, textarea { - color: @main_colour; - background-color: white; + color: @main_colour; + background-color: white; } select { - .borders(1px, dotted, darken(@main_alt_colour, 26.8%)); - padding: 1px; - margin: 3px; - color: @main_colour; - background: @bg_colour; + .borders(1px, dotted, darken(@main_alt_colour, 26.8%)); + padding: 1px; + margin: 3px; + color: @main_colour; + background: @bg_colour; max-width: 85%; min-width: 85px; } option { - padding: 1px; - color: @main_colour; - background: @bg_colour; - &[selected="selected"] { - color: @bg_colour; - background: @dk_bg_colour; - } + padding: 1px; + color: @main_colour; + background: @bg_colour; + &[selected="selected"] { + color: @bg_colour; + background: @dk_bg_colour; + } } tr:nth-child(even) { - background-color: darken(@bg_colour, 10%); + background-color: darken(@bg_colour, 10%); } ///* remember to define focus styles! */ -//outline Sets all the outline properties in one declaration -//outline-color Sets the color of an outline color_name,hex_number,rgb_number,invert,inherit -//outline-style Sets the style of an outline dotted,dashed,solid,double,groove,ridge,inset,outset,inherit -//outline-width Sets the width of an outline thin,medium,thick,length,inherit +//outline Sets all the outline properties in one declaration +//outline-color Sets the color of an outline color_name,hex_number,rgb_number,invert,inherit +//outline-style Sets the style of an outline dotted,dashed,solid,double,groove,ridge,inset,outset,inherit +//outline-width Sets the width of an outline thin,medium,thick,length,inherit :focus { - outline: none; + outline: none; } a:focus { - outline: invert, dashed, thin; + outline: invert, dashed, thin; } [disabled="disabled"] { - background: @dk_bg_colour; - color: @disabled_colour; + background: @dk_bg_colour; + color: @disabled_colour; } ///* remember to highlight inserts somehow! */ ins, mark { - background-color: @bg_colour; - color: @main_colour; + background-color: @bg_colour; + color: @main_colour; } ins { - text-decoration: none; + text-decoration: none; } mark { - font-style: italic; - font-weight: bold; + font-style: italic; + font-weight: bold; } ///* Redeclare monospace font family: h5bp.com/j */ pre, @@ -119,157 +119,157 @@ code, kbd, samp, .wall-item-body code { - font-family: monospace, monospace; - _font-family: monospace; - font-size: 1em; + font-family: monospace, monospace; + _font-family: monospace; + font-size: 1em; } ///* Improve readability of pre-formatted text in all browsers */ pre, .wall-item-body code { - .wrap; + .wrap; } q { - quotes: none; - &:before, &:after { - content: ""; - content: none; - } + quotes: none; + &:before, &:after { + content: ""; + content: none; + } } em { - font-style: italic; + font-style: italic; } strong { - font-weight: bold; + font-weight: bold; } strike { - text-decoration: line-through; + text-decoration: line-through; } small { - font-size: 85%; + font-size: 85%; } ///* Position subscript and superscript content without affecting // * line-height: h5bp.com/k */ sub, sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } sub { - bottom: -0.25em; + bottom: -0.25em; } sup { - top: -0.5em; + top: -0.5em; } img { - border: 0 none; + border: 0 none; } a { - color: @link_colour; - text-decoration: none; - margin-bottom: 1px; - &:hover { - color: @hover_colour; - border-bottom: 1px dotted @hover_colour; - } - &:hover img { - text-decoration: none; - } + color: @link_colour; + text-decoration: none; + margin-bottom: 1px; + &:hover { + color: @hover_colour; + border-bottom: 1px dotted @hover_colour; + } + &:hover img { + text-decoration: none; + } } blockquote { - background: lighten(@main_alt_colour, 6.5%); - color: @main_colour; - text-indent: 5px; - padding: 5px; - .borders(1px, solid, @main_colour); - .rounded_corners; + background: lighten(@main_alt_colour, 6.5%); + color: @main_colour; + text-indent: 5px; + padding: 5px; + .borders(1px, solid, @main_colour); + .rounded_corners; } .label () { - width: 38%; - display: inline-block; - font-size: small; - margin: 0 10px 1em 0; - .borders(1px, solid, @bg_colour); - padding: 3px 5px; - background: lighten(@main_alt_colour, 20%); - color: @main_colour; - .box_shadow(3px, 3px, 5px); + width: 38%; + display: inline-block; + font-size: small; + margin: 0 10px 1em 0; + .borders(1px, solid, @bg_colour); + padding: 3px 5px; + background: lighten(@main_alt_colour, 20%); + color: @main_colour; + .box_shadow(3px, 3px, 5px); } label { - .label; + .label; } input { - .box(250px, 25px); - .borders(1px, solid, darken(@main_alt_colour, 33.5%)); - width: 17em; - &[type="checkbox"], - &[type="radio"] { - .box(15px, 15px); - margin: 0; - } - &[type="radio"] { - margin: 5px 0; - } - &[type="submit"], - &[type="button"] { - background-color: @menu_bg_colour; - .borders(2px, outset, darken(@main_alt_colour, 33.5%)); - .rounded_corners; - .box_shadow(1px, 3px, 4px, 0); - color: @bg_colour; - cursor: pointer; - font-weight: bold; - width: auto; - .text_shadow; - } - &[type="submit"]:active, - &[type="button"]:active { - .box_shadow(0, 0, 0, 0); - } + .box(250px, 25px); + .borders(1px, solid, darken(@main_alt_colour, 33.5%)); + width: 17em; + &[type="checkbox"], + &[type="radio"] { + .box(15px, 15px); + margin: 0; + } + &[type="radio"] { + margin: 5px 0; + } + &[type="submit"], + &[type="button"] { + background-color: @menu_bg_colour; + .borders(2px, outset, darken(@main_alt_colour, 33.5%)); + .rounded_corners; + .box_shadow(1px, 3px, 4px, 0); + color: @bg_colour; + cursor: pointer; + font-weight: bold; + width: auto; + .text_shadow; + } + &[type="submit"]:active, + &[type="button"]:active { + .box_shadow(0, 0, 0, 0); + } } h1, h2, h3, h4, h5, h6 { - margin: 10px 0px; - font-weight: bold; - border-bottom: 1px solid @hover_colour; + margin: 10px 0px; + font-weight: bold; + border-bottom: 1px solid @hover_colour; } h1 { - font-size: x-large; + font-size: x-large; } h2 { - font-size: large; + font-size: large; } h3 { - font-size: medium; + font-size: medium; } h4 { - font-size: small; + font-size: small; } h5 { - font-size: x-small; + font-size: x-small; } h6 { - font-size: xx-small; + font-size: xx-small; } // .required { - display: inline; - color: red; - font-size: 16px; - font-weight: bold; - margin: 3px; + display: inline; + color: red; + font-size: 16px; + font-weight: bold; + margin: 3px; } .fakelink, .lockview { - color: @link_colour; - cursor: pointer; + color: @link_colour; + cursor: pointer; } .fakelink:hover { - color: @hover_colour; + color: @hover_colour; } .smalltext { - font-size: 0.7em; + font-size: 0.7em; } @@ -278,89 +278,89 @@ h6 { */ /* .tool .action */ .action { - margin: 5px 0; + margin: 5px 0; } .tool { - margin: 5px 0; - list-style: none; + margin: 5px 0; + list-style: none; } #articlemain { - .box(100%, 100%); - margin: 0 auto; + .box(100%, 100%); + margin: 0 auto; } .button { - // .box(25%, auto); - // background: @menu_bg_colour; - color: @main_colour; - // .borders(2px, outset, darken(@menu_bg_colour, 20%)); - .rounded_corners; - padding: 5px; - // font-size: smaller; - cursor: pointer; - // &.active { - // .box_shadow(4px, 4px, 7px); - // } - a { - color: @main_colour; - // font-size: smaller; - font-weight: bold; - } + // .box(25%, auto); + // background: @menu_bg_colour; + color: @main_colour; + // .borders(2px, outset, darken(@menu_bg_colour, 20%)); + .rounded_corners; + padding: 5px; + // font-size: smaller; + cursor: pointer; + // &.active { + // .box_shadow(4px, 4px, 7px); + // } + a { + color: @main_colour; + // font-size: smaller; + font-weight: bold; + } } #profile-listing-desc { - a { - color: @bg_colour; - font-weight: bold; - } + a { + color: @bg_colour; + font-weight: bold; + } } [class$="-desc"], [id$="-desc"] { - color: @bg_colour; - background: @dk_bg_colour; - .borders(2px, outset, @main_colour); - .rounded_corners; - // .box_shadow(3px, 3px, 5px); + color: @bg_colour; + background: @dk_bg_colour; + .borders(2px, outset, @main_colour); + .rounded_corners; + // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; padding: 5px; - font-weight: bold; - font-size: smaller; + font-weight: bold; + font-size: smaller; } #item-delete-selected-desc { - float: left; - margin-right: 5px; - &:hover { - text-decoration: underline; - } + float: left; + margin-right: 5px; + &:hover { + text-decoration: underline; + } } .intro-approve-as-friend-desc { - margin-top: 10px; + margin-top: 10px; } .intro-desc { - margin-bottom: 20px; - font-weight: bold; + margin-bottom: 20px; + font-weight: bold; } #group-edit-desc { - margin: 10px 0px; + margin: 10px 0px; } #settings-nickname-desc { - background: @dk_bg_colour; - .rounded_corners; - .borders; - padding: 5px; - color: @bg_colour; + background: @dk_bg_colour; + .rounded_corners; + .borders; + padding: 5px; + color: @bg_colour; } .contactname, .contact-name { - font-weight: bold; - font-size: smaller; + font-weight: bold; + font-size: smaller; } .contact-details { - font-style: italic; - font-size: smaller; + font-style: italic; + font-size: smaller; } .like-rotator { - vertical-align: middle; - text-align: center; - margin: 1px; + vertical-align: middle; + text-align: center; + margin: 1px; } @@ -368,54 +368,54 @@ h6 { * login */ #asidemain .field { - overflow: hidden; - width: 200px; + overflow: hidden; + width: 200px; } #login-extra-links { - overflow: auto !important; - padding-top: 60px !important; - width: 100% !important; - a { - margin-right: 20px; - } + overflow: auto !important; + padding-top: 60px !important; + width: 100% !important; + a { + margin-right: 20px; + } } #login_standard { - display: block !important; - float: none !important; - height: 100% !important; - position: relative !important; - width: 100% !important; - .field label { - width: 200px !important; - } - input { - margin: 0 0 8px !important; - width: 210px !important; - &[type="text"] { - margin: 0 0 8px !important; - width: 210px !important; } - } + display: block !important; + float: none !important; + height: 100% !important; + position: relative !important; + width: 100% !important; + .field label { + width: 200px !important; + } + input { + margin: 0 0 8px !important; + width: 210px !important; + &[type="text"] { + margin: 0 0 8px !important; + width: 210px !important; } + } } #login-submit-wrapper { - margin: 0 !important; + margin: 0 !important; } #login-submit-button { - margin-left: 0px !important; + margin-left: 0px !important; } #asidemain #login_openid { - position: relative !important; - float: none !important; - margin-left: 0px !important; - height: auto !important; - width: 200px !important; + position: relative !important; + float: none !important; + margin-left: 0px !important; + height: auto !important; + width: 200px !important; } #login_openid { - #id_openid_url { - width: 180px !important; - overflow: hidden !important; } - label { - width: 180px !important; - } + #id_openid_url { + width: 180px !important; + overflow: hidden !important; } + label { + width: 180px !important; + } } @@ -423,133 +423,154 @@ h6 { * nav */ nav { - height: 60px; - background-color: @dk_bg_colour; - color: @bg_colour; - position: relative; - padding: 20px 20px 10px 95px; - a { - text-decoration: none; - color: @bg_colour; - border: 0px; - &:hover { - text-decoration: none; - color: @bg_colour; - border: 0px; } } - #banner { - display: block; - position: absolute; - left: 51px; - top: 25px; - #logo-text a { - font-size: 40px; - font-weight: bold; - margin-left: 3px; } } + height: 60px; + background-color: @dk_bg_colour; + color: @bg_colour; + position: relative; + padding: 20px 20px 10px 95px; + a { + text-decoration: none; + color: @bg_colour; + border: 0px; + &:hover { + text-decoration: none; + color: @bg_colour; + border: 0px; } } + #banner { + display: block; + position: absolute; + left: 51px; + top: 25px; + #logo-text a { + font-size: 40px; + font-weight: bold; + margin-left: 3px; } } +} +#site-location { + font-weight: bold; + font-style: italic; + font-size: small; + width: 30em; + position: relative; + left: -3.5em; + top: 3em; } ul#user-menu-popup { - display: none; - position: absolute; - background-color: @menu_bg_colour; - width: 100%; - padding: 10px 0px; - margin: 0px; - top: 20px; - left: 0; - font-size: small; - line-height: 1; - .rounded_corners(0 0 5px 5px); - .box_shadow(5px, 5px, 10px, 0px); - z-index: 10000; - li { - display: block; - a { - display: block; - padding: 5px; - color: @bg_colour; - background-color: @menu_bg_colour; - &:hover { - color: @bg_colour; - background-color: @main_colour; - } - &.nav-sep { - border-top: 1px solid @bg_alt_colour; } } } + display: none; + position: absolute; + background-color: @menu_bg_colour; + width: 100%; + padding: 10px 0px; + margin: 3px 0 0; + top: 20px; + left: 0; + font-size: small; + line-height: 1; + .rounded_corners(0 0 5px 5px); + .box_shadow(5px, 5px, 10px, 0px); + z-index: 10000; + li { + display: block; + a { + display: block; + padding: 5px; + color: @bg_colour; + background-color: @menu_bg_colour; + &:hover { + color: @bg_colour; + background-color: @main_colour; + } + &.nav-sep { + border-top: 1px solid @bg_alt_colour; } } } } nav .nav-link { - display: inline-block; - .box(22px, 22px); - overflow: hidden; - margin: 0px 5px 5px; - text-indent: 50px; - background: transparent url(light/icons.png) 0 0 no-repeat; + display: inline-block; + .box(22px, 22px); + overflow: hidden; + margin: 0px 5px 5px; + text-indent: 50px; + background: transparent url(light/icons.png) 0 0 no-repeat; +} +#nav-admin-link { + background-position: 0 -154px; + &:hover { + background-position: -22px -154px; + } } #nav-apps-link { - background-position: 0 -66px; - &:hover { - background-position: -22px -66px; - } + background-position: 0 -66px; + &:hover { + background-position: -22px -66px; + } } #nav-community-link, #nav-contacts-link { - background-position: 0 -22px; - &:hover { - background-position: -22px -22px; - } + background-position: 0 -22px; + &:hover { + background-position: -22px -22px; + } } #nav-directory-link { - background-position: -44px -154px; - &:hover { - background-position: -66px -154px; - } + background-position: -44px -154px; + &:hover { + background-position: -66px -154px; + } } #nav-help-link { - background-position: 0 -110px; - &:hover { - background-position: -22px -110px; - } + background-position: 0 -110px; + &:hover { + background-position: -22px -110px; + } } #nav-home-link { - background-position: -44px -132px; - &:hover { - background-position: -66px -132px; - } + background-position: -44px -132px; + &:hover { + background-position: -66px -132px; + } } #nav-intro-link { - background-position: 0px -190px; - &:hover { - background-position: -44px -190px; - } + background-position: 0px -88px; + &:hover { + background-position: -22px -88px; + } } #nav-login-link, #nav-logout-link { - background-position: 0 -88px; - &:hover { - background-position: -22px -88px; - } + background-position: 0 -88px; + &:hover { + background-position: -22px -88px; + } +} +#nav-manage-link { + background-position: 0px -22px; + &:hover { + background-position: -22px -22px; + } } #nav-messages-link { - background-position: -44px -88px; - &:hover { - background-position: -66px -88px; - } + background-position: -44px -88px; + &:hover { + background-position: -66px -88px; + } } #nav-notify-link, #nav-notifications-linkmenu { - background-position: -44px -110px; + background-position: -44px -110px; } #nav-notify-link:hover { - background-position: -66px -110px; + background-position: -66px -110px; } #nav-network-link { - background-position: 0px -177px; - &:hover { - background-position: -22px -177px; - } + background-position: 0px -177px; + &:hover { + background-position: -22px -177px; + } } #nav-search-link { - background-position: 0 -44px; - &:hover { - background-position: -22px -44px; - } + background-position: 0 -44px; + &:hover { + background-position: -22px -44px; + } } #jot-title, #profile-link, @@ -571,266 +592,282 @@ nav .nav-link { .hover, .focus, .pointer { - cursor: pointer; + cursor: pointer; } //* popup notifications */ div.jGrowl div { - &.notice { - background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center; - color: white; - padding-left: 58px; - margin-top: 50px; - } - &.info { - background: @info url("../../../images/icons/48/info.png") no-repeat 5px center; - color: white; - padding-left: 58px; - margin-top: 50px; - } - // &.jGrowl-message { - - // } + &.notice { + background: @notice url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: white; + padding-left: 58px; + margin-top: 50px; + } + &.info { + background: @info url("../../../images/icons/48/info.png") no-repeat 5px center; + color: white; + padding-left: 58px; + margin-top: 50px; + } + // &.jGrowl-message { + + // } } #nav-notifications-menu { - margin: 30px 0 0 -20px; - width: 275px; - max-height: 300px; - overflow-y: auto; - font-size: 9pt; - img { - float: left; - margin-right: 5px; } - .notif-when { - font-size: 0.8em; - display: block; } - li { - word-wrap: normal; - border-bottom: 1px solid black; - &:hover { - color: black; } - } - a:hover { - color: black; - text-decoration: underline; - } + margin: 30px 0 0 -20px; + width: 275px; + max-height: 300px; + overflow-y: auto; + font-size: 9pt; + img { + float: left; + margin-right: 5px; } + .notif-when { + font-size: 0.8em; + display: block; } + li { + word-wrap: normal; + border-bottom: 1px solid black; + &:hover { + color: black; } + } + a:hover { + color: black; + text-decoration: underline; + } } nav #nav-notifications-linkmenu { - &.on .icon.s22.notify, - &.selected .icon.s22.notify { - // background-image: url("../../../images/icons/22/notify_on.png"); - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg=="); - } + &.on .icon.s22.notify, + &.selected .icon.s22.notify { + // background-image: url("../../../images/icons/22/notify_on.png"); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg=="); + } } .show { - display: block; + display: block; } #notifications { - .box(170px, 20px); - font-size: small; - top: -19px; - left: 4px; - position: absolute; + .box(170px, 20px); + font-size: small; + top: -19px; + left: 4px; + position: absolute; } #nav-floater { - position: fixed; - top: 20px; - right: 1%; - padding: 5px; - background: @dk_bg_colour; - color: transparent; - .rounded_corners; - z-index: 100; - .box(270px, 60px); + position: fixed; + top: 20px; + right: 1%; + padding: 5px; + background: @dk_bg_colour; + color: transparent; + .rounded_corners; + z-index: 100; + .box(270px, 60px); } #nav-buttons { - clear: both; - list-style: none; - padding: 0px; - margin: 0px; - height: 25px; - > li { - padding: 0; - display: inline-block; - margin: 0px -4px 0px 0px; - } + clear: both; + list-style: none; + padding: 0px; + margin: 0px; + height: 25px; + > li { + padding: 0; + display: inline-block; + margin: 0px -4px 0px 0px; + } +} +#nav-buttons-2 { + clear: both; + list-style: none; + padding: 0px; + margin: 0px; + left: 136px; + top: -20px; + position: relative; + .box(6em, 25px); + > li { + padding: 0; + display: inline-block; + margin: 0px -4px 0px 0px; + } } .floaterflip { - display: block; - position: fixed; - z-index: 110; - top: 56px; - right: 19px; - .box(22px, 22px); - overflow: hidden; - margin: 0px; - background: transparent url(light/icons.png) -190px -60px no-repeat; + display: block; + position: fixed; + z-index: 110; + top: 56px; + right: 19px; + .box(22px, 22px); + overflow: hidden; + margin: 0px; + background: transparent url(light/icons.png) -190px -60px no-repeat; } .search-box { - display: inline-block; - margin: 5px; - position: fixed; - right: 0px; - bottom: 0px; - z-index: 100; - background: @dk_bg_colour; - .rounded_corners; + display: inline-block; + margin: 5px; + position: fixed; + right: 0px; + bottom: 0px; + z-index: 100; + background: @dk_bg_colour; + .rounded_corners; } #search-text, #mini-search-text { - background: white; - color: @main_colour; + background: white; + color: @main_colour; } #search-text { - .borders(1px, solid, @main_alt_colour); - margin: 5px 0; + .borders(1px, solid, @main_alt_colour); + margin: 5px 0; } #mini-search-text { - font-size: 8pt; - height: 14px; - width: 10em; - margin: 5px; + font-size: 8pt; + height: 14px; + width: 10em; + margin: 5px; } #scrollup { - position: fixed; - right: 5px; - bottom: 40px; - z-index: 100; - a:hover { - text-decoration: none; - border: 0; - } + position: fixed; + right: 5px; + bottom: 40px; + z-index: 100; + a:hover { + text-decoration: none; + border: 0; + } } #user-menu { - .box_shadow(5px, 0, 10px, 0); - display: block; - width: 80%; - margin: 3px 0 0 0; - position: relative; - .rounded_corners; - background-color: @menu_bg_colour; - background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q=="); - background-position: 98% center; - background-repeat: no-repeat; - clear: both; - top: 4px; - left: 10px; - padding: 2px; - > a { - vertical-align: top; - outline: 0 none; - } + .box_shadow(5px, 0, 10px, 0); + display: block; + width: 35%; + margin: 5px 0 0 0; + position: relative; + .rounded_corners; + background-color: @menu_bg_colour; + background-image: url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q=="); + background-position: 98% center; + background-repeat: no-repeat; +/* clear: both;*/ + top: 4px; + left: 7px; + padding: 2px; + > a { + vertical-align: top; + outline: 0 none; + } } #user-menu-label { - font-size: small; - padding: 3px 20px 9px 5px; - height: 10px; + font-size: small; + padding: 0px 20px 10px 5px; + height: 10px; + display: block; } .nav-ajax-update, .nav-ajax-left { - .box(30px, 19px); - background: transparent url(light/notifications.png) 0 0 no-repeat; - color: @main_colour; - font-weight: bold; - font-size: 0.8em; - padding-top: 0.2em; - text-align: center; - float: left; - margin: 0 -1px 0 3px; - display: block; - visibility: hidden; + .box(30px, 19px); + background: transparent url(light/notifications.png) 0 0 no-repeat; + color: @main_colour; + font-weight: bold; + font-size: 0.8em; + padding-top: 0.2em; + text-align: center; + float: left; + margin: 0 -1px 0 3px; + display: block; + visibility: hidden; } .nav-ajax-update.show, .nav-ajax-left.show { - visibility: visible; + visibility: visible; } #net-update { - background-position: 0px 0px; + background-position: 0px 0px; } #mail-update { - background-position: -30px 0; + background-position: -30px 0; } #notify-update { - background-position: -60px 0px; + background-position: -60px 0px; } #home-update { - background-position: -90px 0px; + background-position: -90px 0px; } #intro-update { - background-position: -120px 0px; + background-position: -120px 0px; } #lang-select-icon { - cursor: pointer; - position: fixed; - left: 28px; - bottom: 6px; - z-index: 10; + cursor: pointer; + position: fixed; + left: 28px; + bottom: 6px; + z-index: 10; } #language-selector { - position: fixed; - bottom: 2px; - left: 52px; - z-index: 10; + position: fixed; + bottom: 2px; + left: 52px; + z-index: 10; } .menu-popup { - position: absolute; - display: none; - // width: 11em; - background: white; - color: @main_colour; - margin: 0px; - padding: 0px; - font-size: small; - line-height: 1.2; - .borders(3px, solid, @link_colour); - .rounded_corners; - z-index: 100000; - .box_shadow; - a { - display: block; - color: @main_colour; - padding: 5px 10px; - text-decoration: none; - &:hover { - color: @bg_colour; - background-color: @link_colour; - } - } - .menu-sep { - border-top: 1px solid @med_bg_colour; - } - li { - float: none; - overflow: auto; - height: auto; - display: block; - img { - float: left; - .box(16px, 16px); - padding-right: 5px; - } - } - .empty { - padding: 5px; - text-align: center; - color: lighten(@shiny_colour, 45%); - } + position: absolute; + display: none; + // width: 11em; + background: white; + color: @main_colour; + margin: 0px; + padding: 0px; + font-size: small; + line-height: 1.2; + .borders(3px, solid, @link_colour); + .rounded_corners; + z-index: 100000; + .box_shadow; + a { + display: block; + color: @main_colour; + padding: 5px 10px; + text-decoration: none; + &:hover { + color: @bg_colour; + background-color: @link_colour; + } + } + .menu-sep { + border-top: 1px solid @med_bg_colour; + } + li { + float: none; + overflow: auto; + height: auto; + display: block; + img { + float: left; + .box(16px, 16px); + padding-right: 5px; + } + } + .empty { + padding: 5px; + text-align: center; + color: lighten(@shiny_colour, 45%); + } } .notif-item { - font-size: small; - a { - vertical-align: middle; - } + font-size: small; + a { + vertical-align: middle; + } } .notif-image { - .box(32px, 32px); - padding: 7px 7px 0px 0px; + .box(32px, 32px); + padding: 7px 7px 0px 0px; } .notify-seen { - background: @disabled_colour; - color: @main_colour; + background: @disabled_colour; + color: @main_colour; } .notify-unseen { - color: @main_colour; + color: @main_colour; } @@ -838,32 +875,32 @@ nav #nav-notifications-linkmenu { * sysmsg */ #sysmsg_info { - position: fixed; - bottom: 0; - .box_shadow(@main_shadow); - padding: 10px; - background-color: @lt_orange; - .borders(2px, solid, @orange); - border-bottom: 0; - padding-bottom: 50px; - z-index: 1000; + position: fixed; + bottom: 0; + .box_shadow(@main_shadow); + padding: 10px; + background-color: @lt_orange; + .borders(2px, solid, @orange); + border-bottom: 0; + padding-bottom: 50px; + z-index: 1000; } #sysmsg { - position: fixed; - bottom: 0; - .box_shadow(@main_shadow); - padding: 10px; - background-color: @lt_orange; - .borders(2px, solid, @orange); - border-bottom: 0; - padding-bottom: 50px; - z-index: 1000; + position: fixed; + bottom: 0; + .box_shadow(@main_shadow); + padding: 10px; + background-color: @lt_orange; + .borders(2px, solid, @orange); + border-bottom: 0; + padding-bottom: 50px; + z-index: 1000; } #sysmsg_info br, #sysmsg br { - display: block; - margin: 2px 0px; - border-top: 1px solid @bg_colour; + display: block; + margin: 2px 0px; + border-top: 1px solid @bg_colour; } @@ -871,85 +908,85 @@ nav #nav-notifications-linkmenu { * aside */ #asidemain { - float: left; - font-size: small; - margin: 1em; - width: 25%; - display: inline; + float: left; + font-size: small; + margin: 1em; + width: 25%; + display: inline; } /* for now, disappear these */ #asideright, #asideleft { - display: none; + display: none; } .vcard { - .fn { - font-size: 1.5em; - font-weight: bold; - border-bottom: 1px solid @hover_colour; - padding-bottom: 3px; - } - #profile-photo-wrapper { - margin: 20px 0; - background-color: @menu_bg_colour; - padding: 5px; - .box(175px, 175px); - .rounded_corners; - .box_shadow(3px, 3px, 10px, 0); - } + .fn { + font-size: 1.5em; + font-weight: bold; + border-bottom: 1px solid @hover_colour; + padding-bottom: 3px; + } + #profile-photo-wrapper { + margin: 20px 0; + background-color: @menu_bg_colour; + padding: 5px; + .box(175px, 175px); + .rounded_corners; + .box_shadow(3px, 3px, 10px, 0); + } } #asidemain { - h4 { - font-size: 1.2em; } - #viewcontacts { - text-align: right; - } - #contact-block { - width: 99%; - .contact-block-content { - width: 99%; - .contact-block-div { - float: left; - margin: 0 5px 5px 0; - .box(50px, 50px); - padding: 3px; - position: relative; } } } + h4 { + font-size: 1.2em; } + #viewcontacts { + text-align: right; + } + #contact-block { + width: 99%; + .contact-block-content { + width: 99%; + .contact-block-div { + float: left; + margin: 0 5px 5px 0; + .box(50px, 50px); + padding: 3px; + position: relative; } } } } .aprofile dt { - background: transparent; - color: darken(@main_alt_colour, 20%); - font-weight: bold; - .box_shadow(3px, 3px, 5px); - .rounded_corners; - margin: 15px 0 5px; - padding-left: 5px; + background: transparent; + color: darken(@main_alt_colour, 20%); + font-weight: bold; + .box_shadow(3px, 3px, 5px); + .rounded_corners; + margin: 15px 0 5px; + padding-left: 5px; } #profile-extra-links ul { - margin-left: 0px; - padding-left: 0px; - list-style: none; + margin-left: 0px; + padding-left: 0px; + list-style: none; } #dfrn-request-link { - .rounded_corners; - color: @bg_colour; - display: block; - font-size: 1.2em; - padding: 0.2em 0.5em; - background-color: @link_colour; - // background-image: url(icons/connect.png); - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII="); - background-repeat: no-repeat; - background-position: 95% center; + .rounded_corners; + color: @bg_colour; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; + background-color: @link_colour; + // background-image: url(icons/connect.png); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII="); + background-repeat: no-repeat; + background-position: 95% center; } #wallmessage-link { - ///*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/ - ///*border-radius: 5px 5px 5px 5px;*/ - color: @bg_colour; - display: block; - font-size: 1.2em; - padding: 0.2em 0.5em; + ///*background: #3465A4 url(dark/connect.png) no-repeat 95% center;*/ + ///*border-radius: 5px 5px 5px 5px;*/ + color: @bg_colour; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; } .ttright { - margin: 0px; + margin: 0px; } @@ -957,12 +994,12 @@ nav #nav-notifications-linkmenu { * contacts block */ .contact-block-div { - .box(50px, 50px); - float: left; + .box(50px, 50px); + float: left; } .contact-block-textdiv { - .box(150px, 34px); - float: left; + .box(150px, 34px); + float: left; } @@ -970,96 +1007,96 @@ nav #nav-notifications-linkmenu { * jot */ #jot { - margin: 10px 0 20px 0px; - width: 100%; - #jot-tools { - margin: 0px; - padding: 0px; - .box(100%, 35px); - overflow: none; - span { - float: left; - margin: 10px 20px 2px 0px; - a { - display: block; - } - } - .perms { - float: right; - width: 40px; - } - li.loading { - float: right; - background-color: white; - .box(20px, 38px); - vertical-align: center; - text-align: center; - border-top: 2px solid #9eabb0; - img { - margin-top: 10px; - } - } - } - #jot-title { - .borders(1px, solid, lighten(@main_alt_colour, 20%)); - margin: 0 0 5px; - .box(90%, 20px); - font-weight: bold; - .rounded_corners; - vertical-align: middle; - } + margin: 10px 0 20px 0px; + width: 100%; + #jot-tools { + margin: 0px; + padding: 0px; + .box(100%, 35px); + overflow: none; + span { + float: left; + margin: 10px 20px 2px 0px; + a { + display: block; + } + } + .perms { + float: right; + width: 40px; + } + li.loading { + float: right; + background-color: white; + .box(20px, 38px); + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + img { + margin-top: 10px; + } + } + } + #jot-title { + .borders(1px, solid, lighten(@main_alt_colour, 20%)); + margin: 0 0 5px; + .box(90%, 20px); + font-weight: bold; + .rounded_corners; + vertical-align: middle; + } } #jot-category { - margin: 5px 0; - .rounded_corners; - .borders(1px, solid, lighten(@main_alt_colour, 20%)); - color: darken(@main_alt_colour, 20%); - font-size: smaller; - &:focus { - color: @main_colour; - } + margin: 5px 0; + .rounded_corners; + .borders(1px, solid, lighten(@main_alt_colour, 20%)); + color: darken(@main_alt_colour, 20%); + font-size: smaller; + &:focus { + color: @main_colour; + } } #jot #character-counter { - .box(6%, 15px); - float: right; - text-align: right; - line-height: 20px; - padding: 2px 20px 5px 0; + .box(6%, 15px); + float: right; + text-align: right; + line-height: 20px; + padding: 2px 20px 5px 0; } #profile-jot-text_parent { - .box_shadow(5px, 0, 10px, 0); + .box_shadow(5px, 0, 10px, 0); } #profile-jot-text_tbl { - margin-bottom: 10px; - background: darken(@main_alt_colour, 10%); + margin-bottom: 10px; + background: darken(@main_alt_colour, 10%); } #profile-jot-text_ifr { - width: 99.900002% !important; + width: 99.900002% !important; } #profile-jot-text_toolbargroup, .mceCenter tr { - background: darken(@main_alt_colour, 10%); + background: darken(@main_alt_colour, 10%); } [id$="jot-text_ifr"] { - // width: 99.900002% !important; - color: @main_colour; - background: @bg_colour; - .mceContentBody { - color: @main_colour; - background: @bg_colour; - } + // width: 99.900002% !important; + color: @main_colour; + background: @bg_colour; + .mceContentBody { + color: @main_colour; + background: @bg_colour; + } } .defaultSkin { - tr.mceFirst { - background: darken(@main_alt_colour, 10%); - } - td { - &.mceFirst, &.mceLast { - background-color: @bg_colour; - } - } - span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon { - background-color: @bg_colour; - } + tr.mceFirst { + background: darken(@main_alt_colour, 10%); + } + td { + &.mceFirst, &.mceLast { + background-color: @bg_colour; + } + } + span.mceIcon, img.mceIcon, .mceButtonDisabled .mceIcon { + background-color: @bg_colour; + } } #profile-attach-wrapper, #profile-audio-wrapper, @@ -1069,92 +1106,92 @@ nav #nav-notifications-linkmenu { #profile-title-wrapper, #profile-upload-wrapper, #profile-video-wrapper { - float: left; - margin: 0 20px 0 0; + float: left; + margin: 0 20px 0 0; } #profile-rotator-wrapper { - float: right; + float: right; } #profile-jot-email-wrapper { - margin: 10px 10% 0; - .borders(1px, solid, @menu_bg_colour); - border-bottom: 0; + margin: 10px 10% 0; + .borders(1px, solid, @menu_bg_colour); + border-bottom: 0; } #profile-jot-email-label { - background-color: @menu_bg_colour; - color: @bg_colour; - padding: 5px; + background-color: @menu_bg_colour; + color: @bg_colour; + padding: 5px; } #profile-jot-email { - width: 90%; - margin: 5px; + width: 90%; + margin: 5px; } #profile-jot-networks { - margin: 0 10%; - border: 1px solid @menu_bg_colour; - border-top: 0; - border-bottom: 0; - padding: 5px; + margin: 0 10%; + border: 1px solid @menu_bg_colour; + border-top: 0; + border-bottom: 0; + padding: 5px; } #profile-jot-net { - margin: 5px 0; + margin: 5px 0; } #jot-preview-link { - margin: 0 0 0 10px; - border: 0; - text-decoration: none; - float: right; + margin: 0 0 0 10px; + border: 0; + text-decoration: none; + float: right; } .icon-text-preview { - margin: 0 0 -18px 0; - display: block; - .box(20px, 20px); - background: url(light/icons.png) no-repeat -128px -40px; - border: 0; - text-decoration: none; - float: right; - cursor: pointer; + margin: 0 0 -18px 0; + display: block; + .box(20px, 20px); + background: url(light/icons.png) no-repeat -128px -40px; + border: 0; + text-decoration: none; + float: right; + cursor: pointer; } #profile-jot-perms { - float: right; - color: @menu_bg_colour; - .box(20px, 20px); - .rounded_corners; - .box_shadow(3px, 3px, 5px, 0); - .borders(2px, outset, @menu_bg_colour); - overflow: hidden; - margin: 0 10px 0 10px; + float: right; + color: @menu_bg_colour; + .box(20px, 20px); + .rounded_corners; + .box_shadow(3px, 3px, 5px, 0); + .borders(2px, outset, @menu_bg_colour); + overflow: hidden; + margin: 0 10px 0 10px; } #profile-jot-plugin-wrapper { - width: 1px; - margin: 10px 0 0 0; - float: right; + width: 1px; + margin: 10px 0 0 0; + float: right; } #profile-jot-submit-wrapper { - float: right; - width: 100%; - margin: 10px 0 0 0; - padding: 0; + float: right; + width: 100%; + margin: 10px 0 0 0; + padding: 0; } #profile-jot-submit { - height: auto; - background-color: @menu_bg_colour; - color: @bg_colour; - .rounded_corners; - .borders(2px, outset, @menu_bg_colour); - margin: 0; - float: right; - .text_shadow; - width: auto; - &:active { - .box_shadow(0, 0, 0, 0); - } + height: auto; + background-color: @menu_bg_colour; + color: @bg_colour; + .rounded_corners; + .borders(2px, outset, @menu_bg_colour); + margin: 0; + float: right; + .text_shadow; + width: auto; + &:active { + .box_shadow(0, 0, 0, 0); + } } #jot-perms-icon { - .box(22px, 22px); - .rounded_corners; - overflow: hidden; - background: @menu_bg_colour url("dark/icons.png") -88px -40px; + .box(22px, 22px); + .rounded_corners; + overflow: hidden; + background: @menu_bg_colour url("dark/icons.png") -88px -40px; } #group_allow_wrapper, #group_deny_wrapper, @@ -1162,67 +1199,67 @@ nav #nav-notifications-linkmenu { #contact_allow_wrapper, #contact_deny_wrapper, #acl-deny-outer-wrapper { - width: 47%; + width: 47%; } #group_allow_wrapper, #group_deny_wrapper, #acl-permit-outer-wrapper { - float: left; + float: left; } #contact_allow_wrapper, #contact_deny_wrapper, #acl-deny-outer-wrapper { - float: right; + float: right; } #acl-permit-text { - background-color: @menu_bg_colour; - color: @main_colour; - padding: 5px; - float: left; + background-color: @menu_bg_colour; + color: @main_colour; + padding: 5px; + float: left; } #jot-public { - background-color: @menu_bg_colour; - color: @alert; - padding: 5px; - float: left; + background-color: @menu_bg_colour; + color: @alert; + padding: 5px; + float: left; } #acl-deny-text { - background-color: @menu_bg_colour; - color: @bg_colour; - padding: 5px; - float: left; + background-color: @menu_bg_colour; + color: @bg_colour; + padding: 5px; + float: left; } #jot-title-desc { - color: lighten(@main_alt_colour, 20%); + color: lighten(@main_alt_colour, 20%); } #profile-jot-desc { - background: @bg_colour; - .borders; - .rounded_corners; - color: @red_orange; - margin: 5px 0; + background: @bg_colour; + .borders; + .rounded_corners; + color: @red_orange; + margin: 5px 0; } #jot-title-wrapper { - margin-bottom: 5px; + margin-bottom: 5px; } #jot-title-display { - font-weight: bold; + font-weight: bold; } .jothidden { - display: none; + display: none; } #jot-preview-content { - background-color: @shiny_colour; - color: @main_colour; - .borders(1px, solid, @main_colour); - .rounded_corners; - .box_shadow(5px, 0, 10px); - padding: 3px 3px 6px 10px; - .wall-item-outside-wrapper { - border: 0; - .rounded_corners(0px 0px 0px 0px); - .box_shadow(0, 0, 0, 0); - } + background-color: @shiny_colour; + color: @main_colour; + .borders(1px, solid, @main_colour); + .rounded_corners; + .box_shadow(5px, 0, 10px); + padding: 3px 3px 6px 10px; + .wall-item-outside-wrapper { + border: 0; + .rounded_corners(0px 0px 0px 0px); + .box_shadow(0, 0, 0, 0); + } } @@ -1230,12 +1267,12 @@ nav #nav-notifications-linkmenu { * section */ #sectionmain { - margin: 1em; - font-size: 0.8em; - min-width: 475px; - width: 69%; - float: left; - display: inline; + margin: 1em; + font-size: 0.8em; + min-width: 475px; + width: 69%; + float: left; + display: inline; } @@ -1243,51 +1280,51 @@ nav #nav-notifications-linkmenu { * tabs */ .tabs { - .list_reset; - margin: 10px 0; - li { - display: inline; - font-size: smaller; - } + .list_reset; + margin: 10px 0; + li { + display: inline; + font-size: smaller; + } } .multibutton () { - .borders(1px, solid, @hover_colour); - padding: 4px; - .rounded_corners; - &:active, - &:hover { - background: @shiny_colour; - color: @main_colour; - .borders(1px, solid, @hover_colour); - } - a { - border: 0; - text-decoration: none; - } + .borders(1px, solid, @hover_colour); + padding: 4px; + .rounded_corners; + &:active, + &:hover { + background: @shiny_colour; + color: @main_colour; + .borders(1px, solid, @hover_colour); + } + a { + border: 0; + text-decoration: none; + } } .multibutton_active () { - background: @dk_bg_colour; - color: @bg_colour; - .borders(1px, solid, @hover_colour); - padding: 4px; - .rounded_corners; - &:hover { - background: @shiny_colour; - color: @main_colour; - .borders(1px, solid, @hover_colour); - } - a { - color: @bg_colour; - text-decoration: none; - } + background: @dk_bg_colour; + color: @bg_colour; + .borders(1px, solid, @hover_colour); + padding: 4px; + .rounded_corners; + &:hover { + background: @shiny_colour; + color: @main_colour; + .borders(1px, solid, @hover_colour); + } + a { + color: @bg_colour; + text-decoration: none; + } } .tab { - .multibutton; + .multibutton; } .tab { - &.active { - .multibutton_active; - } + &.active { + .multibutton_active; + } } @@ -1295,223 +1332,223 @@ nav #nav-notifications-linkmenu { * items */ .wall-item-outside-wrapper { - .borders(1px, solid, darken(@main_alt_colour, 27%)); - .rounded_corners; - .box_shadow(6px, 1px, 10px, -2px);//@lt_shadow_colour - &.comment { - margin-top: 5px; - } + .borders(1px, solid, darken(@main_alt_colour, 27%)); + .rounded_corners; + .box_shadow(6px, 1px, 10px, -2px);//@lt_shadow_colour + &.comment { + margin-top: 5px; + } } .wall-item-content-wrapper { - position: relative; - padding: 0.75em; - width: auto; + position: relative; + padding: 0.75em; + width: auto; } .wall-item-outside-wrapper .wall-item-comment-wrapper { - /*margin-left: 90px;*/ - .preview { - border: 0; - .rounded_corners(0px); - } + /*margin-left: 90px;*/ + .preview { + border: 0; + .rounded_corners(0px); + } } .shiny { - background: @shiny_colour; - .rounded_corners; + background: @shiny_colour; + .rounded_corners; } .wall-outside-wrapper .shiny { - .rounded_corners; + .rounded_corners; } .heart { - color: red; + color: red; } .wall-item-content { - overflow-x: auto; - margin: 0px 4em 1em 5px; + overflow-x: auto; + margin: 0px 4em 1em 5px; } [id^="tread-wrapper"], [class^="tread-wrapper"] { - margin: 1.2em 0 0 0; - padding: 0px; + margin: 1.2em 0 0 0; + padding: 0px; } .wall-item-photo-menu { - display: none; + display: none; } .wall-item-photo-menu-button { - display: none; - text-indent: -99999px; - background: @menu_bg_colour url(light/menu-user-pin.jpg) no-repeat 75px center; - position: absolute; - overflow: hidden; - .box(90px, 20px); - top: 85px; - left: 0; - .rounded_corners(0 0 5px 5px); + display: none; + text-indent: -99999px; + background: @menu_bg_colour url(light/menu-user-pin.jpg) no-repeat 75px center; + position: absolute; + overflow: hidden; + .box(90px, 20px); + top: 85px; + left: 0; + .rounded_corners(0 0 5px 5px); } .wall-item-info { - float: left; - width: 7em; - position: relative; + float: left; + width: 7em; + position: relative; } .wall-item-photo-wrapper { - .box(80px, 80px); - position: relative; - padding: 5px; - background-color: @menu_bg_colour; - .rounded_corners; + .box(80px, 80px); + position: relative; + padding: 5px; + background-color: @menu_bg_colour; + .rounded_corners; } [class^="wall-item-tools"] * { - /*margin: 0 0 5px 0;*/ - > * { - /*margin: 0 0 5px 0;*/ - } + /*margin: 0 0 5px 0;*/ + > * { + /*margin: 0 0 5px 0;*/ + } } .wall-item-tools { - float: right; - opacity: 0.4; - .transition; - &:hover { - opacity: 1; - .transition; - } + float: right; + opacity: 0.4; + .transition; + &:hover { + opacity: 1; + .transition; + } } .wall-item-subtools1 { - .box(30px, 30px); - list-style: none outside none; - margin: 18px 0 30px -20px; - padding: 0; + .box(30px, 30px); + list-style: none outside none; + margin: 18px 0 30px -20px; + padding: 0; } .wall-item-subtools2 { - .box(25px, 25px); - list-style: none outside none; - margin: -78px 0 0 5px; - padding: 0; + .box(25px, 25px); + list-style: none outside none; + margin: -78px 0 0 5px; + padding: 0; } .wall-item-title { - font-size: 1.2em; - font-weight: bold; - margin-bottom: 1.4em; + font-size: 1.2em; + font-weight: bold; + margin-bottom: 1.4em; } .wall-item-body { - margin: 15px 10px 10px 0px; - text-align: left; - overflow-x: auto; + margin: 15px 10px 10px 0px; + text-align: left; + overflow-x: auto; } .wall-item-lock-wrapper { - float: right; - .box(22px, 22px); - margin: 0 -5px 0 0; - opacity: 1; + float: right; + .box(22px, 22px); + margin: 0 -5px 0 0; + opacity: 1; } .wall-item-dislike, .wall-item-like { - clear: left; - font-size: 0.8em; - color: @main_colour; - margin: 5px 0 5px 10.2em; - .transition; - opacity: 0.5; - &:hover { - opacity: 1; - } + clear: left; + font-size: 0.8em; + color: @main_colour; + margin: 5px 0 5px 10.2em; + .transition; + opacity: 0.5; + &:hover { + opacity: 1; + } } .wall-item-author, .wall-item-actions-author, .wall-item-ago { - color: @main_colour; - line-height: 1; - display: inline-block; - font-size: x-small; - margin: 0.5em auto; - font-weight: bold; + color: @main_colour; + line-height: 1; + display: inline-block; + font-size: x-small; + margin: 0.5em auto; + font-weight: bold; } .comment-edit-preview { - width: auto; - margin: auto auto auto -2em; - &.wall-item-author, - &.wall-item-actions-author, - &.wall-item-ago { - font-size: smaller; - } + width: auto; + margin: auto auto auto -2em; + &.wall-item-author, + &.wall-item-actions-author, + &.wall-item-ago { + font-size: smaller; + } } .wall-item-location { - margin-top: 2em; - width: 6em; - overflow: hidden; - .text_overflow; - .icon { - float: left; - } - > a, - .smalltext { - margin-left: 25px; - font-size: 0.7em; - display: block; - } - > br { - display: none; - } + margin-top: 2em; + width: 6em; + overflow: hidden; + .text_overflow; + .icon { + float: left; + } + > a, + .smalltext { + margin-left: 25px; + font-size: 0.7em; + display: block; + } + > br { + display: none; + } } .wallwall { - .wwto { - left: 5px; - margin: 0; - position: absolute; - top: 75px; - z-index: 10001; - .box(30px, 30px); - img { - width: 30px !important; - height: 30px !important; - } - } - .wall-item-photo-end { - clear: both; - } + .wwto { + left: 5px; + margin: 0; + position: absolute; + top: 75px; + z-index: 10001; + .box(30px, 30px); + img { + width: 30px !important; + height: 30px !important; + } + } + .wall-item-photo-end { + clear: both; + } } .wall-item-arrowphoto-wrapper { - position: absolute; - left: 35px; - top: 80px; - z-index: 10002; + position: absolute; + left: 35px; + top: 80px; + z-index: 10002; } .wall-item-photo-menu { - min-width: 92px; - font-size: 0.75em; - .borders(2px, solid, @menu_bg_colour); - border-top: 0px; - background: @menu_bg_colour; - position: absolute; - left: -2px; - top: 101px; - display: none; - z-index: 10003; - .rounded_corners(0 5px 5px 5px); - li a { - white-space: nowrap; - display: block; - padding: 5px 6px; - color: @bg_colour; - &:hover { - color: @menu_bg_colour; - background: @bg_colour; - } - } + min-width: 92px; + font-size: 0.75em; + .borders(2px, solid, @menu_bg_colour); + border-top: 0px; + background: @menu_bg_colour; + position: absolute; + left: -2px; + top: 101px; + display: none; + z-index: 10003; + .rounded_corners(0 5px 5px 5px); + li a { + white-space: nowrap; + display: block; + padding: 5px 6px; + color: @bg_colour; + &:hover { + color: @menu_bg_colour; + background: @bg_colour; + } + } } #item-delete-selected { - overflow: auto; - width: 100%; + overflow: auto; + width: 100%; } #connect-services-header, #extra-help-header { - margin: 1.5em 0 0 0; + margin: 1.5em 0 0 0; } #connect-services, #extra-help { - .list_reset; - margin: 1em 0 0 0; - li { - display: inline; - } + .list_reset; + margin: 1em 0 0 0; + li { + display: inline; + } } @@ -1519,36 +1556,36 @@ nav #nav-notifications-linkmenu { * comment */ .ccollapse-wrapper { - font-size: 0.9em; - margin-left: 5em; + font-size: 0.9em; + margin-left: 5em; } .hide-comments-outer { - font-size: small; + font-size: small; } .wall-item-outside-wrapper.comment { - margin-left: 5em; - .wall-item-info { - width: 5em; - } - .wall-item-photo { - width: 40px !important; - height: 40px !important; - } - .wall-item-photo-wrapper { - .box(40px, 40px); - } - .wall-item-photo-menu-button { - width: 3.35em; - top: 3.2em; - background-position: 35px center; - } - .wall-item-author { - margin-left: 0.2em; - } - .wall-item-photo-menu { - min-width: 4.5em; - top: 5.5em; - } + margin-left: 5em; + .wall-item-info { + width: 5em; + } + .wall-item-photo { + width: 40px !important; + height: 40px !important; + } + .wall-item-photo-wrapper { + .box(40px, 40px); + } + .wall-item-photo-menu-button { + width: 3.35em; + top: 3.2em; + background-position: 35px center; + } + .wall-item-author { + margin-left: 0.2em; + } + .wall-item-photo-menu { + min-width: 4.5em; + top: 5.5em; + } } .comment-wwedit-wrapper { .borders(1px, solid, @main_colour); @@ -1556,61 +1593,61 @@ nav #nav-notifications-linkmenu { margin: 5px; } .comment-edit-wrapper { - border-top: 1px #aaa solid; + border-top: 1px #aaa solid; } [class^="comment-edit-bb"] { - .list_reset; - display: none; - margin: -40px 0 5px 60px; - width: 75%; - > li { - display: inline-block; - margin: 0 10px 0 0; - visibility: none; - } + .list_reset; + display: none; + margin: -40px 0 5px 60px; + width: 75%; + > li { + display: inline-block; + margin: 0 10px 0 0; + visibility: none; + } } .comment-wwedit-wrapper img, .comment-edit-wrapper img { - .box; + .box; } .comment-edit-photo-link, .comment-edit-photo { - margin-left: 10px; + margin-left: 10px; } .my-comment-photo { - .box(40px, 40px); - padding: 5px; + .box(40px, 40px); + padding: 5px; } [class^="comment-edit-text"] { - margin: 5px 0 10px 20px; - width: 94%; + margin: 5px 0 10px 20px; + width: 94%; } .comment-edit-text-empty { - height: 20px; - .med_borders; - .rounded_corners; - color: @med_border_colour; - .transition; - &:hover { - color: darken(@main_alt_colour, 33.5%); - } + height: 20px; + .med_borders; + .rounded_corners; + color: @med_border_colour; + .transition; + &:hover { + color: darken(@main_alt_colour, 33.5%); + } } .comment-edit-text-full { - height: 10em; - .rounded_corners; - .transition; + height: 10em; + .rounded_corners; + .transition; } .comment-edit-submit-wrapper { - width: 90%; - margin: 5px 5px 10px 50px; - text-align: right; + width: 90%; + margin: 5px 5px 10px 50px; + text-align: right; } .comment-edit-submit { - height: 22px; - background-color: @menu_bg_colour; - color: @bg_colour; - .rounded_corners; - border: 0; + height: 22px; + background-color: @menu_bg_colour; + color: @bg_colour; + .rounded_corners; + border: 0; } @@ -1622,14 +1659,14 @@ nav #nav-notifications-linkmenu { border-bottom: 1px dashed darken(@main_alt_colour, 6.5%); border-left: 5px solid darken(@main_alt_colour, 6.5%); border-top: 1px dashed darken(@main_alt_colour, 6.5%); - color: darken(@main_alt_colour, 50%); + color: darken(@main_alt_colour, 50%); display: block; overflow-x: auto; padding: 5px 0 15px 10px; width: 95%; - a { - color: @lt_link_colour; - } + a { + color: @lt_link_colour; + } } @@ -1637,47 +1674,47 @@ nav #nav-notifications-linkmenu { * profile */ div { - &[id$="text"] { - font-weight: bold; - border-bottom: 1px solid @bg_colour; - } - &[id$="wrapper"] { - height: 100%; - br { - clear: left; - } - } + &[id$="text"] { + font-weight: bold; + border-bottom: 1px solid @bg_colour; + } + &[id$="wrapper"] { + height: 100%; + br { + clear: left; + } + } } .profile-match-wrapper { - float: left; - margin: 0 5px 40px 0; - .box(120px, 120px); - padding: 3px; - position: relative; + float: left; + margin: 0 5px 40px 0; + .box(120px, 120px); + padding: 3px; + position: relative; } .icon.drophide.profile-match-ignore { - margin: 0 6px 0 -3px; + margin: 0 6px 0 -3px; } .profile-match-photo { - + } [id$="-end"], [class$="-end"] { - clear: both; - margin: 0 0 10px 0; + clear: both; + margin: 0 0 10px 0; } .profile-match-end { - margin: 0 0 5px 0; + margin: 0 0 5px 0; } .profile-match-name { - font-weight: bold; - margin: auto auto auto 23px; + font-weight: bold; + margin: auto auto auto 23px; } .profile-match-connect { - font-style: italic; - margin: auto auto auto 23px; + font-style: italic; + margin: auto auto auto 23px; } #advanced-profile-with { - margin-left: 200px; + margin-left: 200px; } @@ -1685,98 +1722,98 @@ div { * photos */ .photos { - height: auto; - overflow: auto; + height: auto; + overflow: auto; } #photo-top-links { - margin-bottom: 30px; + margin-bottom: 30px; } .photo-album-image-wrapper, .photo-top-image-wrapper { - float: left; - .box_shadow(3px, 3px, 10px, 0); - background-color: @bg_colour; - color: @main_colour; - .rounded_corners; - padding-bottom: 30px; - position: relative; - margin: 0 10px 10px 0; + float: left; + .box_shadow(3px, 3px, 10px, 0); + background-color: @bg_colour; + color: @main_colour; + .rounded_corners; + padding-bottom: 30px; + position: relative; + margin: 0 10px 10px 0; } #photo-photo { - margin: auto auto 5em 20%; - img { - max-width: 50%; - } + margin: auto auto 5em 20%; + img { + max-width: 50%; + } } .photo-top-image-wrapper a:hover, #photo-photo a:hover, .photo-album-image-wrapper a:hover { - border-bottom: 0; + border-bottom: 0; } .photo-top-photo, .photo-album-photo { - .rounded_corners(5px 5px 0 0); + .rounded_corners(5px 5px 0 0); } .photo-top-album-name, .caption { - position: absolute; - bottom: 0; - padding: 0 5px; + position: absolute; + bottom: 0; + padding: 0 5px; } #photo-prev-link, #photo-next-link { - position: absolute; - // .box(30%, 100%); - .box(50px, 200px); - background: white center center no-repeat; - opacity: 0; - .transition(all, 0.5s); - z-index: 10; - top: 15em; - .rounded_corners; - &:hover { - opacity: 0.6; - .transition(all, 0.5s); - } - .icon { - display: none; - } + position: absolute; + // .box(30%, 100%); + .box(50px, 200px); + background: white center center no-repeat; + opacity: 0; + .transition(all, 0.5s); + z-index: 10; + top: 15em; + .rounded_corners; + &:hover { + opacity: 0.6; + .transition(all, 0.5s); + } + .icon { + display: none; + } } #photo-prev-link { - // background-image: url(light/prev.png); - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII="); + // background-image: url(light/prev.png); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII="); left: 5%; } #photo-next-link { - // background-image: url(light/next.png); - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII="); + // background-image: url(light/next.png); + background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII="); left: 50%; } #photo-prev-link a, #photo-next-link a { - display: block; - .box(100%, 100%); - .rounded_corners; - overflow: hidden; - text-indent: -900000px; + display: block; + .box(100%, 100%); + .rounded_corners; + overflow: hidden; + text-indent: -900000px; } #photos-upload-spacer, #photos-upload-new-wrapper, #photos-upload-exist-wrapper { - margin-bottom: 1em; + margin-bottom: 1em; } #photos-upload-existing-album-text, #photos-upload-newalbum-div { - background-color: @menu_bg_colour; - color: @bg_colour; - padding: 1px; + background-color: @menu_bg_colour; + color: @bg_colour; + padding: 1px; } #photos-upload-album-select, #photos-upload-newalbum { - width: 99%; + width: 99%; } #photos-upload-perms-menu { - text-align: right; + text-align: right; } #photo-edit-caption, #photo-edit-newtag, @@ -1784,45 +1821,45 @@ div { } #photo-edit-link-wrap { - margin-bottom: 15px; + margin-bottom: 15px; } #photo-edit-caption, #photo-edit-newtag { } #photo-edit-perms { - width: auto; + width: auto; } #photo-edit-rotate-label { - .label; + .label; } #photo-like-div { - float: left; - margin: auto 0 0; - width: 2em; - .rounded_corners; - .borders; + float: left; + margin: auto 0 0; + width: 2em; + .rounded_corners; + .borders; } .wall-item-like-buttons { - > * { - display: inline; - } + > * { + display: inline; + } } #photo-edit-delete-button { - margin: auto auto auto 1em; + margin: auto auto auto 1em; } #photo-edit-end { - margin-bottom: 35px; + margin-bottom: 35px; } #photo-caption { - font-size: 110%; - font-weight: bold; - margin-top: 15px; - margin-bottom: 15px; + font-size: 110%; + font-weight: bold; + margin-top: 15px; + margin-bottom: 15px; } #wall-photo-container { - margin: 0 auto 1em 4em; - width: 90%; + margin: 0 auto 1em 4em; + width: 90%; } @@ -1830,79 +1867,79 @@ div { * message */ .prvmail-text { - width: 100%; + width: 100%; } #prvmail-subject { - width: 100%; - color: @bg_colour; - background: @main_colour; + width: 100%; + color: @bg_colour; + background: @main_colour; } #prvmail-submit-wrapper { - margin-top: 10px; + margin-top: 10px; } #prvmail-submit { - float: right; - margin-top: 0; + float: right; + margin-top: 0; } #prvmail-submit-wrapper div { - margin-right: 5px; - float: left; + margin-right: 5px; + float: left; } .mail-list-outside-wrapper { - margin-top: 20px; + margin-top: 20px; } .mail-list-sender { - float: left; + float: left; } .mail-list-detail { - margin-left: 90px; + margin-left: 90px; } .mail-list-sender-name { - display: inline; - font-size: 1.1em; + display: inline; + font-size: 1.1em; } .mail-list-date { - display: inline; - font-size: 0.9em; - padding-left: 10px; + display: inline; + font-size: 0.9em; + padding-left: 10px; } .mail-list-sender-name, .mail-list-date { - font-style: italic; + font-style: italic; } .mail-list-subject { - font-size: 1.2em; + font-size: 1.2em; } .mail-list-delete-wrapper { - float: right; + float: right; } .mail-list-outside-wrapper-end { - clear: both; - border-bottom: 1px @main_colour dotted; + clear: both; + border-bottom: 1px @main_colour dotted; } .mail-conv-sender { - float: left; - margin: 0px 5px 5px 0px; + float: left; + margin: 0px 5px 5px 0px; } .mail-conv-sender-photo { - .box(32px, 32px) + .box(32px, 32px) } .mail-conv-sender-name { - float: left; + float: left; } .mail-conv-date { - float: right; + float: right; } .mail-conv-subject { - clear: right; - font-weight: bold; - font-size: 1.2em; + clear: right; + font-weight: bold; + font-size: 1.2em; } .mail-conv-body { - clear: both; + clear: both; } .mail-conv-delete-wrapper { - margin-top: 5px; + margin-top: 5px; } @@ -1911,129 +1948,129 @@ div { */ .view-contact-wrapper, .contact-entry-wrapper { - float: left; - margin: 0 5px 40px 0; - .box(120px, 135px); - padding: 3px; - position: relative; + float: left; + margin: 0 5px 40px 0; + .box(120px, 135px); + padding: 3px; + position: relative; } .contact-direction-wrapper { - position: absolute; - top: 20px; + position: absolute; + top: 20px; } .contact-edit-links { - position: absolute; - top: 60px; + position: absolute; + top: 60px; } .contact-entry-photo-wrapper {} .contact-entry-photo { - margin-left: 20px; + margin-left: 20px; } .contact-entry-name { - width: 120px; - font-weight: bold; - font-size: small; + width: 120px; + font-weight: bold; + font-size: small; } .contact-entry-details { - font-size: x-small; + font-size: x-small; } .contact-entry-photo { - position: relative; + position: relative; } .contact-entry-edit-links .icon { - .borders(1px, solid, #babdb6); - .rounded_corners(3px); - background-color: white; + .borders(1px, solid, #babdb6); + .rounded_corners(3px); + background-color: white; } #contact-entry-url, [id^="contact-entry-url"], #contact-entry-network, [id^="contact-entry-network"] { - font-size: smaller; + font-size: smaller; } #contact-entry-network, [id^="contact-entry-network"] { - font-style: italic; + font-style: italic; } #contact-edit-banner-name { - font-size: 1.5em; + font-size: 1.5em; } #contact-edit-photo-wrapper { - position: relative; - float: left; - padding: 20px; + position: relative; + float: left; + padding: 20px; } #contact-edit-direction-icon { - position: absolute; - top: 60px; - left: 0; + position: absolute; + top: 60px; + left: 0; } #contact-edit-nav-wrapper { - margin-left: 0px; + margin-left: 0px; } #contact-edit-links { - margin-top: 23px; + margin-top: 23px; } #contact-drop-links { - margin-left: 5px; + margin-left: 5px; } #contact-edit-nav-wrapper .icon { - .borders(1px, solid, #babdb6); - .rounded_corners(3px); + .borders(1px, solid, #babdb6); + .rounded_corners(3px); } #contact-edit-poll-wrapper { - margin-left: 0px; + margin-left: 0px; } #contact-edit-last-update-text { - margin-bottom: 15px; + margin-bottom: 15px; } #contact-edit-last-updated { - font-weight: bold; + font-weight: bold; } #contact-edit-poll-text { - display: inline; + display: inline; } #contact-edit-end { - clear: both; - margin-bottom: 65px; + clear: both; + margin-bottom: 65px; } .contact-photo-menu-button { - position: absolute; - background: url("light/photo-menu.jpg") top left no-repeat transparent; - margin: 0px; - padding: 0px; - .box(16px, 16px); - top: 64px; - left: 0px; - overflow: hidden; - text-indent: 40px; - display: none; + position: absolute; + background: url("light/photo-menu.jpg") top left no-repeat transparent; + margin: 0px; + padding: 0px; + .box(16px, 16px); + top: 64px; + left: 0px; + overflow: hidden; + text-indent: 40px; + display: none; } .contact-photo-menu { - width: auto; - .borders(2px, solid, @link_colour); - background: @bg_colour; - color: @main_colour; - position: absolute; - font-size: smaller; - .rounded_corners; - left: 0px; - top: 90px; - display: none; - z-index: 10000; - li a { - display: block; - padding: 4px; - color: @link_colour; - background: @bg_colour; - line-height: 1; - &:hover { - background: @link_colour; - color: @bg_colour; - text-decoration: none; - } - } + width: auto; + .borders(2px, solid, @link_colour); + background: @bg_colour; + color: @main_colour; + position: absolute; + font-size: smaller; + .rounded_corners; + left: 0px; + top: 90px; + display: none; + z-index: 10000; + li a { + display: block; + padding: 4px; + color: @link_colour; + background: @bg_colour; + line-height: 1; + &:hover { + background: @link_colour; + color: @bg_colour; + text-decoration: none; + } + } } @@ -2042,23 +2079,23 @@ div { */ .openid {} #id_openid_url { - background: url(light/login-bg.gif) no-repeat; - background-position: 0 50%; - padding-left: 18px; + background: url(light/login-bg.gif) no-repeat; + background-position: 0 50%; + padding-left: 18px; } #settings-default-perms { - margin-bottom: 20px; + margin-bottom: 20px; } #register-form div, #profile-edit-form div { - clear: both; + clear: both; } .settings-block { - label { - clear: left; - } - input { - margin: 10px 5px; - } + label { + clear: left; + } + input { + margin: 10px 5px; + } } #register-form label, #profile-edit-form label { @@ -2071,53 +2108,53 @@ div { margin-bottom: 20px; } #profile-edit-marital-label span { - margin: -4px; + margin: -4px; } .settings-submit-wrapper, .profile-edit-submit-wrapper { - margin: 0 0 30px; + margin: 0 0 30px; } .profile-edit-side-div { - display: none; + display: none; } #profiles-menu-trigger { - margin: 0px 0px 0px 25px; + margin: 0px 0px 0px 25px; } .profile-listing { - float: left; - margin: 20px 20px 0px 0px; + float: left; + margin: 20px 20px 0px 0px; } .icon-profile-edit { - background: url("light/icons.png") -150px 0px no-repeat; - border: 0; - cursor: pointer; - display: block; - .box(20px, 20px); - margin: 0 0 -18px; - text-decoration: none; - top: 113px; - right: 260px; + background: url("light/icons.png") -150px 0px no-repeat; + border: 0; + cursor: pointer; + display: block; + .box(20px, 20px); + margin: 0 0 -18px; + text-decoration: none; + top: 113px; + right: 260px; } #profile-edit-links ul { - .list_reset; - margin: 20px 0; + .list_reset; + margin: 20px 0; } .marital { - margin-top: 5px; + margin-top: 5px; } #register-sitename { - display: inline; - font-weight: bold; + display: inline; + font-weight: bold; } #advanced-expire-popup { - background: @main_colour; - color: @bg_colour; + background: @main_colour; + color: @bg_colour; } #id_ssl_policy { - width: 374px; + width: 374px; } #theme-preview img { - margin: 10px 10px 10px 288px; + margin: 10px 10px 10px 288px; } @@ -2125,39 +2162,39 @@ div { * contacts selector */ .group-delete-wrapper { - margin: -31px 50px 0 0; - float: right; + margin: -31px 50px 0 0; + float: right; } /*.group-delete-icon { margin: 0 0 0 10px; }*/ #group-edit-submit-wrapper { - margin: 0 0 10px 0; - display: inline; + margin: 0 0 10px 0; + display: inline; } #group-members, #prof-members { - height: 200px; - overflow: auto; - .borders(1px, solid, @menu_bg_colour); - .rounded_corners(5px 5px 0 0); + height: 200px; + overflow: auto; + .borders(1px, solid, @menu_bg_colour); + .rounded_corners(5px 5px 0 0); } #group-all-contacts, #prof-all-contacts { - height: 200px; - overflow: auto; - .borders(1px, solid, @menu_bg_colour); - .rounded_corners(0 0 5px 5px); + height: 200px; + overflow: auto; + .borders(1px, solid, @menu_bg_colour); + .rounded_corners(0 0 5px 5px); } #group-members h3, #group-all-contacts h3, #prof-members h3, #prof-all-contacts h3 { - color: @bg_colour; - background-color: @menu_bg_colour; - margin: 0; - padding: 5px; + color: @bg_colour; + background-color: @menu_bg_colour; + margin: 0; + padding: 5px; } #group-separator, #prof-separator { - display: none; + display: none; } @@ -2165,10 +2202,10 @@ div { * profile */ #cropimage-wrapper { - float: left; + float: left; } #crop-image-form { - clear: both; + clear: both; } @@ -2176,47 +2213,47 @@ div { * intros */ .intro-wrapper { - margin-top: 20px; + margin-top: 20px; } .intro-fullname { - font-size: 1.1em; - font-weight: bold; + font-size: 1.1em; + font-weight: bold; } .intro-note { - padding: 10px; + padding: 10px; } .intro-end { - padding: 30px; + padding: 30px; } .intro-form { - float: left; + float: left; } .intro-approve-form { - clear: both; + clear: both; } .intro-submit-approve, .intro-submit-ignore { - margin-right: 20px; + margin-right: 20px; } .intro-submit-approve { - margin-top: 15px; + margin-top: 15px; } .intro-approve-as-friend-label, .intro-approve-as-fan-label, .intro-approve-as-friend, .intro-approve-as-fan { - float: left; + float: left; } .intro-form-end { - clear: both; - margin-bottom: 10px; + clear: both; + margin-bottom: 10px; } .intro-approve-as-end { - clear: both; - margin-bottom: 10px; + clear: both; + margin-bottom: 10px; } .clear { - clear: both; + clear: both; } @@ -2224,23 +2261,23 @@ div { * events */ .eventcal { - float: left; - font-size: 20px; + float: left; + font-size: 20px; } .event { - background: @bg_colour; + background: @bg_colour; } .vevent { - border: 1px solid @bg_colour; - .event-description, - .event-location, - .event-start { - margin-left: 10px; - margin-right: 10px; - } + border: 1px solid @bg_colour; + .event-description, + .event-location, + .event-start { + margin-left: 10px; + margin-right: 10px; + } } #new-event-link { - margin-bottom: 10px; + margin-bottom: 10px; } .edit-event-link, .plink-event-link { @@ -2250,105 +2287,105 @@ div { /*margin-bottom: 15px;*/ } .event-description:before { - content: url('../../../images/calendar.png'); - margin-right: 15px; + content: url('../../../images/calendar.png'); + margin-right: 15px; } .event-start, .event-end { - margin-left: 10px; - width: 330px; - font-size: smaller; + margin-left: 10px; + width: 330px; + font-size: smaller; } .event-start .dtstart, .event-end .dtend { - float: right; + float: right; } .event-list-date { - margin-bottom: 10px; + margin-bottom: 10px; } .prevcal, .nextcal { - float: left; - margin: 64px 32px auto 32px; + float: left; + margin: 64px 32px auto 32px; } .calendar { - font-family: monospace; + font-family: monospace; } .today { - font-weight: bold; - color: red; + font-weight: bold; + color: red; } #event-start-text, #event-finish-text { - margin-top: 10px; - margin-bottom: 5px; + margin-top: 10px; + margin-bottom: 5px; } #event-nofinish-checkbox, #event-nofinish-text, #event-adjust-checkbox, #event-adjust-text, #event-share-checkbox { - float: left; + float: left; } #event-datetime-break { - margin-bottom: 10px; + margin-bottom: 10px; } #event-nofinish-break, #event-adjust-break, #event-share-break { - clear: both; + clear: both; } #event-desc-text, #event-location-text { - margin-top: 10px; - margin-bottom: 5px; + margin-top: 10px; + margin-bottom: 5px; } #event-submit { - margin-top: 10px; + margin-top: 10px; } .body-tag { - margin: 10px 0; - opacity: 0.5; - &:hover { - opacity: 1.0 !important; - } + margin: 10px 0; + opacity: 0.5; + &:hover { + opacity: 1.0 !important; + } } .filesavetags, .categorytags { - margin: 20px 0; - opacity: 0.5; + margin: 20px 0; + opacity: 0.5; } .filesavetags:hover, .categorytags:hover { - margin: 20px 0; - opacity: 1.0 !important; + margin: 20px 0; + opacity: 1.0 !important; } .item-select { - opacity: 0.1; - margin: 5px 0 0 6px !important; - &:hover { - opacity: 1; - } + opacity: 0.1; + margin: 5px 0 0 6px !important; + &:hover { + opacity: 1; + } } .checkeditem { - opacity: 1; + opacity: 1; } #item-delete-selected { - margin-top: 30px; + margin-top: 30px; } /* was tired of having no way of moving it around, so * here's a little 'hook' to do so */ .delete-checked { - position: absolute; - left: 35px; - margin-top: 20px; + position: absolute; + left: 35px; + margin-top: 20px; } #item-delete-selected-icon { - float: left; - margin-right: 5px; + float: left; + margin-right: 5px; } .fc-state-highlight { - background: @bg_colour; - color: @main_colour; + background: @bg_colour; + color: @main_colour; } @@ -2356,12 +2393,12 @@ div { * directory */ .directory-item { - float: left; - margin: 0 5px 4px 0; - padding: 3px; - width: 180px; - height: 250px; - position: relative; + float: left; + margin: 0 5px 4px 0; + padding: 3px; + width: 180px; + height: 250px; + position: relative; } @@ -2369,93 +2406,93 @@ div { * sidebar */ #group-sidebar { - margin-bottom: 10px; + margin-bottom: 10px; } .categories-selected, .group-selected, .nets-selected, .fileas-selected { - // padding: 4px; - color: @main_colour; - // background: @dk_bg_colour; - // .borders(1px, solid, @hover_colour); - .multibutton_active; + // padding: 4px; + color: @main_colour; + // background: @dk_bg_colour; + // .borders(1px, solid, @hover_colour); + .multibutton_active; } .categories-selected:hover, .group-selected:hover, .nets-selected:hover, .fileas-selected:hover { // padding: 4px; - // color: @link_colour; + // color: @link_colour; // background: @bg_colour; // .borders(1px, solid, @link_colour); } .groupsideedit { - margin-right: 10px; + margin-right: 10px; } #sidebar-group-ul { - padding-left: 0; + padding-left: 0; } #sidebar-group-list { - margin: 0 0 5px 0; - li { - margin-top: 10px; - } - .icon { - display: inline-block; - .box(12px, 12px); - } + margin: 0 0 5px 0; + li { + margin-top: 10px; + } + .icon { + display: inline-block; + .box(12px, 12px); + } } .sidebar-group-element { - .multibutton; - .rounded_corners; + .multibutton; + .rounded_corners; } #sidebar-new-group { - margin: auto; - display: inline-block; - color: @bg_colour; - text-decoration: none; - text-align: center; + margin: auto; + display: inline-block; + color: @bg_colour; + text-decoration: none; + text-align: center; } #peoplefind-sidebar form { - margin-bottom: 10px; + margin-bottom: 10px; } #sidebar-new-group { - &:hover { - /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/ - /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/ - /*background-color: #b20202;*/ - } - &:active { - position: relative; - top: 1px; - } + &:hover { + /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/ + /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/ + /*background-color: #b20202;*/ + } + &:active { + position: relative; + top: 1px; + } } #side-peoplefind-url { - .borders(1px, solid, darken(@main_alt_colour, 20%)); - margin-right: 3px; - width: 75%; + .borders(1px, solid, darken(@main_alt_colour, 20%)); + margin-right: 3px; + width: 75%; } .categories-ul, .nets-ul { - .list_reset; - li { - margin: 10px 0 0; - } + .list_reset; + li { + margin: 10px 0 0; + } } .categories-link, .nets-link, .nets-all { - .multibutton; - .rounded_corners; - margin-left: 0px; + .multibutton; + .rounded_corners; + margin-left: 0px; } #netsearch-box { - margin: 20px 0px 30px; - width: 135px; - #search-submit { - margin: 5px 5px 0px 0px; - } + margin: 20px 0px 30px; + width: 135px; + #search-submit { + margin: 5px 5px 0px 0px; + } } @@ -2463,98 +2500,98 @@ div { * admin */ #pending-update { - float: right; - color: white; - font-weight: bold; - background-color: red; - padding: 0 0.3em; + float: right; + color: white; + font-weight: bold; + background-color: red; + padding: 0 0.3em; } .admin { - &.linklist { - border: 0; - padding: 0; - } - &.link { - .list_reset; - } + &.linklist { + border: 0; + padding: 0; + } + &.link { + .list_reset; + } } #adminpage { - color: @main_colour; - background: @bg_colour; - margin: 5px; - padding: 10px; - font-size: smaller; - dl { - clear: left; - margin-bottom: 2px; - padding-bottom: 2px; - border-bottom: 1px solid @shadow_colour; - } - dt { - width: 250px; - float: left; - font-weight: bold; - } - dd { - margin-left: 250px; - } - h3 { - border-bottom: 1px solid lighten(@main_alt_colour, 20%); - } - .submit { - clear: left; - } - #pluginslist { - margin: 0; - padding: 0; - } - .plugin { - display: block; - .borders(1px, solid, darken(@main_alt_colour, 6.5%)); - padding: 1em; - margin-bottom: 5px; - clear: left; - } - .toggleplugin { - float: left; - margin-right: 1em; - } - table { - width: 100%; - border-bottom: 1px solid @shadow_colour; - margin: 5px 0; - th { - font-weight: bold; - text-align: left; - } - td { - padding: 5px; - vertical-align: middle; - } - &#users { - padding: 5px; - img { - .box(16px, 16px); - } + color: @main_colour; + background: @bg_colour; + margin: 5px; + padding: 10px; + font-size: smaller; + dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid @shadow_colour; + } + dt { + width: 250px; + float: left; + font-weight: bold; + } + dd { + margin-left: 250px; + } + h3 { + border-bottom: 1px solid lighten(@main_alt_colour, 20%); + } + .submit { + clear: left; + } + #pluginslist { + margin: 0; + padding: 0; + } + .plugin { + display: block; + .borders(1px, solid, darken(@main_alt_colour, 6.5%)); + padding: 1em; + margin-bottom: 5px; + clear: left; + } + .toggleplugin { + float: left; + margin-right: 1em; + } + table { + width: 100%; + border-bottom: 1px solid @shadow_colour; + margin: 5px 0; + th { + font-weight: bold; + text-align: left; + } + td { + padding: 5px; + vertical-align: middle; + } + &#users { + padding: 5px; + img { + .box(16px, 16px); + } a { - color: @main_colour; - text-decoration: underline; + color: @main_colour; + text-decoration: underline; } - } - } - td .icon { - float: left; - } - .selectall { - text-align: right; - } + } + } + td .icon { + float: left; + } + .selectall { + text-align: right; + } } #users .name { - color: @main_colour; + color: @main_colour; } #users .tools { - padding: 5px 0; - vertical-align: middle; + padding: 5px 0; + vertical-align: middle; } @@ -2562,50 +2599,50 @@ div { * form fields */ .field { - overflow: auto; + overflow: auto; } .field .onoff { - float: right; - margin: 0 330px 0 auto; - width: 80px; - a { - display: block; - .borders(1px, solid, darken(@main_alt_colour, 20%)); - padding: 3px 6px 4px 10px; - height: 16px; - text-decoration: none; - } - .on, .off { - background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q=='); - background-repeat: no-repeat; - } - .on { - background-position: 42px 1px; - background-color: darken(@main_alt_colour, 40%); - color: lighten(@main_alt_colour, 20%); - text-align: left; - } - .off { - background-position: 2px 1px; - background-color: lighten(@main_alt_colour, 20%); - color: darken(@main_alt_colour, 40%); - text-align: right; - } + float: right; + margin: 0 330px 0 auto; + width: 80px; + a { + display: block; + .borders(1px, solid, darken(@main_alt_colour, 20%)); + padding: 3px 6px 4px 10px; + height: 16px; + text-decoration: none; + } + .on, .off { + background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q=='); + background-repeat: no-repeat; + } + .on { + background-position: 42px 1px; + background-color: darken(@main_alt_colour, 40%); + color: lighten(@main_alt_colour, 20%); + text-align: left; + } + .off { + background-position: 2px 1px; + background-color: lighten(@main_alt_colour, 20%); + color: darken(@main_alt_colour, 40%); + text-align: right; + } } .hidden { - display: none !important; + display: none !important; } .field textarea { - .box(80%, 100px); + .box(80%, 100px); } .field_help { - display: block; - margin-left: 297px; - color: darken(@main_alt_colour, 20%); - font-size: small; + display: block; + margin-left: 297px; + color: darken(@main_alt_colour, 20%); + font-size: small; } .field.radio .field_help { - margin-left: 297px; + margin-left: 297px; } @@ -2613,95 +2650,95 @@ div { * update */ .popup { - .box(100%, 100%); - top: 0px; - left: 0px; - position: absolute; - display: none; - .background { - background-color: @main_colour; - opacity: 0.5; - .box(100%, 100%); - position: absolute; - top: 0px; - left: 0px; - } - .panel { - top: 25%; - left: 25%; - .box(50%, 50%); - padding: 1em; - position: absolute; - .borders(4px, solid, black); - background-color: white; - } + .box(100%, 100%); + top: 0px; + left: 0px; + position: absolute; + display: none; + .background { + background-color: @main_colour; + opacity: 0.5; + .box(100%, 100%); + position: absolute; + top: 0px; + left: 0px; + } + .panel { + top: 25%; + left: 25%; + .box(50%, 50%); + padding: 1em; + position: absolute; + .borders(4px, solid, black); + background-color: white; + } } #panel { - position: absolute; - font-size: small; - .rounded_corners; - .borders(1px, solid, @bg_colour); - background-color: @dk_bg_colour; - color: @bg_colour; - padding: 1em; - z-index: 100; + position: absolute; + font-size: small; + .rounded_corners; + .borders(1px, solid, @bg_colour); + background-color: @dk_bg_colour; + color: @bg_colour; + padding: 1em; + z-index: 100; } .pager { - margin-top: 60px; - display: block; - clear: both; - text-align: center; - font-size: small; - font-weight: bold; - span { - padding: 4px; - margin: 4px; - } + margin-top: 60px; + display: block; + clear: both; + text-align: center; + font-size: small; + font-weight: bold; + span { + padding: 4px; + margin: 4px; + } } .pager_current { - background-color: @link_colour; - color: @bg_colour; + background-color: @link_colour; + color: @bg_colour; } .grey, .gray { - color: gray; + color: gray; } .orange { - color: orange; + color: orange; } .red { - color: red; + color: red; } .popup .panel { - .panel_text { - display: block; - overflow: auto; - height: 80%; - } - .panel_in { - .box(100%, 100%); - position: relative; - } - .panel_actions { - width: 100%; - bottom: 4px; - left: 0px; - position: absolute; - } + .panel_text { + display: block; + overflow: auto; + height: 80%; + } + .panel_in { + .box(100%, 100%); + position: relative; + } + .panel_actions { + width: 100%; + bottom: 4px; + left: 0px; + position: absolute; + } } .panel_text .progress { - width: 50%; - overflow: hidden; - height: auto; - .borders(1px, solid, lighten(@main_alt_colour, 20%)); - margin-bottom: 5px; - span { - float: right; - display: block; - width: 25%; - background-color: @bg_colour; - text-align: right; - } + width: 50%; + overflow: hidden; + height: auto; + .borders(1px, solid, lighten(@main_alt_colour, 20%)); + margin-bottom: 5px; + span { + float: right; + display: block; + width: 25%; + background-color: @bg_colour; + text-align: right; + } } @@ -2709,24 +2746,24 @@ div { * OAuth */ .oauthapp { - height: auto; - overflow: auto; - border-bottom: 2px solid lighten(@main_alt_colour, 20%); - padding-bottom: 1em; - margin-bottom: 1em; - img { - float: left; - .box(48px, 48px); - margin: 10px; - &.noicon { - background-image: url("../../../images/icons/48/plugin.png"); - background-position: center center; - background-repeat: no-repeat; - } - } - a { - float: left; - } + height: auto; + overflow: auto; + border-bottom: 2px solid lighten(@main_alt_colour, 20%); + padding-bottom: 1em; + margin-bottom: 1em; + img { + float: left; + .box(48px, 48px); + margin: 10px; + &.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; + } + } + a { + float: left; + } } @@ -2734,251 +2771,251 @@ div { * icons */ .iconspacer { - display: block; - .box(16px, 16px); + display: block; + .box(16px, 16px); } .icon { - display: block; - .box; - background: transparent url("light/icons.png") no-repeat; - border: 0; - text-decoration: none; - .rounded_corners; - &:hover { - border: 0; - text-decoration: none; - } + display: block; + .box; + background: transparent url("light/icons.png") no-repeat; + border: 0; + text-decoration: none; + .rounded_corners; + &:hover { + border: 0; + text-decoration: none; + } } .editicon { - display: inline-block; - .box(21px, 21px); - background: url("light/editicons.png") no-repeat; - border: 0; - text-decoration: none; + display: inline-block; + .box(21px, 21px); + background: url("light/editicons.png") no-repeat; + border: 0; + text-decoration: none; } .shadow { - .box_shadow(2px, 2px, 5px, 2px); - &:active, &:focus, &:hover { - .box_shadow(0, 0, 0, 0); - } + .box_shadow(2px, 2px, 5px, 2px); + &:active, &:focus, &:hover { + .box_shadow(0, 0, 0, 0); + } } .editicon:hover { - border: 0; + border: 0; } .boldbb { - background-position: 0px 0px; - &:hover { - background-position: -22px 0px; } + background-position: 0px 0px; + &:hover { + background-position: -22px 0px; } } .italicbb { - background-position: 0px -22px; - &:hover { - background-position: -22px -22px; } + background-position: 0px -22px; + &:hover { + background-position: -22px -22px; } } .underlinebb { - background-position: 0px -44px; - &:hover { - background-position: -22px -44px; } + background-position: 0px -44px; + &:hover { + background-position: -22px -44px; } } .quotebb { - background-position: 0px -66px; - &:hover { - background-position: -22px -66px; } + background-position: 0px -66px; + &:hover { + background-position: -22px -66px; } } .codebb { - background-position: 0px -88px; - &:hover { - background-position: -22px -88px; } + background-position: 0px -88px; + &:hover { + background-position: -22px -88px; } } .imagebb { - background-position: -44px 0px; - &:hover { - background-position: -66px 0px; } + background-position: -44px 0px; + &:hover { + background-position: -66px 0px; } } .urlbb { - background-position: -44px -22px; - &:hover { - background-position: -66px -22px; } + background-position: -44px -22px; + &:hover { + background-position: -66px -22px; } } .videobb { - background-position: -44px -44px; - &:hover { - background-position: -66px -44px; } + background-position: -44px -44px; + &:hover { + background-position: -66px -44px; } } .icon { - &.drop, &.drophide, &.delete { - float: left; - margin: 0 2px; - } - &.s22 { - &.delete { - display: block; - background-position: -110px 0; - } - &.text { - padding: 10px 0px 0px 25px; - width: 200px; - } - } - &.text { - text-indent: 0px; - } - &.s16 { - min-width: 16px; - height: 16px; - } + &.drop, &.drophide, &.delete { + float: left; + margin: 0 2px; + } + &.s22 { + &.delete { + display: block; + background-position: -110px 0; + } + &.text { + padding: 10px 0px 0px 25px; + width: 200px; + } + } + &.text { + text-indent: 0px; + } + &.s16 { + min-width: 16px; + height: 16px; + } } // special case for wall items .wall-item-delete-wrapper.icon.delete, .wall-item-delete-wrapper.icon.drophide { - margin: 0; + margin: 0; } .s16 .add { - background: url("../../../images/icons/16/add.png") no-repeat; + background: url("../../../images/icons/16/add.png") no-repeat; } .add { - margin: 0px 5px; + margin: 0px 5px; } .article { - background-position: -50px 0; + background-position: -50px 0; } .audio { - background-position: -70px 0; + background-position: -70px 0; } .block { - background-position: -90px 0px; + background-position: -90px 0px; } .drop, .delete { - background-position: -110px 0; + background-position: -110px 0; } .drophide { - background-position: -130px 0; + background-position: -130px 0; } .edit { - background-position: -150px 0; + background-position: -150px 0; } .camera { - background-position: -170px 0; + background-position: -170px 0; } .dislike { - background-position: -190px 0; + background-position: -190px 0; } .file-as { - background-position: -230px -60px; + background-position: -230px -60px; } .like { - background-position: -211px 0; + background-position: -211px 0; } .link { - background-position: -230px 0; + background-position: -230px 0; } .globe, .location { - background-position: -50px -20px; + background-position: -50px -20px; } .noglobe, .nolocation { - background-position: -70px -20px; + background-position: -70px -20px; } .no { - background-position: -90px -20px; + background-position: -90px -20px; } .pause { - background-position: -110px -20px; + background-position: -110px -20px; } .play { - background-position: -130px -20px; + background-position: -130px -20px; } .pencil { - background-position: -151px -18px; + background-position: -151px -18px; } .small-pencil { - background-position: -170px -20px; + background-position: -170px -20px; } .recycle { - background-position: -190px -20px; + background-position: -190px -20px; } .remote-link { - background-position: -210px -20px; + background-position: -210px -20px; } .share { - background-position: -230px -20px; + background-position: -230px -20px; } .tools { - background-position: -50px -40px; + background-position: -50px -40px; } .lock { - background-position: -70px -40px; + background-position: -70px -40px; } .unlock { - background-position: -88px -40px; + background-position: -88px -40px; } .video { - background-position: -110px -40px; + background-position: -110px -40px; } .attach { - background-position: -191px -40px; + background-position: -191px -40px; } .language { - background-position: -210px -40px; + background-position: -210px -40px; } .starred { - background-position: -130px -60px; + background-position: -130px -60px; } .unstarred { - background-position: -150px -60px; + background-position: -150px -60px; } .tagged { - background-position: -170px -60px; + background-position: -170px -60px; } .on { - background-position: -50px -60px; + background-position: -50px -60px; } .off { - background-position: -70px -60px; + background-position: -70px -60px; } .prev { - background-position: -90px -60px; + background-position: -90px -60px; } .next { - background-position: -110px -60px; + background-position: -110px -60px; } .icon.dim { - opacity: 0.3; + opacity: 0.3; } #pause { - position: fixed; - bottom: 40px; - right: 30px; - z-index: 10; + position: fixed; + bottom: 40px; + right: 30px; + z-index: 10; } .border { - .borders(1px, solid, @border2); - .rounded_corners; - &:hover { - .borders(1px, solid, @border2); - .rounded_corners; - } + .borders(1px, solid, @border2); + .rounded_corners; + &:hover { + .borders(1px, solid, @border2); + .rounded_corners; + } } .attachtype { - display: block; - .box(20px, 23px); - background-image: url(../../../images/content-types.png); + display: block; + .box(20px, 23px); + background-image: url(../../../images/content-types.png); } .type-video { - background-position: 0px 0px; + background-position: 0px 0px; } .type-image { - background-position: -20px 0; + background-position: -20px 0; } .type-audio { - background-position: -40px 0; + background-position: -40px 0; } .type-text { - background-position: -60px 0px; + background-position: -60px 0px; } .type-unkn { - background-position: -80px 0; + background-position: -80px 0; } @@ -2986,23 +3023,23 @@ div { * footer */ .cc-license { - margin-top: 100px; - font-size: 0.7em; + margin-top: 100px; + font-size: 0.7em; } footer { - display: block; - clear: both; + display: block; + clear: both; } #sectionfooter { - margin: 1em 0 1em 0; + margin: 1em 0 1em 0; } #profile-jot-text { - height: 20px; - color: darken(@main_alt_colour, 20%); - background: lighten(@main_alt_colour, 20%); - .borders; - .rounded_corners; - width: 99.5%; + height: 20px; + color: darken(@main_alt_colour, 20%); + background: lighten(@main_alt_colour, 20%); + .borders; + .rounded_corners; + width: 99.5%; } @@ -3012,167 +3049,167 @@ footer { #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { - display: block !important; - background: @bg_colour; - color: @main_colour; + display: block !important; + background: @bg_colour; + color: @main_colour; } #profile-jot-acl-wrapper { - margin: 0 10px; - .borders(1px, solid, @menu_bg_colour); - border-top: 0; - font-size: small; - // .box_shadow; + margin: 0 10px; + .borders(1px, solid, @menu_bg_colour); + border-top: 0; + font-size: small; + // .box_shadow; } #acl-wrapper { - width: 660px; - margin: 0 auto; + width: 660px; + margin: 0 auto; } #acl-search { - float: right; - background: white url("../../../images/search_18.png") no-repeat right center; - padding-right: 20px; - margin: 6px; - color: @main_colour; + float: right; + background: white url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; + margin: 6px; + color: @main_colour; } #acl-showall { - float: left; - display: block; - .box(auto, 18px); - background: @bg_colour url("../../../images/show_all_off.png") 8px 8px no-repeat; - padding: 7px 10px 7px 30px; - .rounded_corners; - color: @main_alt_colour; - margin: 5px 0; - &.selected { - color: black; - background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; - } + float: left; + display: block; + .box(auto, 18px); + background: @bg_colour url("../../../images/show_all_off.png") 8px 8px no-repeat; + padding: 7px 10px 7px 30px; + .rounded_corners; + color: @main_alt_colour; + margin: 5px 0; + &.selected { + color: black; + background: #ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat; + } } #acl-list { - height: 210px; - .borders(1px, solid, lighten(@main_alt_colour, 20%); - clear: both; - margin-top: 30px; - overflow: auto; + height: 210px; + .borders(1px, solid, lighten(@main_alt_colour, 20%); + clear: both; + margin-top: 30px; + overflow: auto; } /*#acl-list-content { }*/ .acl-list-item { - .borders(1px, solid, lighten(@main_alt_colour, 20%)); - .box(120px, 110px); - display: block; - float: left; - margin: 3px 0 5px 5px; - img { - .box(22px, 22px); - float: left; - margin: 5px 5px 20px; - } - p { - height: 12px; - font-size: 10px; - margin: 0 0 22px; - padding: 2px 0 1px; - } - a { - background: lighten(@main_alt_colour, 20%) 3px 3px no-repeat; - .rounded_corners; - .box(55px, 20px); - clear: both; - font-size: 10px; - display: block; - color: @main_alt_colour; - margin: 5px auto 0; - padding: 0 3px; - text-align: center; - vertical-align: middle; - } + .borders(1px, solid, lighten(@main_alt_colour, 20%)); + .box(120px, 110px); + display: block; + float: left; + margin: 3px 0 5px 5px; + img { + .box(22px, 22px); + float: left; + margin: 5px 5px 20px; + } + p { + height: 12px; + font-size: 10px; + margin: 0 0 22px; + padding: 2px 0 1px; + } + a { + background: lighten(@main_alt_colour, 20%) 3px 3px no-repeat; + .rounded_corners; + .box(55px, 20px); + clear: both; + font-size: 10px; + display: block; + color: @main_alt_colour; + margin: 5px auto 0; + padding: 0 3px; + text-align: center; + vertical-align: middle; + } } #acl-wrapper a:hover { - text-decoration: none; - color: @main_colour; - border: 0; + text-decoration: none; + color: @main_colour; + border: 0; } //data URI: // data:[<MIME-type>][;charset=<encoding>][;base64],<data> .acl-button-show { - // background-image: url('../../../images/show_off.png'); - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg=='); - margin: 0 auto; + // background-image: url('../../../images/show_off.png'); + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABxSURBVAiZY/z//z8DDMyaNUuEgYEhk4GBwZ8JJrhv3z5DZmbmMwwMDOoMDAxpLKtWraqTl5d3fPv2rcn///9XpKWlpTIwMDCwfPr0SePWrVtmP378YPn//385zASmf//+Rf/8+XMpIyPj2bS0tHcwCQBWkiq6M5HGDgAAAABJRU5ErkJggg=='); + margin: 0 auto; } .acl-button-hide { - // background-image: url('../../../images/hide_off.png'); - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII='); - margin: 0 auto; + // background-image: url('../../../images/hide_off.png'); + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACWSURBVAiZBcEhDsIwFAbg/72+VXQ7wPSCIlj8JMlmcKQGgdgRCCfpEz0HjgSDw3IA1AQC1QqSpXwfqeoZwHOaphsAqGpfVVVHIYQNM1+J6MLMOwA9gAOVUhBC6Ky1r7quv03TrMZxzAwAIjKIyCel9JvneQ8ApKprY8zdObfNOXMp5bEsyyDGmJaITt77NwDEGI/W2vYP0nYuQ/Tw9H4AAAAASUVORK5CYII='); + margin: 0 auto; } .acl-button-show.selected { - // background: #9ade00 url(../../../images/show_on.png); - background: #9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII='); - color: black; + // background: #9ade00 url(../../../images/show_on.png); + background: #9ade00 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAFCAYAAABmWJ3mAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABXSURBVAiZTcyhDYNQGADh7xEGwGDxhD2qUWxAwIBgE9BdoxO03YaEEX7USzh5l1yKCJl0pBoT+uIhK3zRYk52Az5444w1FijxwoYOTT4UGPHHL9a4crgBhcYSpxKVgzIAAAAASUVORK5CYII='); + color: black; } .acl-button-hide.selected { - // background: #ff4141 url(../../../images/hide_on.png); - background: #ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg=='); - color: black; + // background: #ff4141 url(../../../images/hide_on.png); + background: #ff4141 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAACSSURBVAiZBcGhDoJQFAbg/z/3cGliJDOTszmLichGstkMPoTzvfA2N4vN6gMYCGhwMifMTY7fxyCy4zBcCrMjAFRk7p3LWAEzRwYT2StQgMwBrGlmOJCZV72Ok+QpcTyZ1/VHAEBEyiiKHq+2/d6bZgUADMCUIqeR94t338tAns2sVKea/sy2y667AUAgN+pc+gcI6S733PoZRAAAAABJRU5ErkJggg=='); + color: black; } .acl-list-item { - &.groupshow { - border-color: @group_show; - } - &.grouphide { - border-color: @group_hide; - } + &.groupshow { + border-color: @group_show; + } + &.grouphide { + border-color: @group_hide; + } } /** /acl **/ /* autocomplete popup */ .acpopup { - max-height: 175px; - max-width: 42%; - background-color: @menu_bg_colour; - color: white; - overflow: auto; - z-index: 100000; - border: 1px solid lighten(@main_alt_colour, 20%); + max-height: 175px; + max-width: 42%; + background-color: @menu_bg_colour; + color: white; + overflow: auto; + z-index: 100000; + border: 1px solid lighten(@main_alt_colour, 20%); } .acpopupitem { - background-color: @menu_bg_colour; - padding: 4px; - clear: left; - img { - float: left; - margin-right: 4px; - } - &.selected { - color: @dk_bg_colour; - background-color: @bg_colour; - } + background-color: @menu_bg_colour; + padding: 4px; + clear: left; + img { + float: left; + margin-right: 4px; + } + &.selected { + color: @dk_bg_colour; + background-color: @bg_colour; + } } .qcomment-wrapper { - padding: 0px; - margin: 5px 5px 5px 81%; + padding: 0px; + margin: 5px 5px 5px 81%; } .qcomment { - opacity: 0.5; - &:hover { - opacity: 1.0; - } + opacity: 0.5; + &:hover { + opacity: 1.0; + } } #network-star-link { - margin-top: 10px; + margin-top: 10px; } .network-star { - float: left; - margin-right: 5px; - &.icon.starred { - display: inline-block; - } + float: left; + margin-right: 5px; + &.icon.starred { + display: inline-block; + } } #fileas-sidebar {} .fileas-ul { - padding: 0; + padding: 0; } @@ -3180,21 +3217,21 @@ footer { * addons theming */ #sidebar-page-list { - ul { - padding: 0; - margin: 5px 0; - } - li { - list-style: none; - } + ul { + padding: 0; + margin: 5px 0; + } + li { + list-style: none; + } } #jappix_mini { - margin-left: 130px; - position: fixed; - bottom: 0; - /* override the jappix css */ - right: 175px !important; - z-index: 999; + margin-left: 130px; + position: fixed; + bottom: 0; + /* override the jappix css */ + right: 175px !important; + z-index: 999; } @import "../css/media"; diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 21343aea5..bb6754dae 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -1,56 +1,57 @@ <nav id="pagenav"> -<span id="banner">$banner</span> +<div id="banner">$banner</div> +<div id="site-location">$sitelocation</div> <a name="top" id="top"></a> <div id="nav-floater"> <ul id="nav-buttons"> {{ if $nav.login }} <li><a id="nav-login-link" class="nav-login-link $nav.login.2" - href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a></li> + href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a></li> {{ endif }} {{ if $nav.home }} <li><a id="nav-home-link" class="nav-link $nav.home.2" - href="$nav.home.0" title="$nav.home.1">$nav.home.1</a></li> + href="$nav.home.0" title="$nav.home.1">$nav.home.1</a></li> {{ endif }} {{ if $nav.network }} <li><a id="nav-network-link" class="nav-link $nav.network.2" - href="$nav.network.0" title="$nav.network.1">$nav.network.1</a></li> + href="$nav.network.0" title="$nav.network.1">$nav.network.1</a></li> {{ endif }} {{ if $nav.notifications }} <li><a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2" - href="$nav.notifications.0" - rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a></li> - <ul id="nav-notifications-menu" class="menu-popup"> - <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> - <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> - <li class="empty">$emptynotifications</li> - </ul> + href="$nav.notifications.0" + rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a></li> + <ul id="nav-notifications-menu" class="menu-popup"> + <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> + <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> + <li class="empty">$emptynotifications</li> + </ul> {{ endif }} {{ if $nav.messages }} <li><a id="nav-messages-link" class="nav-link $nav.messages.2" - href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a></li> + href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a></li> {{ endif }} {{ if $nav.community }} <li><a id="nav-community-link" class="nav-link $nav.community.2" - href="$nav.community.0" title="$nav.community.1">$nav.community.1</a></li> + href="$nav.community.0" title="$nav.community.1">$nav.community.1</a></li> {{ endif }} <li><a id="nav-directory-link" class="nav-link $nav.directory.2" - href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li> + href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li> <li><a id="nav-search-link" class="nav-link $nav.search.2" - href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li> + href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li> {{ if $nav.apps }} <li><a id="nav-apps-link" class="nav-link $nav.apps.2" - href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li> + href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li> {{ endif }} {{ if $nav.help }} <li><a id="nav-help-link" class="nav-link $nav.help.2" - href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li> + href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li> {{ endif }} - </ul> + </ul> - <div id="user-menu"> - <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="$nav.home.0">$sitelocation</a> + <div id="user-menu"> + <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="$nav.home.0"><span class="">User Menu</span></a> <ul id="user-menu-popup" onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)"> @@ -63,21 +64,12 @@ {{ if $nav.contacts }} <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li> {{ endif }} - {{ if $nav.introductions }} - <li><a id="nav-intro-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li> - {{ endif }} {{ if $nav.profiles }} <li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li> {{ endif }} {{ if $nav.settings }} <li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li> {{ endif }} - {{ if $nav.manage }} - <li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li> - {{ endif }} - {{ if $nav.admin }} - <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li> - {{ endif }} {{ if $nav.login }} <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }} @@ -87,12 +79,24 @@ </ul> </div> + <ul id="nav-buttons-2"> + {{ if $nav.introductions }} + <li><a id="nav-intro-link" class="nav-link $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li> + {{ endif }} + {{ if $nav.admin }} + <li><a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li> + {{ endif }} + {{ if $nav.manage }} + <li><a id="nav-manage-link" class="nav-link $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li> + {{ endif }} + </ul> + {{ if $userinfo }} <ul id="nav-user-menu" class="menu-popup"> {{ for $nav.usermenu as $usermenu }} <li> - <a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a> - </li> + <a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a> + </li> {{ endfor }} </ul> {{ endif }} @@ -110,9 +114,9 @@ {{ if $nav.messages }} <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a> {{ endif }} - {{if $nav.introductions }} - <a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a> - {{ endif }} + {{if $nav.introductions }} + <a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a> + {{ endif }} </div> </div> <a href="#" class="floaterflip"></a> @@ -124,18 +128,18 @@ $langselector <div id="scrollup"> <a href="#top"><img src="view/theme/dispy/icons/scroll_top.png" - alt="back to top" title="Back to top" /></a> + alt="back to top" title="Back to top" /></a> </div> <div class="search-box"> - <form method="get" action="$nav.search.0"> - <input id="mini-search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> - </form> + <form method="get" action="$nav.search.0"> + <input id="mini-search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> + </form> </div> <ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{4}"> - <a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a> - </li> + <li class="{4}"> + <a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a> + </li> </ul> diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 6263eef51..115f05ad7 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -1,4 +1,4 @@ -<a name="$item.id" /> +<a name="$item.id" ></a> <div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-info" id="wall-item-info-$item.id"> diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index e2a972790..da5fa13b3 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -1,4 +1,4 @@ -<a name="$item.id" /> +<a name="$item.id" ></a> <div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-info wallwall" id="wall-item-info-$item.id"> @@ -88,6 +88,7 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick <div class="wall-item-wrapper-end"></div> <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> + <div class="wall-item-comment-separator"></div> <div class="wall-item-comment-wrapper"> $item.comment </div> diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl index 7ca3daea7..0d0faac37 100644 --- a/view/theme/quattro/conversation.tpl +++ b/view/theme/quattro/conversation.tpl @@ -29,3 +29,19 @@ <span class="icon s22 delete text">$dropping</span> </a> {{ endif }} + +<script> +// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js + (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery); + var colWhite = {backgroundColor:'#EFF0F1'}; + var colShiny = {backgroundColor:'#FCE94F'}; +</script> + +{{ if $mode == display }} +<script> + var id = window.location.pathname.split("/").pop(); + $(window).scrollTop($('#item-'+id).position().top); + $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000); +</script> +{{ endif }} + diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index d8801421e..ea10cc377 100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css @@ -128,6 +128,11 @@ nav #site-location { box-shadow: 4px 4px 3px 0 #444444; } +#sidebar-page-list .label { + margin-left: 5px; +} + + .photo { border: 1px solid #AAAAAA; } diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index 37e56ee8b..9cbfc991e 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -77,7 +77,7 @@ <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div> <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div> <div class="wall-item-comment-separator"></div> - <div class="wall-item-comment-wrapper" > + <div class="wall-item-comment-wrapper"> $item.comment </div> |
