Merge branch 'develop' of https://github.com/friendica/friendica into develop

This commit is contained in:
Tobias Diekershoff 2015-11-08 16:04:50 +01:00
commit 808eaa633a
34 changed files with 916 additions and 1063 deletions

View File

@ -27,7 +27,6 @@ function nav(&$a) {
$a->page['nav'] .= replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$langselector' => lang_selector(),
'$sitelocation' => $nav_info['sitelocation'],
'$nav' => $nav_info['nav'],
'$banner' => $nav_info['banner'],
@ -48,7 +47,7 @@ function nav_info(&$a) {
/**
*
* Our network is distributed, and as you visit friends some of the
* Our network is distributed, and as you visit friends some of the
* sites look exactly the same - it isn't always easy to know where you are.
* Display the current site location as a navigation aid.
*
@ -207,7 +206,7 @@ function nav_info(&$a) {
$banner = get_config('system','banner');
if($banner === false)
if($banner === false)
$banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
call_hooks('nav_info', $nav);
@ -224,7 +223,7 @@ function nav_info(&$a) {
/*
* Set a menu item in navbar as selected
*
*
*/
function nav_set_selected($item){
$a = get_app();

View File

@ -705,8 +705,8 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
$no_of_items = sizeof($items);
if (@is_array($conv_as->items))
foreach ($conv_as->items AS $item)
$items[$item->id] = $item;
foreach ($conv_as->items AS $single_item)
$items[$single_item->id] = $single_item;
if ($no_of_items == sizeof($items))
break;

View File

@ -11,7 +11,7 @@ require_once("include/dba.php");
*
* Get the language setting directly from system variables, bypassing get_config()
* as database may not yet be configured.
*
*
* If possible, we use the value from the browser.
*
*/
@ -21,22 +21,22 @@ if(! function_exists('get_browser_language')) {
function get_browser_language() {
if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) {
// break up string into pieces (languages and q factors)
preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
// break up string into pieces (languages and q factors)
preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
$_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
if (count($lang_parse[1])) {
// create a list like "en" => 0.8
$langs = array_combine($lang_parse[1], $lang_parse[4]);
// set default to 1 for any without q factor
foreach ($langs as $lang => $val) {
if ($val === '') $langs[$lang] = 1;
}
if (count($lang_parse[1])) {
// create a list like "en" => 0.8
$langs = array_combine($lang_parse[1], $lang_parse[4]);
// sort list based on value
arsort($langs, SORT_NUMERIC);
}
// set default to 1 for any without q factor
foreach ($langs as $lang => $val) {
if ($val === '') $langs[$lang] = 1;
}
// sort list based on value
arsort($langs, SORT_NUMERIC);
}
}
if(isset($langs) && count($langs)) {
@ -94,7 +94,7 @@ if(! function_exists('load_translation_table')) {
* load string translation table for alternate language
*
* first plugin strings are loaded, then globals
*
*
* @param string $lang language code to load
*/
function load_translation_table($lang) {
@ -111,7 +111,7 @@ function load_translation_table($lang) {
}
}
}
if(file_exists("view/$lang/strings.php")) {
include("view/$lang/strings.php");
}
@ -145,7 +145,7 @@ function tt($singular, $plural, $count){
$k = $f($count);
return is_array($t)?$t[$k]:$t;
}
if ($count!=1){
return $plural;
} else {
@ -153,11 +153,34 @@ function tt($singular, $plural, $count){
}
}}
// provide a fallback which will not collide with
// a function defined in any language file
// provide a fallback which will not collide with
// a function defined in any language file
if(! function_exists('string_plural_select_default')) {
function string_plural_select_default($n) {
return ($n != 1);
}}
/**
* Return installed languages as associative array
* [
* lang => lang,
* ...
* ]
*/
function get_avaiable_languages() {
$lang_choices = array();
$langs = glob('view/*/strings.php'); /**/
if(is_array($langs) && count($langs)) {
if(! in_array('view/en/strings.php',$langs))
$langs[] = 'view/en/';
asort($langs);
foreach($langs as $l) {
$t = explode("/",$l);
$lang_choices[$t[1]] = $t[1];
}
}
return $lang_choices;
}

View File

@ -1020,8 +1020,9 @@ if(! function_exists('valid_email')) {
*/
function valid_email($x){
if(get_config('system','disable_email_validation'))
return true;
// Removed because Fabio told me so.
//if(get_config('system','disable_email_validation'))
// return true;
if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
return true;
@ -1738,50 +1739,6 @@ function unamp($s) {
}}
if(! function_exists('lang_selector')) {
/**
* get html for language selector
* @global string $lang
* @return string
* @template lang_selector.tpl
*/
function lang_selector() {
global $lang;
$langs = glob('view/*/strings.php');
$lang_options = array();
$selected = "";
if(is_array($langs) && count($langs)) {
$langs[] = '';
if(! in_array('view/en/strings.php',$langs))
$langs[] = 'view/en/';
asort($langs);
foreach($langs as $l) {
if($l == '') {
$lang_options[""] = t('default');
continue;
}
$ll = substr($l,5);
$ll = substr($ll,0,strrpos($ll,'/'));
$selected = (($ll === $lang && (x($_SESSION, 'language'))) ? $ll : $selected);
$lang_options[$ll]=$ll;
}
}
$tpl = get_markup_template("lang_selector.tpl");
$o = replace_macros($tpl, array(
'$title' => t('Select an alternate language'),
'$langs' => array($lang_options, $selected),
));
return $o;
}}
if(! function_exists('return_bytes')) {
/**
* return number of bytes in size (K, M, G)

View File

@ -102,13 +102,13 @@ session_start();
* Language was set earlier, but we can over-ride it in the session.
* We have to do it here because the session was just now opened.
*/
if(array_key_exists('system_language',$_POST)) {
if(strlen($_POST['system_language']))
$_SESSION['language'] = $_POST['system_language'];
else
unset($_SESSION['language']);
if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
// we didn't loaded user data yet, but we need user language
$r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid']));
$_SESSION['language'] = $lang;
if (count($r)>0) $_SESSION['language'] = $r[0]['language'];
}
if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
$lang = $_SESSION['language'];
load_translation_table($lang);

View File

@ -603,18 +603,7 @@ function admin_page_site_post(&$a){
function admin_page_site(&$a) {
/* Installed langs */
$lang_choices = array();
$langs = glob('view/*/strings.php'); /**/
if(is_array($langs) && count($langs)) {
if(! in_array('view/en/strings.php',$langs))
$langs[] = 'view/en/';
asort($langs);
foreach($langs as $l) {
$t = explode("/",$l);
$lang_choices[$t[1]] = $t[1];
}
}
$lang_choices = get_avaiable_languages();
if (strlen(get_config('system','directory_submit_url')) AND
!strlen(get_config('system','directory'))) {

View File

@ -25,13 +25,20 @@ function dirfind_init(&$a) {
function dirfind_content(&$a, $prefix = "") {
$community = false;
$discover_user = false;
$local = get_config('system','poco_local_search');
$search = $prefix.notags(trim($_REQUEST['search']));
if(strpos($search,'@') === 0)
if(strpos($search,'@') === 0) {
$search = substr($search,1);
if ((valid_email($search) AND validate_email($search)) OR
(substr(normalise_link($search), 0, 7) == "http://")) {
$user_data = probe_url($search);
$discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)));
}
}
if(strpos($search,'!') === 0) {
$search = substr($search,1);
@ -42,7 +49,32 @@ function dirfind_content(&$a, $prefix = "") {
if($search) {
if ($local) {
if ($discover_user) {
$j = new stdClass();
$j->total = 1;
$j->items_page = 1;
$j->page = $a->pager['page'];
$objresult = new stdClass();
$objresult->cid = 0;
$objresult->name = $user_data["name"];
$objresult->addr = $user_data["addr"];
$objresult->url = $user_data["url"];
$objresult->photo = $user_data["photo"];
$objresult->tags = "";
$objresult->network = $user_data["network"];
$contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc(normalise_link($user_data["url"])), intval(local_user()));
if ($contact)
$objresult->cid = $contact[0]["id"];
$j->results[] = $objresult;
poco_check($user_data["url"], $user_data["name"], $user_data["network"], $user_data["photo"],
"", "", "", "", "", datetime_convert(), 0);
} elseif ($local) {
if ($community)
$extra_sql = " AND `community`";

View File

@ -4,7 +4,13 @@ require_once('include/acl_selectors.php');
require_once('include/message.php');
function message_init(&$a) {
$tabs = array();
$tabs = '';
if ($a->argc >1 && is_numeric($a->argv[1])) {
$tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
}
$new = array(
'label' => t('New Message'),
'url' => $a->get_baseurl(true) . '/message/new',
@ -55,7 +61,7 @@ function message_post(&$a) {
if(! $plaintext) {
$body = fix_mce_lf($body);
}
$ret = send_message($recipient, $body, $subject, $replyto);
$norecip = false;
@ -246,8 +252,8 @@ function message_content(&$a) {
// remove diaspora conversation pointer
// Actually if we do this, we can never receive another reply to that conversation,
// as we will never again have the info we need to re-create it.
// We'll just have to orphan it.
// as we will never again have the info we need to re-create it.
// We'll just have to orphan it.
//if($convid) {
// q("delete from conv where id = %d limit 1",
@ -344,75 +350,29 @@ function message_content(&$a) {
if($a->argc == 1) {
// list messages
// List messages
$o .= $header;
$r = q("SELECT count(*) AS `total` FROM `mail`
WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
intval(local_user()),
dbesc($myprofile)
);
if(count($r))
$a->set_pager_total($r[0]['total']);
$r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
count( * ) as count
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ",
intval(local_user()),
//
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
if(count($r)) $a->set_pager_total($r[0]['total']);
$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
if(! count($r)) {
info( t('No messages.') . EOL);
return $o;
}
$tpl = get_markup_template('mail_list.tpl');
foreach($r as $rr) {
if($rr['unknown']) {
$partecipants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
}
elseif (link_compare($rr['from-url'],$myprofile)){
$partecipants = sprintf( t("You and %s"), $rr['name']);
}
else {
$partecipants = sprintf( t("%s and You"), $rr['from-name']);
}
$o .= render_messages($r, 'mail_list.tpl');
if($a->theme['template_engine'] === 'internal') {
$subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'));
$body_e = template_escape($rr['body']);
$to_name_e = template_escape($rr['name']);
}
else {
$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
$body_e = $rr['body'];
$to_name_e = $rr['name'];
}
$o .= replace_macros($tpl, array(
'$id' => $rr['id'],
'$from_name' => $partecipants,
'$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
'$sparkle' => ' sparkle',
'$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
'$subject' => $subject_e,
'$delete' => t('Delete conversation'),
'$body' => $body_e,
'$to_name' => $to_name_e,
'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
'$ago' => relative_date($rr['mailcreated']),
'$seen' => $rr['mailseen'],
'$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
));
}
$o .= paginate($a);
return $o;
}
@ -569,5 +529,65 @@ function message_content(&$a) {
return $o;
}
}
function get_messages($user, $lstart, $lend) {
return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
count( * ) as count
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ",
intval($user), intval($lstart), intval($lend)
);
}
function render_messages($msg, $t) {
$a = get_app();
$tpl = get_markup_template($t);
$rslt = '';
foreach($msg as $rr) {
if($rr['unknown']) {
$participants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
}
elseif (link_compare($rr['from-url'], $myprofile)){
$participants = sprintf( t("You and %s"), $rr['name']);
}
else {
$participants = sprintf( t("%s and You"), $rr['from-name']);
}
if($a->theme['template_engine'] === 'internal') {
$subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'));
$body_e = template_escape($rr['body']);
$to_name_e = template_escape($rr['name']);
}
else {
$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
$body_e = $rr['body'];
$to_name_e = $rr['name'];
}
$rslt .= replace_macros($tpl, array(
'$id' => $rr['id'],
'$from_name' => $participants,
'$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
'$sparkle' => ' sparkle',
'$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
'$subject' => $subject_e,
'$delete' => t('Delete conversation'),
'$body' => $body_e,
'$to_name' => $to_name_e,
'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
'$ago' => relative_date($rr['mailcreated']),
'$seen' => $rr['mailseen'],
'$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
));
}
return $rslt;
}

View File

@ -12,8 +12,7 @@ function navigation_content(&$a) {
$tpl = get_markup_template('navigation.tpl');
return replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$langselector' => lang_selector(),
'$baseurl' => $a->get_baseurl(),
'$sitelocation' => $nav_info['sitelocation'],
'$nav' => $nav_info['nav'],
'$banner' => $nav_info['banner'],

View File

@ -33,6 +33,7 @@ function ping_init(&$a) {
$home = 0;
$network = 0;
$network_group = array();
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
`item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
@ -84,6 +85,22 @@ function ping_init(&$a) {
}
}
if ( $network )
{
# Find out how unseen network posts are spread across groups
$sql = "SELECT g.id, g.name, count(i.id) count " .
"FROM `group` g, group_member gm, item i " .
"WHERE g.uid = %d " .
"AND i.uid = %d " .
"AND i.unseen AND i.visible " .
"AND NOT i.deleted " .
"AND i.`contact-id` = gm.`contact-id` " .
"AND gm.gid = g.id GROUP BY g.id";
#echo '<SQL id="' . intval(local_user()) . '">' . $sql . '</SQL>';
$network_group = q($sql, intval(local_user()), intval(local_user()));
#echo '<COUNT R="' . count($network_group) . '"/>';
}
$intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`,
`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
@ -202,6 +219,13 @@ function ping_init(&$a) {
<net>$network</net>
<home>$home</home>\r\n";
if ($register!=0) echo "<register>$register</register>";
if ( count($network_group) ) {
echo '<groups>';
foreach ($network_group as $it) {
echo '<group id="' . $it['id'] . '">' . $it['count'] . "</group>";
}
echo "</groups>";
}
echo "<all-events>$all_events</all-events>
<all-events-today>$all_events_today</all-events-today>

View File

@ -386,6 +386,8 @@ function settings_post(&$a) {
$username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : '');
$email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : '');
$timezone = ((x($_POST,'timezone')) ? notags(trim($_POST['timezone'])) : '');
$language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : '');
$defloc = ((x($_POST,'defloc')) ? notags(trim($_POST['defloc'])) : '');
$openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
$maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0);
@ -532,7 +534,15 @@ function settings_post(&$a) {
}
}
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d",
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s',
`openid` = '%s', `timezone` = '%s',
`allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s',
`notify-flags` = %d, `page-flags` = %d, `default-location` = '%s',
`allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s',
`def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d,
`unkmail` = %d, `cntunkmail` = %d, `language` = '%s'
WHERE `uid` = %d",
dbesc($username),
dbesc($email),
dbesc($openid),
@ -554,11 +564,15 @@ function settings_post(&$a) {
intval($blocktags),
intval($unkmail),
intval($cntunkmail),
dbesc($language),
intval(local_user())
);
if($r)
info( t('Settings updated.') . EOL);
// clear session language
unset($_SESSION['language']);
$r = q("UPDATE `profile`
SET `publish` = %d,
`name` = '%s',
@ -985,6 +999,7 @@ function settings_content(&$a) {
$email = $a->user['email'];
$nickname = $a->user['nickname'];
$timezone = $a->user['timezone'];
$language = $a->user['language'];
$notify = $a->user['notify-flags'];
$defloc = $a->user['default-location'];
$openid = $a->user['openid'];
@ -1168,6 +1183,8 @@ function settings_content(&$a) {
else
$public_post_link = '&public=1';
/* Installed langs */
$lang_choices = get_avaiable_languages();
$o .= replace_macros($stpl, array(
'$ptitle' => t('Account Settings'),
@ -1190,6 +1207,7 @@ function settings_content(&$a) {
'$username' => array('username', t('Full Name:'), $username,''),
'$email' => array('email', t('Email Address:'), $email, '', '', '', 'email'),
'$timezone' => array('timezone_select' , t('Your Timezone:'), select_timezone($timezone), ''),
'$language' => array('language', t('Your Language:'), $language, t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices),
'$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''),
'$allowloc' => array('allow_location', t('Use Browser Location:'), ($a->user['allow_location'] == 1), ''),
@ -1245,7 +1263,7 @@ function settings_content(&$a) {
'$notify8' => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, ''),
'$desktop_notifications' => array('desktop_notifications', t('Activate desktop notifications') , false, t('Show desktop popup on new notifications')),
'$email_textonly' => array('email_textonly', t('Text-only notification emails'),
get_pconfig(local_user(),'system','email_textonly'),
t('Send text only notification emails, without the html part')),

View File

@ -1,11 +0,0 @@
<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" >lang</div>
<div id="language-selector" style="display: none;" >
<form action="#" method="post" >
<select name="system_language" onchange="this.form.submit();" >
{{foreach $langs.0 as $v=>$l}}
<option value="{{$v|escape:'html'}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
{{/foreach}}
</select>
</form>
</div>

View File

@ -1,11 +1,10 @@
<div id="message-sidebar" class="widget">
<div id="message-new"><a href="{{$new.url}}" accesskey="m" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
<ul role="menu" class="message-ul">
{{foreach $tabs as $t}}
<li role="menuitem" class="tool"><a href="{{$t.url}}" {{if $t.accesskey}}accesskey="$t.accesskey"{{/if}} class="message-link{{if $t.sel}}message-selected{{/if}}">{{$t.label}}</a></li>
{{/foreach}}
</ul>
{{if $tabs}}
<div id="message-preview">
{{$tabs}}
</div>
{{/if}}
</div>

View File

@ -27,6 +27,7 @@
{{include file="field_input.tpl" field=$email}}
{{include file="field_password.tpl" field=$password4}}
{{include file="field_custom.tpl" field=$timezone}}
{{include file="field_select.tpl" field=$language}}
{{include file="field_input.tpl" field=$defloc}}
{{include file="field_checkbox.tpl" field=$allowloc}}
@ -147,7 +148,7 @@
(function(){
var elm = $("#id_{{$desktop_notifications.0}}_onoff");
var ckbox = $("#id_{{$desktop_notifications.0}}");
if (getNotificationPermission() === 'granted') {
ckbox.val(1);
elm.find(".off").addClass("hidden");
@ -156,18 +157,18 @@
if (getNotificationPermission() === null) {
elm.parent(".field.yesno").hide();
}
$("#id_{{$desktop_notifications.0}}_onoff").on("click", function(e){
if (Notification.permission === 'granted') {
localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
} else if (Notification.permission === 'denied') {
localStorage.setItem('notification-permissions', 'denied');
ckbox.val(0);
elm.find(".on").addClass("hidden");
elm.find(".off").removeClass("hidden");
} else if (Notification.permission === 'default') {
Notification.requestPermission(function(choice) {
if (choice === 'granted') {
@ -181,10 +182,10 @@
}
});
}
//console.log(getNotificationPermission());
})
})();
</script>

View File

@ -44,7 +44,7 @@ input {
border: 1px solid #666666;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
padding: 3px;
}
@ -74,7 +74,7 @@ img { border :0px; }
background: #EEE;
color: #444;
padding: 10px;
margin-top: 20px;
margin-top: 20px;
}
blockquote {
@ -96,7 +96,7 @@ code {
background: #EEE;
color: #444;
padding: 10px;
margin-top: 20px;
margin-top: 20px;
}
blockquote {
@ -200,10 +200,10 @@ nav #banner #logo-text a:hover { text-decoration: none; }
border: 1px solid #babdb6;
border-bottom: 0px;
background-color: #aec0d3;
color: #565854;
color: #565854;
-moz-border-radius: 3px 3px 0px 0px;
-webkit-border-radius: 3px 3px 0px 0px;
border-radius: 3px 3px 0px 0px;
border-radius: 3px 3px 0px 0px;
}
.nav-commlink.selected {
@ -376,7 +376,7 @@ section {
background-repeat: no-repeat;
min-height: 112px;
border-top: 1px solid #babdb6;
border-top: 1px solid #babdb6;
overflow-x:hidden;
}
@ -388,7 +388,7 @@ footer {
.tabs {
/*background-image: url(head.jpg);
background-repeat: repeat-x;
background-repeat: repeat-x;
background-position: 0px -20px;*/
border-bottom: 1px solid #babdb6;
padding:0px;
@ -416,7 +416,7 @@ footer {
}
.tab.active {
font-weight: bold;
}
#events-tab {
display: none;
@ -465,14 +465,14 @@ navigation-messages-wrapper,
}
/* from default */
#jot-perms-icon,
#jot-perms-icon,
#profile-location,
#profile-nolocation,
#profile-youtube,
#profile-video,
#profile-youtube,
#profile-video,
#profile-audio,
#profile-link,
#profile-title,
#profile-title,
#wall-image-upload,
#wall-file-upload,
#profile-upload-wrapper,
@ -502,12 +502,12 @@ navigation-messages-wrapper,
#jot-category:-moz-placeholder{font-weight: normal;}*/
#profile-jot-text::-webkit-input-placeholder{font-weight: bold;}
#profile-jot-text:-moz-placeholder{font-weight: bold; font-size:18px; color: graytext}
#jot-title:hover,
#jot-title:focus,
#jot-category:hover,
#jot-category:focus {
border: 1px solid #cccccc;
border: 1px solid #cccccc;
}
/*.jothidden { display:none; }*/
@ -532,7 +532,7 @@ navigation-messages-wrapper,
padding: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;
background: #F8F8F8;
font-weight: bold;
@ -542,7 +542,7 @@ navigation-messages-wrapper,
/* padding: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;*/
background: #F8F8F8;
font-weight: bold;
@ -630,7 +630,7 @@ navigation-messages-wrapper,
}
#login-submit-button {
margin-top: 10px;
margin-top: 10px;
margin-left: 200px;
}*/
@ -1041,7 +1041,7 @@ input#dfrn-url {
clear: left;
color: #666666;
display: block;
margin-bottom: 20px
margin-bottom: 20px
}
#profile-edit-profile-name-end,
@ -1126,7 +1126,7 @@ input#dfrn-url {
/* width: 120px;
height: 120px;*/
padding-left: 15px;
padding-right: 15px;
padding-right: 15px;
width: 95px;
height: 200px;
}
@ -1264,7 +1264,7 @@ input#dfrn-url {
display: block;
position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
@ -1273,7 +1273,7 @@ input#dfrn-url {
overflow: hidden;
text-indent: 40px;
display: none;
}
.wall-item-photo-menu {
width: auto;
@ -1318,7 +1318,7 @@ input#dfrn-url {
margin-top: 1em;
left: 105px;
position: absolute;
top: 1px;
top: 1px;
}
.comment .wall-item-lock {
margin-top: 0px;
@ -1370,11 +1370,11 @@ input#dfrn-url {
}
.star-item {
margin-left: 10px;
float: left;
float: left;
}
.tag-item {
margin-left: 10px;
float: left;
float: left;
}
.filer-item {
@ -1412,7 +1412,7 @@ input#dfrn-url {
border-radius: 7px;
}
.comment .wall-item-photo {
width: 50px !important;
width: 50px !important;
height: 50px !important;
}
.wall-item-content {
@ -1433,7 +1433,7 @@ input#dfrn-url {
.wall-item-title {
/*float: left;*/
font-weight: bold;
font-size: 1.6em;
font-size: 1.6em;
/*width: 450px;*/
}
@ -1522,7 +1522,7 @@ input#dfrn-url {
background-repeat: repeat-x;*/
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}
}
.comment-edit-wrapper {
@ -1566,7 +1566,7 @@ input#dfrn-url {
/* float: left;*/
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #cccccc;
padding: 3px 1px 1px 3px;
}
@ -1624,7 +1624,7 @@ input#dfrn-url {
padding-top: 0.5em;
margin-top: 1em;
margin-bottom: 1em;
}
.shared_header img {
float: left;
@ -2149,7 +2149,7 @@ input#profile-jot-email {
.contact-photo-menu-button {
/* position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
@ -2158,7 +2158,7 @@ input#profile-jot-email {
overflow: hidden;
text-indent: 40px;
display: none;*/
}
.contact-photo-menu {
width: 130px;
@ -2217,7 +2217,7 @@ input#profile-jot-email {
padding: 3px 0px 0px 5px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
}
@ -2351,7 +2351,7 @@ input#profile-jot-email {
margin: 4px;
}
.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
.acl-list-item a {
.acl-list-item a {
font-size: 8px;
display: block;
width: 40px;
@ -2670,15 +2670,15 @@ aside input[type='text'] {
margin-top: 15px;
margin-right: 15px;
margin-left: 15px;
/* width: 200px; height: 200px;
overflow: hidden;
/* width: 200px; height: 200px;
overflow: hidden;
position: relative; */
}
.photo-album-image-wrapper .caption {
display: none;
display: none;
width: 100%;
/* position: absolute; */
bottom: 0px;
bottom: 0px;
padding: 0.5em 0.5em 0px 0.5em;
background-color: rgba(245, 245, 255, 0.8);
border-bottom: 2px solid #CCC;
@ -2694,7 +2694,7 @@ aside input[type='text'] {
}
.photo-top-image-wrapper {
/* position: relative;
/* position: relative;
float: left;*/
display: inline-block;
vertical-align: top;
@ -2702,7 +2702,7 @@ aside input[type='text'] {
margin-right: 15px;
margin-left: 15px;
margin-bottom: 15px;
/* width: 200px; height: 200px;
/* width: 200px; height: 200px;
overflow: hidden; */
}
.photo-top-image-wrapper img {
@ -2715,7 +2715,7 @@ aside input[type='text'] {
width: 100%;
min-height: 2em;
/* position: absolute; */
bottom: 0px;
bottom: 0px;
padding: 0px 3px;
padding-top: 0.5em;
background-color: rgb(255, 255, 255);
@ -2794,7 +2794,7 @@ aside input[type='text'] {
}
#profile-jot-banner-end {
/* clear: both; */
/* clear: both; */
}
#photos-upload-select-files-text {
@ -3135,7 +3135,7 @@ aside input[type='text'] {
}
/* end from default */
.fn {
padding: 1em 0px 5px 12px;
@ -3154,7 +3154,7 @@ aside input[type='text'] {
#birthday-title {
float: left;
font-weight: bold;
font-weight: bold;
}
#birthday-adjust {
@ -3281,7 +3281,7 @@ aside input[type='text'] {
clear: both;
}
.calendar {
font-family: Courier, monospace;
}
@ -3394,11 +3394,6 @@ aside input[type='text'] {
margin-bottom: 15px;
}
#language-selector {
position: absolute;
top: 0px;
left: 16px;
}
#group-members {
margin-top: 20px;
@ -3496,7 +3491,7 @@ aside input[type='text'] {
#netsearch-box {
margin-top: 20px;
margin-top: 20px;
}
#netsearch-box #search-submit {
@ -3576,20 +3571,6 @@ aside input[type='text'] {
text-decoration: underline;
}
#lang-select-icon {
cursor: pointer;
position: fixed;
left: 0px;
top: 0px;
opacity: 0.2;
filter:alpha(opacity=20);
}
#lang-select-icon:hover {
opacity: 1;
filter:alpha(opacity=100);
}
.notif-image {
height: 80px;
width: 80px;
@ -3601,7 +3582,6 @@ aside input[type='text'] {
}
/**
* Plugins settings
*/
@ -3610,7 +3590,7 @@ aside input[type='text'] {
.settings-heading {
border-bottom: 1px solid #babdb6;
}
/**
@ -3691,7 +3671,7 @@ aside input[type='text'] {
font-weight: bold;
background-color: #FF0000;
padding: 0em 0.3em;
}
#adminpage dl {
clear: left;
@ -3751,7 +3731,7 @@ aside input[type='text'] {
/*
* UPDATE
*/
.popup {
.popup {
width: 100%; height: 100%;
top:0px; left:0px;
position: absolute;
@ -3772,7 +3752,7 @@ aside input[type='text'] {
border: 4px solid #000000;
background-color: #FFFFFF;
}
.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
.popup .panel .panel_in { width: 100%; height: 100%; position: relative; }
.popup .panel .panel_actions { width: 100%; bottom: 4px; left: 0px; position: absolute; }
.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
@ -3785,7 +3765,7 @@ aside input[type='text'] {
height: auto; overflow: auto;
border-bottom: 2px solid #cccccc;
padding-bottom: 1em;
margin-bottom: 1em;
margin-bottom: 1em;
}
.oauthapp img {
float: left;
@ -4277,7 +4257,7 @@ ul.notifications-menu-popup {
}
#recip {
}
.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; }

View File

@ -1,11 +0,0 @@
<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
<div id="language-selector" style="display: none;" >
<form action="#" method="post" >
<select name="system_language" onchange="this.form.submit();" >
{{foreach $langs.0 as $v=>$l}}
<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
{{/foreach}}
</select>
</form>
</div>

View File

@ -27,6 +27,7 @@
{{include file="field_input.tpl" field=$email}}
{{include file="field_password.tpl" field=$password4}}
{{include file="field_custom.tpl" field=$timezone}}
{{include file="field_select.tpl" field=$language}}
{{include file="field_input.tpl" field=$defloc}}
{{include file="field_checkbox.tpl" field=$allowloc}}

View File

@ -125,8 +125,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#notify-update{background-position:-60px 0px;}
#home-update{background-position:-90px 0px;}
#intro-update{background-position:-120px 0px;}
#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;}
.menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
.menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}

View File

@ -2,7 +2,7 @@
* dispy dark
* Description: Dispy Dark: dark, sleek, functional
* author, maintainer: simon <http://simon.kisikew.org/>
*
*
* Author's notes:
* A few things of note here. The less file is our working copy,
* and the CSS is *generated* from it. The CSS is the one that's
@ -798,19 +798,7 @@ nav #nav-notifications-linkmenu {
#intro-update {
background-position: -120px 0px;
}
#lang-select-icon {
cursor: pointer;
position: fixed;
left: 28px;
bottom: 6px;
z-index: 10;
}
#language-selector {
position: fixed;
bottom: 2px;
left: 52px;
z-index: 10;
}
.menu-popup {
position: absolute;
display: none;
@ -1696,7 +1684,7 @@ div {
margin: 0 6px 0 -3px;
}
.profile-match-photo {
}
[id$="-end"], [class$="-end"] {
clear: both;
@ -2100,7 +2088,7 @@ div {
#register-form label,
#profile-edit-form label {
width: 23em;
}
}
#register-form span,
#profile-edit-form span {
color: @menu_bg_colour;

View File

@ -125,8 +125,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#notify-update{background-position:-60px 0px;}
#home-update{background-position:-90px 0px;}
#intro-update{background-position:-120px 0px;}
#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
.menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;}
.menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
.menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}

View File

@ -799,19 +799,7 @@ nav #nav-notifications-linkmenu {
#intro-update {
background-position: -120px 0px;
}
#lang-select-icon {
cursor: pointer;
position: fixed;
left: 28px;
bottom: 6px;
z-index: 10;
}
#language-selector {
position: fixed;
bottom: 2px;
left: 52px;
z-index: 10;
}
.menu-popup {
position: absolute;
display: none;
@ -1697,7 +1685,7 @@ div {
margin: 0 6px 0 -3px;
}
.profile-match-photo {
}
[id$="-end"], [class$="-end"] {
clear: both;
@ -2101,7 +2089,7 @@ div {
#register-form label,
#profile-edit-form label {
width: 23em;
}
}
#register-form span,
#profile-edit-form span {
color: @menu_bg_colour;

View File

@ -1,11 +0,0 @@
<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
<div id="language-selector" style="display: none;" >
<form action="#" method="post" >
<select name="system_language" onchange="this.form.submit();" >
{{foreach $langs.0 as $v=>$l}}
<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
{{/foreach}}
</select>
</form>
</div>

View File

@ -2713,12 +2713,6 @@ aside input[type='text'] {
margin-bottom: 15px;
}
#language-selector {
position: absolute;
top: 0px;
left: 16px;
}
#group-members {
margin-top: 20px;
padding: 10px;
@ -2888,19 +2882,6 @@ aside input[type='text'] {
text-decoration: underline;
}
#lang-select-icon {
cursor: pointer;
position: absolute;
left: 0px;
top: 0px;
opacity: 0.2;
filter:alpha(opacity=20);
}
#lang-select-icon:hover {
opacity: 1;
filter:alpha(opacity=100);
}
.notif-image {
height: 80px;
@ -3495,5 +3476,9 @@ ul.menu-popup {
.videos .video-top-wrapper:hover .video-delete {
opacity: 1;
}
#message-preview .mail-list-sender-url, #message-preview .mail-list-delete {
display: none;
}
#message-preview .mail-list-outside-wrapper {
margin-top: 20px;
}

View File

@ -1,11 +0,0 @@
<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
<div id="language-selector" style="display: none;" >
<form action="#" method="post" >
<select name="system_language" onchange="this.form.submit();" >
{{foreach $langs.0 as $v=>$l}}
<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
{{/foreach}}
</select>
</form>
</div>

View File

@ -22,7 +22,7 @@ a:hover {text-decoration: underline; }
input {
/*border: 1px solid #666666;*/
/*-moz-border-radius: 3px;*/
border-radius: 3px;
border-radius: 3px;
padding: 3px;
background-color: #0B4E7A;
color: #ffffff;
@ -54,7 +54,7 @@ code {
background: #EEE;
color: #444;
padding: 10px;
margin-top: 20px;
margin-top: 20px;
}
blockquote {
@ -148,9 +148,9 @@ nav #banner #logo-text a:hover { text-decoration: none; }
border-bottom: 0px;
background-color: #FFFFFF;
/*font-weight: bold;*/
color: #FFFFFF;
color: #FFFFFF;
-moz-border-radius: 3px 3px 0px 0px;
border-radius: 3px 3px 0px 0px;
border-radius: 3px 3px 0px 0px;
}
nav .nav-link {
float: right;
@ -172,7 +172,7 @@ nav .nav-link {
font-size:12px ;
font-weight: bold;
float: left;
margin-top: 62px;
margin-top: 62px;
}
@ -217,12 +217,12 @@ section {
background-position: top right;
background-repeat: no-repeat;
min-height: 112px;
}
.tabs {
height: 27px;
background-image: url(head.jpg);
background-repeat: repeat-x;
background-repeat: repeat-x;
background-position: 0px -20px;
border-bottom: 1px solid #babdb6;
padding:0px;
@ -260,14 +260,14 @@ div.wall-item-content-wrapper.shiny {
}
/* from default */
#jot-perms-icon,
#jot-perms-icon,
#profile-location,
#profile-nolocation,
#profile-youtube,
#profile-video,
#profile-youtube,
#profile-video,
#profile-audio,
#profile-link,
#profile-title,
#profile-title,
#wall-image-upload,
#wall-file-upload,
#profile-upload-wrapper,
@ -294,11 +294,11 @@ div.wall-item-content-wrapper.shiny {
#jot-title::-webkit-input-placeholder{font-weight: normal;}
#jot-title:-moz-placeholder{font-weight: normal;}
#jot-title:hover,
#jot-title:focus {
border: 1px solid #cccccc;
border: 1px solid #cccccc;
}
.jothidden { display:none; }
@ -322,7 +322,7 @@ div.wall-item-content-wrapper.shiny {
.group-selected, .nets-selected {
padding: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;
background: #F8F8F8;
font-weight: bold;
@ -778,7 +778,7 @@ input#dfrn-url {
clear: left;
color: #666666;
display: block;
margin-bottom: 20px
margin-bottom: 20px
}
#profile-edit-profile-name-end,
@ -901,7 +901,7 @@ input#dfrn-url {
/*border: 1px solid #CCC;*/
position: relative;
-moz-border-radius: 3px;
/*border-radius: 3px; */
/*border-radius: 3px; */
}
@ -930,7 +930,7 @@ input#dfrn-url {
display: block;
position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
@ -939,7 +939,7 @@ input#dfrn-url {
overflow: hidden;
text-indent: 40px;
display: none;
}
.wall-item-photo-menu {
width: auto;
@ -991,7 +991,7 @@ input#dfrn-url {
/*margin-top: 10px;*/
left: 105px;
position: absolute;
top: 1px;
top: 1px;
}
.comment .wall-item-lock {
left: 65px;
@ -1044,11 +1044,11 @@ input#dfrn-url {
}
.star-item {
margin-left: 10px;
float: left;
float: left;
}
.tag-item {
margin-left: 10px;
float: left;
float: left;
}
@ -1081,7 +1081,7 @@ input#dfrn-url {
border: none;
}
.comment .wall-item-photo {
width: 50px !important;
width: 50px !important;
height: 50px !important;
}
.wall-item-content {
@ -1123,7 +1123,7 @@ input#dfrn-url {
.comment .wall-item-tools {
background:none;
}
}
.comment-edit-wrapper {
margin-top: 15px;
@ -1151,7 +1151,7 @@ input#dfrn-url {
float: left;
margin-top: 10px;
-moz-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #cccccc;
padding: 3px 1px 1px 3px;
}
@ -1549,7 +1549,7 @@ input#dfrn-url {
.contact-photo-menu-button {
position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
@ -1558,7 +1558,7 @@ input#dfrn-url {
overflow: hidden;
text-indent: 40px;
display: none;
}
.contact-photo-menu {
width: auto;
@ -1595,7 +1595,7 @@ input#dfrn-url {
border: 1px solid #cccccc;
padding: 3px 0px 0px 5px;
-moz-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
}
@ -1646,7 +1646,7 @@ input#dfrn-url {
overflow: auto;
}
#acl-list-content {
}
.acl-list-item {
display: block;
@ -1663,7 +1663,7 @@ input#dfrn-url {
margin: 4px;
}
.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
.acl-list-item a {
.acl-list-item a {
font-size: 8px;
display: block;
width: 40px;
@ -1962,15 +1962,15 @@ aside input[type='text'] {
float: left;
margin-top: 15px;
margin-right: 15px;
width: 200px; height: 200px;
overflow: hidden;
width: 200px; height: 200px;
overflow: hidden;
position: relative;
}
.photo-album-image-wrapper .caption {
display: none;
display: none;
width: 100%;
position: absolute;
bottom: 0px;
position: absolute;
bottom: 0px;
padding: 0.5em 0.5em 0px 0.5em;
background-color: rgba(245, 245, 255, 0.8);
border-bottom: 2px solid #CCC;
@ -1989,14 +1989,14 @@ aside input[type='text'] {
float: left;
margin-top: 15px;
margin-right: 15px;
width: 200px; height: 200px;
overflow: hidden;
width: 200px; height: 200px;
overflow: hidden;
}
.photo-top-album-name {
width: 100%;
min-height: 2em;
position: absolute;
bottom: 0px;
position: absolute;
bottom: 0px;
padding: 0px 3px;
padding-top: 0.5em;
background-color: rgb(255, 255, 255);
@ -2075,7 +2075,7 @@ aside input[type='text'] {
}
#profile-jot-banner-end {
/* clear: both; */
/* clear: both; */
}
#photos-upload-select-files-text {
@ -2299,7 +2299,7 @@ aside input[type='text'] {
}
/* end from default */
.fn {
padding: 0px 0px 5px 12px;
@ -2318,7 +2318,7 @@ aside input[type='text'] {
#birthday-title {
float: left;
font-weight: bold;
font-weight: bold;
}
#birthday-adjust {
@ -2411,7 +2411,7 @@ aside input[type='text'] {
clear: both;
}
.calendar {
font-family: Courier, monospace;
}
@ -2493,11 +2493,6 @@ aside input[type='text'] {
margin-bottom: 15px;
}
#language-selector {
position: absolute;
top: 0px;
left: 16px;
}
#group-members {
margin-top: 20px;
@ -2595,7 +2590,7 @@ aside input[type='text'] {
#netsearch-box {
margin-top: 20px;
margin-top: 20px;
}
#netsearch-box #search-submit {
@ -2668,19 +2663,6 @@ aside input[type='text'] {
text-decoration: underline;
}
#lang-select-icon {
cursor: pointer;
position: absolute;
left: 0px;
top: 0px;
opacity: 0.2;
filter:alpha(opacity=20);
}
#lang-select-icon:hover {
opacity: 1;
filter:alpha(opacity=100);
}
.notif-image {
height: 80px;
@ -2702,7 +2684,7 @@ aside input[type='text'] {
.settings-heading {
border-bottom: 1px solid #babdb6;
}
/**
* Form fields
@ -2728,7 +2710,7 @@ aside input[type='text'] {
display: block;
margin-left: 200px;
color: #666666;
}
@ -2774,7 +2756,7 @@ aside input[type='text'] {
font-weight: bold;
background-color: #FF0000;
padding: 0em 0.3em;
}
#adminpage dl {
clear: left;
@ -2829,7 +2811,7 @@ aside input[type='text'] {
/*
* UPDATE
*/
.popup {
.popup {
width: 100%; height: 100%;
top:0px; left:0px;
position: absolute;
@ -2850,7 +2832,7 @@ aside input[type='text'] {
border: 4px solid #000000;
background-color: #FFFFFF;
}
.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
.popup .panel .panel_in { width: 100%; height: 100%; position: relative; }
.popup .panel .panel_actions { width: 100%; bottom: 4px; left: 0px; position: absolute; }
.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
@ -2863,7 +2845,7 @@ aside input[type='text'] {
height: auto; overflow: auto;
border-bottom: 2px solid #cccccc;
padding-bottom: 1em;
margin-bottom: 1em;
margin-bottom: 1em;
}
.oauthapp img {
float: left;

View File

@ -44,7 +44,7 @@ input {
border: 1px solid #666666;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
padding: 3px;
}
@ -74,7 +74,7 @@ img { border :0px; }
background: #EEE;
color: #444;
padding: 10px;
margin-top: 20px;
margin-top: 20px;
}
blockquote {
@ -96,7 +96,7 @@ code {
background: #EEE;
color: #444;
padding: 10px;
margin-top: 20px;
margin-top: 20px;
}
blockquote {
@ -205,10 +205,10 @@ nav #banner #logo-text a:hover { text-decoration: none; }
border: 1px solid #babdb6;
border-bottom: 0px;
background-color: #aec0d3;
color: #565854;
color: #565854;
-moz-border-radius: 3px 3px 0px 0px;
-webkit-border-radius: 3px 3px 0px 0px;
border-radius: 3px 3px 0px 0px;
border-radius: 3px 3px 0px 0px;
}
.nav-commlink.selected {
@ -377,13 +377,13 @@ section {
background-repeat: no-repeat;
min-height: 112px;
border-top: 1px solid #babdb6;
border-top: 1px solid #babdb6;
overflow-x:hidden;
}
.tabs {
/*background-image: url(head.jpg);
background-repeat: repeat-x;
background-repeat: repeat-x;
background-position: 0px -20px;*/
border-bottom: 1px solid #babdb6;
padding:0px;
@ -411,7 +411,7 @@ section {
}
.tab.active {
font-weight: bold;
}
#events-tab {
display: none;
@ -449,14 +449,14 @@ footer {
}
/* from default */
#jot-perms-icon,
#jot-perms-icon,
#profile-location,
#profile-nolocation,
#profile-youtube,
#profile-video,
#profile-youtube,
#profile-video,
#profile-audio,
#profile-link,
#profile-title,
#profile-title,
#wall-image-upload,
#wall-file-upload,
#profile-upload-wrapper,
@ -484,13 +484,13 @@ footer {
#jot-category::-webkit-input-placeholder{font-weight: normal;}
#jot-title:-moz-placeholder{font-weight: normal;}
#jot-category:-moz-placeholder{font-weight: normal;}*/
#jot-title:hover,
#jot-title:focus,
#jot-category:hover,
#jot-category:focus {
border: 1px solid #cccccc;
border: 1px solid #cccccc;
}
.jothidden { display:none; }
@ -515,7 +515,7 @@ footer {
padding: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;
background: #F8F8F8;
font-weight: bold;
@ -525,7 +525,7 @@ footer {
/* padding: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;*/
background: #F8F8F8;
font-weight: bold;
@ -613,7 +613,7 @@ footer {
}
#login-submit-button {
margin-top: 10px;
margin-top: 10px;
margin-left: 200px;
}*/
@ -1024,7 +1024,7 @@ input#dfrn-url {
clear: left;
color: #666666;
display: block;
margin-bottom: 20px
margin-bottom: 20px
}
#profile-edit-profile-name-end,
@ -1109,7 +1109,7 @@ input#dfrn-url {
/* width: 120px;
height: 120px;*/
padding-left: 15px;
padding-right: 15px;
padding-right: 15px;
max-width: 262px;
height: 90px;
margin: 0 10px 10px 0px;
@ -1250,7 +1250,7 @@ input#dfrn-url {
display: block;
position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
@ -1259,7 +1259,7 @@ input#dfrn-url {
overflow: hidden;
text-indent: 40px;
display: none;
}
.wall-item-photo-menu {
width: auto;
@ -1357,11 +1357,11 @@ input#dfrn-url {
}
.star-item {
margin-left: 10px;
float: left;
float: left;
}
.tag-item {
margin-left: 10px;
float: left;
float: left;
}
.filer-item {
@ -1399,7 +1399,7 @@ input#dfrn-url {
border-radius: 7px;
}
.comment .wall-item-photo {
width: 50px !important;
width: 50px !important;
height: 50px !important;
}
.wall-item-content {
@ -1420,7 +1420,7 @@ input#dfrn-url {
.wall-item-title {
/*float: left;*/
font-weight: bold;
font-size: 1.6em;
font-size: 1.6em;
/*width: 450px;*/
}
@ -1509,7 +1509,7 @@ input#dfrn-url {
background-repeat: repeat-x;*/
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}
}
.comment-edit-wrapper {
@ -1553,7 +1553,7 @@ input#dfrn-url {
/* float: left;*/
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #cccccc;
padding: 3px 1px 1px 3px;
}
@ -1612,7 +1612,7 @@ input#dfrn-url {
padding-top: 0.5em;
margin-top: 1em;
margin-bottom: 1em;
}
.shared_header img {
float: left;
@ -2131,7 +2131,7 @@ input#profile-jot-email {
.contact-photo-menu-button {
/* position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
@ -2140,7 +2140,7 @@ input#profile-jot-email {
overflow: hidden;
text-indent: 40px;
display: none;*/
}
.contact-photo-menu {
width: 130px;
@ -2199,7 +2199,7 @@ input#profile-jot-email {
padding: 3px 0px 0px 5px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
}
@ -2272,7 +2272,7 @@ input#profile-jot-email {
overflow: visible;
}
#acl-list-content {
}
.acl-list-item {
display: inline-block;
@ -2296,7 +2296,7 @@ input#profile-jot-email {
margin: 4px;
}
.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
.acl-list-item a {
.acl-list-item a {
font-size: 10px;
display: block;
width: 55px;
@ -2634,15 +2634,15 @@ aside input[type='text'] {
margin-top: 15px;
margin-right: 15px;
margin-left: 15px;
/* width: 200px; height: 200px;
overflow: hidden;
/* width: 200px; height: 200px;
overflow: hidden;
position: relative; */
}
.photo-album-image-wrapper .caption {
display: none;
display: none;
width: 100%;
/* position: absolute; */
bottom: 0px;
bottom: 0px;
padding: 0.5em 0.5em 0px 0.5em;
background-color: rgba(245, 245, 255, 0.8);
border-bottom: 2px solid #CCC;
@ -2658,7 +2658,7 @@ aside input[type='text'] {
}
.photo-top-image-wrapper {
/* position: relative;
/* position: relative;
float: left;*/
display: inline-block;
vertical-align: top;
@ -2666,7 +2666,7 @@ aside input[type='text'] {
margin-right: 15px;
margin-left: 15px;
margin-bottom: 15px;
/* width: 200px; height: 200px;
/* width: 200px; height: 200px;
overflow: hidden; */
}
.photo-top-image-wrapper img {
@ -2679,7 +2679,7 @@ aside input[type='text'] {
width: 100%;
min-height: 2em;
/* position: absolute; */
bottom: 0px;
bottom: 0px;
padding: 0px 3px;
padding-top: 0.5em;
background-color: rgb(255, 255, 255);
@ -2759,7 +2759,7 @@ aside input[type='text'] {
}
#profile-jot-banner-end {
/* clear: both; */
/* clear: both; */
}
#photos-upload-select-files-text {
@ -3097,7 +3097,7 @@ aside input[type='text'] {
}
/* end from default */
.fn {
padding: 1em 0px 5px 12px;
@ -3116,7 +3116,7 @@ aside input[type='text'] {
#birthday-title {
float: left;
font-weight: bold;
font-weight: bold;
}
#birthday-adjust {
@ -3243,7 +3243,7 @@ aside input[type='text'] {
clear: both;
}
.calendar {
font-family: Courier, monospace;
}
@ -3389,11 +3389,6 @@ aside input[type='text'] {
margin-bottom: 15px;
}
#language-selector {
position: absolute;
top: 0px;
left: 16px;
}
#group-members {
margin-top: 20px;
@ -3491,7 +3486,7 @@ aside input[type='text'] {
#netsearch-box {
margin-top: 20px;
margin-top: 20px;
}
#netsearch-box #search-submit {
@ -3570,20 +3565,6 @@ aside input[type='text'] {
text-decoration: underline;
}
#lang-select-icon {
cursor: pointer;
position: fixed;
left: 0px;
top: 0px;
opacity: 0.2;
filter:alpha(opacity=20);
}
#lang-select-icon:hover {
opacity: 1;
filter:alpha(opacity=100);
}
.notif-image {
height: 80px;
width: 80px;
@ -3604,7 +3585,7 @@ aside input[type='text'] {
.settings-heading {
border-bottom: 1px solid #babdb6;
}
/**
@ -3685,7 +3666,7 @@ aside input[type='text'] {
font-weight: bold;
background-color: #FF0000;
padding: 0em 0.3em;
}
#adminpage dl {
clear: left;
@ -3745,7 +3726,7 @@ aside input[type='text'] {
/*
* UPDATE
*/
.popup {
.popup {
width: 100%; height: 100%;
top:0px; left:0px;
position: absolute;
@ -3766,7 +3747,7 @@ aside input[type='text'] {
border: 4px solid #000000;
background-color: #FFFFFF;
}
.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
.popup .panel .panel_in { width: 100%; height: 100%; position: relative; }
.popup .panel .panel_actions { width: 100%; bottom: 4px; left: 0px; position: absolute; }
.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
@ -3779,7 +3760,7 @@ aside input[type='text'] {
height: auto; overflow: auto;
border-bottom: 2px solid #cccccc;
padding-bottom: 1em;
margin-bottom: 1em;
margin-bottom: 1em;
}
.oauthapp img {
float: left;
@ -4275,7 +4256,7 @@ ul.notifications-menu-popup {
}
#recip {
}
.autocomplete-w1 { background: #ffffff no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; }

View File

@ -1,11 +0,0 @@
<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
<div id="language-selector" style="display: none;" >
<form action="#" method="post" >
<select name="system_language" onchange="this.form.submit();" >
{{foreach $langs.0 as $v=>$l}}
<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
{{/foreach}}
</select>
</form>
</div>

View File

@ -27,6 +27,7 @@
{{include file="field_input.tpl" field=$email}}
{{include file="field_password.tpl" field=$password4}}
{{include file="field_custom.tpl" field=$timezone}}
{{include file="field_select.tpl" field=$language}}
{{include file="field_input.tpl" field=$defloc}}
{{include file="field_checkbox.tpl" field=$allowloc}}

View File

@ -35,7 +35,7 @@ input {
border: 1px solid #666666;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
padding: 3px;
}
@ -63,7 +63,7 @@ code {
background: #EEE;
color: #444;
padding: 10px;
margin-top: 20px;
margin-top: 20px;
}
blockquote {
@ -176,10 +176,10 @@ nav #banner #logo-text a:hover { text-decoration: none; }
border: 1px solid #babdb6;
border-bottom: 0px;
background-color: #aec0d3;
color: #565854;
color: #565854;
-moz-border-radius: 3px 3px 0px 0px;
-webkit-border-radius: 3px 3px 0px 0px;
border-radius: 3px 3px 0px 0px;
border-radius: 3px 3px 0px 0px;
}
.nav-commlink.selected {
@ -337,7 +337,7 @@ section {
.tabs {
height: 27px;
/*background-image: url(head.jpg);
background-repeat: repeat-x;
background-repeat: repeat-x;
background-position: 0px -20px;
border-bottom: 1px solid #babdb6;*/
padding:0px;
@ -345,7 +345,7 @@ section {
.tabs li { margin: 0px; list-style: none; }
.tabs a {
/* background-image: url(head.jpg);
background-repeat: repeat-x;
background-repeat: repeat-x;
background-position: 0px 0px;
background-size: auto 45px;*/
@ -423,14 +423,14 @@ div.wall-item-content-wrapper.shiny {
}
/* from default */
#jot-perms-icon,
#jot-perms-icon,
#profile-location,
#profile-nolocation,
#profile-youtube,
#profile-video,
#profile-youtube,
#profile-video,
#profile-audio,
#profile-link,
#profile-title,
#profile-title,
#wall-image-upload,
#wall-file-upload,
#profile-upload-wrapper,
@ -462,13 +462,13 @@ div.wall-item-content-wrapper.shiny {
#jot-category::-webkit-input-placeholder{font-weight: normal;}
#jot-title:-moz-placeholder{font-weight: normal;}
#jot-category:-moz-placeholder{font-weight: normal;}
#jot-title:hover,
#jot-title:focus,
#jot-category:hover,
#jot-category:focus {
border: 1px solid #cccccc;
border: 1px solid #cccccc;
}
.jothidden { display:none; }
@ -493,7 +493,7 @@ div.wall-item-content-wrapper.shiny {
padding: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;
background: #F8F8F8;
font-weight: bold;
@ -503,7 +503,7 @@ div.wall-item-content-wrapper.shiny {
padding: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #CCCCCC;
background: #F8F8F8;
font-weight: bold;
@ -593,7 +593,7 @@ div.wall-item-content-wrapper.shiny {
}
#login-submit-button {
margin-top: 10px;
margin-top: 10px;
margin-left: 200px;
}*/
@ -995,7 +995,7 @@ input#dfrn-url {
clear: left;
color: #666666;
display: block;
margin-bottom: 20px
margin-bottom: 20px
}
#profile-edit-profile-name-end,
@ -1220,7 +1220,7 @@ input#dfrn-url {
display: block;
position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
@ -1229,7 +1229,7 @@ input#dfrn-url {
overflow: hidden;
text-indent: 40px;
display: none;
}
.wall-item-photo-menu {
width: auto;
@ -1275,7 +1275,7 @@ input#dfrn-url {
margin-top: 1em; /* needs to match .wall-item-content-wrapper padding-top */
left: 105px;
position: absolute;
top: 1px;
top: 1px;
}
.comment .wall-item-lock {
left: 65px;
@ -1329,11 +1329,11 @@ input#dfrn-url {
}
.star-item {
margin-left: 10px;
float: left;
float: left;
}
.tag-item {
margin-left: 10px;
float: left;
float: left;
}
.filer-item {
@ -1373,7 +1373,7 @@ input#dfrn-url {
-webkit-border-radius: 7px;
}
.comment .wall-item-photo {
width: 50px !important;
width: 50px !important;
height: 50px !important;
border-radius: 5px;
-moz-border-radius: 5px;
@ -1431,7 +1431,7 @@ input#dfrn-url {
.wall-item-title {
float: left;
font-weight: bold;
font-size: 1.6em;
font-size: 1.6em;
/*width: 450px;*/
}
@ -1475,7 +1475,7 @@ input#dfrn-url {
margin-left: 0px;
margin-top: 5px;
padding-top: 0px;
}
}
.comment-edit-wrapper {
margin-top: 15px;
@ -1514,7 +1514,7 @@ input#dfrn-url {
margin-top: 10px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
border: 1px solid #cccccc;
padding: 3px 1px 1px 3px;
}
@ -1563,7 +1563,7 @@ input#dfrn-url {
padding-top: 0.5em;
margin-top: 1em;
margin-bottom: 1em;
}
.shared_header img {
float: left;
@ -2010,7 +2010,7 @@ input#dfrn-url {
.contact-photo-menu-button {
position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
@ -2019,7 +2019,7 @@ input#dfrn-url {
overflow: hidden;
text-indent: 40px;
display: none;
}
.contact-photo-menu {
width: auto;
@ -2056,7 +2056,7 @@ input#dfrn-url {
border: 1px solid #cccccc;
padding: 3px 0px 0px 5px;
-moz-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
}
@ -2110,7 +2110,7 @@ input#dfrn-url {
overflow: auto;
}
#acl-list-content {
}
.acl-list-item {
display: block;
@ -2127,7 +2127,7 @@ input#dfrn-url {
margin: 4px;
}
.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
.acl-list-item a {
.acl-list-item a {
font-size: 10px; /* 8px; */
display: block;
width: 50px;
@ -2442,15 +2442,15 @@ aside input[type='text'] {
margin-top: 15px;
margin-right: 15px;
margin-left: 15px;
/* width: 200px; height: 200px;
overflow: hidden;
/* width: 200px; height: 200px;
overflow: hidden;
position: relative; */
}
.photo-album-image-wrapper .caption {
display: none;
display: none;
width: 100%;
/* position: absolute; */
bottom: 0px;
bottom: 0px;
padding: 0.5em 0.5em 0px 0.5em;
background-color: rgba(245, 245, 255, 0.8);
border-bottom: 2px solid #CCC;
@ -2466,7 +2466,7 @@ aside input[type='text'] {
}
.photo-top-image-wrapper {
/* position: relative;
/* position: relative;
float: left;*/
display: inline-block;
vertical-align: top;
@ -2474,7 +2474,7 @@ aside input[type='text'] {
margin-right: 15px;
margin-left: 15px;
margin-bottom: 15px;
/* width: 200px; height: 200px;
/* width: 200px; height: 200px;
overflow: hidden; */
}
.photo-album-image-wrapper img, .photo-top-image-wrapper img {
@ -2489,7 +2489,7 @@ aside input[type='text'] {
width: 100%;
min-height: 2em;
/* position: absolute; */
bottom: 0px;
bottom: 0px;
padding: 0px 3px;
padding-top: 0.5em;
background-color: rgb(255, 255, 255);
@ -2585,7 +2585,7 @@ aside input[type='text'] {
}
#profile-jot-banner-end {
/* clear: both; */
/* clear: both; */
}
#photos-upload-select-files-text {
@ -2872,7 +2872,7 @@ aside input[type='text'] {
}
/* end from default */
.fn {
padding: 0px 0px 5px 12px;
@ -2891,7 +2891,7 @@ aside input[type='text'] {
#birthday-title {
float: left;
font-weight: bold;
font-weight: bold;
}
#birthday-adjust {
@ -3015,7 +3015,7 @@ aside input[type='text'] {
clear: both;
}
.calendar {
font-family: Courier, monospace;
}
@ -3159,12 +3159,6 @@ aside input[type='text'] {
margin-bottom: 15px;
}
#language-selector {
position: absolute;
top: 0px;
left: 16px;
}
#group-members {
margin-top: 20px;
padding: 10px;
@ -3261,7 +3255,7 @@ aside input[type='text'] {
#netsearch-box {
margin-top: 20px;
margin-top: 20px;
}
#netsearch-box #search-submit {
@ -3351,19 +3345,6 @@ aside input[type='text'] {
text-decoration: underline;
}
#lang-select-icon {
cursor: pointer;
position: absolute;
left: 0px;
top: 0px;
opacity: 0.2;
filter:alpha(opacity=20);
}
#lang-select-icon:hover {
opacity: 1;
filter:alpha(opacity=100);
}
.notif-image {
height: 80px;
@ -3385,7 +3366,7 @@ aside input[type='text'] {
.settings-heading {
border-bottom: 1px solid #babdb6;
}
/**
* Form fields
@ -3468,7 +3449,7 @@ aside input[type='text'] {
font-weight: bold;
background-color: #FF0000;
padding: 0em 0.3em;
}
#adminpage dl {
clear: left;
@ -3527,7 +3508,7 @@ aside input[type='text'] {
/*
* UPDATE
*/
.popup {
.popup {
width: 100%; height: 100%;
top:0px; left:0px;
position: absolute;
@ -3548,7 +3529,7 @@ aside input[type='text'] {
border: 4px solid #000000;
background-color: #FFFFFF;
}
.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
.popup .panel .panel_in { width: 100%; height: 100%; position: relative; }
.popup .panel .panel_actions { width: 100%; bottom: 4px; left: 0px; position: absolute; }
.panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
@ -3561,7 +3542,7 @@ aside input[type='text'] {
height: auto; overflow: auto;
border-bottom: 2px solid #cccccc;
padding-bottom: 1em;
margin-bottom: 1em;
margin-bottom: 1em;
}
.oauthapp img {
float: left;
@ -4154,7 +4135,7 @@ ul.notifications-menu-popup {
}
#recip {
}
.autocomplete-w1 { background: #ffffff no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; }
@ -4165,5 +4146,9 @@ ul.notifications-menu-popup {
margin-left: 40px;
width: 130px;
}
#message-preview .mail-list-sender, #message-preview .mail-list-delete {
display:none;
}
#message-preview .mail-list-outside-wrapper {
margin-top: 20px;
}

View File

@ -1,11 +0,0 @@
<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
<div id="language-selector" style="display: none;" >
<form action="#" method="post" >
<select name="system_language" onchange="this.form.submit();" >
{{foreach $langs.0 as $v=>$l}}
<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
{{/foreach}}
</select>
</form>
</div>

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +0,0 @@
<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
<div id="language-selector" style="display: none;" >
<form action="#" method="post" >
<select name="system_language" onchange="this.form.submit();" >
{{foreach $langs.0 as $v=>$l}}
<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
{{/foreach}}
</select>
</form>
</div>

View File

@ -1,7 +1,7 @@
/*
style.css
TestBubble
Created by Anne Walk and Devlon Duthie on 2011-09-24.
Based loosely on the Dipsy theme.
*/
@ -25,7 +25,7 @@ body {
font-family: freesans,helvetica,arial,clean,sans-serif;
font-size: 15px;
color: #626262;
width: 100%;
width: 100%;
}
img { border: 0 none; max-width: 550px; }
@ -74,7 +74,7 @@ input[type=text] {
margin: 0px;
-webkit-border-radius: 3px 3px 3px 3px;
-moz-border-radius: 3px 3px 3px 3px;
border-radius: 3px 3px 3px 3px;
border-radius: 3px 3px 3px 3px;
}
input[type=submit] {
@ -118,7 +118,7 @@ section {
float: left;
margin-left: 8%;
padding-top: 50px;
width: 50%;
width: 50%;
margin: 20px 0px 30px 10%;
font-size: 0.9em;
line-height: 1.2em;
@ -130,7 +130,7 @@ section {
-webkit-box-shadow: 3px 3px 6px #959494;
box-shadow: 3px 3px 6px #959494;
background-color: #efefef;
padding: 10px;
padding: 10px;
}
.mframe {
@ -160,7 +160,7 @@ section {
-webkit-border-radius:5px;
border-radius:5px;
color:#efefef;
text-align: center;
text-align: center;
}
.button:hover {
@ -169,7 +169,7 @@ section {
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
color: #efefef;
color: #efefef;
}
.button:active {
@ -197,7 +197,7 @@ section {
#login-password-wrapper {
vertical-align: middle;
margin: auto;
margin: auto;
}
#login-extra-links {
@ -210,7 +210,7 @@ section {
margin: 10px;
padding: 5px 0px 5px 0px;
text-align: center;
margin-right: 20px;
margin-right: 20px;
}
#login-extra-filler {
@ -282,7 +282,7 @@ nav #banner {
position: absolute;
margin-left: 10px;
margin-top: 5px;
padding-bottom:5px;
padding-bottom:5px;
}
nav #banner #logo-text a {
display: hidden;
@ -292,7 +292,7 @@ nav #banner #logo-text a {
}
nav #user-menu {
display: block;
display: block;
width: 250px;
float: right;
margin-right:20%;
@ -310,7 +310,7 @@ nav #user-menu {
border: 1px solid #9A9A9A;
color:#efefef;
text-decoration:none;
text-align: center;
text-align: center;
}
nav #user-menu-label::after {
@ -341,11 +341,11 @@ ul#user-menu-popup {
border: 1px solid #9a9a9a;
border-top: none;
-webkit-border-radius: 0px 0px 5px 5px;
-moz-border-radius: 0px 0px 5px 5px;
-moz-border-radius: 0px 0px 5px 5px;
border-radius: 0px 0px 5px 5px;
-moz-box-shadow: 5px 5px 10px #242424;
-webkit-box-shadow: 5px 5px 10px #242424;
box-shadow: 5px 5px 10px #242424;
box-shadow: 5px 5px 10px #242424;
z-index: 10000;
}
@ -373,7 +373,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
.nav-ajax-update {
width: 44px;
height: 32px;
background: transparent url('notifications.png') 0px 0px no-repeat;
background: transparent url('notifications.png') 0px 0px no-repeat;
color: #efefef;
font-weight: bold;
font-size: 0.8em;
@ -388,30 +388,19 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
#intro-update { background-position: 0px -84px; }
#home-update { background-position: 0px 0px; }
#lang-select-icon {
cursor: pointer;
position: absolute;
left: 5px;
top: 5px;
}
#language-selector {
position: absolute;
top: 0;
left: 16px;
}
/* =================== */
/* = System Messages = */
/* =================== */
#sysmsg_info, #sysmsg {
position:fixed;
bottom: 0px; right:20%;
position:fixed;
bottom: 0px; right:20%;
-moz-box-shadow: 7px 7px 12px #434343;
-webkit-box-shadow: 7px75px 12px #434343;
box-shadow: 7px 7px 10px #434343;
padding: 10px;
padding: 10px;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
@ -421,7 +410,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
border-radius: 5px 5px 0px 0px;
border: 1px solid #da2c2c;
border-bottom:0px;
padding-bottom: 50px;
padding-bottom: 50px;
z-index: 1000;
color: #efefef;
font-style: bold;
@ -479,7 +468,7 @@ aside a{
border: 1px solid #dddddd;
-moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494;
box-shadow: 3px 3px 4px #959494;
box-shadow: 3px 3px 4px #959494;
}
aside h4 { font-size: 1.3em; }
@ -560,7 +549,7 @@ h3#search:before {
margin-bottom: 10px;
-webkit-border-radius: 5px 5px 5px 5px;
-moz-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
}
#group-sidebar {
@ -700,7 +689,7 @@ ul .sidebar-group-li .icon{
padding-bottom: 5px;
vertical-align: baseline;
text-align: center;
text-shadow:-1px 0px 0px #bdbdbd;
text-shadow:-1px 0px 0px #bdbdbd;
}
#group-sidebar h3:before{
@ -751,7 +740,7 @@ ul .sidebar-group-li .icon{
}
.contact-block-textdiv { width: 150px; height: 34px; float: left; }
#contact-block-end { clear: both; }
#contact-block-end { clear: both; }
/* ======= */
/* = Jot = */
@ -759,7 +748,7 @@ ul .sidebar-group-li .icon{
#profile-jot-text_tbl { margin-bottom: 10px; }
#profile-jot-text_ifr { width: 99.9%!important }
#profile-jot-submit-wrapper {
#profile-jot-submit-wrapper {
}
@ -774,11 +763,11 @@ ul .sidebar-group-li .icon{
#jot-title::-webkit-input-placeholder{font-weight: normal;}
#jot-title:-moz-placeholder{font-weight: normal;}
#jot-title:hover,
#jot-title:focus {
border: 1px solid #cccccc;
border: 1px solid #cccccc;
}
.preview {
@ -838,7 +827,7 @@ ul .sidebar-group-li .icon{
position: absolute: right: 100px; top:100px;
}
#profile-rotator-wrapper {
float: right;
float: right;
}
.jot-tool {
@ -855,7 +844,7 @@ ul .sidebar-group-li .icon{
}
#profile-jot-email-label { background-color: #555753; color: #ccccce; padding: 5px;}
#profile-jot-email { margin: 5px; width: 98%; }
#profile-jot-networks {
margin: 0px 10%;
border: 1px solid #eeeeee;
@ -928,7 +917,7 @@ profile-jot-banner-wrapper {
.wall-item-outside-wrapper {
max-width: 93%;
border-bottom: 1px solid #dedede;
border-bottom: 1px solid #dedede;
margin-top: 20px;
padding-right: 10px;
padding-left: 12px;
@ -944,27 +933,27 @@ profile-jot-banner-wrapper {
background: #eeeeee url("menu-user-pin.png") no-repeat 75px center;
position: absolute;
overflow: hidden;
height: 20px; width: 90px;
height: 20px; width: 90px;
top: 85px; left: -1px;
-webkit-border-radius: 0px 0px 5px 5px;
-moz-border-radius: 0px 0px 5px 5px;
border-radius: 0px 0px 5px 5px;
border-radius: 0px 0px 5px 5px;
}
.wall-item-info { float: left; width: 140px; }
.wall-item-photo-wrapper {
width: 80px; height: 80px;
.wall-item-photo-wrapper {
width: 80px; height: 80px;
position: relative;
}
.wall-item-tools {
.wall-item-tools {
filter: alpha(opacity=60);
opacity: 0.7;
-webkit-transition: all 0.25s ease-in-out;
-moz-transition: all 0.25s ease-in-out;
-o-transition: all 0.25s ease-in-out;
-ms-transition: all 0.25s ease-in-out;
transition: all 0.25s ease-in-out;
transition: all 0.25s ease-in-out;
margin-left: 140px;
margin-top: 10px;
padding-bottom: 6px;
@ -977,7 +966,7 @@ profile-jot-banner-wrapper {
-moz-transition: all 0.25s ease-in-out;
-o-transition: all 0.25s ease-in-out;
-ms-transition: all 0.25s ease-in-out;
transition: all 0.25s ease-in-out;
transition: all 0.25s ease-in-out;
margin-left: 140px;
}
@ -1014,12 +1003,12 @@ profile-jot-banner-wrapper {
.star-item {
margin-left: 5px;
margin-right: 2px;
float: left;
float: left;
}
.tag-item {
margin-left: 5px;
margin-right: 2px;
float: left;
float: left;
}
.wall-item-title { font-size: 1.2em; font-weight: bold;}
.wall-item-body {
@ -1048,7 +1037,7 @@ profile-jot-banner-wrapper {
color: #898989;
}
.wall-item-ago { display: inline; padding-left: 10px; color: #898989;}
.wall-item-ago { display: inline; padding-left: 10px; color: #898989;}
.wall-item-wrapper-end { clear:both; }
.wall-item-location {
margin-top:5px;
@ -1083,7 +1072,7 @@ profile-jot-banner-wrapper {
width: 30px;
z-index: 900;
width: 30px;
height: 30px;
height: 30px;
}
.wallwall .wwto img { width: 30px!important; height: 30px!important;}
@ -1140,7 +1129,7 @@ profile-jot-banner-wrapper {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
background-color:#b20202;
order-bottom: none;
}
@ -1152,14 +1141,14 @@ profile-jot-banner-wrapper {
/* ============ */
/* = Comments = */
/* ============ */
.ccollapse-wrapper {
font-size: 0.9em;
color: #898989;
margin-left: 60px;
/* font-variant:small-caps; */
}
.wall-item-outside-wrapper.comment { margin-left: 70px; }
.wall-item-outside-wrapper.comment .wall-item-photo {
width: 40px!important;
@ -1197,7 +1186,7 @@ profile-jot-banner-wrapper {
.comment-wwedit-wrapper img,
.comment-edit-wrapper img { width: 20px; height: 20px; }
.comment-edit-photo-link { float: left; width: 40px;}
.comment-edit-text-empty {
.comment-edit-text-empty {
width: 80%;
height: 20px;
border: 0px;
@ -1206,7 +1195,7 @@ profile-jot-banner-wrapper {
-moz-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out;
-ms-transition: all 0.5s ease-in-out;
transition: all 0.5s ease-in-out;
transition: all 0.5s ease-in-out;
}
.comment-edit-text-empty:hover { color: #999999;}
.comment-edit-text-full { width: 80%; height: 6em;
@ -1214,7 +1203,7 @@ profile-jot-banner-wrapper {
-moz-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out;
-ms-transition: all 0.5s ease-in-out;
transition: all 0.5s ease-in-out;
transition: all 0.5s ease-in-out;
}
.comment-edit-submit-wrapper { width: 80%; margin-left: 40px; text-align: right; }
.comment-edit-submit {
@ -1247,7 +1236,7 @@ profile-jot-banner-wrapper {
border: 1px solid #cccccc;
border-width: 1px 1px 1px 10px;
padding-left: 10px;
margin-top: 20px;
margin-top: 20px;
}
/* =========== */
@ -1268,8 +1257,8 @@ profile-jot-banner-wrapper {
font-size: 18px;
/* font-variant:small-caps; */
}
div[id$="wrapper"] { height: 100%;}
div[id$="wrapper"] { height: 100%;}
div[id$="wrapper"] br { clear: left; }
#advanced-profile-with { margin-left: 20px;}
@ -1316,19 +1305,19 @@ div[id$="wrapper"] br { clear: left; }
font-style: bold;
-webkit-border-radius: 5px 5px 5px 5px;
-moz-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
}
#profile-edit-links li a {
color: #efefef;
color: #efefef;
}
#profile-edit-links li:hover {
background-color: #b20202;
background-color: #b20202;
}
#profile-edit-links li:active {
background-color: #b20202;
background-color: #b20202;
}
.profile-edit-side-div {
@ -1360,7 +1349,7 @@ div[id$="wrapper"] br { clear: left; }
-moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494;
box-shadow: 3px 3px 4px #959494;
clear: both;
clear: both;
}
.profile-match-end {
@ -1406,25 +1395,25 @@ div[id$="wrapper"] br { clear: left; }
font-style: bold;
-webkit-border-radius: 5px 5px 5px 5px;
-moz-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
}
#photo-top-links a {
color: #efefef;
}
#photo-top-links:hover {
background-color: #b20202;
background-color: #b20202;
}
#photo-top-links:active {
background-color: #b20202;
background-color: #b20202;
}
.photo-album-image-wrapper {
.photo-album-image-wrapper {
float: left;
margin: 0px 10px 10px 0px;
padding-bottom: 30px;
position:relative;
position:relative;
}
.photo-top-image-wrapper {
@ -1449,12 +1438,12 @@ div[id$="wrapper"] br { clear: left; }
.photo-top-image-wrapper a:hover,
#photo-photo a:hover,
.photo-album-image-wrapper a:hover {
border-bottom: 0px;
.photo-album-image-wrapper a:hover {
border-bottom: 0px;
}
.photo-top-photo {}
.photo-album-photo {}
.photo-album-photo {}
.photo-top-album-name {
position: absolute;
@ -1463,7 +1452,7 @@ div[id$="wrapper"] br { clear: left; }
font-weight: bold;
font-stretch:semi-expanded;
/* font-variant:small-caps; */
}
}
.photo-top-album-name a{
text-align: center;
@ -1481,7 +1470,7 @@ div[id$="wrapper"] br { clear: left; }
#photo-photo{
position: relative;
float:left;
float:left;
}
#photo-caption {
@ -1505,7 +1494,7 @@ div[id$="wrapper"] br { clear: left; }
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
background-position: center center;
background-repeat: no-repeat;
background-repeat: no-repeat;
}
#photo-prev-link { left:0px; top:0px; background-image: url('prev.png'); }
@ -1514,7 +1503,7 @@ div[id$="wrapper"] br { clear: left; }
#photo-next-link a{
display: block; width: 100%; height: 100%;
overflow: hidden;
text-indent: -900000px;
text-indent: -900000px;
}
#photo-prev-link:hover,
@ -1524,7 +1513,7 @@ div[id$="wrapper"] br { clear: left; }
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
-ms-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
#photo-next-link .icon,
@ -1534,7 +1523,7 @@ div[id$="wrapper"] br { clear: left; }
#photos-upload-new-wrapper,
#photos-upload-exist-wrapper { margin-bottom: 1em; }
#photos-upload-existing-album-text,
#photos-upload-newalbum-div {
#photos-upload-newalbum-div {
background-color: #fff;
color: #909090;
font-size: 1.2em;
@ -1560,7 +1549,7 @@ select, input {
padding: 2px;
-webkit-border-radius: 3px 3px 3px 3px;
-moz-border-radius: 3px 3px 3px 3px;
border-radius: 3px 3px 3px 3px;
border-radius: 3px 3px 3px 3px;
}
select[size], select[multiple], select[size][multiple] {
@ -1571,7 +1560,7 @@ select {
-webkit-appearance: menulist;
box-sizing: border-box;
-webkit-box-align: center;
cursor: default;
cursor: default;
}
keygen, select {
@ -1587,7 +1576,7 @@ input, textarea, keygen {
text-indent: 0px;
text-shadow: none;
display: inline-block;
text-align: -webkit-auto;
text-align: -webkit-auto;
}
.qq-upload-button {
@ -1607,7 +1596,7 @@ input, textarea, keygen {
font-style: bold;
-webkit-border-radius: 5px 5px 5px 5px;
-moz-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
}
#album-edit-link a {
@ -1724,7 +1713,7 @@ input#photo_edit_form {
#prvmail-message-label {
/* font-variant:small-caps; */
font-size: 1em;
font-size: 1em;
}
#prvmail-submit-wrapper { margin-top: 10px; }
@ -1735,7 +1724,7 @@ input#photo_edit_form {
}
#prvmail-upload {
margin-left: 0px;
margin-left: 0px;
}
#prvmail-submit-wrapper > div {
@ -1765,7 +1754,7 @@ margin-left: 0px;
padding-top:10px;
border: 1px solid #dddddd;
}
.mail-list-sender-name {
font-size: 1.1em;
display: inline;
@ -1912,11 +1901,11 @@ margin-left: 0px;
position: relative;
}
.contact-entry-edit-links .icon {
.contact-entry-edit-links .icon {
border: 1px solid #babdb6;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
background-color: #ffffff;
}
@ -1967,7 +1956,7 @@ margin-left: 0px;
.contact-photo-menu-button {
position: absolute;
background-image: url("photo-menu.jpg");
background-position: top left;
background-position: top left;
background-repeat: no-repeat;
margin: 0px; padding: 0px;
width: 16px;
@ -1975,7 +1964,7 @@ margin-left: 0px;
top: 64px; left:0px;
overflow: hidden;
text-indent: 40px;
display: none;
display: none;
}
.contact-photo-menu {
@ -2088,7 +2077,7 @@ margin-left: 0px;
padding: 5px 10px 5px 10px;
color: #efefef;
font-size: 1.2em;
text-align: center;
text-align: center;
}
#side-invite-link:hover {
@ -2096,18 +2085,18 @@ margin-left: 0px;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
background-color:#b20202;
}
#side-invite-link:active {
background-color: #b20202;
position:relative;
top:1px;
top:1px;
}
#side-invite-link a {
color: #efefef;
color: #efefef;
}
#side-suggest-link {
@ -2128,7 +2117,7 @@ margin-left: 0px;
padding: 5px 10px 5px 10px;
color: #efefef;
font-size: 1.2em;
text-align: center;
text-align: center;
}
#side-suggest-link:hover {
@ -2136,18 +2125,18 @@ margin-left: 0px;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
background-color:#b20202;
}
#side-suggest-link:active {
background-color: #b20202;
position:relative;
top:1px;
top:1px;
}
#side-suggest-link a {
color: #efefef;
color: #efefef;
}
#invite-message, #invite-recipients, #invite-recipient-text {
@ -2169,7 +2158,7 @@ margin-left: 0px;
#side-follow-wrapper label{
font-size: 1.1em;
font-variant: normal;
font-variant: normal;
}
#contact-suggest {
@ -2191,7 +2180,7 @@ margin-left: 0px;
padding: 5px 10px 5px 10px;
color: #efefef;
font-size: 1.2em;
text-align: center;
text-align: center;
}
#contact-suggest:hover {
@ -2199,13 +2188,13 @@ margin-left: 0px;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
background-color:#b20202;
}
#contact-suggest:active {
background-color: #b20202;
position:relative;
top:1px;
top:1px;
}
#contact-suggest a {
@ -2306,7 +2295,7 @@ margin-left: 0px;
}
#settings-default-perms .fakelink {
color: #efefef;
color: #efefef;
}
#settings-default-perms:hover {
@ -2326,7 +2315,7 @@ margin-left: 0px;
position:relative;
top:1px;
}
#settings-nickname-desc {
width: 80%;
background-color: #efefef;
@ -2341,7 +2330,7 @@ margin-left: 0px;
clear: both;
}
#profile-edit-form div {
#profile-edit-form div {
margin-bottom: 5px;
}
@ -2371,7 +2360,7 @@ margin-left: 0px;
#register-sitename { display: inline; font-weight: bold;}
/* ===================== */
/* = Contacts Selector = */
/* ===================== */
@ -2412,14 +2401,14 @@ margin-left: 0px;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
background-color:#b20202;
}
.group-delete-wrapper:active {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
background-color:#b20202;
}
.group-delete-wrapper a {
@ -2432,7 +2421,7 @@ margin-left: 0px;
#group-members,
#prof-members {
width: 83%;
height: 200px;
height: 200px;
overflow: auto;
border: none;
background-color: #f0edf0;
@ -2443,10 +2432,10 @@ margin-left: 0px;
}
#group-all-contacts,
#prof-all-contacts {
#prof-all-contacts {
width: 83%;
height: 200px;
overflow: auto;
overflow: auto;
border: 1px solid #ccc;
background-color: #f0edf0;
padding: 10px;
@ -2467,7 +2456,7 @@ margin-left: 0px;
/* ========== */
/* = Events = */
/* ========== */
.clear { clear: both; }
.eventcal {
float: left;
@ -2531,7 +2520,7 @@ margin-left: 0px;
font-size: 1em;
font-style: oblique;
text-align: center;
}
.vevent .event-start, .vevent .event-end {
@ -2629,7 +2618,7 @@ margin-left: 0px;
margin-bottom: 10px;
-moz-box-shadow: 5px 5px 8px #959494;
-webkit-box-shadow: 5px 5px 8px #959494;
box-shadow: 5px 5px 8px #959494;
box-shadow: 5px 5px 8px #959494;
}
.calendar caption{
@ -2665,7 +2654,7 @@ tr {
}
.calendar th {
font-size: 16px;
font-size: 16px;
}
.today {
@ -2674,16 +2663,16 @@ tr {
background-color: #b20202;
color: #fff;
}
#event-start-text,
#event-start-text,
#event-finish-text {
margin-top: 10px;
margin-bottom: 5px;
}
#event-nofinish-checkbox,
#event-nofinish-text,
#event-adjust-checkbox,
#event-nofinish-checkbox,
#event-nofinish-text,
#event-adjust-checkbox,
#event-adjust-text,
#event-share-checkbox {
float: left;
@ -2693,13 +2682,13 @@ tr {
margin-bottom: 10px;
}
#event-nofinish-break,
#event-nofinish-break,
#event-adjust-break,
#event-share-break {
clear: both;
}
#event-desc-text,
#event-desc-text,
#event-location-text {
margin-top: 10px;
margin-bottom: 5px;
@ -2727,7 +2716,7 @@ tr {
.directory-name {
font-size: 1em;
/* font-variant: small-caps; */
width: 150px;
width: 150px;
}
/* ========= */
@ -2833,7 +2822,7 @@ tr {
.field_help {
display: block;
margin-left: 100px;
color: #666666;
color: #666666;
}
.field .onoff {
@ -2883,11 +2872,11 @@ tr {
display: block; width: 20px; height: 20px;
background-image: url('icons.png');
}
.starred {
background-image: url("star.png");
.starred {
background-image: url("star.png");
repeat: no-repeat;
}
.unstarred {
.unstarred {
background-image: url("premium.png");
repeat: no-repeat;
}
@ -2901,7 +2890,7 @@ tr {
border: 1px solid #c1c1c1;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
border-radius: 3px;
}
.article { background-position: -50px 0px;}
@ -2974,10 +2963,10 @@ tr {
/* ========== */
/* = Footer = */
/* ========== */
.cc-license { margin-top: 100px; font-size: 0.7em; }
.cc-license { margin-top: 100px; font-size: 0.7em; }
footer { display: block; margin: 50px 20%; clear: both; }
#profile-jot-text {
height: 20px;
color:#cccccc;
@ -3066,7 +3055,7 @@ footer { display: block; margin: 50px 20%; clear: both; }
overflow: hidden;
}
.acl-list-item a {
.acl-list-item a {
font-size: 10px;
display: block;
float: left;
@ -3241,7 +3230,7 @@ ul.menu-popup {
max-height:150px;
overflow:auto;
z-index:100000;
color: #2e3436;
border-top: 0px;
background: #eeeeee;
@ -3254,7 +3243,7 @@ ul.menu-popup {
-moz-box-shadow: 3px 3px 4px #959494;
-webkit-box-shadow: 3px 3px 4px #959494;
box-shadow: 3px 3px 4px #959494;
}
.acpopupitem {
color: #2e3436; padding: 4px;
@ -3270,7 +3259,7 @@ ul.menu-popup {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#b20202', endColorstr='#d60808');
background-color:#b20202;
background-color:#b20202;
order-bottom: none;
}

View File

@ -3037,3 +3037,8 @@ a.mail-list-link {
/* upload/select popup */
.fbrowser.image .photo-album-image-wrapper { margin-left: 10px; }
#message-preview { margin-top: 15px; }
#message-preview span { width: 100%; }
#message-preview .mail-count, #message-preview .mail-delete { display:none; }
#message-preview .mail-list-wrapper { padding: 3px; }
#message-preview .mail-date { opacity:0.6; font-size:10px; }