Merge git://github.com/friendica/friendica
This commit is contained in:
Zvi ben Yaakov (a.k.a rdc)
commit
5e3e3915e3
14
boot.php
14
boot.php
|
|
@ -10,7 +10,7 @@ require_once('include/nav.php');
|
||||||
require_once('include/cache.php');
|
require_once('include/cache.php');
|
||||||
|
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '3.0.1378' );
|
define ( 'FRIENDICA_VERSION', '3.0.1380' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1149 );
|
define ( 'DB_UPDATE_VERSION', 1149 );
|
||||||
|
|
||||||
|
|
@ -77,14 +77,6 @@ define ( 'CONTACT_IS_SHARING', 2);
|
||||||
define ( 'CONTACT_IS_FRIEND', 3);
|
define ( 'CONTACT_IS_FRIEND', 3);
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Hook array order
|
|
||||||
*/
|
|
||||||
|
|
||||||
define ( 'HOOK_HOOK', 0);
|
|
||||||
define ( 'HOOK_FILE', 1);
|
|
||||||
define ( 'HOOK_FUNCTION', 2);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DB update return values
|
* DB update return values
|
||||||
*/
|
*/
|
||||||
|
|
@ -1392,7 +1384,7 @@ if(! function_exists('proc_run')) {
|
||||||
|
|
||||||
if(! function_exists('current_theme')) {
|
if(! function_exists('current_theme')) {
|
||||||
function current_theme(){
|
function current_theme(){
|
||||||
$app_base_themes = array('duepuntozero', 'loozah');
|
$app_base_themes = array('duepuntozero', 'dispy', 'quattro');
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
|
|
@ -1410,7 +1402,7 @@ if(! function_exists('current_theme')) {
|
||||||
return($t);
|
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))
|
if(count($fallback))
|
||||||
return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
|
return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -352,10 +352,11 @@ function probe_url($url, $mode = PROBE_NORMAL) {
|
||||||
$email_conversant = false;
|
$email_conversant = false;
|
||||||
|
|
||||||
$twitter = ((strpos($url,'twitter.com') !== false) ? true : 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);
|
$at_addr = ((strpos($url,'@') !== false) ? true : false);
|
||||||
|
|
||||||
if(! $twitter) {
|
if((! $twitter) && (! $lastfm)) {
|
||||||
|
|
||||||
if(strpos($url,'mailto:') !== false && $at_addr) {
|
if(strpos($url,'mailto:') !== false && $at_addr) {
|
||||||
$url = str_replace('mailto:','',$url);
|
$url = str_replace('mailto:','',$url);
|
||||||
|
|
@ -564,6 +565,14 @@ function probe_url($url, $mode = PROBE_NORMAL) {
|
||||||
$vcard['fn'] = $tid . '@twitter';
|
$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,'fn'))
|
||||||
if(x($vcard,'nick'))
|
if(x($vcard,'nick'))
|
||||||
$vcard['fn'] = $vcard['nick'];
|
$vcard['fn'] = $vcard['nick'];
|
||||||
|
|
|
||||||
|
|
@ -719,14 +719,18 @@
|
||||||
if ($page<0) $page=0;
|
if ($page<0) $page=0;
|
||||||
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_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);
|
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
|
|
||||||
$start = $page*$count;
|
$start = $page*$count;
|
||||||
|
|
||||||
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
||||||
|
|
||||||
|
$sql_extra = '';
|
||||||
if ($max_id > 0)
|
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`,
|
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||||
|
|
@ -1061,11 +1065,14 @@
|
||||||
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
|
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
|
||||||
if ($page<0) $page=0;
|
if ($page<0) $page=0;
|
||||||
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']: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);
|
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
|
|
||||||
$start = $page*$count;
|
$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`,
|
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||||
|
|
|
||||||
|
|
@ -2150,7 +2150,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
$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
|
// 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.
|
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
|
||||||
|
|
@ -2213,7 +2213,10 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
$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
|
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
|
||||||
|
|
@ -2232,26 +2235,30 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
$relay_retract = false;
|
$relay_retract = false;
|
||||||
$sql_sign_id = 'iid';
|
$sql_sign_id = 'iid';
|
||||||
if( $item['deleted']) {
|
if( $item['deleted']) {
|
||||||
$tpl = get_markup_template('diaspora_relayable_retraction.tpl');
|
|
||||||
$relay_retract = true;
|
$relay_retract = true;
|
||||||
$sql_sign_id = 'retract_iid';
|
|
||||||
$target_type = ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
|
$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) {
|
elseif($item['verb'] === ACTIVITY_LIKE) {
|
||||||
$tpl = get_markup_template('diaspora_like_relay.tpl');
|
|
||||||
$like = true;
|
$like = true;
|
||||||
|
|
||||||
$target_type = 'Post';
|
$target_type = 'Post';
|
||||||
// $positive = (($item['deleted']) ? 'false' : 'true');
|
// $positive = (($item['deleted']) ? 'false' : 'true');
|
||||||
$positive = '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');
|
$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
|
// fetch the original signature if the relayable was created by a Diaspora
|
||||||
// or DFRN user. Relayables for other networks are not supported.
|
// or DFRN user. Relayables for other networks are not supported.
|
||||||
|
|
@ -2272,51 +2279,20 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
// function is called
|
// function is called
|
||||||
logger('diaspora_send_relay: original author signature not found, cannot send relayable');
|
logger('diaspora_send_relay: original author signature not found, cannot send relayable');
|
||||||
return;
|
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(
|
$msg = replace_macros($tpl,array(
|
||||||
'$guid' => xmlify($item['guid']),
|
'$guid' => xmlify($item['guid']),
|
||||||
|
|
|
||||||
|
|
@ -446,6 +446,8 @@ function get_atom_elements($feed,$item) {
|
||||||
$res['body'] = $purifier->purify($res['body']);
|
$res['body'] = $purifier->purify($res['body']);
|
||||||
|
|
||||||
$res['body'] = @html2bbcode($res['body']);
|
$res['body'] = @html2bbcode($res['body']);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
elseif(! $have_real_body) {
|
elseif(! $have_real_body) {
|
||||||
|
|
||||||
|
|
@ -1264,6 +1266,12 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
||||||
return 3;
|
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);
|
$res = parse_xml_string($xml);
|
||||||
|
|
||||||
return $res->status;
|
return $res->status;
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,9 @@ function load_hooks() {
|
||||||
$r = q("SELECT * FROM `hook` WHERE 1");
|
$r = q("SELECT * FROM `hook` WHERE 1");
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
foreach($r as $rr) {
|
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) {
|
function call_hooks($name, &$data = null) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
if(count($a->hooks)) {
|
if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) {
|
||||||
foreach($a->hooks as $hook) {
|
foreach($a->hooks[$name] as $hook) {
|
||||||
if($hook[HOOK_HOOK] === $name) {
|
@include_once($hook[0]);
|
||||||
@include_once($hook[HOOK_FILE]);
|
if(function_exists($hook[1])) {
|
||||||
if(function_exists($hook[HOOK_FUNCTION])) {
|
$func = $hook[1];
|
||||||
$func = $hook[HOOK_FUNCTION];
|
|
||||||
$func($a,$data);
|
$func($a,$data);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// remove orphan hooks
|
// remove orphan hooks
|
||||||
q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1",
|
q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1",
|
||||||
dbesc($hook[HOOK_HOOK]),
|
dbesc($name),
|
||||||
dbesc($hook[HOOK_FILE]),
|
dbesc($hook[0]),
|
||||||
dbesc($hook[HOOK_FUNCTION])
|
dbesc($hook[1])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -709,7 +709,7 @@ class SimplePie
|
||||||
* @see SimplePie::strip_htmltags()
|
* @see SimplePie::strip_htmltags()
|
||||||
* @access private
|
* @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
|
* The SimplePie class contains feed level data and options
|
||||||
|
|
@ -14803,7 +14803,7 @@ class SimplePie_Sanitize
|
||||||
// Options
|
// Options
|
||||||
var $remove_div = true;
|
var $remove_div = true;
|
||||||
var $image_handler = '';
|
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 $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_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
|
||||||
var $strip_comments = false;
|
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)
|
if ($tags)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -479,12 +479,13 @@ function contacts_content(&$a) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$searching = false;
|
||||||
if($search) {
|
if($search) {
|
||||||
$search_hdr = $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)
|
if($nets)
|
||||||
$sql_extra .= sprintf(" AND network = '%s' ", dbesc($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 ",
|
$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($_SESSION['uid']),
|
||||||
intval($a->pager['start']),
|
intval($a->pager['start']),
|
||||||
|
|
@ -568,7 +568,7 @@ function contacts_content(&$a) {
|
||||||
'$total' => $total,
|
'$total' => $total,
|
||||||
'$search' => $search_hdr,
|
'$search' => $search_hdr,
|
||||||
'$desc' => t('Search your contacts'),
|
'$desc' => t('Search your contacts'),
|
||||||
'$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""),
|
'$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
|
||||||
'$submit' => t('Find'),
|
'$submit' => t('Find'),
|
||||||
'$cmd' => $a->cmd,
|
'$cmd' => $a->cmd,
|
||||||
'$contacts' => $contacts,
|
'$contacts' => $contacts,
|
||||||
|
|
|
||||||
|
|
@ -443,7 +443,7 @@ function dfrn_poll_content(&$a) {
|
||||||
$encrypted_id = '';
|
$encrypted_id = '';
|
||||||
$id_str = $my_id . '.' . mt_rand(1000,9999);
|
$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($hash,$challenge,$r[0]['pubkey']);
|
||||||
openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']);
|
openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -306,7 +306,8 @@ function photos_post(&$a) {
|
||||||
$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
|
$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');
|
logger('rotate');
|
||||||
|
|
||||||
$r = q("select * from photo where `resource-id` = '%s' and uid = %d and scale = 0 limit 1",
|
$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)) {
|
if(count($r)) {
|
||||||
$ph = new Photo($r[0]['data'], $r[0]['type']);
|
$ph = new Photo($r[0]['data'], $r[0]['type']);
|
||||||
if($ph->is_valid()) {
|
if($ph->is_valid()) {
|
||||||
$ph->rotate(270);
|
$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
|
||||||
|
$ph->rotate($rotate_deg);
|
||||||
|
|
||||||
$width = $ph->getWidth();
|
$width = $ph->getWidth();
|
||||||
$height = $ph->getHeight();
|
$height = $ph->getHeight();
|
||||||
|
|
@ -1251,7 +1253,8 @@ function photos_content(&$a) {
|
||||||
$edit_tpl = get_markup_template('photo_edit.tpl');
|
$edit_tpl = get_markup_template('photo_edit.tpl');
|
||||||
$edit = replace_macros($edit_tpl, array(
|
$edit = replace_macros($edit_tpl, array(
|
||||||
'$id' => $ph[0]['id'],
|
'$id' => $ph[0]['id'],
|
||||||
'$rotate' => t('Rotate CW'),
|
'$rotatecw' => t('Rotate CW (right)'),
|
||||||
|
'$rotateccw' => t('Rotate CCW (left)'),
|
||||||
'$album' => template_escape($ph[0]['album']),
|
'$album' => template_escape($ph[0]['album']),
|
||||||
'$newalbum' => t('New album name'),
|
'$newalbum' => t('New album name'),
|
||||||
'$nickname' => $a->data['user']['nickname'],
|
'$nickname' => $a->data['user']['nickname'],
|
||||||
|
|
|
||||||
255
util/messages.po
255
util/messages.po
|
|
@ -6,9 +6,9 @@
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: 3.0.1378\n"
|
"Project-Id-Version: 3.0.1380\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2012-06-18 10:00-0700\n"
|
"POT-Creation-Date: 2012-06-20 10:00-0700\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -36,7 +36,7 @@ msgstr ""
|
||||||
|
|
||||||
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
|
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
|
||||||
#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
|
#: ../../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:929
|
||||||
#: ../../mod/editpost.php:10 ../../mod/install.php:151
|
#: ../../mod/editpost.php:10 ../../mod/install.php:151
|
||||||
#: ../../mod/notifications.php:66 ../../mod/contacts.php:145
|
#: ../../mod/notifications.php:66 ../../mod/contacts.php:145
|
||||||
#: ../../mod/settings.php:106 ../../mod/settings.php:537
|
#: ../../mod/settings.php:106 ../../mod/settings.php:537
|
||||||
|
|
@ -55,8 +55,8 @@ msgstr ""
|
||||||
#: ../../mod/profiles.php:385 ../../mod/delegate.php:6
|
#: ../../mod/profiles.php:385 ../../mod/delegate.php:6
|
||||||
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
|
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
|
||||||
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:507
|
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:507
|
||||||
#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3387
|
#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3400
|
||||||
#: ../../index.php:299
|
#: ../../index.php:309
|
||||||
msgid "Permission denied."
|
msgid "Permission denied."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -123,20 +123,21 @@ msgid "New photo from this URL"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
|
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
|
||||||
#: ../../mod/events.php:428 ../../mod/photos.php:963 ../../mod/photos.php:1021
|
#: ../../mod/events.php:428 ../../mod/photos.php:964 ../../mod/photos.php:1022
|
||||||
#: ../../mod/photos.php:1266 ../../mod/photos.php:1306
|
#: ../../mod/photos.php:1267 ../../mod/photos.php:1307
|
||||||
#: ../../mod/photos.php:1346 ../../mod/photos.php:1377
|
#: ../../mod/photos.php:1347 ../../mod/photos.php:1378
|
||||||
#: ../../mod/install.php:246 ../../mod/install.php:284
|
#: ../../mod/install.php:246 ../../mod/install.php:284
|
||||||
#: ../../mod/localtime.php:45 ../../mod/contacts.php:343
|
#: ../../mod/localtime.php:45 ../../mod/contacts.php:343
|
||||||
#: ../../mod/settings.php:555 ../../mod/settings.php:701
|
#: ../../mod/settings.php:555 ../../mod/settings.php:701
|
||||||
#: ../../mod/settings.php:762 ../../mod/settings.php:969
|
#: ../../mod/settings.php:762 ../../mod/settings.php:969
|
||||||
#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/admin.php:420
|
#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/message.php:410
|
||||||
#: ../../mod/admin.php:656 ../../mod/admin.php:792 ../../mod/admin.php:991
|
#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792
|
||||||
#: ../../mod/admin.php:1078 ../../mod/profiles.php:554
|
#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554
|
||||||
#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:609
|
#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:609
|
||||||
#: ../../addon/snautofollow/snautofollow.php:64
|
#: ../../addon/snautofollow/snautofollow.php:64
|
||||||
#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
|
#: ../../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/uhremotestorage/uhremotestorage.php:89
|
||||||
#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
|
#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
|
||||||
#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
|
#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
|
||||||
|
|
@ -226,7 +227,7 @@ msgid "link to source"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131
|
#: ../../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"
|
msgid "Events"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -277,7 +278,7 @@ msgid "Description:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/events.php:423 ../../include/event.php:37
|
#: ../../mod/events.php:423 ../../include/event.php:37
|
||||||
#: ../../include/bb2diaspora.php:265 ../../boot.php:1109
|
#: ../../include/bb2diaspora.php:265 ../../boot.php:1126
|
||||||
msgid "Location:"
|
msgid "Location:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -354,19 +355,19 @@ msgstr ""
|
||||||
msgid "No"
|
msgid "No"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:44 ../../boot.php:1523
|
#: ../../mod/photos.php:44 ../../boot.php:1540
|
||||||
msgid "Photo Albums"
|
msgid "Photo Albums"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:942
|
#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:943
|
||||||
#: ../../mod/photos.php:1013 ../../mod/photos.php:1028
|
#: ../../mod/photos.php:1014 ../../mod/photos.php:1029
|
||||||
#: ../../mod/photos.php:1455 ../../mod/photos.php:1467
|
#: ../../mod/photos.php:1456 ../../mod/photos.php:1468
|
||||||
#: ../../addon/communityhome/communityhome.php:110
|
#: ../../addon/communityhome/communityhome.php:110
|
||||||
#: ../../view/theme/diabook/theme.php:598
|
#: ../../view/theme/diabook/theme.php:598
|
||||||
msgid "Contact Photos"
|
msgid "Contact Photos"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:59 ../../mod/photos.php:1038 ../../mod/photos.php:1505
|
#: ../../mod/photos.php:59 ../../mod/photos.php:1039 ../../mod/photos.php:1506
|
||||||
msgid "Upload New Photos"
|
msgid "Upload New Photos"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -378,8 +379,8 @@ msgstr ""
|
||||||
msgid "Contact information unavailable"
|
msgid "Contact information unavailable"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1013
|
#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1014
|
||||||
#: ../../mod/photos.php:1028 ../../mod/profile_photo.php:60
|
#: ../../mod/photos.php:1029 ../../mod/profile_photo.php:60
|
||||||
#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
|
#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
|
||||||
#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254
|
#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254
|
||||||
#: ../../mod/profile_photo.php:263
|
#: ../../mod/profile_photo.php:263
|
||||||
|
|
@ -393,11 +394,11 @@ msgstr ""
|
||||||
msgid "Album not found."
|
msgid "Album not found."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:182 ../../mod/photos.php:1022
|
#: ../../mod/photos.php:182 ../../mod/photos.php:1023
|
||||||
msgid "Delete Album"
|
msgid "Delete Album"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:245 ../../mod/photos.php:1267
|
#: ../../mod/photos.php:245 ../../mod/photos.php:1268
|
||||||
msgid "Delete Photo"
|
msgid "Delete Photo"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -430,155 +431,155 @@ msgstr ""
|
||||||
msgid "Unable to process image."
|
msgid "Unable to process image."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:734 ../../mod/profile_photo.php:259
|
#: ../../mod/photos.php:735 ../../mod/profile_photo.php:259
|
||||||
#: ../../mod/wall_upload.php:105
|
#: ../../mod/wall_upload.php:105
|
||||||
msgid "Image upload failed."
|
msgid "Image upload failed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:820 ../../mod/community.php:16
|
#: ../../mod/photos.php:821 ../../mod/community.php:16
|
||||||
#: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17
|
#: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17
|
||||||
#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
|
#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
|
||||||
msgid "Public access denied."
|
msgid "Public access denied."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:830
|
#: ../../mod/photos.php:831
|
||||||
msgid "No photos selected"
|
msgid "No photos selected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:909
|
#: ../../mod/photos.php:910
|
||||||
msgid "Access to this item is restricted."
|
msgid "Access to this item is restricted."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:970
|
#: ../../mod/photos.php:971
|
||||||
msgid "Upload Photos"
|
msgid "Upload Photos"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:973 ../../mod/photos.php:1017
|
#: ../../mod/photos.php:974 ../../mod/photos.php:1018
|
||||||
msgid "New album name: "
|
msgid "New album name: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:974
|
#: ../../mod/photos.php:975
|
||||||
msgid "or existing album name: "
|
msgid "or existing album name: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:975
|
#: ../../mod/photos.php:976
|
||||||
msgid "Do not show a status post for this upload"
|
msgid "Do not show a status post for this upload"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:977 ../../mod/photos.php:1262
|
#: ../../mod/photos.php:978 ../../mod/photos.php:1263
|
||||||
msgid "Permissions"
|
msgid "Permissions"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1032
|
#: ../../mod/photos.php:1033
|
||||||
msgid "Edit Album"
|
msgid "Edit Album"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1056 ../../mod/photos.php:1488
|
#: ../../mod/photos.php:1057 ../../mod/photos.php:1489
|
||||||
msgid "View Photo"
|
msgid "View Photo"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1091
|
#: ../../mod/photos.php:1092
|
||||||
msgid "Permission denied. Access to this item may be restricted."
|
msgid "Permission denied. Access to this item may be restricted."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1093
|
#: ../../mod/photos.php:1094
|
||||||
msgid "Photo not available"
|
msgid "Photo not available"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1143
|
#: ../../mod/photos.php:1144
|
||||||
msgid "View photo"
|
msgid "View photo"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1143
|
#: ../../mod/photos.php:1144
|
||||||
msgid "Edit photo"
|
msgid "Edit photo"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1144
|
#: ../../mod/photos.php:1145
|
||||||
msgid "Use as profile photo"
|
msgid "Use as profile photo"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1150 ../../include/conversation.php:490
|
#: ../../mod/photos.php:1151 ../../include/conversation.php:490
|
||||||
msgid "Private Message"
|
msgid "Private Message"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1172
|
#: ../../mod/photos.php:1173
|
||||||
msgid "View Full Size"
|
msgid "View Full Size"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1240
|
#: ../../mod/photos.php:1241
|
||||||
msgid "Tags: "
|
msgid "Tags: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1243
|
#: ../../mod/photos.php:1244
|
||||||
msgid "[Remove any tag]"
|
msgid "[Remove any tag]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1253
|
#: ../../mod/photos.php:1254
|
||||||
msgid "Rotate CW"
|
msgid "Rotate CW"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1255
|
#: ../../mod/photos.php:1256
|
||||||
msgid "New album name"
|
msgid "New album name"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1258
|
#: ../../mod/photos.php:1259
|
||||||
msgid "Caption"
|
msgid "Caption"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1260
|
#: ../../mod/photos.php:1261
|
||||||
msgid "Add a Tag"
|
msgid "Add a Tag"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1264
|
#: ../../mod/photos.php:1265
|
||||||
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
|
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1284 ../../include/conversation.php:554
|
#: ../../mod/photos.php:1285 ../../include/conversation.php:554
|
||||||
msgid "I like this (toggle)"
|
msgid "I like this (toggle)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1285 ../../include/conversation.php:555
|
#: ../../mod/photos.php:1286 ../../include/conversation.php:555
|
||||||
msgid "I don't like this (toggle)"
|
msgid "I don't like this (toggle)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1286 ../../include/conversation.php:989
|
#: ../../mod/photos.php:1287 ../../include/conversation.php:989
|
||||||
msgid "Share"
|
msgid "Share"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1287 ../../mod/editpost.php:104
|
#: ../../mod/photos.php:1288 ../../mod/editpost.php:104
|
||||||
#: ../../mod/wallmessage.php:145 ../../mod/message.php:215
|
#: ../../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
|
#: ../../include/conversation.php:731 ../../include/conversation.php:1008
|
||||||
msgid "Please wait"
|
msgid "Please wait"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1303 ../../mod/photos.php:1343
|
#: ../../mod/photos.php:1304 ../../mod/photos.php:1344
|
||||||
#: ../../mod/photos.php:1374 ../../include/conversation.php:577
|
#: ../../mod/photos.php:1375 ../../include/conversation.php:577
|
||||||
msgid "This is you"
|
msgid "This is you"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1305 ../../mod/photos.php:1345
|
#: ../../mod/photos.php:1306 ../../mod/photos.php:1346
|
||||||
#: ../../mod/photos.php:1376 ../../include/conversation.php:579
|
#: ../../mod/photos.php:1377 ../../include/conversation.php:579
|
||||||
#: ../../boot.php:523
|
#: ../../boot.php:518
|
||||||
msgid "Comment"
|
msgid "Comment"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1307 ../../mod/editpost.php:125
|
#: ../../mod/photos.php:1308 ../../mod/editpost.php:125
|
||||||
#: ../../include/conversation.php:589 ../../include/conversation.php:1026
|
#: ../../include/conversation.php:589 ../../include/conversation.php:1026
|
||||||
msgid "Preview"
|
msgid "Preview"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1404 ../../mod/settings.php:618
|
#: ../../mod/photos.php:1405 ../../mod/settings.php:618
|
||||||
#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663
|
#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663
|
||||||
#: ../../include/conversation.php:328 ../../include/conversation.php:609
|
#: ../../include/conversation.php:328 ../../include/conversation.php:609
|
||||||
msgid "Delete"
|
msgid "Delete"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1494
|
#: ../../mod/photos.php:1495
|
||||||
msgid "View Album"
|
msgid "View Album"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/photos.php:1503
|
#: ../../mod/photos.php:1504
|
||||||
msgid "Recent Photos"
|
msgid "Recent Photos"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -821,7 +822,7 @@ msgstr ""
|
||||||
msgid "Confirm"
|
msgid "Confirm"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/dfrn_request.php:715 ../../include/items.php:2783
|
#: ../../mod/dfrn_request.php:715 ../../include/items.php:2796
|
||||||
msgid "[Name Withheld]"
|
msgid "[Name Withheld]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1193,7 +1194,7 @@ msgid "is interested in:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/match.php:58 ../../mod/suggest.php:59
|
#: ../../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"
|
msgid "Connect"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1723,8 +1724,8 @@ msgstr ""
|
||||||
#: ../../addon/facebook/facebook.php:692
|
#: ../../addon/facebook/facebook.php:692
|
||||||
#: ../../addon/facebook/facebook.php:1182
|
#: ../../addon/facebook/facebook.php:1182
|
||||||
#: ../../addon/public_server/public_server.php:62
|
#: ../../addon/public_server/public_server.php:62
|
||||||
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2792
|
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2805
|
||||||
#: ../../boot.php:703
|
#: ../../boot.php:720
|
||||||
msgid "Administrator"
|
msgid "Administrator"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1734,7 +1735,7 @@ msgid ""
|
||||||
"Password reset failed."
|
"Password reset failed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/lostpass.php:83 ../../boot.php:835
|
#: ../../mod/lostpass.php:83 ../../boot.php:852
|
||||||
msgid "Password Reset"
|
msgid "Password Reset"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2409,7 +2410,7 @@ msgstr ""
|
||||||
msgid "Invalid contact."
|
msgid "Invalid contact."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/notes.php:44 ../../boot.php:1535
|
#: ../../mod/notes.php:44 ../../boot.php:1552
|
||||||
msgid "Personal Notes"
|
msgid "Personal Notes"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2618,7 +2619,7 @@ msgstr ""
|
||||||
msgid "Group name changed."
|
msgid "Group name changed."
|
||||||
msgstr ""
|
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"
|
msgid "Permission denied"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2660,7 +2661,7 @@ msgstr ""
|
||||||
|
|
||||||
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
|
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
|
||||||
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:79
|
#: ../../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"
|
msgid "Profile"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2764,7 +2765,7 @@ msgstr ""
|
||||||
msgid "Choose a nickname: "
|
msgid "Choose a nickname: "
|
||||||
msgstr ""
|
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"
|
msgid "Register"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2798,7 +2799,7 @@ msgstr ""
|
||||||
|
|
||||||
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
|
#: ../../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/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:3247
|
||||||
msgid "Item not found."
|
msgid "Item not found."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2807,7 +2808,7 @@ msgid "Access denied."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
|
#: ../../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"
|
msgid "Photos"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3610,7 +3611,7 @@ msgstr ""
|
||||||
msgid "FTP Password"
|
msgid "FTP Password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/profile.php:21 ../../boot.php:966
|
#: ../../mod/profile.php:21 ../../boot.php:983
|
||||||
msgid "Requested profile is not available."
|
msgid "Requested profile is not available."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3985,23 +3986,23 @@ msgstr ""
|
||||||
msgid "Edit/Manage Profiles"
|
msgid "Edit/Manage Profiles"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/profiles.php:645 ../../boot.php:1075
|
#: ../../mod/profiles.php:645 ../../boot.php:1092
|
||||||
msgid "Change profile photo"
|
msgid "Change profile photo"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/profiles.php:646 ../../boot.php:1076
|
#: ../../mod/profiles.php:646 ../../boot.php:1093
|
||||||
msgid "Create New Profile"
|
msgid "Create New Profile"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/profiles.php:657 ../../boot.php:1086
|
#: ../../mod/profiles.php:657 ../../boot.php:1103
|
||||||
msgid "Profile Image"
|
msgid "Profile Image"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/profiles.php:659 ../../boot.php:1089
|
#: ../../mod/profiles.php:659 ../../boot.php:1106
|
||||||
msgid "visible to everybody"
|
msgid "visible to everybody"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../mod/profiles.php:660 ../../boot.php:1090
|
#: ../../mod/profiles.php:660 ../../boot.php:1107
|
||||||
msgid "Edit visibility"
|
msgid "Edit visibility"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4615,16 +4616,32 @@ msgstr ""
|
||||||
msgid "%s - Click to open/close"
|
msgid "%s - Click to open/close"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../addon/page/page.php:48
|
#: ../../addon/page/page.php:58 ../../addon/page/page.php:88
|
||||||
msgid "Forums"
|
msgid "Forums"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
|
#: ../../addon/page/page.php:73 ../../addon/page/page.php:107
|
||||||
#: ../../include/contact_widgets.php:188 ../../include/conversation.php:476
|
#: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188
|
||||||
#: ../../boot.php:524
|
#: ../../include/conversation.php:476 ../../boot.php:519
|
||||||
msgid "show more"
|
msgid "show more"
|
||||||
msgstr ""
|
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
|
#: ../../addon/planets/planets.php:150
|
||||||
msgid "Planets Settings"
|
msgid "Planets Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4637,7 +4654,7 @@ msgstr ""
|
||||||
#: ../../addon/communityhome/communityhome.php:34
|
#: ../../addon/communityhome/communityhome.php:34
|
||||||
#: ../../addon/communityhome/twillingham/communityhome.php:28
|
#: ../../addon/communityhome/twillingham/communityhome.php:28
|
||||||
#: ../../addon/communityhome/twillingham/communityhome.php:34
|
#: ../../addon/communityhome/twillingham/communityhome.php:34
|
||||||
#: ../../include/nav.php:64 ../../boot.php:822
|
#: ../../include/nav.php:64 ../../boot.php:839
|
||||||
msgid "Login"
|
msgid "Login"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -6051,7 +6068,7 @@ msgstr ""
|
||||||
msgid "Set colour scheme"
|
msgid "Set colour scheme"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/profile_advanced.php:17 ../../boot.php:1111
|
#: ../../include/profile_advanced.php:17 ../../boot.php:1128
|
||||||
msgid "Gender:"
|
msgid "Gender:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -6064,7 +6081,7 @@ msgid "j F"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/profile_advanced.php:30 ../../include/datetime.php:450
|
#: ../../include/profile_advanced.php:30 ../../include/datetime.php:450
|
||||||
#: ../../include/items.php:1446
|
#: ../../include/items.php:1459
|
||||||
msgid "Birthday:"
|
msgid "Birthday:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -6072,7 +6089,7 @@ msgstr ""
|
||||||
msgid "Age:"
|
msgid "Age:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/profile_advanced.php:37 ../../boot.php:1114
|
#: ../../include/profile_advanced.php:37 ../../boot.php:1131
|
||||||
msgid "Status:"
|
msgid "Status:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -6081,7 +6098,7 @@ msgstr ""
|
||||||
msgid "for %1$d %2$s"
|
msgid "for %1$d %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/profile_advanced.php:48 ../../boot.php:1116
|
#: ../../include/profile_advanced.php:48 ../../boot.php:1133
|
||||||
msgid "Homepage:"
|
msgid "Homepage:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -6660,7 +6677,7 @@ msgstr ""
|
||||||
msgid "Contacts not in any group"
|
msgid "Contacts not in any group"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/nav.php:46 ../../boot.php:821
|
#: ../../include/nav.php:46 ../../boot.php:838
|
||||||
msgid "Logout"
|
msgid "Logout"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -6668,7 +6685,7 @@ msgstr ""
|
||||||
msgid "End this session"
|
msgid "End this session"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/nav.php:49 ../../boot.php:1508
|
#: ../../include/nav.php:49 ../../boot.php:1525
|
||||||
msgid "Status"
|
msgid "Status"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -6748,11 +6765,11 @@ msgstr ""
|
||||||
msgid "Manage other pages"
|
msgid "Manage other pages"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/nav.php:138 ../../boot.php:1069
|
#: ../../include/nav.php:138 ../../boot.php:1086
|
||||||
msgid "Profiles"
|
msgid "Profiles"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/nav.php:138 ../../boot.php:1069
|
#: ../../include/nav.php:138 ../../boot.php:1086
|
||||||
msgid "Manage/edit profiles"
|
msgid "Manage/edit profiles"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -7039,7 +7056,7 @@ msgstr ""
|
||||||
|
|
||||||
#: ../../include/enotify.php:126
|
#: ../../include/enotify.php:126
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s [url=%2s]tagged you[/url]."
|
msgid "%1$s [url=%2$s]tagged you[/url]."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/enotify.php:137
|
#: ../../include/enotify.php:137
|
||||||
|
|
@ -7163,15 +7180,15 @@ msgstr ""
|
||||||
msgid "following"
|
msgid "following"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/items.php:2790
|
#: ../../include/items.php:2803
|
||||||
msgid "A new person is sharing with you at "
|
msgid "A new person is sharing with you at "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/items.php:2790
|
#: ../../include/items.php:2803
|
||||||
msgid "You have a new follower at "
|
msgid "You have a new follower at "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../include/items.php:3452
|
#: ../../include/items.php:3465
|
||||||
msgid "Archives"
|
msgid "Archives"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -7523,96 +7540,96 @@ msgstr ""
|
||||||
msgid "permissions"
|
msgid "permissions"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:522
|
#: ../../boot.php:517
|
||||||
msgid "Delete this item?"
|
msgid "Delete this item?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:525
|
#: ../../boot.php:520
|
||||||
msgid "show fewer"
|
msgid "show fewer"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:698
|
#: ../../boot.php:715
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Update %s failed. See error logs."
|
msgid "Update %s failed. See error logs."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:700
|
#: ../../boot.php:717
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "Update Error at %s"
|
msgid "Update Error at %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:800
|
#: ../../boot.php:817
|
||||||
msgid "Create a New Account"
|
msgid "Create a New Account"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:824
|
#: ../../boot.php:841
|
||||||
msgid "Nickname or Email address: "
|
msgid "Nickname or Email address: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:825
|
#: ../../boot.php:842
|
||||||
msgid "Password: "
|
msgid "Password: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:828
|
#: ../../boot.php:845
|
||||||
msgid "Or login using OpenID: "
|
msgid "Or login using OpenID: "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:834
|
#: ../../boot.php:851
|
||||||
msgid "Forgot your password?"
|
msgid "Forgot your password?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1001
|
#: ../../boot.php:1018
|
||||||
msgid "Edit profile"
|
msgid "Edit profile"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1061
|
#: ../../boot.php:1078
|
||||||
msgid "Message"
|
msgid "Message"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1177 ../../boot.php:1253
|
#: ../../boot.php:1194 ../../boot.php:1270
|
||||||
msgid "g A l F d"
|
msgid "g A l F d"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1178 ../../boot.php:1254
|
#: ../../boot.php:1195 ../../boot.php:1271
|
||||||
msgid "F d"
|
msgid "F d"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1223 ../../boot.php:1294
|
#: ../../boot.php:1240 ../../boot.php:1311
|
||||||
msgid "[today]"
|
msgid "[today]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1235
|
#: ../../boot.php:1252
|
||||||
msgid "Birthday Reminders"
|
msgid "Birthday Reminders"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1236
|
#: ../../boot.php:1253
|
||||||
msgid "Birthdays this week:"
|
msgid "Birthdays this week:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1287
|
#: ../../boot.php:1304
|
||||||
msgid "[No description]"
|
msgid "[No description]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1305
|
#: ../../boot.php:1322
|
||||||
msgid "Event Reminders"
|
msgid "Event Reminders"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1306
|
#: ../../boot.php:1323
|
||||||
msgid "Events this week:"
|
msgid "Events this week:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1511
|
#: ../../boot.php:1528
|
||||||
msgid "Status Messages and Posts"
|
msgid "Status Messages and Posts"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1517
|
#: ../../boot.php:1534
|
||||||
msgid "Profile Details"
|
msgid "Profile Details"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1532
|
#: ../../boot.php:1549
|
||||||
msgid "Events and Calendar"
|
msgid "Events and Calendar"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ../../boot.php:1538
|
#: ../../boot.php:1555
|
||||||
msgid "Only You Can See This"
|
msgid "Only You Can See This"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,12 @@
|
||||||
|
|
||||||
<div id="photo-edit-tags-end"></div>
|
<div id="photo-edit-tags-end"></div>
|
||||||
<div id="photo-edit-rotate-wrapper">
|
<div id="photo-edit-rotate-wrapper">
|
||||||
<div id="photo-edit-rotate-label">$rotate</div>
|
<div id="photo-edit-rotate-label">
|
||||||
<input type="checkbox" name="rotate" value="1" />
|
$rotatecw<br>
|
||||||
|
$rotateccw
|
||||||
|
</div>
|
||||||
|
<input type="radio" name="rotate" value="1" /><br>
|
||||||
|
<input type="radio" name="rotate" value="2" />
|
||||||
</div>
|
</div>
|
||||||
<div id="photo-edit-rotate-end"></div>
|
<div id="photo-edit-rotate-end"></div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -151,6 +151,10 @@ blockquote {
|
||||||
overflow: none;
|
overflow: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.editicon:hover {
|
.editicon {
|
||||||
background-color: #ccc;
|
background-color: #333;
|
||||||
|
}
|
||||||
|
|
||||||
|
#datebrowse-sidebar select {
|
||||||
|
color:#99CCFF !important;
|
||||||
}
|
}
|
||||||
|
|
@ -150,3 +150,7 @@ blockquote {
|
||||||
.editicon {
|
.editicon {
|
||||||
background-color: #333;
|
background-color: #333;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#datebrowse-sidebar select {
|
||||||
|
color:#99CCFF !important;
|
||||||
|
}
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 28 KiB |
|
|
@ -14,9 +14,9 @@
|
||||||
height="200"
|
height="200"
|
||||||
id="svg3403"
|
id="svg3403"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48+devel r"
|
inkscape:version="0.48.3.1 r9886"
|
||||||
sodipodi:docname="icons.svg"
|
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-xdpi="90"
|
||||||
inkscape:export-ydpi="90">
|
inkscape:export-ydpi="90">
|
||||||
<defs
|
<defs
|
||||||
|
|
@ -52,8 +52,8 @@
|
||||||
inkscape:pageopacity="0"
|
inkscape:pageopacity="0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:zoom="1.9403009"
|
inkscape:zoom="1.9403009"
|
||||||
inkscape:cx="95.950174"
|
inkscape:cx="127.81563"
|
||||||
inkscape:cy="115.58345"
|
inkscape:cy="128.63003"
|
||||||
inkscape:document-units="px"
|
inkscape:document-units="px"
|
||||||
inkscape:current-layer="layer1"
|
inkscape:current-layer="layer1"
|
||||||
showgrid="true"
|
showgrid="true"
|
||||||
|
|
@ -1127,16 +1127,16 @@
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path4319"
|
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"
|
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)" />
|
transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
|
||||||
<path
|
<path
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path4321"
|
id="path4321"
|
||||||
d="m -44.467884,1124.9404 4.644661,0"
|
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)" />
|
transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
|
||||||
<path
|
<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"
|
d="m -42.239747,1107.2336 0,17.6813"
|
||||||
id="path4323"
|
id="path4323"
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
|
|
@ -1146,7 +1146,7 @@
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
id="path4325"
|
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"
|
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)" />
|
transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
|
||||||
<rect
|
<rect
|
||||||
ry="0.42804927"
|
ry="0.42804927"
|
||||||
|
|
@ -1156,7 +1156,7 @@
|
||||||
height="1.8614606"
|
height="1.8614606"
|
||||||
width="5.1800866"
|
width="5.1800866"
|
||||||
id="rect4327"
|
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)" />
|
transform="matrix(0.52823691,0.52823691,-0.52823691,0.52823691,773.22931,313.68781)" />
|
||||||
<path
|
<path
|
||||||
style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
|
style="fill:none;stroke:#e6e6e6;stroke-width:0.66930836;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 120 KiB |
|
|
@ -78,16 +78,19 @@ h6{font-size:xx-small;}
|
||||||
#login_openid label{width:180px !important;}
|
#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{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;}
|
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;}
|
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 .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-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-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-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-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-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-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-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,#nav-notifications-linkmenu{background-position:-44px -110px;}
|
||||||
#nav-notify-link:hover{background-position:-66px -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;}
|
#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-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{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;}
|
.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-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,#mini-search-text{background:white;color:#2e2f2e;}
|
||||||
#search-text{border:1px solid #eeeeee;margin:5px 0;}
|
#search-text{border:1px solid #eeeeee;margin:5px 0;}
|
||||||
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
|
#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;}
|
#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{-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:3px 20px 9px 5px;height:10px;}
|
#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,.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;}
|
.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
|
||||||
#net-update{background-position:0px 0px;}
|
#net-update{background-position:0px 0px;}
|
||||||
|
|
|
||||||
|
|
@ -445,13 +445,22 @@ nav {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
margin-left: 3px; } }
|
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 {
|
ul#user-menu-popup {
|
||||||
display: none;
|
display: none;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
background-color: @menu_bg_colour;
|
background-color: @menu_bg_colour;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 10px 0px;
|
padding: 10px 0px;
|
||||||
margin: 0px;
|
margin: 3px 0 0;
|
||||||
top: 20px;
|
top: 20px;
|
||||||
left: 0;
|
left: 0;
|
||||||
font-size: small;
|
font-size: small;
|
||||||
|
|
@ -481,6 +490,12 @@ nav .nav-link {
|
||||||
text-indent: 50px;
|
text-indent: 50px;
|
||||||
background: transparent url(dark/icons.png) 0 0 no-repeat;
|
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 {
|
#nav-apps-link {
|
||||||
background-position: 0 -66px;
|
background-position: 0 -66px;
|
||||||
&:hover {
|
&:hover {
|
||||||
|
|
@ -513,9 +528,9 @@ nav .nav-link {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#nav-intro-link {
|
#nav-intro-link {
|
||||||
background-position: 0px -190px;
|
background-position: 0px -88px;
|
||||||
&:hover {
|
&:hover {
|
||||||
background-position: -44px -190px;
|
background-position: -22px -88px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#nav-login-link,
|
#nav-login-link,
|
||||||
|
|
@ -525,6 +540,12 @@ nav .nav-link {
|
||||||
background-position: -22px -88px;
|
background-position: -22px -88px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#nav-manage-link {
|
||||||
|
background-position: 0px -22px;
|
||||||
|
&:hover {
|
||||||
|
background-position: -22px -22px;
|
||||||
|
}
|
||||||
|
}
|
||||||
#nav-messages-link {
|
#nav-messages-link {
|
||||||
background-position: -44px -88px;
|
background-position: -44px -88px;
|
||||||
&:hover {
|
&:hover {
|
||||||
|
|
@ -653,6 +674,21 @@ nav #nav-notifications-linkmenu {
|
||||||
margin: 0px -4px 0px 0px;
|
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 {
|
.floaterflip {
|
||||||
display: block;
|
display: block;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
|
|
@ -702,17 +738,17 @@ nav #nav-notifications-linkmenu {
|
||||||
#user-menu {
|
#user-menu {
|
||||||
.box_shadow(5px, 0, 10px, 0);
|
.box_shadow(5px, 0, 10px, 0);
|
||||||
display: block;
|
display: block;
|
||||||
width: 80%;
|
width: 35%;
|
||||||
margin: 3px 0 0 0;
|
margin: 5px 0 0 0;
|
||||||
position: relative;
|
position: relative;
|
||||||
.rounded_corners;
|
.rounded_corners;
|
||||||
background-color: @menu_bg_colour;
|
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-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-position: 98% center;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
clear: both;
|
/* clear: both;*/
|
||||||
top: 4px;
|
top: 4px;
|
||||||
left: 10px;
|
left: 7px;
|
||||||
padding: 2px;
|
padding: 2px;
|
||||||
> a {
|
> a {
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
|
|
@ -721,8 +757,9 @@ nav #nav-notifications-linkmenu {
|
||||||
}
|
}
|
||||||
#user-menu-label {
|
#user-menu-label {
|
||||||
font-size: small;
|
font-size: small;
|
||||||
padding: 3px 20px 9px 5px;
|
padding: 0px 20px 10px 5px;
|
||||||
height: 10px;
|
height: 10px;
|
||||||
|
display: block;
|
||||||
}
|
}
|
||||||
.nav-ajax-update,
|
.nav-ajax-update,
|
||||||
.nav-ajax-left {
|
.nav-ajax-left {
|
||||||
|
|
|
||||||
|
|
@ -78,16 +78,19 @@ h6{font-size:xx-small;}
|
||||||
#login_openid label{width:180px !important;}
|
#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{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;}
|
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;}
|
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 .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-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-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-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-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-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-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-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,#nav-notifications-linkmenu{background-position:-44px -110px;}
|
||||||
#nav-notify-link:hover{background-position:-66px -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;}
|
#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-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{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;}
|
.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-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,#mini-search-text{background:white;color:#111111;}
|
||||||
#search-text{border:1px solid #999999;margin:5px 0;}
|
#search-text{border:1px solid #999999;margin:5px 0;}
|
||||||
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
|
#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;}
|
#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{-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:3px 20px 9px 5px;height:10px;}
|
#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,.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;}
|
.nav-ajax-update.show,.nav-ajax-left.show{visibility:visible;}
|
||||||
#net-update{background-position:0px 0px;}
|
#net-update{background-position:0px 0px;}
|
||||||
|
|
|
||||||
|
|
@ -446,13 +446,22 @@ nav {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
margin-left: 3px; } }
|
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 {
|
ul#user-menu-popup {
|
||||||
display: none;
|
display: none;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
background-color: @menu_bg_colour;
|
background-color: @menu_bg_colour;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 10px 0px;
|
padding: 10px 0px;
|
||||||
margin: 0px;
|
margin: 3px 0 0;
|
||||||
top: 20px;
|
top: 20px;
|
||||||
left: 0;
|
left: 0;
|
||||||
font-size: small;
|
font-size: small;
|
||||||
|
|
@ -482,6 +491,12 @@ nav .nav-link {
|
||||||
text-indent: 50px;
|
text-indent: 50px;
|
||||||
background: transparent url(light/icons.png) 0 0 no-repeat;
|
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 {
|
#nav-apps-link {
|
||||||
background-position: 0 -66px;
|
background-position: 0 -66px;
|
||||||
&:hover {
|
&:hover {
|
||||||
|
|
@ -514,9 +529,9 @@ nav .nav-link {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#nav-intro-link {
|
#nav-intro-link {
|
||||||
background-position: 0px -190px;
|
background-position: 0px -88px;
|
||||||
&:hover {
|
&:hover {
|
||||||
background-position: -44px -190px;
|
background-position: -22px -88px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#nav-login-link,
|
#nav-login-link,
|
||||||
|
|
@ -526,6 +541,12 @@ nav .nav-link {
|
||||||
background-position: -22px -88px;
|
background-position: -22px -88px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#nav-manage-link {
|
||||||
|
background-position: 0px -22px;
|
||||||
|
&:hover {
|
||||||
|
background-position: -22px -22px;
|
||||||
|
}
|
||||||
|
}
|
||||||
#nav-messages-link {
|
#nav-messages-link {
|
||||||
background-position: -44px -88px;
|
background-position: -44px -88px;
|
||||||
&:hover {
|
&:hover {
|
||||||
|
|
@ -654,6 +675,21 @@ nav #nav-notifications-linkmenu {
|
||||||
margin: 0px -4px 0px 0px;
|
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 {
|
.floaterflip {
|
||||||
display: block;
|
display: block;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
|
|
@ -703,17 +739,17 @@ nav #nav-notifications-linkmenu {
|
||||||
#user-menu {
|
#user-menu {
|
||||||
.box_shadow(5px, 0, 10px, 0);
|
.box_shadow(5px, 0, 10px, 0);
|
||||||
display: block;
|
display: block;
|
||||||
width: 80%;
|
width: 35%;
|
||||||
margin: 3px 0 0 0;
|
margin: 5px 0 0 0;
|
||||||
position: relative;
|
position: relative;
|
||||||
.rounded_corners;
|
.rounded_corners;
|
||||||
background-color: @menu_bg_colour;
|
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-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-position: 98% center;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
clear: both;
|
/* clear: both;*/
|
||||||
top: 4px;
|
top: 4px;
|
||||||
left: 10px;
|
left: 7px;
|
||||||
padding: 2px;
|
padding: 2px;
|
||||||
> a {
|
> a {
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
|
|
@ -722,8 +758,9 @@ nav #nav-notifications-linkmenu {
|
||||||
}
|
}
|
||||||
#user-menu-label {
|
#user-menu-label {
|
||||||
font-size: small;
|
font-size: small;
|
||||||
padding: 3px 20px 9px 5px;
|
padding: 0px 20px 10px 5px;
|
||||||
height: 10px;
|
height: 10px;
|
||||||
|
display: block;
|
||||||
}
|
}
|
||||||
.nav-ajax-update,
|
.nav-ajax-update,
|
||||||
.nav-ajax-left {
|
.nav-ajax-left {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
<nav id="pagenav">
|
<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>
|
<a name="top" id="top"></a>
|
||||||
<div id="nav-floater">
|
<div id="nav-floater">
|
||||||
|
|
@ -50,7 +51,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div id="user-menu">
|
<div id="user-menu">
|
||||||
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="$nav.home.0">$sitelocation</a>
|
<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"
|
<ul id="user-menu-popup"
|
||||||
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
|
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
|
||||||
onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
|
onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
|
||||||
|
|
@ -62,9 +63,6 @@
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
{{ if $nav.contacts }}
|
{{ 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>
|
<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 }}
|
{{ endif }}
|
||||||
{{ if $nav.profiles }}
|
{{ 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>
|
<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>
|
||||||
|
|
@ -72,12 +70,6 @@
|
||||||
{{ if $nav.settings }}
|
{{ 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>
|
<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 }}
|
{{ 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 }}
|
{{ 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>
|
<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 }}
|
{{ endif }}
|
||||||
|
|
@ -87,6 +79,18 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</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 }}
|
{{ if $userinfo }}
|
||||||
<ul id="nav-user-menu" class="menu-popup">
|
<ul id="nav-user-menu" class="menu-popup">
|
||||||
{{ for $nav.usermenu as $usermenu }}
|
{{ for $nav.usermenu as $usermenu }}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue