$Projectname Doxygen API Documentation not rendered
+ +To get the Doxygen API Documentation you must render it with the program Doxygen (included in most distributions). ++$ doxygen util/Doxyfile ++
+back + + diff --git a/doc/install-ejabberd.md b/doc/install-ejabberd.md new file mode 100644 index 000000000..c99a84550 --- /dev/null +++ b/doc/install-ejabberd.md @@ -0,0 +1,45 @@ +Install an ejabberd with synchronized credentials +================================================= + +* [Home](help) + +[Ejabberd](https://www.ejabberd.im/) is a chat server that uses XMPP as messaging protocol that you can use with a large amount of clients. In conjunction +with the "xmpp" addon it can be used for a web based chat solution for your users. + +Installation +------------ + +- Change it's owner to whichever user is running the server, ie. ejabberd + + $ chown ejabberd:ejabberd /path/to/friendica/include/auth_ejabberd.php + +- Change the access mode so it is readable only to the user ejabberd and has exec + + $ chmod 700 /path/to/friendica/include/auth_ejabberd.php + +- Edit your ejabberd.cfg file, comment out your auth_method and add: + + {auth_method, external}. + {extauth_program, "/path/to/friendica/include/auth_ejabberd.php"}. + +- Disable the module "mod_register" and disable the registration: + + {access, register, [{deny, all}]}. + +- Enable BOSH: + - Enable the module "mod_http_bind" + - Edit this line: + + {5280, ejabberd_http, [captcha, http_poll, http_bind]} + + - In your apache configuration for your site add this line: + + ProxyPass /http-bind http://127.0.0.1:5280/http-bind retry=0 + +- Restart your ejabberd service, you should be able to login with your friendica credentials + +Other hints +----------- +- if a user has a space or a @ in the nickname, the user has to replace these characters: + - " " (space) is replaced with "%20" + - "@" is replaced with "(a)" diff --git a/doc/readme.md b/doc/readme.md index a5eeb5451..068d0c9c5 100644 --- a/doc/readme.md +++ b/doc/readme.md @@ -30,6 +30,7 @@ Friendica Documentation and Resources * [Settings](help/Settings) * [Plugins](help/Plugins) * [Installing Connectors (Twitter/GNU Social)](help/Installing-Connectors) +* [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd) * [Message Flow](help/Message-Flow) * [Using SSL with Friendica](help/SSL) * [Developers](help/Developers) diff --git a/images/icons.png b/images/icons.png index 0ff5c430c..e255316e6 100644 Binary files a/images/icons.png and b/images/icons.png differ diff --git a/include/Contact.php b/include/Contact.php index 920ec3c2b..340b3ec6f 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -144,7 +144,7 @@ function terminate_friendship($user,$self,$contact) { // and we won't waste any more time trying to communicate with them. // This provides for the possibility that their database is temporarily messed // up or some other transient event and that there's a possibility we could recover from it. - + if(! function_exists('mark_for_death')) { function mark_for_death($contact) { @@ -166,7 +166,7 @@ function mark_for_death($contact) { $expiry = $contact['term-date'] . ' + 32 days '; if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) { - // relationship is really truly dead. + // relationship is really truly dead. // archive them rather than delete // though if the owner tries to unarchive them we'll start the whole process over again @@ -191,8 +191,90 @@ function unmark_for_death($contact) { ); }} +function get_contact_details_by_url($url, $uid = -1) { + if ($uid == -1) + $uid = local_user(); + + $r = q("SELECT `id` AS `gid`, `url`, `name`, `nick`, `addr`, `photo`, `location`, `about`, `keywords`, `gender`, `community`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", + dbesc(normalise_link($url))); + + if ($r) { + $profile = $r[0]; + + if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND + in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) + proc_run('php',"include/update_gcontact.php", $profile["gid"]); + + } else { + $r = q("SELECT `url`, `name`, `nick`, `avatar` AS `photo`, `location`, `about` FROM `unique_contacts` WHERE `url` = '%s'", + dbesc(normalise_link($url))); + + if (count($r)) { + $profile = $r[0]; + $profile["keywords"] = ""; + $profile["gender"] = ""; + $profile["community"] = false; + $profile["network"] = ""; + $profile["addr"] = ""; + } + } + + // Fetching further contact data from the contact table + $r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `network` = '%s'", + dbesc(normalise_link($url)), intval($uid), dbesc($profile["network"])); + + if (!count($r)) + $r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d", + dbesc(normalise_link($url)), intval($uid)); + + if (!count($r)) + $r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0", + dbesc(normalise_link($url))); + + if ($r) { + if (isset($r[0]["url"]) AND $r[0]["url"]) + $profile["url"] = $r[0]["url"]; + if (isset($r[0]["name"]) AND $r[0]["name"]) + $profile["name"] = $r[0]["name"]; + if (isset($r[0]["nick"]) AND $r[0]["nick"] AND ($profile["nick"] == "")) + $profile["nick"] = $r[0]["nick"]; + if (isset($r[0]["addr"]) AND $r[0]["addr"] AND ($profile["addr"] == "")) + $profile["addr"] = $r[0]["addr"]; + if (isset($r[0]["photo"]) AND $r[0]["photo"]) + $profile["photo"] = $r[0]["photo"]; + if (isset($r[0]["location"]) AND $r[0]["location"]) + $profile["location"] = $r[0]["location"]; + if (isset($r[0]["about"]) AND $r[0]["about"]) + $profile["about"] = $r[0]["about"]; + if (isset($r[0]["keywords"]) AND $r[0]["keywords"]) + $profile["keywords"] = $r[0]["keywords"]; + if (isset($r[0]["gender"]) AND $r[0]["gender"]) + $profile["gender"] = $r[0]["gender"]; + if (isset($r[0]["forum"]) OR isset($r[0]["prv"])) + $profile["community"] = ($r[0]["forum"] OR $r[0]["prv"]); + if (isset($r[0]["network"]) AND $r[0]["network"]) + $profile["network"] = $r[0]["network"]; + if (isset($r[0]["addr"]) AND $r[0]["addr"]) + $profile["addr"] = $r[0]["addr"]; + if (isset($r[0]["bd"]) AND $r[0]["bd"]) + $profile["bd"] = $r[0]["bd"]; + if ($r[0]["uid"] == 0) + $profile["cid"] = 0; + else + $profile["cid"] = $r[0]["id"]; + } else + $profile["cid"] = 0; + + if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) { + $profile["location"] = ""; + $profile["about"] = ""; + } + + return($profile); +} + if(! function_exists('contact_photo_menu')){ -function contact_photo_menu($contact) { +function contact_photo_menu($contact, $uid = 0) { $a = get_app(); @@ -204,6 +286,33 @@ function contact_photo_menu($contact) { $contact_drop_link = ""; $poke_link=""; + if ($uid == 0) + $uid = local_user(); + + if ($contact["uid"] != $uid) { + if ($uid == 0) { + $profile_link = zrl($contact['url']); + $menu = Array('profile' => array(t("View Profile"), $profile_link, true)); + + return $menu; + } + + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `network` = '%s' AND `uid` = %d", + dbesc($contact["nurl"]), dbesc($contact["network"]), intval($uid)); + if ($r) + return contact_photo_menu($r[0], $uid); + else { + $profile_link = zrl($contact['url']); + $connlnk = 'follow/?url='.$contact['url']; + $menu = Array( + 'profile' => array(t("View Profile"), $profile_link, true), + 'follow' => array(t("Connect/Follow"), $connlnk, true) + ); + + return $menu; + } + } + $sparkle = false; if($contact['network'] === NETWORK_DFRN) { $sparkle = true; @@ -219,24 +328,32 @@ function contact_photo_menu($contact) { $status_link = $profile_link . "?url=status"; $photos_link = $profile_link . "?url=photos"; $profile_link = $profile_link . "?url=profile"; - $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id']; } - $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id']; + if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA))) + $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id']; + + if ($contact["network"] == NETWORK_DFRN) + $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id']; + $contact_url = $a->get_baseurl() . '/contacts/' . $contact['id']; - $posts_link = $a->get_baseurl() . '/network/0?nets=all&cid=' . $contact['id']; + $posts_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/posts'; $contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1'; + /** + * menu array: + * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ] + */ $menu = Array( - 'poke' => array(t("Poke"), $poke_link), - 'status' => array(t("View Status"), $status_link), - 'profile' => array(t("View Profile"), $profile_link), - 'photos' => array(t("View Photos"), $photos_link), - 'network' => array(t("Network Posts"), $posts_link), - 'edit' => array(t("Edit Contact"), $contact_url), - 'drop' => array(t("Drop Contact"), $contact_drop_link), - 'pm' => array(t("Send PM"), $pm_url), + 'status' => array(t("View Status"), $status_link, true), + 'profile' => array(t("View Profile"), $profile_link, true), + 'photos' => array(t("View Photos"), $photos_link,true), + 'network' => array(t("Network Posts"), $posts_link,false), + 'edit' => array(t("Edit Contact"), $contact_url, false), + 'drop' => array(t("Drop Contact"), $contact_drop_link, false), + 'pm' => array(t("Send PM"), $pm_url, false), + 'poke' => array(t("Poke"), $poke_link, false), ); @@ -244,25 +361,13 @@ function contact_photo_menu($contact) { call_hooks('contact_photo_menu', $args); -/* $o = ""; - foreach($menu as $k=>$v){ - if ($v!="") { - if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact'))) - $o .= "
".$tagline; + } + $Text = $Text." ".$tagline; } } else diff --git a/include/bbcode.php b/include/bbcode.php index 13061958c..100c3b930 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -2,7 +2,23 @@ require_once("include/oembed.php"); require_once('include/event.php'); require_once('include/map.php'); +require_once('mod/proxy.php'); +function bb_PictureCacheExt($matches) { + if (strpos($matches[3], "data:image/") === 0) + return ($matches[0]); + + $matches[3] = proxy_url($matches[3]); + return "[img=".$matches[1]."x".$matches[2]."]".$matches[3]."[/img]"; +} + +function bb_PictureCache($matches) { + if (strpos($matches[1], "data:image/") === 0) + return ($matches[0]); + + $matches[1] = proxy_url($matches[1]); + return "[img]".$matches[1]."[/img]"; +} function bb_map_coords($match) { // the extra space in the following line is intentional @@ -83,10 +99,19 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { $image = ""; } - if ($simplehtml == 7) - $text = sprintf('%s', - $url, $title, $title); - elseif (($simplehtml != 4) AND ($simplehtml != 0)) + if ($simplehtml == 7) { + $title2 = $title; + + $test1 = trim(html_entity_decode($match[1],ENT_QUOTES,'UTF-8')); + $test2 = trim(html_entity_decode($title,ENT_QUOTES,'UTF-8')); + + // If the link description is similar to the text above then don't add the link description + if (($title != "") AND ((strpos($test1,$test2) !== false) OR + (similar_text($test1,$test2) / strlen($title)) > 0.9)) + $title2 = $url; + $text = sprintf('%s
', + $url, $title, $title2); + } elseif (($simplehtml != 4) AND ($simplehtml != 0)) $text = sprintf('%s
', $url, $title); else { $text = sprintf('', $type); @@ -101,9 +126,9 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { $text = $oembed; else { if (($image != "") AND !strstr(strtolower($oembed), "
', $url, $image, $title); + $text .= sprintf('
', $url, proxy_url($image), $title); elseif (($preview != "") AND !strstr(strtolower($oembed), "
', $url, $preview, $title); + $text .= sprintf('
', $url, proxy_url($preview), $title); $text .= $oembed; @@ -455,7 +480,7 @@ function bb_replace_images($body, $images) { // We're depending on the property of 'foreach' (specified on the PHP website) that // it loops over the array starting from the first element and going sequentially // to the last element - $newbody = str_replace('[$#saved_image' . $cnt . '#$]', '
';
if ($avatar != "")
- $headline .= '
';
+ $headline .= '.')
';
$headline .= sprintf(t('%s wrote the following post'.$reldate.':'), $profile, $author, $link);
$headline .= "
";
@@ -934,12 +959,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
$Text = preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi", 'bb_DiasporaLinks', $Text);
// if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
- if (!$forplaintext)
- $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1$2', $Text);
- else {
- $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism"," $1 ",$Text);
- $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text);
- }
+// if ($simplehtml != 7) {
+ if (!$forplaintext)
+ $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1$2', $Text);
+ else {
+ $Text = preg_replace("(\[url\]([$URLSearchString]*)\[\/url\])ism"," $1 ",$Text);
+ $Text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'bb_RemovePictureLinks', $Text);
+ }
+// }
if ($tryoembed)
$Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text);
@@ -1102,13 +1129,17 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
"" . $t_wrote . "
$2", $Text); + // [img=widthxheight]image source[/img] - //$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '
'
- . sprintf( tt('%d invitation available','%d invitations available',$x), $x)
+ $a->page['aside'] .= '
' . "\r\n";
}
else {
@@ -970,7 +977,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
. (($click) ? ' fakelink' : '') . '" '
. (($redir) ? ' target="redir" ' : '')
. (($url) ? ' href="' . $url . '"' : '') . $click . ' >'
+ . sprintf( tt('%d invitation available','%d invitations available',$x), $x)
. '
' . $inv;
}
}
-
+
return replace_macros(get_markup_template('peoplefind.tpl'),array(
'$findpeople' => t('Find People'),
'$desc' => t('Enter name or interest'),
@@ -40,18 +40,55 @@ function findpeople_widget() {
}
+function unavailable_networks() {
+ $network_filter = "";
+
+ $networks = array();
+
+ if (!plugin_enabled("appnet"))
+ $networks[] = NETWORK_APPNET;
+
+ if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook"))
+ $networks[] = NETWORK_FACEBOOK;
+
+ if (!plugin_enabled("statusnet"))
+ $networks[] = NETWORK_STATUSNET;
+
+ if (!plugin_enabled("pumpio"))
+ $networks[] = NETWORK_PUMPIO;
+
+ if (!plugin_enabled("twitter"))
+ $networks[] = NETWORK_TWITTER;
+
+ if (get_config("system","ostatus_disabled"))
+ $networks[] = NETWORK_OSTATUS;
+
+ if (!get_config("system","diaspora_enabled"))
+ $networks[] = NETWORK_DIASPORA;
+
+ if (!sizeof($networks))
+ return "";
+
+ $network_filter = implode("','", $networks);
+
+ $network_filter = "AND `network` NOT IN ('$network_filter')";
+
+ return $network_filter;
+}
function networks_widget($baseurl,$selected = '') {
$a = get_app();
- if(! local_user())
+ if(!local_user())
return '';
- if(! feature_enabled(local_user(),'networks'))
+ if(!feature_enabled(local_user(),'networks'))
return '';
- $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `self` = 0 ORDER BY `network`",
+ $extra_sql = unavailable_networks();
+
+ $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND NOT `self` $extra_sql ORDER BY `network`",
intval(local_user())
);
@@ -180,7 +217,7 @@ function common_friends_visitor_widget($profile_uid) {
}
if($cid == 0 && $zcid == 0)
- return;
+ return;
require_once('include/socgraph.php');
@@ -204,6 +241,6 @@ function common_friends_visitor_widget($profile_uid) {
'$linkmore' => (($t > 5) ? 'true' : ''),
'$more' => t('show more'),
'$items' => $r
- ));
+ ));
};
diff --git a/include/conversation.php b/include/conversation.php
index 5a84ca42a..f2d3cda33 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -100,7 +100,11 @@ function localize_item(&$item){
$item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']);
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
- if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){
+ if (activity_match($item['verb'],ACTIVITY_LIKE)
+ || activity_match($item['verb'],ACTIVITY_DISLIKE)
+ || activity_match($item['verb'],ACTIVITY_ATTEND)
+ || activity_match($item['verb'],ACTIVITY_ATTENDNO)
+ || activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)){
$r = q("SELECT * from `item`,`contact` WHERE
`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -139,6 +143,15 @@ function localize_item(&$item){
elseif(activity_match($item['verb'],ACTIVITY_DISLIKE)) {
$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
}
+ elseif(activity_match($item['verb'],ACTIVITY_ATTEND)) {
+ $bodyverb = t('%1$s attends %2$s\'s %3$s');
+ }
+ elseif(activity_match($item['verb'],ACTIVITY_ATTENDNO)) {
+ $bodyverb = t('%1$s doesn\'t attend %2$s\'s %3$s');
+ }
+ elseif(activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)) {
+ $bodyverb = t('%1$s attends maybe %2$s\'s %3$s');
+ }
$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
}
@@ -204,7 +217,7 @@ function localize_item(&$item){
// we can't have a translation string with three positions but no distinguishable text
// So here is the translate string.
$txt = t('%1$s poked %2$s');
-
+
// now translate the verb
$poked_t = trim(sprintf($txt, "",""));
$txt = str_replace( $poked_t, t($verb), $txt);
@@ -341,8 +354,15 @@ function count_descendants($item) {
function visible_activity($item) {
- if(activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE))
- return false;
+ // likes (etc.) can apply to other things besides posts. Check if they are post children,
+ // in which case we handle them specially
+
+ $hidden_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE);
+ foreach($hidden_activities as $act) {
+ if(activity_match($item['verb'],$act)) {
+ return false;
+ }
+ }
if(activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) {
if(! (($item['self']) && ($item['uid'] == local_user()))) {
@@ -396,25 +416,25 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$page_writeable = true;
if(!$update) {
// The special div is needed for liveUpdate to kick in for this page.
- // We only launch liveUpdate if you aren't filtering in some incompatible
+ // We only launch liveUpdate if you aren't filtering in some incompatible
// way and also you aren't writing a comment (discovered in javascript).
$live_update_div = '' . "\r\n"
- . "\r\n";
}
@@ -431,7 +451,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
// because browser prefetching might change it on us. We have to deliver it with the page.
$live_update_div = '' . "\r\n"
- . "\r\n";
}
}
@@ -441,7 +461,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$page_writeable = true;
if(!$update) {
$live_update_div = '' . "\r\n"
- . "\r\n";
}
}
@@ -484,8 +504,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$cmnt_tpl = get_markup_template('comment_item.tpl');
$hide_comments_tpl = get_markup_template('hide_comments.tpl');
- $alike = array();
- $dlike = array();
+ $conv_responses = array(
+ 'like' => array('title' => t('Likes','title')), 'dislike' => array('title' => t('Dislikes','title')),
+ 'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
+ );
// array with html for each thread (parent+comments)
$threads = array();
@@ -656,7 +678,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
'name' => $profile_name_e,
'sparkle' => $sparkle,
'lock' => $lock,
- 'thumb' => proxy_url($profile_avatar),
+ 'thumb' => proxy_url($profile_avatar, false, PROXY_SIZE_THUMB),
'title' => $item['title_e'],
'body' => $body_e,
'tags' => $tags_e,
@@ -675,7 +697,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
'indent' => '',
'owner_name' => $owner_name_e,
'owner_url' => $owner_url,
- 'owner_photo' => proxy_url($owner_photo),
+ 'owner_photo' => proxy_url($owner_photo, false, PROXY_SIZE_THUMB),
'plink' => get_plink($item),
'edpost' => false,
'isstarred' => $isstarred,
@@ -734,8 +756,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
// Can we put this after the visibility check?
- like_puller($a,$item,$alike,'like');
- like_puller($a,$item,$dlike,'dislike');
+ builtin_activity_puller($item, $conv_responses);
// Only add what is visible
if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
@@ -755,7 +776,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
}
}
- $threads = $conv->get_template_data($alike, $dlike);
+ $threads = $conv->get_template_data($conv_responses);
if(!$threads) {
logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
@@ -792,10 +813,16 @@ function best_link_url($item,&$sparkle,$ssl_state = false) {
if($a->contacts[$clean_url]['network'] === NETWORK_DFRN) {
$best_url = $a->get_baseurl($ssl_state) . '/redir/' . $a->contacts[$clean_url]['id'];
$sparkle = true;
- }
- else
+ } else
$best_url = $a->contacts[$clean_url]['url'];
}
+ } elseif (local_user()) {
+ $r = q("SELECT `id`, `network` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s'",
+ dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url)));
+ if ($r) {
+ $best_url = $a->get_baseurl($ssl_state).'/redir/'.$r[0]['id'];
+ $sparkle = true;
+ }
}
if(! $best_url) {
if(strlen($item['author-link']))
@@ -848,15 +875,23 @@ function item_photo_menu($item){
$profile_link = zrl($profile_link);
if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
$cid = $item['contact-id'];
- }
- else {
- $cid = 0;
+ } else {
+ $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' ORDER BY `uid` DESC LIMIT 1",
+ intval(local_user()), dbesc(normalise_link($item['author-link'])));
+ if ($r) {
+ $cid = $r[0]["id"];
+
+ if ($r[0]["network"] == NETWORK_DIASPORA)
+ $pm_url = $a->get_baseurl($ssl_state) . '/message/new/' . $cid;
+
+ } else
+ $cid = 0;
}
}
if(($cid) && (! $item['self'])) {
$poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $cid;
$contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
- $posts_link = $a->get_baseurl($ssl_state) . '/network/0?nets=all&cid=' . $cid;
+ $posts_link = $a->get_baseurl($ssl_state) . '/contacts/' . $cid . '/posts';
$clean_url = normalise_link($item['author-link']);
@@ -870,17 +905,25 @@ function item_photo_menu($item){
}
- $menu = Array(
- t("Follow Thread") => $sub_link,
- t("View Status") => $status_link,
- t("View Profile") => $profile_link,
- t("View Photos") => $photos_link,
- t("Network Posts") => $posts_link,
- t("Edit Contact") => $contact_url,
- t("Send PM") => $pm_url,
- t("Poke") => $poke_link
- );
+ if (local_user()) {
+ $menu = Array(
+ t("Follow Thread") => $sub_link,
+ t("View Status") => $status_link,
+ t("View Profile") => $profile_link,
+ t("View Photos") => $photos_link,
+ t("Network Posts") => $posts_link,
+ t("Edit Contact") => $contact_url,
+ t("Send PM") => $pm_url
+ );
+ if ($a->contacts[$clean_url]['network'] === NETWORK_DFRN)
+ $menu[t("Poke")] = $poke_link;
+
+ if ((($cid == 0) OR ($a->contacts[$clean_url]['rel'] == CONTACT_IS_FOLLOWER)) AND
+ in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
+ $menu[t("Connect/Follow")] = $a->get_baseurl($ssl_state)."/follow?url=".urlencode($item['author-link']);
+ } else
+ $menu = array(t("View Profile") => $item['author-link']);
$args = array('item' => $item, 'menu' => $menu);
@@ -899,65 +942,114 @@ function item_photo_menu($item){
return $o;
}}
-if(! function_exists('like_puller')) {
-function like_puller($a,$item,&$arr,$mode) {
+/**
+ * @brief Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.)
+ * Increments the count of each matching activity and adds a link to the author as needed.
+ *
+ * @param array $a (not used)
+ * @param array $item
+ * @param array &$conv_responses (already created with builtin activity structure)
+ * @return void
+ */
+if(! function_exists('builtin_activity_puller')) {
+function builtin_activity_puller($item, &$conv_responses) {
+ foreach($conv_responses as $mode => $v) {
+ $url = '';
+ $sparkle = '';
- $url = '';
- $sparkle = '';
- $verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE);
-
- if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
- $url = $item['author-link'];
- if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
- $url = $a->get_baseurl(true) . '/redir/' . $item['contact-id'];
- $sparkle = ' class="sparkle" ';
+ switch($mode) {
+ case 'like':
+ $verb = ACTIVITY_LIKE;
+ break;
+ case 'dislike':
+ $verb = ACTIVITY_DISLIKE;
+ break;
+ case 'attendyes':
+ $verb = ACTIVITY_ATTEND;
+ break;
+ case 'attendno':
+ $verb = ACTIVITY_ATTENDNO;
+ break;
+ case 'attendmaybe':
+ $verb = ACTIVITY_ATTENDMAYBE;
+ break;
+ default:
+ return;
+ break;
}
- else
- $url = zrl($url);
- if(! $item['thr-parent'])
- $item['thr-parent'] = $item['parent-uri'];
+ if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
+ $url = $item['author-link'];
+ if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
+ $url = z_root(true) . '/redir/' . $item['contact-id'];
+ $sparkle = ' class="sparkle" ';
+ }
+ else
+ $url = zrl($url);
- if(! ((isset($arr[$item['thr-parent'] . '-l'])) && (is_array($arr[$item['thr-parent'] . '-l']))))
- $arr[$item['thr-parent'] . '-l'] = array();
- if(! isset($arr[$item['thr-parent']]))
- $arr[$item['thr-parent']] = 1;
- else
- $arr[$item['thr-parent']] ++;
- $arr[$item['thr-parent'] . '-l'][] = '' . $item['author-name'] . '';
+ $url = '' . htmlentities($item['author-name']) . '';
+
+ if(! $item['thr-parent'])
+ $item['thr-parent'] = $item['parent-uri'];
+
+ if(! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l']))
+ && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l']))))
+ $conv_responses[$mode][$item['thr-parent'] . '-l'] = array();
+
+ // only list each unique author once
+ if(in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l']))
+ continue;
+
+ if(! isset($conv_responses[$mode][$item['thr-parent']]))
+ $conv_responses[$mode][$item['thr-parent']] = 1;
+ else
+ $conv_responses[$mode][$item['thr-parent']] ++;
+
+ $conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url;
+
+ // there can only be one activity verb per item so if we found anything, we can stop looking
+ return;
+ }
}
- return;
}}
-// Format the like/dislike text for a profile item
-// $cnt = number of people who like/dislike the item
+// Format the vote text for a profile item
+// $cnt = number of people who vote the item
// $arr = array of pre-linked names of likers/dislikers
-// $type = one of 'like, 'dislike'
+// $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
// $id = item id
// returns formatted text
if(! function_exists('format_like')) {
function format_like($cnt,$arr,$type,$id) {
$o = '';
- if($cnt == 1)
- $o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
- else {
- $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
+ $expanded = '';
+
+ if($cnt == 1) {
+ $likers = $arr[0];
+
+ // Phrase if there is only one liker. In other cases it will be uses for the expanded
+ // list which show all likers
switch($type) {
- case 'like':
- $phrase = sprintf( t('%2$d people like this'), $spanatts, $cnt);
+ case 'like' :
+ $phrase = sprintf( t('%s likes this.'), $likers);
break;
- case 'dislike':
- $phrase = sprintf( t('%2$d people don\'t like this'), $spanatts, $cnt);
+ case 'dislike' :
+ $phrase = sprintf( t('%s doesn\'t like this.'), $likers);
+ break;
+ case 'attendyes' :
+ $phrase = sprintf( t('%s attends.'), $likers);
+ break;
+ case 'attendno' :
+ $phrase = sprintf( t('%s doesn\'t attend.'), $likers);
+ break;
+ case 'attendmaybe' :
+ $phrase = sprintf( t('%s attends maybe.'), $likers);
break;
}
- $phrase .= EOL ;
- $o .= replace_macros(get_markup_template('voting_fakelink.tpl'), array(
- '$phrase' => $phrase,
- '$type' => $type,
- '$id' => $id
- ));
+ }
+ if($cnt > 1) {
$total = count($arr);
if($total >= MAX_LIKERS)
$arr = array_slice($arr, 0, MAX_LIKERS - 1);
@@ -970,9 +1062,45 @@ function format_like($cnt,$arr,$type,$id) {
$str = implode(', ', $arr);
$str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS );
}
- $str = (($type === 'like') ? sprintf( t('%s like this.'), $str) : sprintf( t('%s don\'t like this.'), $str));
- $o .= "\t" . '';
+
+ $likers = $str;
+
+ $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
+
+ switch($type) {
+ case 'like':
+ $phrase = sprintf( t('%2$d people like this'), $spanatts, $cnt);
+ $explikers = sprintf( t('%s like this.'), $likers);
+ break;
+ case 'dislike':
+ $phrase = sprintf( t('%2$d people don\'t like this'), $spanatts, $cnt);
+ $explikers = sprintf( t('%s don\'t like this.'), $likers);
+ break;
+ case 'attendyes':
+ $phrase = sprintf( t('%2$d people attend'), $spanatts, $cnt);
+ $explikers = sprintf( t('%s attend.'), $likers);
+ break;
+ case 'attendno':
+ $phrase = sprintf( t('%2$d people don\'t attend'), $spanatts, $cnt);
+ $explikers = sprintf( t('%s don\'t attend.'), $likers);
+ break;
+ case 'attendmaybe':
+ $phrase = sprintf( t('%2$d people anttend maybe'), $spanatts, $cnt);
+ $explikers = sprintf( t('%s anttend maybe.'), $likers);
+ break;
+ }
+
+ $expanded .= "\t" . '';
}
+
+ $phrase .= EOL ;
+ $o .= replace_macros(get_markup_template('voting_fakelink.tpl'), array(
+ '$phrase' => $phrase,
+ '$type' => $type,
+ '$id' => $id
+ ));
+ $o .= $expanded;
+
return $o;
}}
@@ -1163,6 +1291,15 @@ function conv_sort($arr,$order) {
$parents = array();
$children = array();
+ $newarr = array();
+
+ // This is a preparation for having two different items with the same uri in one thread
+ // This will otherwise lead to an endless loop.
+ foreach($arr as $x)
+ if (!isset($newarr[$x['uri']]))
+ $newarr[$x['uri']] = $x;
+
+ $arr = $newarr;
foreach($arr as $x)
if($x['id'] == $x['parent'])
@@ -1236,3 +1373,51 @@ function render_location_dummy($item) {
if ($item['coord'] != "")
return $item['coord'];
}
+
+function get_responses($conv_responses,$response_verbs,$ob,$item) {
+ $ret = array();
+ foreach($response_verbs as $v) {
+ $ret[$v] = array();
+ $ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : '');
+ $ret[$v]['list'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : '');
+ if(count($ret[$v]['list']) > MAX_LIKERS) {
+ $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
+ array_push($ret[$v]['list_part'], '' . t('View all') . '');
+ }
+ else {
+ $ret[$v]['list_part'] = '';
+ }
+ $ret[$v]['button'] = get_response_button_text($v,$ret[$v]['count']);
+ $ret[$v]['title'] = $conv_responses[$v]['title'];
+ }
+
+ $count = 0;
+ foreach($ret as $key) {
+ if ($key['count'] == true)
+ $count++;
+ }
+ $ret['count'] = $count;
+
+ return $ret;
+}
+
+function get_response_button_text($v,$count) {
+ switch($v) {
+ case 'like':
+ return tt('Like','Likes',$count,'noun');
+ break;
+ case 'dislike':
+ return tt('Dislike','Dislikes',$count,'noun');
+ break;
+ case 'attendyes':
+ return tt('Attending','Attending',$count,'noun');
+ break;
+ case 'attendno':
+ return tt('Not Attending','Not Attending',$count,'noun');
+ break;
+ case 'attendmaybe':
+ return tt('Undecided','Undecided',$count,'noun');
+ break;
+ }
+}
diff --git a/include/cron.php b/include/cron.php
new file mode 100644
index 000000000..18674817d
--- /dev/null
+++ b/include/cron.php
@@ -0,0 +1,379 @@
+ $maxsysload) {
+ logger('system: load ' . $load . ' too high. cron deferred to next scheduled run.');
+ return;
+ }
+ }
+
+ $last = get_config('system','last_cron');
+
+ $poll_interval = intval(get_config('system','cron_interval'));
+ if(! $poll_interval)
+ $poll_interval = 10;
+
+ if($last) {
+ $next = $last + ($poll_interval * 60);
+ if($next > time()) {
+ logger('cron intervall not reached');
+ return;
+ }
+ }
+
+ $lockpath = get_lockpath();
+ if ($lockpath != '') {
+ $pidfile = new pidfile($lockpath, 'cron');
+ if($pidfile->is_already_running()) {
+ logger("cron: Already running");
+ if ($pidfile->running_time() > 9*60) {
+ $pidfile->kill();
+ logger("cron: killed stale process");
+ // Calling a new instance
+ proc_run('php','include/cron.php');
+ }
+ exit;
+ }
+ }
+
+
+
+ $a->set_baseurl(get_config('system','url'));
+
+ load_hooks();
+
+ logger('cron: start');
+
+ // run queue delivery process in the background
+
+ proc_run('php',"include/queue.php");
+
+ // run diaspora photo queue process in the background
+
+ proc_run('php',"include/dsprphotoq.php");
+
+ // run the process to discover global contacts in the background
+
+ proc_run('php',"include/discover_poco.php");
+
+ // run the process to update locally stored global contacts in the background
+
+ proc_run('php',"include/discover_poco.php", "checkcontact");
+
+ // expire any expired accounts
+
+ q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
+ AND `account_expires_on` != '0000-00-00 00:00:00'
+ AND `account_expires_on` < UTC_TIMESTAMP() ");
+
+ // delete user and contact records for recently removed accounts
+
+ $r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
+ if ($r) {
+ foreach($r as $user) {
+ q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid']));
+ q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
+ }
+ }
+
+ $abandon_days = intval(get_config('system','account_abandon_days'));
+ if($abandon_days < 1)
+ $abandon_days = 0;
+
+ // Check OStatus conversations
+ // Check only conversations with mentions (for a longer time)
+ check_conversations(true);
+
+ // Check every conversation
+ check_conversations(false);
+
+ // Follow your friends from your legacy OStatus account
+ // Doesn't work
+ // ostatus_check_follow_friends();
+
+ // update nodeinfo data
+ nodeinfo_cron();
+
+ // To-Do: Regenerate usage statistics
+ // q("ANALYZE TABLE `item`");
+
+ // once daily run birthday_updates and then expire in background
+
+ $d1 = get_config('system','last_expire_day');
+ $d2 = intval(datetime_convert('UTC','UTC','now','d'));
+
+ if($d2 != intval($d1)) {
+
+ update_contact_birthdays();
+
+ proc_run('php',"include/discover_poco.php", "suggestions");
+
+ set_config('system','last_expire_day',$d2);
+
+ proc_run('php','include/expire.php');
+ }
+
+ $last = get_config('system','cache_last_cleared');
+
+ if($last) {
+ $next = $last + (3600); // Once per hour
+ $clear_cache = ($next <= time());
+ } else
+ $clear_cache = true;
+
+ if ($clear_cache) {
+ // clear old cache
+ Cache::clear();
+
+ // clear old item cache files
+ clear_cache();
+
+ // clear cache for photos
+ clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+
+ // clear smarty cache
+ clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled");
+
+ // clear cache for image proxy
+ if (!get_config("system", "proxy_disabled")) {
+ clear_cache($a->get_basepath(), $a->get_basepath()."/proxy");
+
+ $cachetime = get_config('system','proxy_cache_time');
+ if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME;
+
+ q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
+ }
+
+ // Maximum table size in megabyte
+ $max_tablesize = intval(get_config('system','optimize_max_tablesize')) * 1000000;
+ if ($max_tablesize == 0)
+ $max_tablesize = 100 * 1000000; // Default are 100 MB
+
+ // Minimum fragmentation level in percent
+ $fragmentation_level = intval(get_config('system','optimize_fragmentation')) / 100;
+ if ($fragmentation_level == 0)
+ $fragmentation_level = 0.3; // Default value is 30%
+
+ // Optimize some tables that need to be optimized
+ $r = q("SHOW TABLE STATUS");
+ foreach($r as $table) {
+
+ // Don't optimize tables that are too large
+ if ($table["Data_length"] > $max_tablesize)
+ continue;
+
+ // Don't optimize empty tables
+ if ($table["Data_length"] == 0)
+ continue;
+
+ // Calculate fragmentation
+ $fragmentation = $table["Data_free"] / $table["Data_length"];
+
+ logger("Table ".$table["Name"]." - Fragmentation level: ".round($fragmentation * 100, 2), LOGGER_DEBUG);
+
+ // Don't optimize tables that needn't to be optimized
+ if ($fragmentation < $fragmentation_level)
+ continue;
+
+ // So optimize it
+ logger("Optimize Table ".$table["Name"], LOGGER_DEBUG);
+ q("OPTIMIZE TABLE `%s`", dbesc($table["Name"]));
+ }
+
+ set_config('system','cache_last_cleared', time());
+ }
+
+ $manual_id = 0;
+ $generation = 0;
+ $force = false;
+ $restart = false;
+
+ if(($argc > 1) && ($argv[1] == 'force'))
+ $force = true;
+
+ if(($argc > 1) && ($argv[1] == 'restart')) {
+ $restart = true;
+ $generation = intval($argv[2]);
+ if(! $generation)
+ killme();
+ }
+
+ if(($argc > 1) && intval($argv[1])) {
+ $manual_id = intval($argv[1]);
+ $force = true;
+ }
+
+ $interval = intval(get_config('system','poll_interval'));
+ if(! $interval)
+ $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
+
+ // If we are using the worker we don't need a delivery interval
+ if (get_config("system", "worker"))
+ $interval = false;
+
+ $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
+
+ reload_plugins();
+
+ $d = datetime_convert();
+
+ // Only poll from those with suitable relationships,
+ // and which have a polling address and ignore Diaspora since
+ // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
+
+ $abandon_sql = (($abandon_days)
+ ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
+ : ''
+ );
+
+ $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
+ WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s')
+ $sql_extra
+ AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive`
+ AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
+ intval(CONTACT_IS_SHARING),
+ intval(CONTACT_IS_FRIEND),
+ dbesc(NETWORK_DFRN),
+ dbesc(NETWORK_ZOT),
+ dbesc(NETWORK_OSTATUS),
+ dbesc(NETWORK_FEED),
+ dbesc(NETWORK_MAIL),
+ dbesc(NETWORK_MAIL2)
+ );
+
+ if(! count($contacts)) {
+ return;
+ }
+
+ foreach($contacts as $c) {
+
+ $res = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+ intval($c['id'])
+ );
+
+ if((! $res) || (! count($res)))
+ continue;
+
+ foreach($res as $contact) {
+
+ $xml = false;
+
+ if($manual_id)
+ $contact['last-update'] = '0000-00-00 00:00:00';
+
+ if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS)))
+ $contact['priority'] = 2;
+
+ if($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
+ // We should be getting everything via a hub. But just to be sure, let's check once a day.
+ // (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
+ // This also lets us update our subscription to the hub, and add or replace hubs in case it
+ // changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
+
+ $poll_interval = get_config('system','pushpoll_frequency');
+ $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
+ }
+
+ if($contact['priority'] AND !$force) {
+
+ $update = false;
+
+ $t = $contact['last-update'];
+
+ /**
+ * Based on $contact['priority'], should we poll this site now? Or later?
+ */
+
+ switch ($contact['priority']) {
+ case 5:
+ if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month"))
+ $update = true;
+ break;
+ case 4:
+ if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week"))
+ $update = true;
+ break;
+ case 3:
+ if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
+ $update = true;
+ break;
+ case 2:
+ if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour"))
+ $update = true;
+ break;
+ case 1:
+ default:
+ if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour"))
+ $update = true;
+ break;
+ }
+ if(!$update)
+ continue;
+ }
+
+ logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
+
+ proc_run('php','include/onepoll.php',$contact['id']);
+
+ if($interval)
+ @time_sleep_until(microtime(true) + (float) $interval);
+ }
+ }
+
+ logger('cron: end');
+
+ set_config('system','last_cron', time());
+
+ return;
+}
+
+if (array_search(__file__,get_included_files())===0){
+ cron_run($_SERVER["argv"],$_SERVER["argc"]);
+ killme();
+}
diff --git a/include/cronhooks.php b/include/cronhooks.php
index 26cab3cf9..8c70008e4 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -11,11 +11,11 @@ function cronhooks_run(&$argv, &$argc){
}
if(is_null($db)) {
- @include(".htconfig.php");
- require_once("include/dba.php");
- $db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
- };
+ @include(".htconfig.php");
+ require_once("include/dba.php");
+ $db = new dba($db_host, $db_user, $db_pass, $db_data);
+ unset($db_host, $db_user, $db_pass, $db_data);
+ };
require_once('include/session.php');
require_once('include/datetime.php');
@@ -27,10 +27,25 @@ function cronhooks_run(&$argv, &$argc){
$maxsysload = intval(get_config('system','maxloadavg'));
if($maxsysload < 1)
$maxsysload = 50;
- if(function_exists('sys_getloadavg')) {
- $load = sys_getloadavg();
- if(intval($load[0]) > $maxsysload) {
- logger('system: load ' . $load[0] . ' too high. Cronhooks deferred to next scheduled run.');
+
+ $load = current_load();
+ if($load) {
+ if(intval($load) > $maxsysload) {
+ logger('system: load ' . $load . ' too high. Cronhooks deferred to next scheduled run.');
+ return;
+ }
+ }
+
+ $last = get_config('system','last_cronhook');
+
+ $poll_interval = intval(get_config('system','cronhook_interval'));
+ if(! $poll_interval)
+ $poll_interval = 9;
+
+ if($last) {
+ $next = $last + ($poll_interval * 60);
+ if($next > time()) {
+ logger('cronhook intervall not reached');
return;
}
}
@@ -41,11 +56,11 @@ function cronhooks_run(&$argv, &$argc){
if($pidfile->is_already_running()) {
logger("cronhooks: Already running");
if ($pidfile->running_time() > 19*60) {
- $pidfile->kill();
- logger("cronhooks: killed stale process");
+ $pidfile->kill();
+ logger("cronhooks: killed stale process");
// Calling a new instance
proc_run('php','include/cronhooks.php');
- }
+ }
exit;
}
}
@@ -62,10 +77,12 @@ function cronhooks_run(&$argv, &$argc){
logger('cronhooks: end');
+ set_config('system','last_cronhook', time());
+
return;
}
if (array_search(__file__,get_included_files())===0){
- cronhooks_run($_SERVER["argv"],$_SERVER["argc"]);
- killme();
+ cronhooks_run($_SERVER["argv"],$_SERVER["argc"]);
+ killme();
}
diff --git a/include/datetime.php b/include/datetime.php
index 6461298ba..79964ef40 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -43,18 +43,18 @@ function select_timezone($current = 'America/Los_Angeles') {
if($continent != t('Miscellaneous')) {
$o .= '';
$continent = t('Miscellaneous');
- $o .= ' . '/images/smiley-heart.gif)
',
- ' . '/images/smiley-brokenheart.gif)
',
- '',
- ' . '/images/smiley-smile.gif)
',
- ' . '/images/smiley-wink.gif)
',
- ' . '/images/smiley-frown.gif)
',
- ' . '/images/smiley-tongue-out.gif)
',
- '',
- ' . '/images/smiley-kiss.gif)
',
- '',
- '',
- '',
- ' . '/images/smiley-laughing.gif)
',
- ' . '/images/smiley-surprised.gif)
',
- '',
- '',
- ' . '/images/smiley-thumbsup.gif)
',
- ' . '/images/smiley-Oo.gif)
',
- '',
- '',
- '',
- ' . '/images/smiley-cry.gif)
',
- ' . '/images/smiley-foot-in-mouth.gif)
',
- ' . '/images/smiley-undecided.gif)
',
- ' . '/images/smiley-embarassed.gif)
',
- ' . '/images/smiley-cool.gif)
',
- ' . '/images/beer_mug.gif)
',
- '',
- ' . '/images/coffee.gif)
',
- ' . '/images/smiley-facepalm.gif)
',
- ' . '/images/like.gif)
',
- ' . '/images/dislike.gif)
',
- '~friendica  . '/images/friendica-16.png)
',
- 'red . '/images/rm-16.png)
matrix',
- 'redmatrix'
+ ' . '/images/smiley-heart.gif)
',
+ ' . '/images/smiley-brokenheart.gif)
',
+ '',
+ ' . '/images/smiley-smile.gif)
',
+ ' . '/images/smiley-wink.gif)
',
+ ' . '/images/smiley-frown.gif)
',
+ ' . '/images/smiley-tongue-out.gif)
',
+ '',
+ ' . '/images/smiley-kiss.gif)
',
+ '',
+ '',
+ '',
+ ' . '/images/smiley-laughing.gif)
',
+ ' . '/images/smiley-surprised.gif)
',
+ '',
+ '',
+ ' . '/images/smiley-thumbsup.gif)
',
+ ' . '/images/smiley-Oo.gif)
',
+ '',
+ '',
+ '',
+ ' . '/images/smiley-cry.gif)
',
+ ' . '/images/smiley-foot-in-mouth.gif)
',
+ ' . '/images/smiley-undecided.gif)
',
+ ' . '/images/smiley-embarassed.gif)
',
+ ' . '/images/smiley-cool.gif)
',
+ ' . '/images/beer_mug.gif)
',
+ '',
+ ' . '/images/coffee.gif)
',
+ ' . '/images/smiley-facepalm.gif)
',
+ ' . '/images/like.gif)
',
+ ' . '/images/dislike.gif)
',
+ '~friendica  . '/images/friendica-16.png)
',
+ 'red . '/images/rm-16.png)
matrix',
+ 'redmatrix'
);
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
@@ -1248,7 +1256,7 @@ function preg_heart($x) {
return $x[0];
$t = '';
for($cnt = 0; $cnt < strlen($x[1]); $cnt ++)
- $t .= '';
+ $t .= '';
$r = str_replace($x[0],$t,$x[0]);
return $r;
}
@@ -1326,7 +1334,7 @@ function redir_private_images($a, &$item) {
if((local_user() == $item['uid']) && ($item['private'] != 0) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) {
//logger("redir_private_images: redir");
- $img_url = $a->get_baseurl() . '/redir?f=1&quiet=1&url=' . $mtch[1] . '&conurl=' . $item['author-link'];
+ $img_url = z_root() . '/redir?f=1&quiet=1&url=' . $mtch[1] . '&conurl=' . $item['author-link'];
$item['body'] = str_replace($mtch[0], "[img]".$img_url."[/img]", $item['body']);
}
}
@@ -1377,7 +1385,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$a = get_app();
call_hooks('prepare_body_init', $item);
- $searchpath = $a->get_baseurl()."/search?tag=";
+ $searchpath = z_root()."/search?tag=";
$tags=array();
$hashtags = array();
@@ -1410,9 +1418,6 @@ function prepare_body(&$item,$attach = false, $preview = false) {
put_item_in_cache($item, true);
$s = $item["rendered-html"];
- require_once("mod/proxy.php");
- $s = proxy_parse_html($s);
-
$prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
call_hooks('prepare_body', $prep_arr);
$s = $prep_arr['html'];
@@ -1438,7 +1443,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$mime = $mtch[3];
if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))
- $the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
+ $the_url = z_root() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
else
$the_url = $mtch[1];
@@ -1446,10 +1451,10 @@ function prepare_body(&$item,$attach = false, $preview = false) {
if(!$vhead) {
$vhead = true;
$a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array(
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => z_root(),
));
$a->page['end'] .= replace_macros(get_markup_template('videos_end.tpl'), array(
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => z_root(),
));
}
@@ -1505,7 +1510,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
if($x) {
$s = preg_replace('/\/','$0' . $x,$s);
}
- }
+ }
// Look for spoiler
@@ -1522,7 +1527,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
$pos = strpos($s, $spoilersearch);
$rnd = random_string(8);
$spoilerreplace = '
'.sprintf(t('Click to open/close')).''. - '
-
- '.sprintf(t('Click to open/close')).''. - '
{{$contact.name}}
-{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}}
- {{$contact.network}}
+
+
+
diff --git a/view/theme/frost-mobile/templates/contacts-template.tpl b/view/theme/frost-mobile/templates/contacts-template.tpl
index 94e9afbe5..f776222f3 100644
--- a/view/theme/frost-mobile/templates/contacts-template.tpl
+++ b/view/theme/frost-mobile/templates/contacts-template.tpl
@@ -15,11 +15,10 @@
{{$tabs}}
-
+ {{$contact.name}}
+ {{if $contact.account_type}} ({{$contact.account_type}}){{/if}}
+
+ {{if $contact.alt_text}}{{$contact.alt_text}}
{{/if}}
+ {{if $contact.itemurl}}{{$contact.itemurl}}
{{/if}}
+ {{if $contact.tags}}{{$contact.tags}}
{{/if}}
+ {{if $contact.details}}{{$contact.details}}
{{/if}}
+ {{if $contact.network}}{{$contact.network}}
{{/if}}
+
+
{{foreach $contacts as $contact}}
{{include file="contact_template.tpl"}}
{{/foreach}}
-
{{$paginate}}
diff --git a/view/theme/frost-mobile/templates/lang_selector.tpl b/view/theme/frost-mobile/templates/lang_selector.tpl
deleted file mode 100644
index d9a90e7b8..000000000
--- a/view/theme/frost-mobile/templates/lang_selector.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
diff --git a/view/theme/frost-mobile/templates/profile_vcard.tpl b/view/theme/frost-mobile/templates/profile_vcard.tpl
index 6e097c62b..b3024074b 100644
--- a/view/theme/frost-mobile/templates/profile_vcard.tpl
+++ b/view/theme/frost-mobile/templates/profile_vcard.tpl
@@ -3,12 +3,14 @@
{{$profile.name}}
-
+ {{if $profile.addr}}{{$profile.addr}}
{{/if}}
- {{if $pdesc}}{{$profile.pdesc}}
{{/if}}
+ {{if $profile.pdesc}}{{$profile.pdesc}}
{{/if}}
{{$account_type}}
{{/if}}
+ {{if $profile.network_name}}- {{$network}}
- {{$profile.network_name}}
- {{$location}} diff --git a/view/theme/frost-mobile/templates/settings.tpl b/view/theme/frost-mobile/templates/settings.tpl index cd9e1d316..e3a636a84 100644 --- a/view/theme/frost-mobile/templates/settings.tpl +++ b/view/theme/frost-mobile/templates/settings.tpl @@ -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}} diff --git a/view/theme/frost-mobile/templates/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl deleted file mode 100644 index e39cca6e5..000000000 --- a/view/theme/frost-mobile/templates/suggest_friends.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - diff --git a/view/theme/frost-mobile/templates/wall_thread.tpl b/view/theme/frost-mobile/templates/wall_thread.tpl index c96129195..377c90242 100644 --- a/view/theme/frost-mobile/templates/wall_thread.tpl +++ b/view/theme/frost-mobile/templates/wall_thread.tpl @@ -94,6 +94,12 @@ {{/if}} + {{if $item.isevent}} + + + + {{/if}} + {{**}} {{if $item.drop.dropping}}{{/if}} {{**}} @@ -102,8 +108,12 @@ {{**}} -
- {{$network}}
- {{$profile.network_name}}
- {{$location}} @@ -43,10 +45,11 @@ {{if $wallmessage}}
{{$item.like}}
- {{$item.dislike}}
+ {{if $item.responses}}
+ {{foreach $item.responses as $verb=>$response}}
+ {{$response.output}}
+ {{/foreach}}
+ {{/if}}
+
{{if $item.threaded}}
{{if $item.comment}}
diff --git a/view/theme/frost/images/event-attend-16.png b/view/theme/frost/images/event-attend-16.png
new file mode 100644
index 000000000..b96a92aef
Binary files /dev/null and b/view/theme/frost/images/event-attend-16.png differ
diff --git a/view/theme/frost/images/event-attend.png b/view/theme/frost/images/event-attend.png
new file mode 100644
index 000000000..f555fbb4a
Binary files /dev/null and b/view/theme/frost/images/event-attend.png differ
diff --git a/view/theme/frost/images/event-dontattend-16.png b/view/theme/frost/images/event-dontattend-16.png
new file mode 100644
index 000000000..56351f25f
Binary files /dev/null and b/view/theme/frost/images/event-dontattend-16.png differ
diff --git a/view/theme/frost/images/event-dontattend.png b/view/theme/frost/images/event-dontattend.png
new file mode 100644
index 000000000..2dd0c731e
Binary files /dev/null and b/view/theme/frost/images/event-dontattend.png differ
diff --git a/view/theme/frost/images/event-maybeattend-16.png b/view/theme/frost/images/event-maybeattend-16.png
new file mode 100644
index 000000000..ab6ee336f
Binary files /dev/null and b/view/theme/frost/images/event-maybeattend-16.png differ
diff --git a/view/theme/frost/images/event-maybeattend.png b/view/theme/frost/images/event-maybeattend.png
new file mode 100644
index 000000000..16daa3208
Binary files /dev/null and b/view/theme/frost/images/event-maybeattend.png differ
diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 8b87c3bd4..3dd400c76 100644
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -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 {
@@ -284,6 +284,7 @@ aside {
/* float:left;*/
}
+#subscribe-feed-link,
#dfrn-request-link {
display: block;
color: #FFFFFF;
@@ -337,7 +338,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 +346,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;*/
@@ -383,6 +384,27 @@ section {
padding-top: 3em;
}
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+ width: 100%;
+ min-height: 100px;
+ background-color: #FAFAFA;
+ border: 1px solid #DDDDDD;
+ border-radius: 5px;
+}
+#contact-entry-wrapper-network {
+ float: none;
+ width: auto;
+ height: auto;
+ padding: 10px;
+ margin: 0;
+}
+#contact-entry-accounttype-network {
+ font-size: 0.9em;
+}
+#contact-entry-name-network {
+ font-size: 1.5em;
+}
/* footer */
footer {
@@ -423,14 +445,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 +484,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; }
@@ -489,11 +511,11 @@ div.wall-item-content-wrapper.shiny {
margin-bottom: 10px;
}
-.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+.group-selected, .nets-selected, .fileas-selected, .categories-selected, .forum-selected {
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 +525,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 +615,7 @@ div.wall-item-content-wrapper.shiny {
}
#login-submit-button {
- margin-top: 10px;
+ margin-top: 10px;
margin-left: 200px;
}*/
@@ -995,7 +1017,7 @@ input#dfrn-url {
clear: left;
color: #666666;
display: block;
- margin-bottom: 20px
+ margin-bottom: 20px
}
#profile-edit-profile-name-end,
@@ -1074,12 +1096,14 @@ input#dfrn-url {
.contact-entry-wrapper {
float: left;
-/* width: 120px;
- height: 120px;*/
- padding-left: 8px;
- padding-right: 8px;
- width: 95px;
- height: 170px;
+ width: 262px;
+ height: 90px;
+ padding-right: 10px;
+ margin: 0 10px 10px 0px;
+}
+.contact-entry-wrapper .contact-entry-photo-wrapper {
+ float: left;
+ margin-right: 10px;
}
#contacts-search-end {
margin-bottom: 10px;
@@ -1093,15 +1117,22 @@ input#dfrn-url {
.contact-entry-photo img {
border: none;
}
+.contact-entry-photo a img {
+ width: 80px;
+ height: 80px;
+}
.contact-entry-photo-end {
clear: both;
}
+.contact-entry-desc {
+ overflow: hidden;
+}
.contact-entry-name {
- float: left;
+ /*float: left;*/
margin-left: 0px;
margin-right: 10px;
padding-bottom: 5px;
- width: 120px;
+ /*width: 120px;*/
font-weight: 600;
overflow: hidden;
}
@@ -1109,6 +1140,9 @@ input#dfrn-url {
font-style: italic;
font-size: 10px;
font-weight: 500;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.contact-entry-network {
font-size: 10px;
@@ -1170,22 +1204,22 @@ input#dfrn-url {
border: none;
}
-.wall-item-like, .wall-item-dislike {
+.wall-item-response {
font-style: italic;
margin-left: 0px;
opacity: 0.4;
}
-.wall-item-dislike {
+.wall-item-respose:last-chid {
margin-bottom: 15px;
}
-.wall-item-like:hover, .wall-item-dislike:hover {
+.wall-item-response:hover {
opacity: 1.0;
}
-.wall-item-like.comment, .wall-item-dislike.comment {
+.wall-item-response.comment {
margin-left: 75px;
}
-.wall-item-dislike.comment {
+.wall-item-response.comment:last-chid {
margin-bottom: 0px;
}
@@ -1208,7 +1242,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;
@@ -1217,7 +1251,7 @@ input#dfrn-url {
overflow: hidden;
text-indent: 40px;
display: none;
-
+
}
.wall-item-photo-menu {
width: auto;
@@ -1263,7 +1297,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;
@@ -1311,20 +1345,11 @@ input#dfrn-url {
margin-right: 10px;
}
-.editpost {
- margin-left: 10px;
- float: left;
-}
-.star-item {
- margin-left: 10px;
- float: left;
-}
-.tag-item {
- margin-left: 10px;
- float: left;
-}
-
-.filer-item {
+.editpost,
+.star-item ,
+.tag-item,
+.filer-item,
+.event-item {
margin-left: 10px;
float: left;
}
@@ -1361,7 +1386,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;
@@ -1419,7 +1444,7 @@ input#dfrn-url {
.wall-item-title {
float: left;
font-weight: bold;
- font-size: 1.6em;
+ font-size: 1.6em;
/*width: 450px;*/
}
@@ -1463,7 +1488,7 @@ input#dfrn-url {
margin-left: 0px;
margin-top: 5px;
padding-top: 0px;
-}
+}
.comment-edit-wrapper {
margin-top: 15px;
@@ -1502,7 +1527,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;
}
@@ -1551,7 +1576,7 @@ input#dfrn-url {
padding-top: 0.5em;
margin-top: 1em;
margin-bottom: 1em;
-
+
}
.shared_header img {
float: left;
@@ -1998,7 +2023,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;
@@ -2007,7 +2032,7 @@ input#dfrn-url {
overflow: hidden;
text-indent: 40px;
display: none;
-
+
}
.contact-photo-menu {
width: auto;
@@ -2044,7 +2069,7 @@ input#dfrn-url {
border: 1px solid #cccccc;
padding: 3px 0px 0px 5px;
-moz-border-radius: 3px;
- border-radius: 3px;
+ border-radius: 3px;
}
@@ -2098,7 +2123,7 @@ input#dfrn-url {
overflow: auto;
}
#acl-list-content {
-
+
}
.acl-list-item {
display: block;
@@ -2115,7 +2140,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;
@@ -2315,6 +2340,22 @@ a.mail-list-link {
clear: both;
}
+#poke-desc {
+ margin: 5px 0 10px;
+}
+
+#poke-wrapper {
+ padding: 10px 0 20px;
+}
+
+#poke-recipient, #poke-action, #poke-privacy-settings {
+ margin: 10px 0 30px;
+}
+
+#poke-recip-label, #poke-action-label, #prvmail-message-label {
+ margin: 10px 0 10px;
+}
+
#sidebar-group-list ul {
list-style-type: none;
}
@@ -2329,6 +2370,16 @@ a.mail-list-link {
margin-top: 10px;
}
+#forumlist-sidebar ul {
+ list-style: none;
+}
+
+.forumlist-img {
+ height: 20px;
+ width: 20px;
+ vertical-align: middle;
+}
+
.nets-ul, .fileas-ul, .categories-ul, .datebrowse-ul {
list-style-type: none;
}
@@ -2414,15 +2465,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;
@@ -2438,7 +2489,7 @@ aside input[type='text'] {
}
.photo-top-image-wrapper {
-/* position: relative;
+/* position: relative;
float: left;*/
display: inline-block;
vertical-align: top;
@@ -2446,7 +2497,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 {
@@ -2461,7 +2512,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);
@@ -2557,7 +2608,7 @@ aside input[type='text'] {
}
#profile-jot-banner-end {
- /* clear: both; */
+ /* clear: both; */
}
#photos-upload-select-files-text {
@@ -2807,14 +2858,14 @@ aside input[type='text'] {
margin-bottom: 25px;
}
-.location-label, .gender-label, .marital-label, .homepage-label {
+.location-label, .gender-label, .marital-label, .homepage-label, .network-label {
float: left;
text-align: right;
display: block;
width: 65px;
}
-.adr, .x-gender, .marital-text, .homepage-url {
+.adr, .x-gender, .marital-text, .homepage-url, .x-network {
float: left;
display: block;
margin-left: 8px;
@@ -2844,7 +2895,7 @@ aside input[type='text'] {
}
/* end from default */
-
+
.fn {
padding: 0px 0px 5px 12px;
@@ -2852,10 +2903,16 @@ aside input[type='text'] {
font-weight: bold;
}
-.vcard .title {
+.vcard .title,
+.vcard .p-addr,
+.vcard .account-type {
margin-bottom: 5px;
margin-left: 12px;
}
+.vcard .account-type {
+ font-size: 120%;
+ margin-bottom: 13px;
+}
.vcard dl {
clear: both;
@@ -2863,7 +2920,7 @@ aside input[type='text'] {
#birthday-title {
float: left;
- font-weight: bold;
+ font-weight: bold;
}
#birthday-adjust {
@@ -2987,7 +3044,7 @@ aside input[type='text'] {
clear: both;
}
-
+
.calendar {
font-family: Courier, monospace;
}
@@ -3006,17 +3063,49 @@ aside input[type='text'] {
margin: 10px;
}
-#identity-manage-desc {
- margin-top:15px;
- margin-bottom: 15px;
+.itentity-match-wrapper {
+ float: left;
+ padding: 10px;
+ width: 120px;
+ height: 140px;
+ margin-bottom: 20px;
}
-#identity-manage-choose {
- margin-bottom: 15px;
+.identity-match-photo {
+ float: left;
+ text-align: center;
+ width: 120px;
}
-#identity-submit {
- margin-top: 20px;
+.identity-match-name {
+ text-align: center;
+}
+
+.identity-match-details {
+ float: left;
+ text-align: center;
+ width: 120px;
+ overflow: hidden;
+ font-size: 10px;
+ font-weight: 500;
+ color: #999999;
+}
+
+.identity-match-break, .identity-match-end {
+ clear: both;
+}
+
+.identity-match-photo button {
+ border: none;
+ padding: 0;
+ margin: 0;
+ background: none;
+ height: 80px;
+ width: 80px;
+}
+
+.selected-identity img {
+ border: 2px solid #ff0000;
}
#photo-prev-link, #photo-next-link {
@@ -3099,12 +3188,6 @@ aside input[type='text'] {
margin-bottom: 15px;
}
-#language-selector {
- position: absolute;
- top: 0px;
- left: 16px;
-}
-
#group-members {
margin-top: 20px;
padding: 10px;
@@ -3201,7 +3284,7 @@ aside input[type='text'] {
#netsearch-box {
- margin-top: 20px;
+ margin-top: 20px;
}
#netsearch-box #search-submit {
@@ -3291,19 +3374,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;
@@ -3325,7 +3395,7 @@ aside input[type='text'] {
.settings-heading {
border-bottom: 1px solid #babdb6;
}
-
+
/**
* Form fields
@@ -3408,7 +3478,7 @@ aside input[type='text'] {
font-weight: bold;
background-color: #FF0000;
padding: 0em 0.3em;
-
+
}
#adminpage dl {
clear: left;
@@ -3467,7 +3537,7 @@ aside input[type='text'] {
/*
* UPDATE
*/
-.popup {
+.popup {
width: 100%; height: 100%;
top:0px; left:0px;
position: absolute;
@@ -3488,7 +3558,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}
@@ -3501,7 +3571,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;
@@ -3752,6 +3822,21 @@ aside input[type='text'] {
opacity: 1.0;
}
+.event-icon {
+ display: block; width: 16px; height: 16px;
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ opacity: 0.4;
+}
+.event-attend-icon { background-image: url('images/event-attend-16.png'); }
+.event-maybeattend-icon { background-image: url('images/event-maybeattend-16.png'); }
+.event-dontattend-icon { background-image: url('images/event-dontattend-16.png'); }
+
+.filer-icon:hover {
+ opacity: 1.0;
+}
+
+
.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
/*[class^="comment-edit-bb"] {*/
.comment-edit-bb {
@@ -3988,6 +4073,22 @@ div.jGrowl-notification {
}
/* notifications popup menu */
+.manage-notify {
+ padding: 1px 3px;
+ top: 0px;
+ min-width: 15px;
+ text-align: center;
+ float: right;
+ margin-top: -14px;
+ margin-right: -20px;
+
+ font-size: 0.8em;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ background-color: gold !important;
+}
+
.nav-notify {
display: none;
position: absolute;
@@ -4094,7 +4195,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; }
@@ -4105,5 +4206,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;
+}
diff --git a/view/theme/frost/templates/contact_template.tpl b/view/theme/frost/templates/contact_template.tpl
index 7a29bd045..fe491fd83 100644
--- a/view/theme/frost/templates/contact_template.tpl
+++ b/view/theme/frost/templates/contact_template.tpl
@@ -10,8 +10,8 @@
{{if $contact.photo_menu}}
-
{{/if}}
-
- {{$contact.name}}
-{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}}
- {{$contact.network}}
+
+
+
diff --git a/view/theme/frost/templates/lang_selector.tpl b/view/theme/frost/templates/lang_selector.tpl
deleted file mode 100644
index d9a90e7b8..000000000
--- a/view/theme/frost/templates/lang_selector.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
diff --git a/view/theme/frost/templates/profile_vcard.tpl b/view/theme/frost/templates/profile_vcard.tpl
index 6e097c62b..1a0c39a82 100644
--- a/view/theme/frost/templates/profile_vcard.tpl
+++ b/view/theme/frost/templates/profile_vcard.tpl
@@ -3,12 +3,14 @@
+ {{$contact.name}}
+ {{if $contact.account_type}} ({{$contact.account_type}}){{/if}}
+
+ {{if $contact.alt_text}}{{$contact.alt_text}}
{{/if}}
+ {{if $contact.itemurl}}{{$contact.itemurl}}
{{/if}}
+ {{if $contact.tags}}{{$contact.tags}}
{{/if}}
+ {{if $contact.details}}{{$contact.details}}
{{/if}}
+ {{if $contact.network}}{{$contact.network}}
{{/if}}
+ {{$profile.name}}
-
+ {{if $profile.addr}}{{$profile.addr}}
{{/if}}
- {{if $pdesc}}{{$profile.pdesc}}
{{/if}}
+ {{if $profile.pdesc}}{{$profile.pdesc}}
{{/if}}
{{$account_type}}
{{/if}}
+ {{if $profile.network_name}}{{$item.like}}
- {{$item.dislike}}
+ {{if $item.responses}}
+ {{foreach $item.responses as $verb=>$response}}
+ {{$response.output}}
+ {{/foreach}}
+ {{/if}}
{{if $item.threaded}}
{{if $item.comment}}
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 89f3649ab..1b021687c 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -422,7 +422,7 @@ body {
font-size: 11px;
background-color: #ffffff;
color: #2d2d2d;
- margin: 50px 0px 0px 0px;
+ margin: 50px 0 0 0;
display: table;
}
h4 {
@@ -484,14 +484,14 @@ code {
width: 10em;
background: #ffffff;
color: #2d2d2d;
- margin: 0px;
+ margin: 0;
padding: 1em;
list-style: none;
border: 3px solid #364e59;
z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
/* tool */
.tool {
@@ -540,9 +540,9 @@ header {
position: fixed;
left: 43%;
right: 43%;
- top: 0px;
- margin: 0px;
- padding: 0px;
+ top: 0;
+ margin: 0;
+ padding: 0;
/*width: 100%; height: 12px; */
z-index: 110;
@@ -578,15 +578,15 @@ nav {
width: 100%;
height: 32px;
position: fixed;
- left: 0px;
- top: 0px;
- padding: 0px;
+ left: 0;
+ top: 0;
+ padding: 0;
background-color: #0e232e;
color: #ffffff;
z-index: 100;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
}
nav a,
nav a:active,
@@ -598,24 +598,24 @@ nav a:hover {
outline: none;
}
nav ul {
- margin: 0px;
- padding: 0px 20px;
+ margin: 0;
+ padding: 0 20px;
}
nav ul li {
list-style: none;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
float: left;
}
nav ul li .menu-popup {
- left: 0px;
+ left: 0;
right: auto;
}
nav .nav-menu-icon {
position: relative;
height: 22px;
padding: 5px;
- margin: 0px 10px;
+ margin: 0 10px;
-moz-border-radius: 5px 5px 0 0;
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
@@ -634,7 +634,7 @@ nav .nav-menu {
position: relative;
height: 16px;
padding: 5px;
- margin: 3px 15px 0px;
+ margin: 3px 15px 0;
font-size: 14px;
border-bottom: 3px solid #0e232e;
}
@@ -650,7 +650,7 @@ nav .nav-notify {
border-radius: 5px 5px 5px 5px;
font-size: 10px;
padding: 1px 3px;
- top: 0px;
+ top: 0;
right: -10px;
min-width: 15px;
text-align: right;
@@ -670,7 +670,7 @@ nav #nav-search-link .menu-popup,
nav #nav-directory-link .menu-popup,
nav #nav-apps-link .menu-popup,
nav #nav-site-linkmenu .menu-popup {
- right: 0px;
+ right: 0;
left: auto;
}
nav #nav-notifications-linkmenu.on .icon.s22.notify,
@@ -694,14 +694,14 @@ ul.menu-popup {
width: 10em;
background: #ffffff;
color: #2d2d2d;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
list-style: none;
border: 3px solid #364e59;
z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
ul.menu-popup a {
display: block;
@@ -752,9 +752,9 @@ ul.menu-popup .toolbar a:hover {
border: 1px solid #364e59;
overflow: auto;
z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
.autocomplete > div,
.acpopupitem {
@@ -792,12 +792,35 @@ ul.menu-popup .toolbar a:hover {
color: #9eabb0;
display: block;
}
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+ width: 100%;
+ min-height: 100px;
+ background-color: #eff0f1;
+ border-bottom: 1px solid #cccccc;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network {
+ float: none;
+ width: auto;
+ height: auto;
+ padding: 10px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network {
+ font-size: 22px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network {
+ font-size: 24.5px;
+ font-weight: normal;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details {
+ font-size: 12px;
+}
/* aside 230px*/
aside {
display: table-cell;
vertical-align: top;
width: 200px;
- padding: 0px 10px 0px 20px;
+ padding: 0px 10px 0 20px;
border-right: 1px solid #bdcdd4;
}
aside .profile-edit-side-div {
@@ -811,13 +834,20 @@ aside .vcard .fn {
aside .vcard .title {
margin-bottom: 5px;
}
+aside .vcard .p-addr {
+ margin-bottom: 5px;
+}
+aside .vcard .account-type {
+ font-size: 14px;
+ margin-bottom: 13px;
+}
aside .vcard dl {
height: auto;
overflow: auto;
}
aside .vcard dt {
float: left;
- margin-left: 0px;
+ margin-left: 0;
width: 35%;
text-align: right;
color: #999999;
@@ -828,12 +858,12 @@ aside .vcard dd {
width: 60%;
}
aside #profile-extra-links ul {
- padding: 0px;
- margin: 0px;
+ padding: 0;
+ margin: 0;
}
aside #profile-extra-links li {
- padding: 0px;
- margin: 0px;
+ padding: 0.2em 0;
+ margin: 0;
list-style: none;
}
aside #wallmessage-link {
@@ -858,7 +888,7 @@ aside #dfrn-request-link {
-webkit-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
color: #ffffff;
- background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+ background: #005c94 url('icons/connect-bg.png') no-repeat left center;
font-weight: bold;
text-transform: uppercase;
padding: 4px 2px 2px 35px;
@@ -867,6 +897,21 @@ aside #dfrn-request-link:hover {
text-decoration: none;
background-color: #19aeff;
}
+aside #subscribe-feed-link {
+ display: block;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+ color: #ffffff;
+ background: #005c94 url('icons/rss-bg.png') no-repeat left center;
+ font-weight: bold;
+ text-transform: uppercase;
+ padding: 4px 2px 2px 35px;
+}
+aside #subscribe-feed-link:hover {
+ text-decoration: none;
+ background-color: #19aeff;
+}
aside #profiles-menu {
width: 20em;
}
@@ -881,11 +926,11 @@ aside .posted-date-selector-months {
}
#contact-block .contact-block-h4 {
float: left;
- margin: 5px 0px;
+ margin: 5px 0;
}
#contact-block .allcontact-link {
float: right;
- margin: 5px 0px;
+ margin: 5px 0;
}
#contact-block .contact-block-content {
clear: both;
@@ -894,7 +939,7 @@ aside .posted-date-selector-months {
}
#contact-block .contact-block-link {
float: left;
- margin: 0px 2px 2px 0px;
+ margin: 0 2px 2px 0;
}
#contact-block .contact-block-link img {
width: 48px;
@@ -957,12 +1002,12 @@ aside .posted-date-selector-months {
/* widget */
.widget {
margin-bottom: 2em;
- /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
- .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+ /*.action .s10 { width: 10px; overflow: hidden; padding: 0;}
+ .action .s16 { width: 16px; overflow: hidden; padding: 0;}*/
}
.widget h3 {
- padding: 0px;
+ padding: 0;
margin: 2px;
}
.widget .action {
@@ -1006,7 +1051,7 @@ aside .posted-date-selector-months {
transition: all 0.2s ease-in-out;
}
.widget ul {
- padding: 0px;
+ padding: 0;
}
.widget ul li {
padding-left: 16px;
@@ -1016,6 +1061,21 @@ aside .posted-date-selector-months {
.widget .tool.selected {
background: url('../../../images/selected.png') no-repeat left center;
}
+.widget .notify {
+ display: none;
+ background-color: #19AEFF;
+ border-radius: 5px;
+ font-size: 10px;
+ padding: 1px 3px;
+ min-width: 15px;
+ text-align: right;
+ float: right;
+ color: #ffffff;
+ margin-right: 10px;
+}
+.widget .notify.on {
+ display: block;
+}
/* widget: search */
#add-search-popup {
width: 200px;
@@ -1026,7 +1086,7 @@ section {
display: table-cell;
vertical-align: top;
width: 770px;
- padding: 0px 20px 0px 10px;
+ padding: 0px 20px 0 10px;
}
.sparkle {
cursor: url('icons/lock.cur'), pointer;
@@ -1126,6 +1186,13 @@ section {
width: 20em;
margin-top: 0.5em;
}
+.wall-item-container .wall-item-actions-events {
+ float: left;
+ margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-events a {
+ margin-right: 3em;
+}
.wall-item-container .wall-item-actions-social {
float: left;
margin-top: 0.5em;
@@ -1152,13 +1219,13 @@ section {
}
.wall-item-container.comment .contact-photo-menu-button {
top: 15px !important;
- left: 0px !important;
+ left: 0 !important;
}
.wall-item-container.comment .wall-item-links {
padding-left: 12px;
}
.wall-item-container.comment .commentbox {
- height: 0px;
+ height: 0;
overflow: hidden;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -1168,7 +1235,7 @@ section {
}
.wall-item-container.comment .commentbox .wall-item-comment-wrapper {
border-top: 1px solid #999999;
- height: 0px;
+ height: 0;
overflow: hidden;
}
.wall-item-container.comment:hover .commentbox {
@@ -1181,7 +1248,7 @@ section {
transition: all 0.2s ease-in-out;
}
.wall-item-container.comment:hover .commentbox .wall-item-comment-wrapper {
- border-top: 0px;
+ border-top: 0;
height: auto;
overflow: visible;
}
@@ -1225,10 +1292,10 @@ section {
border: 1px solid #2d2d2d;
}
.wall-item-comment-wrapper.photo {
- margin: 1em 2em 1em 0px;
+ margin: 1em 2em 1em 0;
}
.threaded .wall-item-comment-wrapper {
- margin-left: 0px;
+ margin-left: 0;
}
.comment-edit-preview {
width: 710px;
@@ -1258,7 +1325,7 @@ section {
padding: 0;
margin: 10px 0;
background-color: #fce94f;
- border-bottom: 0px;
+ border-bottom: 0;
}
.comment-edit-preview .wall-item-conv {
display: none;
@@ -1312,7 +1379,7 @@ section {
color: #666666;
}
/*.filesavetags {
- padding: 3px 0px 3px 0px;
+ padding: 3px 0 3px 0;
opacity: 0.5;
}*/
.wwto {
@@ -1325,9 +1392,9 @@ section {
padding: 1px;
top: 40px;
left: 30px;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
}
.wwto .contact-photo {
width: 25px;
@@ -1346,10 +1413,10 @@ section {
max-width: 650px;
max-height: inital;
float: none;
- margin-right: 0px;
+ margin-right: 0;
}
.type-link blockquote {
- margin: 1em 0px;
+ margin: 1em 0;
max-height: 160px;
overflow: hidden;
padding-left: 1em;
@@ -1441,10 +1508,10 @@ blockquote.shared_content {
width: 500px;
}
.children .children .children .children .children .children {
- margin-left: 0px;
+ margin-left: 0;
}
.children .children .children .children .children .children .hide-comments-outer {
- margin-left: 0px;
+ margin-left: 0;
}
/*.threaded .hide-comments-outer { margin-left: 20px; }*/
span[id^="showmore-teaser"] {
@@ -1487,7 +1554,7 @@ span[id^="showmore-wrap"] {
display: block;
width: 100%;
background-color: #ffffff;
- border: 0px;
+ border: 0;
color: #2d2d2d;
text-align: left;
padding: 5px 10px;
@@ -1522,7 +1589,7 @@ span[id^="showmore-wrap"] {
width: 300px;
height: 90px;
padding-right: 10px;
- margin: 0 10px 10px 0px;
+ margin: 0 10px 10px 0;
}
.contact-wrapper .contact-photo-wrapper {
float: left;
@@ -1537,9 +1604,34 @@ span[id^="showmore-wrap"] {
height: 80px;
}
.contact-wrapper .contact-photo-menu-button {
- left: 0px;
+ left: 0;
top: 63px;
}
+.contact-wrapper .drop {
+ background-image: url('../../../images/icons/22/delete.png');
+ display: block;
+ width: 22px;
+ height: 22px;
+ position: relative;
+ top: 10px;
+ left: -10px;
+ z-index: 99;
+}
+.contact-wrapper .drophide {
+ background-image: url('../../../images/icons/22/delete.png');
+ display: block;
+ width: 22px;
+ height: 22px;
+ opacity: 0.3;
+ position: relative;
+ top: 10px;
+ left: -10px;
+ z-index: 99;
+}
+.contact-wrapper .contact-entry-connect {
+ padding-top: 5px;
+ font-weight: bold;
+}
.directory-item {
float: left;
width: 200px;
@@ -1555,7 +1647,7 @@ span[id^="showmore-wrap"] {
}
.contact-name {
font-weight: bold;
- padding-top: 15px;
+ /* padding-top: 15px; */
}
.contact-details {
color: #999999;
@@ -1569,7 +1661,7 @@ span[id^="showmore-wrap"] {
}
#jot {
width: 100%;
- margin: 0px 2em 20px 0px;
+ margin: 0 2em 20px 0;
}
#jot .profile-jot-text {
height: 1em;
@@ -1580,8 +1672,8 @@ span[id^="showmore-wrap"] {
padding: 0.3em;
}
#jot #jot-tools {
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
height: 40px;
overflow: none;
width: 770px;
@@ -1630,9 +1722,9 @@ span[id^="showmore-wrap"] {
border-left: 1px solid #666666;
}
#jot #jot-tools li.submit input {
- border: 0px;
- margin: 0px;
- padding: 0px;
+ border: 0;
+ margin: 0;
+ padding: 0;
background-color: #cccccc;
color: #666666;
width: 80px;
@@ -1656,8 +1748,8 @@ span[id^="showmore-wrap"] {
margin-top: 10px;
}
#jot #jot-title {
- border: 0px;
- margin: 0px;
+ border: 0;
+ margin: 0;
height: 20px;
width: 500px;
font-weight: bold;
@@ -1684,8 +1776,8 @@ span[id^="showmore-wrap"] {
padding-right: 20px;
}
#jot #jot-category {
- border: 0px;
- margin: 0px;
+ border: 0;
+ margin: 0;
height: 20px;
width: 200px;
border: 1px solid #ffffff;
@@ -1698,13 +1790,35 @@ span[id^="showmore-wrap"] {
}
/** buttons **/
/*input[type="submit"] {
- border: 0px;
+ border: 0;
background-color: @ButtonBackgroundColor;
color: @ButtonColor;
- padding: 0px 10px;
+ padding: 0 10px;
.rounded(5px);
height: 18px;
}*/
+a.actionbutton {
+ border: 1px solid #999999;
+ background-color: #cccccc;
+ color: #2d2d2d;
+ font-size: 8pt;
+ padding: 2pt;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+}
+a.actionbutton i.icon {
+ display: inline-block;
+ vertical-align: baseline;
+ padding: 0;
+}
+a.actionbutton:hover {
+ text-decoration: none;
+ background-color: #ffffff;
+}
+h2 > .actionbutton {
+ float: right;
+}
/** acl **/
#photo-edit-perms-select,
#photos-upload-permissions-wrapper,
@@ -1729,7 +1843,7 @@ span[id^="showmore-wrap"] {
background-image: url("../../../images/show_all_off.png");
background-position: 7px 7px;
background-repeat: no-repeat;
- padding: 7px 5px 0px 30px;
+ padding: 7px 5px 0 30px;
color: #999999;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
@@ -1764,8 +1878,8 @@ span[id^="showmore-wrap"] {
.acl-list-item p {
height: 12px;
font-size: 10px;
- margin: 0px;
- padding: 2px 0px 1px;
+ margin: 0;
+ padding: 2px 0 1px;
overflow: hidden;
}
.acl-list-item a {
@@ -1916,7 +2030,7 @@ ul.tabs li .active {
display: none!important;
}
.field.radio .field_help {
- margin-left: 0px;
+ margin-left: 0;
}
#profile-edit-links li {
list-style: none;
@@ -1999,11 +2113,27 @@ ul.tabs li .active {
width: 50px;
float: left;
}
+/* manage page */
+.identity-match-photo {
+ position: relative;
+}
+.identity-match-photo .manage-notify {
+ background-color: #19AEFF;
+ border-radius: 5px;
+ font-size: 10px;
+ padding: 1px 3px;
+ min-width: 15px;
+ text-align: right;
+ position: absolute;
+ right: 10px;
+ top: -5px;
+ color: #ffffff;
+}
/* videos page */
.videos .video-top-wrapper {
width: 200px;
float: left;
- margin: 0px 10px 10px 0px;
+ margin: 0 10px 10px 0;
position: relative;
}
.videos .video-top-wrapper .video-js {
@@ -2013,8 +2143,8 @@ ul.tabs li .active {
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
- right: 0px;
- top: 0px;
+ right: 0;
+ top: 0;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
@@ -2041,7 +2171,7 @@ ul.tabs li .active {
}
#photo-top-upload-link,
.photos-upload-link {
- margin: 1em 0px;
+ margin: 1em 0;
display: block;
}
.photos-upload-link a,
@@ -2052,7 +2182,7 @@ ul.tabs li .active {
.photo-top-image-wrapper,
.photo-album-image-wrapper {
float: left;
- margin: 0px 10px 10px 0px;
+ margin: 0 10px 10px 0;
width: 150px;
height: 150px;
position: relative;
@@ -2084,10 +2214,10 @@ ul.tabs li .active {
.photo-album-image-wrapper:hover .photo-top-album-name,
.photo-top-image-wrapper:hover .caption,
.photo-album-image-wrapper:hover .caption {
- bottom: 0px;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ bottom: 0;
+ -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
-webkit-transition: all 0.5s ease-in-out;
-moz-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out;
@@ -2098,7 +2228,7 @@ ul.tabs li .active {
display: block;
width: 660px;
padding: 50px;
- margin-bottom: 0px;
+ margin-bottom: 0;
text-align: center;
background-color: #999999;
}
@@ -2183,7 +2313,7 @@ ul.tabs li .active {
height: 80px;
}
.profile-match-wrapper .contact-photo-menu-button {
- left: 0px;
+ left: 0;
top: 63px;
}
/* messages */
@@ -2197,7 +2327,7 @@ ul.tabs li .active {
text-align: center;
display: block;
font-weight: bold;
- padding: 1em 0px;
+ padding: 1em 0;
}
.mail-list-wrapper {
background-color: #f6f7f8;
@@ -2214,7 +2344,7 @@ ul.tabs li .active {
}
.mail-list-wrapper .mail-subject {
width: 30%;
- padding: 4px 0px 0px 4px;
+ padding: 4px 0 0 4px;
}
.mail-list-wrapper .mail-subject a {
display: block;
@@ -2223,18 +2353,65 @@ ul.tabs li .active {
font-weight: bold;
}
.mail-list-wrapper .mail-date {
- padding: 4px 4px 0px 4px;
+ padding: 4px 4px 0 4px;
}
.mail-list-wrapper .mail-from {
- padding: 4px 4px 0px 4px;
+ padding: 4px 4px 0 4px;
}
.mail-list-wrapper .mail-count {
- padding: 4px 4px 0px 4px;
+ padding: 4px 4px 0 4px;
text-align: right;
}
.mail-list-wrapper .mail-delete {
float: right;
}
+#message-preview {
+ margin-top: 1em;
+ box-sizing: border-box;
+}
+#message-preview * {
+ box-sizing: border-box;
+ white-space: nowrap;
+}
+#message-preview .mail-list-wrapper .mail-subject {
+ width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-date {
+ font-size: 0.8em;
+ width: 25%;
+ text-align: right;
+}
+#message-preview .mail-list-wrapper .mail-from {
+ font-size: 0.8em;
+ width: 75%;
+}
+#message-preview .mail-list-wrapper .mail-count {
+ font-size: 0.8em;
+ width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-delete {
+ display: none;
+}
+#message-preview .mail-list-wrapper .mail-date,
+#message-preview .mail-list-wrapper .mail-from,
+#message-preview .mail-list-wrapper .mail-count {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+#message-preview .mail-list-wrapper:hover .mail-date,
+#message-preview .mail-list-wrapper:hover .mail-from,
+#message-preview .mail-list-wrapper:hover .mail-count {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
#mail-display-subject {
background-color: #f6f7f8;
color: #2d2d2d;
@@ -2246,7 +2423,7 @@ ul.tabs li .active {
#mail-display-subject span {
float: left;
overflow: hidden;
- padding: 4px 0px 0px 10px;
+ padding: 4px 0 0 10px;
}
#mail-display-subject .mail-delete {
float: right;
@@ -2322,8 +2499,8 @@ footer {
text-align: right;
}
#adminpage #pluginslist {
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
}
#adminpage .plugin {
list-style: none;
@@ -2343,7 +2520,7 @@ footer {
#adminpage table {
width: 100%;
border-bottom: 1px solid #000000;
- margin: 5px 0px;
+ margin: 5px 0;
}
#adminpage table th {
text-align: left;
@@ -2369,8 +2546,8 @@ footer {
.comment-edit-bb {
list-style: none;
display: none;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
width: 75%;
}
.comment-edit-bb > li {
@@ -2389,49 +2566,49 @@ footer {
background-color: #ccc;
}
.boldbb {
- background-position: 0px 0px;
+ background-position: 0 0;
}
.boldbb:hover {
- background-position: 0px -16px;
+ background-position: 0 -16px;
}
.italicbb {
- background-position: -16px 0px;
+ background-position: -16px 0;
}
.italicbb:hover {
background-position: -16px -16px;
}
.underlinebb {
- background-position: -32px 0px;
+ background-position: -32px 0;
}
.underlinebb:hover {
background-position: -32px -16px;
}
.quotebb {
- background-position: -48px 0px;
+ background-position: -48px 0;
}
.quotebb:hover {
background-position: -48px -16px;
}
.codebb {
- background-position: -64px 0px;
+ background-position: -64px 0;
}
.codebb:hover {
background-position: -64px -16px;
}
.imagebb {
- background-position: -80px 0px;
+ background-position: -80px 0;
}
.imagebb:hover {
background-position: -80px -16px;
}
.urlbb {
- background-position: -96px 0px;
+ background-position: -96px 0;
}
.urlbb:hover {
background-position: -96px -16px;
}
.videobb {
- background-position: -112px 0px;
+ background-position: -112px 0;
}
.videobb:hover {
background-position: -112px -16px;
@@ -2444,7 +2621,7 @@ footer {
cursor: pointer;
border: 1px solid #333;
width: 200px;
- margin: 10px 0px 10px 0px;
+ margin: 10px 0 10px 0;
float: left;
}
/* progress bar (enabled with progress: true) */
@@ -2468,16 +2645,16 @@ footer {
-moz-border-radius: 0 0 5px 5px;
-webkit-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
/* the input field */
.range {
width: 20px!important;
font-size: 8pt;
margin-left: 10px;
- border: 0px;
+ border: 0;
color: #999999;
}
/* buttons for the event view */
@@ -2489,7 +2666,7 @@ footer {
.fbrowser {
overflow: auto;
position: absolute;
- top: 0px;
+ top: 0;
width: 100%;
height: 100%;
}
@@ -2498,7 +2675,7 @@ footer {
}
.fbrowser .path a {
padding: 5px;
- margin: 0px 2px;
+ margin: 0 2px;
display: inline-block;
}
.fbrowser .path a,
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index e49a0b16c..4c50fb35f 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -422,7 +422,7 @@ body {
font-size: 11px;
background-color: #ffffff;
color: #2d2d2d;
- margin: 50px 0px 0px 0px;
+ margin: 50px 0 0 0;
display: table;
}
h4 {
@@ -484,14 +484,14 @@ code {
width: 10em;
background: #ffffff;
color: #2d2d2d;
- margin: 0px;
+ margin: 0;
padding: 1em;
list-style: none;
border: 3px solid #364e59;
z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
/* tool */
.tool {
@@ -540,9 +540,9 @@ header {
position: fixed;
left: 43%;
right: 43%;
- top: 0px;
- margin: 0px;
- padding: 0px;
+ top: 0;
+ margin: 0;
+ padding: 0;
/*width: 100%; height: 12px; */
z-index: 110;
@@ -578,15 +578,15 @@ nav {
width: 100%;
height: 32px;
position: fixed;
- left: 0px;
- top: 0px;
- padding: 0px;
+ left: 0;
+ top: 0;
+ padding: 0;
background-color: #009100;
color: #ffffff;
z-index: 100;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
}
nav a,
nav a:active,
@@ -598,24 +598,24 @@ nav a:hover {
outline: none;
}
nav ul {
- margin: 0px;
- padding: 0px 20px;
+ margin: 0;
+ padding: 0 20px;
}
nav ul li {
list-style: none;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
float: left;
}
nav ul li .menu-popup {
- left: 0px;
+ left: 0;
right: auto;
}
nav .nav-menu-icon {
position: relative;
height: 22px;
padding: 5px;
- margin: 0px 10px;
+ margin: 0 10px;
-moz-border-radius: 5px 5px 0 0;
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
@@ -634,7 +634,7 @@ nav .nav-menu {
position: relative;
height: 16px;
padding: 5px;
- margin: 3px 15px 0px;
+ margin: 3px 15px 0;
font-size: 14px;
border-bottom: 3px solid #009100;
}
@@ -650,7 +650,7 @@ nav .nav-notify {
border-radius: 5px 5px 5px 5px;
font-size: 10px;
padding: 1px 3px;
- top: 0px;
+ top: 0;
right: -10px;
min-width: 15px;
text-align: right;
@@ -670,7 +670,7 @@ nav #nav-search-link .menu-popup,
nav #nav-directory-link .menu-popup,
nav #nav-apps-link .menu-popup,
nav #nav-site-linkmenu .menu-popup {
- right: 0px;
+ right: 0;
left: auto;
}
nav #nav-notifications-linkmenu.on .icon.s22.notify,
@@ -694,14 +694,14 @@ ul.menu-popup {
width: 10em;
background: #ffffff;
color: #2d2d2d;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
list-style: none;
border: 3px solid #364e59;
z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
ul.menu-popup a {
display: block;
@@ -752,9 +752,9 @@ ul.menu-popup .toolbar a:hover {
border: 1px solid #364e59;
overflow: auto;
z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
.autocomplete > div,
.acpopupitem {
@@ -792,12 +792,35 @@ ul.menu-popup .toolbar a:hover {
color: #9eabb0;
display: block;
}
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+ width: 100%;
+ min-height: 100px;
+ background-color: #eff0f1;
+ border-bottom: 1px solid #cccccc;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network {
+ float: none;
+ width: auto;
+ height: auto;
+ padding: 10px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network {
+ font-size: 22px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network {
+ font-size: 24.5px;
+ font-weight: normal;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details {
+ font-size: 12px;
+}
/* aside 230px*/
aside {
display: table-cell;
vertical-align: top;
width: 200px;
- padding: 0px 10px 0px 20px;
+ padding: 0px 10px 0 20px;
border-right: 1px solid #bdcdd4;
}
aside .profile-edit-side-div {
@@ -811,13 +834,20 @@ aside .vcard .fn {
aside .vcard .title {
margin-bottom: 5px;
}
+aside .vcard .p-addr {
+ margin-bottom: 5px;
+}
+aside .vcard .account-type {
+ font-size: 14px;
+ margin-bottom: 13px;
+}
aside .vcard dl {
height: auto;
overflow: auto;
}
aside .vcard dt {
float: left;
- margin-left: 0px;
+ margin-left: 0;
width: 35%;
text-align: right;
color: #999999;
@@ -828,12 +858,12 @@ aside .vcard dd {
width: 60%;
}
aside #profile-extra-links ul {
- padding: 0px;
- margin: 0px;
+ padding: 0;
+ margin: 0;
}
aside #profile-extra-links li {
- padding: 0px;
- margin: 0px;
+ padding: 0.2em 0;
+ margin: 0;
list-style: none;
}
aside #wallmessage-link {
@@ -858,7 +888,7 @@ aside #dfrn-request-link {
-webkit-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
color: #ffffff;
- background: #009100 url('../../../images/connect-bg.png') no-repeat left center;
+ background: #009100 url('icons/connect-bg.png') no-repeat left center;
font-weight: bold;
text-transform: uppercase;
padding: 4px 2px 2px 35px;
@@ -867,6 +897,21 @@ aside #dfrn-request-link:hover {
text-decoration: none;
background-color: #ccff42;
}
+aside #subscribe-feed-link {
+ display: block;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+ color: #ffffff;
+ background: #009100 url('icons/rss-bg.png') no-repeat left center;
+ font-weight: bold;
+ text-transform: uppercase;
+ padding: 4px 2px 2px 35px;
+}
+aside #subscribe-feed-link:hover {
+ text-decoration: none;
+ background-color: #ccff42;
+}
aside #profiles-menu {
width: 20em;
}
@@ -881,11 +926,11 @@ aside .posted-date-selector-months {
}
#contact-block .contact-block-h4 {
float: left;
- margin: 5px 0px;
+ margin: 5px 0;
}
#contact-block .allcontact-link {
float: right;
- margin: 5px 0px;
+ margin: 5px 0;
}
#contact-block .contact-block-content {
clear: both;
@@ -894,7 +939,7 @@ aside .posted-date-selector-months {
}
#contact-block .contact-block-link {
float: left;
- margin: 0px 2px 2px 0px;
+ margin: 0 2px 2px 0;
}
#contact-block .contact-block-link img {
width: 48px;
@@ -957,12 +1002,12 @@ aside .posted-date-selector-months {
/* widget */
.widget {
margin-bottom: 2em;
- /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
- .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+ /*.action .s10 { width: 10px; overflow: hidden; padding: 0;}
+ .action .s16 { width: 16px; overflow: hidden; padding: 0;}*/
}
.widget h3 {
- padding: 0px;
+ padding: 0;
margin: 2px;
}
.widget .action {
@@ -1006,7 +1051,7 @@ aside .posted-date-selector-months {
transition: all 0.2s ease-in-out;
}
.widget ul {
- padding: 0px;
+ padding: 0;
}
.widget ul li {
padding-left: 16px;
@@ -1016,6 +1061,21 @@ aside .posted-date-selector-months {
.widget .tool.selected {
background: url('../../../images/selected.png') no-repeat left center;
}
+.widget .notify {
+ display: none;
+ background-color: #19AEFF;
+ border-radius: 5px;
+ font-size: 10px;
+ padding: 1px 3px;
+ min-width: 15px;
+ text-align: right;
+ float: right;
+ color: #ffffff;
+ margin-right: 10px;
+}
+.widget .notify.on {
+ display: block;
+}
/* widget: search */
#add-search-popup {
width: 200px;
@@ -1026,7 +1086,7 @@ section {
display: table-cell;
vertical-align: top;
width: 770px;
- padding: 0px 20px 0px 10px;
+ padding: 0px 20px 0 10px;
}
.sparkle {
cursor: url('icons/lock.cur'), pointer;
@@ -1126,6 +1186,13 @@ section {
width: 20em;
margin-top: 0.5em;
}
+.wall-item-container .wall-item-actions-events {
+ float: left;
+ margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-events a {
+ margin-right: 3em;
+}
.wall-item-container .wall-item-actions-social {
float: left;
margin-top: 0.5em;
@@ -1152,13 +1219,13 @@ section {
}
.wall-item-container.comment .contact-photo-menu-button {
top: 15px !important;
- left: 0px !important;
+ left: 0 !important;
}
.wall-item-container.comment .wall-item-links {
padding-left: 12px;
}
.wall-item-container.comment .commentbox {
- height: 0px;
+ height: 0;
overflow: hidden;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -1168,7 +1235,7 @@ section {
}
.wall-item-container.comment .commentbox .wall-item-comment-wrapper {
border-top: 1px solid #999999;
- height: 0px;
+ height: 0;
overflow: hidden;
}
.wall-item-container.comment:hover .commentbox {
@@ -1181,7 +1248,7 @@ section {
transition: all 0.2s ease-in-out;
}
.wall-item-container.comment:hover .commentbox .wall-item-comment-wrapper {
- border-top: 0px;
+ border-top: 0;
height: auto;
overflow: visible;
}
@@ -1225,10 +1292,10 @@ section {
border: 1px solid #2d2d2d;
}
.wall-item-comment-wrapper.photo {
- margin: 1em 2em 1em 0px;
+ margin: 1em 2em 1em 0;
}
.threaded .wall-item-comment-wrapper {
- margin-left: 0px;
+ margin-left: 0;
}
.comment-edit-preview {
width: 710px;
@@ -1258,7 +1325,7 @@ section {
padding: 0;
margin: 10px 0;
background-color: #ddffdd;
- border-bottom: 0px;
+ border-bottom: 0;
}
.comment-edit-preview .wall-item-conv {
display: none;
@@ -1312,7 +1379,7 @@ section {
color: #666666;
}
/*.filesavetags {
- padding: 3px 0px 3px 0px;
+ padding: 3px 0 3px 0;
opacity: 0.5;
}*/
.wwto {
@@ -1325,9 +1392,9 @@ section {
padding: 1px;
top: 40px;
left: 30px;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
}
.wwto .contact-photo {
width: 25px;
@@ -1346,10 +1413,10 @@ section {
max-width: 650px;
max-height: inital;
float: none;
- margin-right: 0px;
+ margin-right: 0;
}
.type-link blockquote {
- margin: 1em 0px;
+ margin: 1em 0;
max-height: 160px;
overflow: hidden;
padding-left: 1em;
@@ -1441,10 +1508,10 @@ blockquote.shared_content {
width: 500px;
}
.children .children .children .children .children .children {
- margin-left: 0px;
+ margin-left: 0;
}
.children .children .children .children .children .children .hide-comments-outer {
- margin-left: 0px;
+ margin-left: 0;
}
/*.threaded .hide-comments-outer { margin-left: 20px; }*/
span[id^="showmore-teaser"] {
@@ -1487,7 +1554,7 @@ span[id^="showmore-wrap"] {
display: block;
width: 100%;
background-color: #ffffff;
- border: 0px;
+ border: 0;
color: #2d2d2d;
text-align: left;
padding: 5px 10px;
@@ -1522,7 +1589,7 @@ span[id^="showmore-wrap"] {
width: 300px;
height: 90px;
padding-right: 10px;
- margin: 0 10px 10px 0px;
+ margin: 0 10px 10px 0;
}
.contact-wrapper .contact-photo-wrapper {
float: left;
@@ -1537,9 +1604,34 @@ span[id^="showmore-wrap"] {
height: 80px;
}
.contact-wrapper .contact-photo-menu-button {
- left: 0px;
+ left: 0;
top: 63px;
}
+.contact-wrapper .drop {
+ background-image: url('../../../images/icons/22/delete.png');
+ display: block;
+ width: 22px;
+ height: 22px;
+ position: relative;
+ top: 10px;
+ left: -10px;
+ z-index: 99;
+}
+.contact-wrapper .drophide {
+ background-image: url('../../../images/icons/22/delete.png');
+ display: block;
+ width: 22px;
+ height: 22px;
+ opacity: 0.3;
+ position: relative;
+ top: 10px;
+ left: -10px;
+ z-index: 99;
+}
+.contact-wrapper .contact-entry-connect {
+ padding-top: 5px;
+ font-weight: bold;
+}
.directory-item {
float: left;
width: 200px;
@@ -1555,7 +1647,7 @@ span[id^="showmore-wrap"] {
}
.contact-name {
font-weight: bold;
- padding-top: 15px;
+ /* padding-top: 15px; */
}
.contact-details {
color: #999999;
@@ -1569,7 +1661,7 @@ span[id^="showmore-wrap"] {
}
#jot {
width: 100%;
- margin: 0px 2em 20px 0px;
+ margin: 0 2em 20px 0;
}
#jot .profile-jot-text {
height: 1em;
@@ -1580,8 +1672,8 @@ span[id^="showmore-wrap"] {
padding: 0.3em;
}
#jot #jot-tools {
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
height: 40px;
overflow: none;
width: 770px;
@@ -1630,9 +1722,9 @@ span[id^="showmore-wrap"] {
border-left: 1px solid #666666;
}
#jot #jot-tools li.submit input {
- border: 0px;
- margin: 0px;
- padding: 0px;
+ border: 0;
+ margin: 0;
+ padding: 0;
background-color: #cccccc;
color: #666666;
width: 80px;
@@ -1656,8 +1748,8 @@ span[id^="showmore-wrap"] {
margin-top: 10px;
}
#jot #jot-title {
- border: 0px;
- margin: 0px;
+ border: 0;
+ margin: 0;
height: 20px;
width: 500px;
font-weight: bold;
@@ -1684,8 +1776,8 @@ span[id^="showmore-wrap"] {
padding-right: 20px;
}
#jot #jot-category {
- border: 0px;
- margin: 0px;
+ border: 0;
+ margin: 0;
height: 20px;
width: 200px;
border: 1px solid #ffffff;
@@ -1698,13 +1790,35 @@ span[id^="showmore-wrap"] {
}
/** buttons **/
/*input[type="submit"] {
- border: 0px;
+ border: 0;
background-color: @ButtonBackgroundColor;
color: @ButtonColor;
- padding: 0px 10px;
+ padding: 0 10px;
.rounded(5px);
height: 18px;
}*/
+a.actionbutton {
+ border: 1px solid #999999;
+ background-color: #cccccc;
+ color: #2d2d2d;
+ font-size: 8pt;
+ padding: 2pt;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+}
+a.actionbutton i.icon {
+ display: inline-block;
+ vertical-align: baseline;
+ padding: 0;
+}
+a.actionbutton:hover {
+ text-decoration: none;
+ background-color: #ffffff;
+}
+h2 > .actionbutton {
+ float: right;
+}
/** acl **/
#photo-edit-perms-select,
#photos-upload-permissions-wrapper,
@@ -1729,7 +1843,7 @@ span[id^="showmore-wrap"] {
background-image: url("../../../images/show_all_off.png");
background-position: 7px 7px;
background-repeat: no-repeat;
- padding: 7px 5px 0px 30px;
+ padding: 7px 5px 0 30px;
color: #999999;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
@@ -1764,8 +1878,8 @@ span[id^="showmore-wrap"] {
.acl-list-item p {
height: 12px;
font-size: 10px;
- margin: 0px;
- padding: 2px 0px 1px;
+ margin: 0;
+ padding: 2px 0 1px;
overflow: hidden;
}
.acl-list-item a {
@@ -1916,7 +2030,7 @@ ul.tabs li .active {
display: none!important;
}
.field.radio .field_help {
- margin-left: 0px;
+ margin-left: 0;
}
#profile-edit-links li {
list-style: none;
@@ -1999,11 +2113,27 @@ ul.tabs li .active {
width: 50px;
float: left;
}
+/* manage page */
+.identity-match-photo {
+ position: relative;
+}
+.identity-match-photo .manage-notify {
+ background-color: #19AEFF;
+ border-radius: 5px;
+ font-size: 10px;
+ padding: 1px 3px;
+ min-width: 15px;
+ text-align: right;
+ position: absolute;
+ right: 10px;
+ top: -5px;
+ color: #ffffff;
+}
/* videos page */
.videos .video-top-wrapper {
width: 200px;
float: left;
- margin: 0px 10px 10px 0px;
+ margin: 0 10px 10px 0;
position: relative;
}
.videos .video-top-wrapper .video-js {
@@ -2013,8 +2143,8 @@ ul.tabs li .active {
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
- right: 0px;
- top: 0px;
+ right: 0;
+ top: 0;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
@@ -2041,7 +2171,7 @@ ul.tabs li .active {
}
#photo-top-upload-link,
.photos-upload-link {
- margin: 1em 0px;
+ margin: 1em 0;
display: block;
}
.photos-upload-link a,
@@ -2052,7 +2182,7 @@ ul.tabs li .active {
.photo-top-image-wrapper,
.photo-album-image-wrapper {
float: left;
- margin: 0px 10px 10px 0px;
+ margin: 0 10px 10px 0;
width: 150px;
height: 150px;
position: relative;
@@ -2084,10 +2214,10 @@ ul.tabs li .active {
.photo-album-image-wrapper:hover .photo-top-album-name,
.photo-top-image-wrapper:hover .caption,
.photo-album-image-wrapper:hover .caption {
- bottom: 0px;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ bottom: 0;
+ -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
-webkit-transition: all 0.5s ease-in-out;
-moz-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out;
@@ -2098,7 +2228,7 @@ ul.tabs li .active {
display: block;
width: 660px;
padding: 50px;
- margin-bottom: 0px;
+ margin-bottom: 0;
text-align: center;
background-color: #999999;
}
@@ -2183,7 +2313,7 @@ ul.tabs li .active {
height: 80px;
}
.profile-match-wrapper .contact-photo-menu-button {
- left: 0px;
+ left: 0;
top: 63px;
}
/* messages */
@@ -2197,7 +2327,7 @@ ul.tabs li .active {
text-align: center;
display: block;
font-weight: bold;
- padding: 1em 0px;
+ padding: 1em 0;
}
.mail-list-wrapper {
background-color: #f6f7f8;
@@ -2214,7 +2344,7 @@ ul.tabs li .active {
}
.mail-list-wrapper .mail-subject {
width: 30%;
- padding: 4px 0px 0px 4px;
+ padding: 4px 0 0 4px;
}
.mail-list-wrapper .mail-subject a {
display: block;
@@ -2223,18 +2353,65 @@ ul.tabs li .active {
font-weight: bold;
}
.mail-list-wrapper .mail-date {
- padding: 4px 4px 0px 4px;
+ padding: 4px 4px 0 4px;
}
.mail-list-wrapper .mail-from {
- padding: 4px 4px 0px 4px;
+ padding: 4px 4px 0 4px;
}
.mail-list-wrapper .mail-count {
- padding: 4px 4px 0px 4px;
+ padding: 4px 4px 0 4px;
text-align: right;
}
.mail-list-wrapper .mail-delete {
float: right;
}
+#message-preview {
+ margin-top: 1em;
+ box-sizing: border-box;
+}
+#message-preview * {
+ box-sizing: border-box;
+ white-space: nowrap;
+}
+#message-preview .mail-list-wrapper .mail-subject {
+ width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-date {
+ font-size: 0.8em;
+ width: 25%;
+ text-align: right;
+}
+#message-preview .mail-list-wrapper .mail-from {
+ font-size: 0.8em;
+ width: 75%;
+}
+#message-preview .mail-list-wrapper .mail-count {
+ font-size: 0.8em;
+ width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-delete {
+ display: none;
+}
+#message-preview .mail-list-wrapper .mail-date,
+#message-preview .mail-list-wrapper .mail-from,
+#message-preview .mail-list-wrapper .mail-count {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+#message-preview .mail-list-wrapper:hover .mail-date,
+#message-preview .mail-list-wrapper:hover .mail-from,
+#message-preview .mail-list-wrapper:hover .mail-count {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
#mail-display-subject {
background-color: #f6f7f8;
color: #2d2d2d;
@@ -2246,7 +2423,7 @@ ul.tabs li .active {
#mail-display-subject span {
float: left;
overflow: hidden;
- padding: 4px 0px 0px 10px;
+ padding: 4px 0 0 10px;
}
#mail-display-subject .mail-delete {
float: right;
@@ -2322,8 +2499,8 @@ footer {
text-align: right;
}
#adminpage #pluginslist {
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
}
#adminpage .plugin {
list-style: none;
@@ -2343,7 +2520,7 @@ footer {
#adminpage table {
width: 100%;
border-bottom: 1px solid #000000;
- margin: 5px 0px;
+ margin: 5px 0;
}
#adminpage table th {
text-align: left;
@@ -2369,8 +2546,8 @@ footer {
.comment-edit-bb {
list-style: none;
display: none;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
width: 75%;
}
.comment-edit-bb > li {
@@ -2389,49 +2566,49 @@ footer {
background-color: #ccc;
}
.boldbb {
- background-position: 0px 0px;
+ background-position: 0 0;
}
.boldbb:hover {
- background-position: 0px -16px;
+ background-position: 0 -16px;
}
.italicbb {
- background-position: -16px 0px;
+ background-position: -16px 0;
}
.italicbb:hover {
background-position: -16px -16px;
}
.underlinebb {
- background-position: -32px 0px;
+ background-position: -32px 0;
}
.underlinebb:hover {
background-position: -32px -16px;
}
.quotebb {
- background-position: -48px 0px;
+ background-position: -48px 0;
}
.quotebb:hover {
background-position: -48px -16px;
}
.codebb {
- background-position: -64px 0px;
+ background-position: -64px 0;
}
.codebb:hover {
background-position: -64px -16px;
}
.imagebb {
- background-position: -80px 0px;
+ background-position: -80px 0;
}
.imagebb:hover {
background-position: -80px -16px;
}
.urlbb {
- background-position: -96px 0px;
+ background-position: -96px 0;
}
.urlbb:hover {
background-position: -96px -16px;
}
.videobb {
- background-position: -112px 0px;
+ background-position: -112px 0;
}
.videobb:hover {
background-position: -112px -16px;
@@ -2444,7 +2621,7 @@ footer {
cursor: pointer;
border: 1px solid #333;
width: 200px;
- margin: 10px 0px 10px 0px;
+ margin: 10px 0 10px 0;
float: left;
}
/* progress bar (enabled with progress: true) */
@@ -2468,16 +2645,16 @@ footer {
-moz-border-radius: 0 0 5px 5px;
-webkit-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
/* the input field */
.range {
width: 20px!important;
font-size: 8pt;
margin-left: 10px;
- border: 0px;
+ border: 0;
color: #999999;
}
/* buttons for the event view */
@@ -2489,7 +2666,7 @@ footer {
.fbrowser {
overflow: auto;
position: absolute;
- top: 0px;
+ top: 0;
width: 100%;
height: 100%;
}
@@ -2498,7 +2675,7 @@ footer {
}
.fbrowser .path a {
padding: 5px;
- margin: 0px 2px;
+ margin: 0 2px;
display: inline-block;
}
.fbrowser .path a,
diff --git a/view/theme/quattro/icons/connect-bg.png b/view/theme/quattro/icons/connect-bg.png
new file mode 100644
index 000000000..0611c73e5
Binary files /dev/null and b/view/theme/quattro/icons/connect-bg.png differ
diff --git a/view/theme/quattro/icons/rss-bg.png b/view/theme/quattro/icons/rss-bg.png
new file mode 100644
index 000000000..1528c9c84
Binary files /dev/null and b/view/theme/quattro/icons/rss-bg.png differ
diff --git a/view/theme/quattro/js/quattro.js b/view/theme/quattro/js/quattro.js
new file mode 100644
index 000000000..259874a29
--- /dev/null
+++ b/view/theme/quattro/js/quattro.js
@@ -0,0 +1,150 @@
+$(document).ready(function(){
+ $('nav').bind('nav-update', function(e,data){
+ var notifCount = $(data).find('notif').attr('count');
+ var intro = $(data).find('intro').text();
+ var mail = $(data).find('mail').text();
+
+ $(".tool .notify").removeClass("on");
+ $(data).find("group").each(function() {
+ var gid = this.id;
+ var gcount = this.innerHTML;
+ $(".group-"+gid+" .notify").addClass("on").text(gcount);
+ });
+
+ $(".forum-widget-entry .notify").removeClass("on");
+ $(data).find("forum").each(function() {
+ var fid = this.id;
+ var fcount = this.innerHTML;
+ $(".forum-"+fid+" .notify").addClass("on").text(fcount);
+ });
+
+ console.log(intro,mail);
+
+ if (notifCount > 0 ) {
+ Tinycon.setBubble(notifCount);
+ } else {
+ Tinycon.setBubble('');
+ }
+
+ if (intro>0){
+ $("#nav-introductions-link").addClass("on");
+ } else {
+ $("#nav-introductions-link").removeClass("on");
+ }
+
+ if (mail>0){
+ $("#nav-messages-link").addClass("on");
+ } else {
+ $("#nav-messages-link").removeClass("on");
+ }
+
+ });
+
+ /*
+ * show and hide contact action buttons in
+ * contacts page on contacts' checkbox selection
+ */
+ $('.contact-select').bind('click', function(e) {
+ var y = e.clientY;
+ var elm = $("#contacts-actions");
+ y=y-40;
+ if (y<0) y=0;
+ if (y+elm.height() > $("html").height()) y=$("html").height()-elm.height();
+ elm.css('top', y+"px");
+ if ($(".contact-select:checked").length > 0) {
+ elm.show();
+ } else {
+ elm.hide();
+ }
+ });
+});
+
+function insertFormatting(comment,BBcode,id) {
+
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == comment) {
+ tmpStr = "";
+ $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+ $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+ openMenu("comment-edit-submit-wrapper-" + id);
+ $("#comment-edit-text-" + id).val(tmpStr);
+ }
+
+ textarea = document.getElementById("comment-edit-text-" +id);
+ if (document.selection) {
+ textarea.focus();
+ selected = document.selection.createRange();
+ if (BBcode == "url"){
+ selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
+ } else
+ selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+ } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+ var start = textarea.selectionStart;
+ var end = textarea.selectionEnd;
+ if (BBcode == "url"){
+ textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+ } else
+ textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+ }
+ return true;
+}
+
+function showThread(id) {
+ $("#collapsed-comments-" + id).show()
+ $("#collapsed-comments-" + id + " .collapsed-comments").show()
+}
+function hideThread(id) {
+ $("#collapsed-comments-" + id).hide()
+ $("#collapsed-comments-" + id + " .collapsed-comments").hide()
+}
+
+
+function cmtBbOpen(id) {
+ $("#comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+ $("#comment-edit-bb-" + id).hide();
+}
+
+$(document).ready(function() {
+
+ $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
+ $('.group-edit-icon').hover(
+ function() {
+ $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+ function() {
+ $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+ );
+
+ $('.sidebar-group-element').hover(
+ function() {
+ id = $(this).attr('id');
+ $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+ function() {
+ id = $(this).attr('id');
+ $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+ );
+
+
+ $('.savedsearchdrop').hover(
+ function() {
+ $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+ function() {
+ $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+ );
+
+ $('.savedsearchterm').hover(
+ function() {
+ id = $(this).attr('id');
+ $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+ function() {
+ id = $(this).attr('id');
+ $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+ );
+
+});
+
+
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 5ea6b40c3..7fb505dec 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -422,7 +422,7 @@ body {
font-size: 11px;
background-color: #f6ecf9;
color: #2d2d2d;
- margin: 50px 0px 0px 0px;
+ margin: 50px 0 0 0;
display: table;
}
h4 {
@@ -484,14 +484,14 @@ code {
width: 10em;
background: #ffffff;
color: #2d2d2d;
- margin: 0px;
+ margin: 0;
padding: 1em;
list-style: none;
border: 3px solid #364e59;
z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
/* tool */
.tool {
@@ -540,9 +540,9 @@ header {
position: fixed;
left: 43%;
right: 43%;
- top: 0px;
- margin: 0px;
- padding: 0px;
+ top: 0;
+ margin: 0;
+ padding: 0;
/*width: 100%; height: 12px; */
z-index: 110;
@@ -578,15 +578,15 @@ nav {
width: 100%;
height: 32px;
position: fixed;
- left: 0px;
- top: 0px;
- padding: 0px;
+ left: 0;
+ top: 0;
+ padding: 0;
background-color: #521f5c;
color: #ffffff;
z-index: 100;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
}
nav a,
nav a:active,
@@ -598,24 +598,24 @@ nav a:hover {
outline: none;
}
nav ul {
- margin: 0px;
- padding: 0px 20px;
+ margin: 0;
+ padding: 0 20px;
}
nav ul li {
list-style: none;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
float: left;
}
nav ul li .menu-popup {
- left: 0px;
+ left: 0;
right: auto;
}
nav .nav-menu-icon {
position: relative;
height: 22px;
padding: 5px;
- margin: 0px 10px;
+ margin: 0 10px;
-moz-border-radius: 5px 5px 0 0;
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
@@ -634,7 +634,7 @@ nav .nav-menu {
position: relative;
height: 16px;
padding: 5px;
- margin: 3px 15px 0px;
+ margin: 3px 15px 0;
font-size: 14px;
border-bottom: 3px solid #521f5c;
}
@@ -650,7 +650,7 @@ nav .nav-notify {
border-radius: 5px 5px 5px 5px;
font-size: 10px;
padding: 1px 3px;
- top: 0px;
+ top: 0;
right: -10px;
min-width: 15px;
text-align: right;
@@ -670,7 +670,7 @@ nav #nav-search-link .menu-popup,
nav #nav-directory-link .menu-popup,
nav #nav-apps-link .menu-popup,
nav #nav-site-linkmenu .menu-popup {
- right: 0px;
+ right: 0;
left: auto;
}
nav #nav-notifications-linkmenu.on .icon.s22.notify,
@@ -694,14 +694,14 @@ ul.menu-popup {
width: 10em;
background: #ffffff;
color: #2d2d2d;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
list-style: none;
border: 3px solid #364e59;
z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
ul.menu-popup a {
display: block;
@@ -752,9 +752,9 @@ ul.menu-popup .toolbar a:hover {
border: 1px solid #364e59;
overflow: auto;
z-index: 100000;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
.autocomplete > div,
.acpopupitem {
@@ -792,12 +792,35 @@ ul.menu-popup .toolbar a:hover {
color: #9eabb0;
display: block;
}
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+ width: 100%;
+ min-height: 100px;
+ background-color: #eff0f1;
+ border-bottom: 1px solid #cccccc;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network {
+ float: none;
+ width: auto;
+ height: auto;
+ padding: 10px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network {
+ font-size: 22px;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network {
+ font-size: 24.5px;
+ font-weight: normal;
+}
+#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details {
+ font-size: 12px;
+}
/* aside 230px*/
aside {
display: table-cell;
vertical-align: top;
width: 200px;
- padding: 0px 10px 0px 20px;
+ padding: 0px 10px 0 20px;
border-right: 1px solid #bdcdd4;
}
aside .profile-edit-side-div {
@@ -811,13 +834,20 @@ aside .vcard .fn {
aside .vcard .title {
margin-bottom: 5px;
}
+aside .vcard .p-addr {
+ margin-bottom: 5px;
+}
+aside .vcard .account-type {
+ font-size: 14px;
+ margin-bottom: 13px;
+}
aside .vcard dl {
height: auto;
overflow: auto;
}
aside .vcard dt {
float: left;
- margin-left: 0px;
+ margin-left: 0;
width: 35%;
text-align: right;
color: #999999;
@@ -828,12 +858,12 @@ aside .vcard dd {
width: 60%;
}
aside #profile-extra-links ul {
- padding: 0px;
- margin: 0px;
+ padding: 0;
+ margin: 0;
}
aside #profile-extra-links li {
- padding: 0px;
- margin: 0px;
+ padding: 0.2em 0;
+ margin: 0;
list-style: none;
}
aside #wallmessage-link {
@@ -858,7 +888,7 @@ aside #dfrn-request-link {
-webkit-border-radius: 5px 5px 5px 5px;
border-radius: 5px 5px 5px 5px;
color: #ffffff;
- background: #521f5c url('../../../images/connect-bg.png') no-repeat left center;
+ background: #521f5c url('icons/connect-bg.png') no-repeat left center;
font-weight: bold;
text-transform: uppercase;
padding: 4px 2px 2px 35px;
@@ -867,6 +897,21 @@ aside #dfrn-request-link:hover {
text-decoration: none;
background-color: #86608e;
}
+aside #subscribe-feed-link {
+ display: block;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+ color: #ffffff;
+ background: #521f5c url('icons/rss-bg.png') no-repeat left center;
+ font-weight: bold;
+ text-transform: uppercase;
+ padding: 4px 2px 2px 35px;
+}
+aside #subscribe-feed-link:hover {
+ text-decoration: none;
+ background-color: #86608e;
+}
aside #profiles-menu {
width: 20em;
}
@@ -881,11 +926,11 @@ aside .posted-date-selector-months {
}
#contact-block .contact-block-h4 {
float: left;
- margin: 5px 0px;
+ margin: 5px 0;
}
#contact-block .allcontact-link {
float: right;
- margin: 5px 0px;
+ margin: 5px 0;
}
#contact-block .contact-block-content {
clear: both;
@@ -894,7 +939,7 @@ aside .posted-date-selector-months {
}
#contact-block .contact-block-link {
float: left;
- margin: 0px 2px 2px 0px;
+ margin: 0 2px 2px 0;
}
#contact-block .contact-block-link img {
width: 48px;
@@ -957,12 +1002,12 @@ aside .posted-date-selector-months {
/* widget */
.widget {
margin-bottom: 2em;
- /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
- .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+ /*.action .s10 { width: 10px; overflow: hidden; padding: 0;}
+ .action .s16 { width: 16px; overflow: hidden; padding: 0;}*/
}
.widget h3 {
- padding: 0px;
+ padding: 0;
margin: 2px;
}
.widget .action {
@@ -1006,7 +1051,7 @@ aside .posted-date-selector-months {
transition: all 0.2s ease-in-out;
}
.widget ul {
- padding: 0px;
+ padding: 0;
}
.widget ul li {
padding-left: 16px;
@@ -1016,6 +1061,21 @@ aside .posted-date-selector-months {
.widget .tool.selected {
background: url('../../../images/selected.png') no-repeat left center;
}
+.widget .notify {
+ display: none;
+ background-color: #19AEFF;
+ border-radius: 5px;
+ font-size: 10px;
+ padding: 1px 3px;
+ min-width: 15px;
+ text-align: right;
+ float: right;
+ color: #ffffff;
+ margin-right: 10px;
+}
+.widget .notify.on {
+ display: block;
+}
/* widget: search */
#add-search-popup {
width: 200px;
@@ -1026,7 +1086,7 @@ section {
display: table-cell;
vertical-align: top;
width: 770px;
- padding: 0px 20px 0px 10px;
+ padding: 0px 20px 0 10px;
}
.sparkle {
cursor: url('icons/lock.cur'), pointer;
@@ -1126,6 +1186,13 @@ section {
width: 20em;
margin-top: 0.5em;
}
+.wall-item-container .wall-item-actions-events {
+ float: left;
+ margin-top: 0.5em;
+}
+.wall-item-container .wall-item-actions-events a {
+ margin-right: 3em;
+}
.wall-item-container .wall-item-actions-social {
float: left;
margin-top: 0.5em;
@@ -1152,13 +1219,13 @@ section {
}
.wall-item-container.comment .contact-photo-menu-button {
top: 15px !important;
- left: 0px !important;
+ left: 0 !important;
}
.wall-item-container.comment .wall-item-links {
padding-left: 12px;
}
.wall-item-container.comment .commentbox {
- height: 0px;
+ height: 0;
overflow: hidden;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
@@ -1168,7 +1235,7 @@ section {
}
.wall-item-container.comment .commentbox .wall-item-comment-wrapper {
border-top: 1px solid #999999;
- height: 0px;
+ height: 0;
overflow: hidden;
}
.wall-item-container.comment:hover .commentbox {
@@ -1181,7 +1248,7 @@ section {
transition: all 0.2s ease-in-out;
}
.wall-item-container.comment:hover .commentbox .wall-item-comment-wrapper {
- border-top: 0px;
+ border-top: 0;
height: auto;
overflow: visible;
}
@@ -1225,10 +1292,10 @@ section {
border: 1px solid #2d2d2d;
}
.wall-item-comment-wrapper.photo {
- margin: 1em 2em 1em 0px;
+ margin: 1em 2em 1em 0;
}
.threaded .wall-item-comment-wrapper {
- margin-left: 0px;
+ margin-left: 0;
}
.comment-edit-preview {
width: 710px;
@@ -1258,7 +1325,7 @@ section {
padding: 0;
margin: 10px 0;
background-color: #c0a3c7;
- border-bottom: 0px;
+ border-bottom: 0;
}
.comment-edit-preview .wall-item-conv {
display: none;
@@ -1312,7 +1379,7 @@ section {
color: #666666;
}
/*.filesavetags {
- padding: 3px 0px 3px 0px;
+ padding: 3px 0 3px 0;
opacity: 0.5;
}*/
.wwto {
@@ -1325,9 +1392,9 @@ section {
padding: 1px;
top: 40px;
left: 30px;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
}
.wwto .contact-photo {
width: 25px;
@@ -1346,10 +1413,10 @@ section {
max-width: 650px;
max-height: inital;
float: none;
- margin-right: 0px;
+ margin-right: 0;
}
.type-link blockquote {
- margin: 1em 0px;
+ margin: 1em 0;
max-height: 160px;
overflow: hidden;
padding-left: 1em;
@@ -1441,10 +1508,10 @@ blockquote.shared_content {
width: 500px;
}
.children .children .children .children .children .children {
- margin-left: 0px;
+ margin-left: 0;
}
.children .children .children .children .children .children .hide-comments-outer {
- margin-left: 0px;
+ margin-left: 0;
}
/*.threaded .hide-comments-outer { margin-left: 20px; }*/
span[id^="showmore-teaser"] {
@@ -1487,7 +1554,7 @@ span[id^="showmore-wrap"] {
display: block;
width: 100%;
background-color: #ffffff;
- border: 0px;
+ border: 0;
color: #2d2d2d;
text-align: left;
padding: 5px 10px;
@@ -1522,7 +1589,7 @@ span[id^="showmore-wrap"] {
width: 300px;
height: 90px;
padding-right: 10px;
- margin: 0 10px 10px 0px;
+ margin: 0 10px 10px 0;
}
.contact-wrapper .contact-photo-wrapper {
float: left;
@@ -1537,9 +1604,34 @@ span[id^="showmore-wrap"] {
height: 80px;
}
.contact-wrapper .contact-photo-menu-button {
- left: 0px;
+ left: 0;
top: 63px;
}
+.contact-wrapper .drop {
+ background-image: url('../../../images/icons/22/delete.png');
+ display: block;
+ width: 22px;
+ height: 22px;
+ position: relative;
+ top: 10px;
+ left: -10px;
+ z-index: 99;
+}
+.contact-wrapper .drophide {
+ background-image: url('../../../images/icons/22/delete.png');
+ display: block;
+ width: 22px;
+ height: 22px;
+ opacity: 0.3;
+ position: relative;
+ top: 10px;
+ left: -10px;
+ z-index: 99;
+}
+.contact-wrapper .contact-entry-connect {
+ padding-top: 5px;
+ font-weight: bold;
+}
.directory-item {
float: left;
width: 200px;
@@ -1555,7 +1647,7 @@ span[id^="showmore-wrap"] {
}
.contact-name {
font-weight: bold;
- padding-top: 15px;
+ /* padding-top: 15px; */
}
.contact-details {
color: #999999;
@@ -1569,7 +1661,7 @@ span[id^="showmore-wrap"] {
}
#jot {
width: 100%;
- margin: 0px 2em 20px 0px;
+ margin: 0 2em 20px 0;
}
#jot .profile-jot-text {
height: 1em;
@@ -1580,8 +1672,8 @@ span[id^="showmore-wrap"] {
padding: 0.3em;
}
#jot #jot-tools {
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
height: 40px;
overflow: none;
width: 770px;
@@ -1630,9 +1722,9 @@ span[id^="showmore-wrap"] {
border-left: 1px solid #666666;
}
#jot #jot-tools li.submit input {
- border: 0px;
- margin: 0px;
- padding: 0px;
+ border: 0;
+ margin: 0;
+ padding: 0;
background-color: #cccccc;
color: #666666;
width: 80px;
@@ -1656,8 +1748,8 @@ span[id^="showmore-wrap"] {
margin-top: 10px;
}
#jot #jot-title {
- border: 0px;
- margin: 0px;
+ border: 0;
+ margin: 0;
height: 20px;
width: 500px;
font-weight: bold;
@@ -1684,8 +1776,8 @@ span[id^="showmore-wrap"] {
padding-right: 20px;
}
#jot #jot-category {
- border: 0px;
- margin: 0px;
+ border: 0;
+ margin: 0;
height: 20px;
width: 200px;
border: 1px solid #f6ecf9;
@@ -1698,13 +1790,35 @@ span[id^="showmore-wrap"] {
}
/** buttons **/
/*input[type="submit"] {
- border: 0px;
+ border: 0;
background-color: @ButtonBackgroundColor;
color: @ButtonColor;
- padding: 0px 10px;
+ padding: 0 10px;
.rounded(5px);
height: 18px;
}*/
+a.actionbutton {
+ border: 1px solid #999999;
+ background-color: #cccccc;
+ color: #2d2d2d;
+ font-size: 8pt;
+ padding: 2pt;
+ -moz-border-radius: 5px 5px 5px 5px;
+ -webkit-border-radius: 5px 5px 5px 5px;
+ border-radius: 5px 5px 5px 5px;
+}
+a.actionbutton i.icon {
+ display: inline-block;
+ vertical-align: baseline;
+ padding: 0;
+}
+a.actionbutton:hover {
+ text-decoration: none;
+ background-color: #ffffff;
+}
+h2 > .actionbutton {
+ float: right;
+}
/** acl **/
#photo-edit-perms-select,
#photos-upload-permissions-wrapper,
@@ -1729,7 +1843,7 @@ span[id^="showmore-wrap"] {
background-image: url("../../../images/show_all_off.png");
background-position: 7px 7px;
background-repeat: no-repeat;
- padding: 7px 5px 0px 30px;
+ padding: 7px 5px 0 30px;
color: #999999;
-moz-border-radius: 5px 5px 5px 5px;
-webkit-border-radius: 5px 5px 5px 5px;
@@ -1764,8 +1878,8 @@ span[id^="showmore-wrap"] {
.acl-list-item p {
height: 12px;
font-size: 10px;
- margin: 0px;
- padding: 2px 0px 1px;
+ margin: 0;
+ padding: 2px 0 1px;
overflow: hidden;
}
.acl-list-item a {
@@ -1916,7 +2030,7 @@ ul.tabs li .active {
display: none!important;
}
.field.radio .field_help {
- margin-left: 0px;
+ margin-left: 0;
}
#profile-edit-links li {
list-style: none;
@@ -1999,11 +2113,27 @@ ul.tabs li .active {
width: 50px;
float: left;
}
+/* manage page */
+.identity-match-photo {
+ position: relative;
+}
+.identity-match-photo .manage-notify {
+ background-color: #19AEFF;
+ border-radius: 5px;
+ font-size: 10px;
+ padding: 1px 3px;
+ min-width: 15px;
+ text-align: right;
+ position: absolute;
+ right: 10px;
+ top: -5px;
+ color: #ffffff;
+}
/* videos page */
.videos .video-top-wrapper {
width: 200px;
float: left;
- margin: 0px 10px 10px 0px;
+ margin: 0 10px 10px 0;
position: relative;
}
.videos .video-top-wrapper .video-js {
@@ -2013,8 +2143,8 @@ ul.tabs li .active {
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
- right: 0px;
- top: 0px;
+ right: 0;
+ top: 0;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
@@ -2041,7 +2171,7 @@ ul.tabs li .active {
}
#photo-top-upload-link,
.photos-upload-link {
- margin: 1em 0px;
+ margin: 1em 0;
display: block;
}
.photos-upload-link a,
@@ -2052,7 +2182,7 @@ ul.tabs li .active {
.photo-top-image-wrapper,
.photo-album-image-wrapper {
float: left;
- margin: 0px 10px 10px 0px;
+ margin: 0 10px 10px 0;
width: 150px;
height: 150px;
position: relative;
@@ -2084,10 +2214,10 @@ ul.tabs li .active {
.photo-album-image-wrapper:hover .photo-top-album-name,
.photo-top-image-wrapper:hover .caption,
.photo-album-image-wrapper:hover .caption {
- bottom: 0px;
- -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+ bottom: 0;
+ -webkit-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0px 0 10px rgba(0, 0, 0, 0.7);
-webkit-transition: all 0.5s ease-in-out;
-moz-transition: all 0.5s ease-in-out;
-o-transition: all 0.5s ease-in-out;
@@ -2098,7 +2228,7 @@ ul.tabs li .active {
display: block;
width: 660px;
padding: 50px;
- margin-bottom: 0px;
+ margin-bottom: 0;
text-align: center;
background-color: #999999;
}
@@ -2183,7 +2313,7 @@ ul.tabs li .active {
height: 80px;
}
.profile-match-wrapper .contact-photo-menu-button {
- left: 0px;
+ left: 0;
top: 63px;
}
/* messages */
@@ -2197,7 +2327,7 @@ ul.tabs li .active {
text-align: center;
display: block;
font-weight: bold;
- padding: 1em 0px;
+ padding: 1em 0;
}
.mail-list-wrapper {
background-color: #f6f7f8;
@@ -2214,7 +2344,7 @@ ul.tabs li .active {
}
.mail-list-wrapper .mail-subject {
width: 30%;
- padding: 4px 0px 0px 4px;
+ padding: 4px 0 0 4px;
}
.mail-list-wrapper .mail-subject a {
display: block;
@@ -2223,18 +2353,65 @@ ul.tabs li .active {
font-weight: bold;
}
.mail-list-wrapper .mail-date {
- padding: 4px 4px 0px 4px;
+ padding: 4px 4px 0 4px;
}
.mail-list-wrapper .mail-from {
- padding: 4px 4px 0px 4px;
+ padding: 4px 4px 0 4px;
}
.mail-list-wrapper .mail-count {
- padding: 4px 4px 0px 4px;
+ padding: 4px 4px 0 4px;
text-align: right;
}
.mail-list-wrapper .mail-delete {
float: right;
}
+#message-preview {
+ margin-top: 1em;
+ box-sizing: border-box;
+}
+#message-preview * {
+ box-sizing: border-box;
+ white-space: nowrap;
+}
+#message-preview .mail-list-wrapper .mail-subject {
+ width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-date {
+ font-size: 0.8em;
+ width: 25%;
+ text-align: right;
+}
+#message-preview .mail-list-wrapper .mail-from {
+ font-size: 0.8em;
+ width: 75%;
+}
+#message-preview .mail-list-wrapper .mail-count {
+ font-size: 0.8em;
+ width: 100%;
+}
+#message-preview .mail-list-wrapper .mail-delete {
+ display: none;
+}
+#message-preview .mail-list-wrapper .mail-date,
+#message-preview .mail-list-wrapper .mail-from,
+#message-preview .mail-list-wrapper .mail-count {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+#message-preview .mail-list-wrapper:hover .mail-date,
+#message-preview .mail-list-wrapper:hover .mail-from,
+#message-preview .mail-list-wrapper:hover .mail-count {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
#mail-display-subject {
background-color: #f6f7f8;
color: #2d2d2d;
@@ -2246,7 +2423,7 @@ ul.tabs li .active {
#mail-display-subject span {
float: left;
overflow: hidden;
- padding: 4px 0px 0px 10px;
+ padding: 4px 0 0 10px;
}
#mail-display-subject .mail-delete {
float: right;
@@ -2322,8 +2499,8 @@ footer {
text-align: right;
}
#adminpage #pluginslist {
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
}
#adminpage .plugin {
list-style: none;
@@ -2343,7 +2520,7 @@ footer {
#adminpage table {
width: 100%;
border-bottom: 1px solid #000000;
- margin: 5px 0px;
+ margin: 5px 0;
}
#adminpage table th {
text-align: left;
@@ -2369,8 +2546,8 @@ footer {
.comment-edit-bb {
list-style: none;
display: none;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
width: 75%;
}
.comment-edit-bb > li {
@@ -2389,49 +2566,49 @@ footer {
background-color: #ccc;
}
.boldbb {
- background-position: 0px 0px;
+ background-position: 0 0;
}
.boldbb:hover {
- background-position: 0px -16px;
+ background-position: 0 -16px;
}
.italicbb {
- background-position: -16px 0px;
+ background-position: -16px 0;
}
.italicbb:hover {
background-position: -16px -16px;
}
.underlinebb {
- background-position: -32px 0px;
+ background-position: -32px 0;
}
.underlinebb:hover {
background-position: -32px -16px;
}
.quotebb {
- background-position: -48px 0px;
+ background-position: -48px 0;
}
.quotebb:hover {
background-position: -48px -16px;
}
.codebb {
- background-position: -64px 0px;
+ background-position: -64px 0;
}
.codebb:hover {
background-position: -64px -16px;
}
.imagebb {
- background-position: -80px 0px;
+ background-position: -80px 0;
}
.imagebb:hover {
background-position: -80px -16px;
}
.urlbb {
- background-position: -96px 0px;
+ background-position: -96px 0;
}
.urlbb:hover {
background-position: -96px -16px;
}
.videobb {
- background-position: -112px 0px;
+ background-position: -112px 0;
}
.videobb:hover {
background-position: -112px -16px;
@@ -2444,7 +2621,7 @@ footer {
cursor: pointer;
border: 1px solid #333;
width: 200px;
- margin: 10px 0px 10px 0px;
+ margin: 10px 0 10px 0;
float: left;
}
/* progress bar (enabled with progress: true) */
@@ -2468,16 +2645,16 @@ footer {
-moz-border-radius: 0 0 5px 5px;
-webkit-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
- -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
- box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.7);
}
/* the input field */
.range {
width: 20px!important;
font-size: 8pt;
margin-left: 10px;
- border: 0px;
+ border: 0;
color: #999999;
}
/* buttons for the event view */
@@ -2489,7 +2666,7 @@ footer {
.fbrowser {
overflow: auto;
position: absolute;
- top: 0px;
+ top: 0;
width: 100%;
height: 100%;
}
@@ -2498,7 +2675,7 @@ footer {
}
.fbrowser .path a {
padding: 5px;
- margin: 0px 2px;
+ margin: 0 2px;
display: inline-block;
}
.fbrowser .path a,
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 368e26c3a..d47263b50 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -6,12 +6,12 @@ body {
font-size: 11px;
background-color: @BodyBackground;
color: @BodyColor;
- margin: 50px 0px 0px 0px;
+ margin: 50px 0 0 0;
display:table;
}
h4 { font-size: 1.1em }
-.shadow(@x: 0px, @y: 5px){
+.shadow(@x: 0, @y: 5px){
-webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
@@ -76,7 +76,7 @@ code {
width: 10em;
background: @MenuBg;
color: @Menu;
- margin: 0px;
+ margin: 0;
padding: 1em;
list-style: none;
border: 3px solid @MenuBorder;
@@ -126,8 +126,8 @@ div.jGrowl div.info {
/* header */
header {
- position: fixed; left: 43%; right: 43%; top: 0px;
- margin: 0px; padding: 0px;
+ position: fixed; left: 43%; right: 43%; top: 0;
+ margin: 0; padding: 0;
/*width: 100%; height: 12px; */
z-index: 110;
color: @Grey1;
@@ -147,23 +147,23 @@ header {
/* nav */
nav {
width: 100%; height: 32px;
- position: fixed; left: 0px; top: 0px;
- padding: 0px;
+ position: fixed; left: 0; top: 0;
+ padding: 0;
background-color: @NavbarBackground;
color: @Grey1;
z-index: 100;
- .shadow(0px, 0px);
+ .shadow(0px, 0);
a, a:active, a:visited, a:link, a:hover { color: @Banner; text-decoration: none; outline: none; }
ul {
- margin: 0px;
- padding: 0px 20px;
+ margin: 0;
+ padding: 0 20px;
li {
list-style: none;
- margin: 0px; padding: 0px;
+ margin: 0; padding: 0;
float: left;
- .menu-popup{ left: 0px; right: auto; }
+ .menu-popup{ left: 0; right: auto; }
}
}
@@ -172,7 +172,7 @@ nav {
position: relative;
height: 22px;
padding: 5px;
- margin: 0px 10px;
+ margin: 0 10px;
.roundtop();
&.selected {
@@ -187,7 +187,7 @@ nav {
position: relative;
height: 16px;
padding: 5px;
- margin: 3px 15px 0px;
+ margin: 3px 15px 0;
font-size: 14px;
border-bottom: 3px solid @NavbarBackground;
&.selected {
@@ -203,7 +203,7 @@ nav {
.rounded();
font-size: 10px;
padding: 1px 3px;
- top: 0px;
+ top: 0;
right: -10px;
min-width: 15px;
text-align: right;
@@ -218,7 +218,7 @@ nav {
#nav-apps-link,
#nav-site-linkmenu {
float: right;
- .menu-popup{ right: 0px; left: auto; }
+ .menu-popup{ right: 0; left: auto; }
}
#nav-notifications-linkmenu.on .icon.s22.notify,
@@ -237,8 +237,8 @@ ul.menu-popup {
width: 10em;
background: @MenuBg;
color: @Menu;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
list-style: none;
border: 3px solid @MenuBorder;
z-index: 100000;
@@ -301,7 +301,22 @@ ul.menu-popup {
.notif-when { font-size: 10px; color: @MenuItemDetail; display: block; }
}
-
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+ width: 100%;
+ min-height: 100px;
+ background-color: #eff0f1;
+ border-bottom: 1px solid #cccccc;
+ #contact-entry-wrapper-network {
+ float: none;
+ width: auto;
+ height: auto;
+ padding: 10px;
+ #contact-entry-accounttype-network { font-size: 22px; }
+ #contact-entry-name-network { font-size: 24.5px; font-weight: normal; }
+ .contact-details { font-size: 12px; }
+ }
+}
/* aside 230px*/
@@ -309,7 +324,7 @@ aside {
display: table-cell;
vertical-align: top;
width: 200px;
- padding:0px 10px 0px 20px;
+ padding:0px 10px 0 20px;
border-right: 1px solid @AsideBorder;
.profile-edit-side-div { display: none; }
@@ -317,15 +332,17 @@ aside {
.vcard {
.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
.title { margin-bottom: 5px; }
+ .p-addr { margin-bottom: 5px; }
+ .account-type { font-size: 14px; margin-bottom: 13px; }
dl { height: auto; overflow: auto; }
- dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
+ dt {float: left; margin-left: 0; width: 35%; text-align: right; color: @VCardLabelColor; }
dd {float: left; margin-left: 4px; width: 60%;}
}
#profile-extra-links {
- ul { padding: 0px; margin: 0px; }
- li { padding: 0px; margin: 0px; list-style: none; }
+ ul { padding: 0; margin: 0; }
+ li { padding: 0.2em 0; margin: 0; list-style: none; }
}
#wallmessage-link {
@@ -344,7 +361,18 @@ aside {
display: block;
.rounded();
color: @AsideConnect;
- background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center;
+ background: @AsideConnectBg url('icons/connect-bg.png') no-repeat left center;
+ font-weight: bold;
+ text-transform:uppercase;
+ padding: 4px 2px 2px 35px;
+
+ &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
+ }
+ #subscribe-feed-link {
+ display: block;
+ .rounded();
+ color: @AsideConnect;
+ background: @AsideConnectBg url('icons/rss-bg.png') no-repeat left center;
font-weight: bold;
text-transform:uppercase;
padding: 4px 2px 2px 35px;
@@ -359,8 +387,8 @@ aside {
#contact-block {
overflow: auto; height: auto;
- .contact-block-h4 { float: left; margin: 5px 0px; }
- .allcontact-link { float: right; margin: 5px 0px; }
+ .contact-block-h4 { float: left; margin: 5px 0; }
+ .allcontact-link { float: right; margin: 5px 0; }
.contact-block-content {
clear: both;
overflow: hidden;
@@ -369,7 +397,7 @@ aside {
/*.contact-block-div { width:60px; height: 60px; }*/
.contact-block-link {
float: left;
- margin: 0px 2px 2px 0px;
+ margin: 0 2px 2px 0;
img { width: 48px; height: 48px; }
}
}
@@ -425,23 +453,37 @@ aside {
.widget {
margin-bottom: 2em;
- h3 { padding: 0px; margin: 2px;}
+ h3 { padding: 0; margin: 2px;}
.action { .opaque(0.1); }
input.action { .opaque(0.5); }
&:hover .title .action { .opaque(1); }
.tool:hover .action { .opaque(1); }
.tool:hover .action.ticked { .opaque(1); }
- ul { padding: 0px;}
+ ul { padding: 0;}
ul li {padding-left: 16px; min-height: 16px; list-style: none; }
.tool.selected {
background: url('../../../images/selected.png') no-repeat left center;
}
- /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
- .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
+ /*.action .s10 { width: 10px; overflow: hidden; padding: 0;}
+ .action .s16 { width: 16px; overflow: hidden; padding: 0;}*/
+ .notify {
+ display: none;
+ background-color: #19AEFF;
+ border-radius: 5px;
+ font-size: 10px;
+ padding: 1px 3px;
+ min-width: 15px;
+ text-align: right;
+ float: right;
+ color: rgb(255, 255, 255);
+ margin-right: 10px;
+
+ &.on { display: block; }
+ }
}
/* widget: search */
@@ -456,7 +498,7 @@ section {
display: table-cell;
vertical-align: top;
width: 770px;
- padding:0px 20px 0px 10px;
+ padding:0px 20px 0 10px;
}
.sparkle {
@@ -519,6 +561,9 @@ section {
.wall-item-name { font-weight: bold; }
.wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; }
+ .wall-item-actions-events { float: left; margin-top: 0.5em;
+ a { margin-right: 3em; }
+ }
.wall-item-actions-social { float: left; margin-top: 0.5em;
a { margin-right: 3em; }
}
@@ -538,16 +583,16 @@ section {
.contact-photo-menu-button {
top: 15px !important;
- left: 0px !important;
+ left: 0 !important;
}
.wall-item-links { padding-left: 12px; }
.commentbox {
- height: 0px;
+ height: 0;
overflow: hidden;
.wall-item-comment-wrapper {
border-top: 1px solid @CommentBoxEmptyBorderColor;
- height: 0px; overflow: hidden;
+ height: 0; overflow: hidden;
}
.transition();
}
@@ -555,7 +600,7 @@ section {
&:hover .commentbox {
height:auto; overflow: visible;
.wall-item-comment-wrapper {
- border-top: 0px;
+ border-top: 0;
height:auto;overflow: visible;
}
.transition();
@@ -595,11 +640,11 @@ section {
}
&.photo {
- margin: 1em 2em 1em 0px;
+ margin: 1em 2em 1em 0;
}
}
-.threaded .wall-item-comment-wrapper { margin-left: 0px; }
+.threaded .wall-item-comment-wrapper { margin-left: 0; }
.comment-edit-preview {
width: 710px;
@@ -620,7 +665,7 @@ section {
.tread-wrapper {
width: 90%; padding: 0; margin: 10px 0;
background-color: @JotPreviewBackgroundColor;
- border-bottom: 0px;
+ border-bottom: 0;
}
.wall-item-conv { display: none; }
}
@@ -660,7 +705,7 @@ section {
a { color: @MentionColor; }
}
/*.filesavetags {
- padding: 3px 0px 3px 0px;
+ padding: 3px 0 3px 0;
opacity: 0.5;
}*/
@@ -675,7 +720,7 @@ section {
top: 40px;
left: 30px;
- .shadow(0px, 0px);
+ .shadow(0px, 0);
}
.wwto .contact-photo { width: 25px; height: 25px; }
@@ -691,13 +736,13 @@ section {
max-width: 650px;
max-height: inital;
float: none;
- margin-right: 0px;
+ margin-right: 0;
}
}
.type-link {
blockquote {
- margin: 1em 0px;
+ margin: 1em 0;
max-height: 160px;
overflow: hidden;
padding-left: 1em;
@@ -785,8 +830,8 @@ blockquote.shared_content {
}
.children {
- margin-left: 0px;
- .hide-comments-outer { margin-left: 0px; }
+ margin-left: 0;
+ .hide-comments-outer { margin-left: 0; }
}
}
}
@@ -828,7 +873,7 @@ span[id^="showmore-wrap"] {
display: block;
width: 100%;
background-color: @MenuBg;
- border: 0px;
+ border: 0;
color: @MenuItem;
text-align: left;
padding: 5px 10px;
@@ -861,7 +906,7 @@ span[id^="showmore-wrap"] {
width: 300px;
height: 90px;
padding-right: 10px;
- margin: 0 10px 10px 0px;
+ margin: 0 10px 10px 0;
.contact-photo-wrapper {
float: left;
margin-right: 10px;
@@ -871,9 +916,30 @@ span[id^="showmore-wrap"] {
img { width: 80px; height: 80px; }
}
.contact-photo-menu-button {
- left: 0px;
+ left: 0;
top: 63px;
}
+ .drop {
+ background-image: url('../../../images/icons/22/delete.png');
+ display: block; width: 22px; height: 22px;
+ position: relative;
+ top: 10px;
+ left: -10px;
+ z-index: 99;
+ }
+ .drophide {
+ background-image: url('../../../images/icons/22/delete.png');
+ display: block; width: 22px; height: 22px;
+ opacity: 0.3;
+ position: relative;
+ top: 10px;
+ left: -10px;
+ z-index: 99;
+ }
+ .contact-entry-connect {
+ padding-top: 5px;
+ font-weight: bold;
+ }
}
.directory-item {
float: left;
@@ -884,7 +950,7 @@ span[id^="showmore-wrap"] {
img { width: 175px; height: 175px; }
}
}
-.contact-name { font-weight: bold; padding-top: 15px; }
+.contact-name { font-weight: bold; /* padding-top: 15px; */}
.contact-details {
color: @Grey3; white-space: nowrap;
overflow: hidden;
@@ -896,7 +962,7 @@ span[id^="showmore-wrap"] {
#jot {
width: 100%;
- margin: 0px 2em 20px 0px;
+ margin: 0 2em 20px 0;
.profile-jot-text {
height: 1em; width: 99%; font-size: 10px;
@@ -906,7 +972,7 @@ span[id^="showmore-wrap"] {
}
#jot-tools {
- margin: 0px; padding: 0px;
+ margin: 0; padding: 0;
height: 40px; overflow: none;
width: 770px;
background-color: @JotToolsBackgroundColor;
@@ -953,7 +1019,7 @@ span[id^="showmore-wrap"] {
border-right: 1px solid @Grey4;
border-left: 1px solid @Grey4;
input {
- border: 0px; margin: 0px; padding: 0px;
+ border: 0; margin: 0; padding: 0;
background-color: @JotSubmitBackgroundColor;
color: @JotSubmitText;
width: 80px; height: 40px;
@@ -977,8 +1043,8 @@ span[id^="showmore-wrap"] {
}
#jot-title {
- border: 0px;
- margin: 0px;
+ border: 0;
+ margin: 0;
height: 20px;
width: 500px;
font-weight: bold;
@@ -1006,8 +1072,8 @@ span[id^="showmore-wrap"] {
}
#jot-category {
- border: 0px;
- margin: 0px;
+ border: 0;
+ margin: 0;
height: 20px;
width: 200px;
border: 1px solid @BodyBackground;
@@ -1019,14 +1085,35 @@ span[id^="showmore-wrap"] {
/** buttons **/
/*input[type="submit"] {
- border: 0px;
+ border: 0;
background-color: @ButtonBackgroundColor;
color: @ButtonColor;
- padding: 0px 10px;
+ padding: 0 10px;
.rounded(5px);
height: 18px;
}*/
+a.actionbutton {
+ border: 1px solid @Grey3;
+ background-color: @Grey2;
+ color: @Grey5;
+ font-size: 8pt;
+ padding: 2pt;
+ .rounded();
+
+ i.icon {
+ display: inline-block;
+ vertical-align: baseline;
+ padding: 0;
+ }
+
+ &:hover {
+ text-decoration: none;
+ background-color: @Grey1;
+ }
+}
+h2 > .actionbutton { float: right; }
+
/** acl **/
#photo-edit-perms-select,
@@ -1055,7 +1142,7 @@ span[id^="showmore-wrap"] {
background-image: url("../../../images/show_all_off.png");
background-position: 7px 7px;
background-repeat: no-repeat;
- padding: 7px 5px 0px 30px;
+ padding: 7px 5px 0 30px;
color: #999999;
.rounded(5px);
}
@@ -1089,7 +1176,7 @@ span[id^="showmore-wrap"] {
float: left;
margin: 4px;
}
-.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
+.acl-list-item p { height: 12px; font-size: 10px; margin: 0; padding: 2px 0 1px; overflow: hidden;}
.acl-list-item a {
font-size: 8px;
display: block;
@@ -1231,7 +1318,7 @@ ul.tabs {
}
.hidden { display: none!important; }
- &.radio .field_help { margin-left: 0px; }
+ &.radio .field_help { margin-left: 0; }
}
@@ -1317,11 +1404,29 @@ ul.tabs {
width: 50px; float: left;
}
+/* manage page */
+.identity-match-photo {
+ position: relative;
+ .manage-notify {
+ background-color: #19AEFF;
+ border-radius: 5px;
+ font-size: 10px;
+ padding: 1px 3px;
+ min-width: 15px;
+ text-align: right;
+ position: absolute;
+ right: 10px;
+ top: -5px;
+ color: rgb(255, 255, 255);
+ }
+}
+
+
/* videos page */
.videos {
.video-top-wrapper {
width: 200px; float: left;
- margin: 0px 10px 10px 0px;
+ margin: 0 10px 10px 0;
position: relative;
.video-js {
@@ -1332,8 +1437,8 @@ ul.tabs {
.video-delete {
position: absolute;
opacity: 0;
- right: 0px;
- top: 0px;
+ right: 0;
+ top: 0;
transition: opacity 0.5s;
}
@@ -1365,7 +1470,7 @@ ul.tabs {
}
#photo-top-upload-link,
-.photos-upload-link { margin: 1em 0px; display: block; }
+.photos-upload-link { margin: 1em 0; display: block; }
.photos-upload-link a,
#photo-top-upload-link {
background: url("../../../images/icons/16/add.png") no-repeat left center;
@@ -1376,7 +1481,7 @@ ul.tabs {
.photo-top-image-wrapper,
.photo-album-image-wrapper {
float: left;
- margin: 0px 10px 10px 0px;
+ margin: 0 10px 10px 0;
width:@photosize; height: @photosize;
position: relative;
overflow: hidden;
@@ -1397,15 +1502,15 @@ ul.tabs {
&:hover .photo-top-album-name,
&:hover .caption {
- bottom: 0px;
- .shadow(0px, 0px);
+ bottom: 0;
+ .shadow(0px, 0);
.transition(0.5s);
}
}
#photo-photo {
display: block; width: 660px;
- padding: 50px; margin-bottom: 0px;
+ padding: 50px; margin-bottom: 0;
text-align: center;
background-color: @Grey3;
img { max-width: 560px; }
@@ -1473,7 +1578,7 @@ ul.tabs {
img { width: 80px; height: 80px; }
}
.contact-photo-menu-button {
- left: 0px;
+ left: 0;
top: 63px;
}
}
@@ -1488,7 +1593,7 @@ ul.tabs {
text-align: center;
display: block;
font-weight: bold;
- padding: 1em 0px;
+ padding: 1em 0;
}
}
@@ -1501,23 +1606,42 @@ ul.tabs {
.mail-subject {
width: 30%;
- padding:4px 0px 0px 4px;
+ padding:4px 0 0 4px;
a { display: block; }
&.unseen a { font-weight: bold; }
}
- .mail-date { padding: 4px 4px 0px 4px; }
- .mail-from { padding: 4px 4px 0px 4px; }
- .mail-count { padding: 4px 4px 0px 4px; text-align: right;}
+ .mail-date { padding: 4px 4px 0 4px; }
+ .mail-from { padding: 4px 4px 0 4px; }
+ .mail-count { padding: 4px 4px 0 4px; text-align: right;}
.mail-delete { float: right; }
}
+#message-preview {
+ margin-top: 1em;
+ box-sizing: border-box;
+ * { box-sizing: border-box; white-space: nowrap;}
+ .mail-list-wrapper {
+ .mail-subject {
+ width: 100%;
+ }
+ .mail-date { font-size: 0.8em; width: 25%; text-align: right}
+ .mail-from { font-size: 0.8em; width: 75%;}
+ .mail-count { font-size: 0.8em; width: 100%;}
+ .mail-delete { display: none;}
+
+ & .mail-date, & .mail-from, & .mail-count { .opaque(0.5); }
+ &:hover .mail-date, &:hover .mail-from, &:hover .mail-count { .opaque(1); }
+ }
+}
+
+
#mail-display-subject {
background-color: @MailDisplaySubjectBackgroundColor;
color: @MailDisplaySubjectColor;
margin-bottom: 10px;
width: 100%; height: auto; overflow: hidden;
- span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;}
+ span { float: left; overflow: hidden; padding: 4px 0 0 10px;}
.mail-delete { float: right; .opaque(0.5);}
&:hover .mail-delete { .opaque(1); }
@@ -1577,7 +1701,7 @@ footer { height: 100px; display: table-row; }
text-align: right;
}
#pluginslist {
- margin: 0px; padding: 0px;
+ margin: 0; padding: 0;
}
.plugin {
list-style: none;
@@ -1597,7 +1721,7 @@ footer { height: 100px; display: table-row; }
table {
width:100%;
border-bottom: 1px solid #000000;
- margin: 5px 0px;
+ margin: 5px 0;
th {
text-align: left;
}
@@ -1620,8 +1744,8 @@ footer { height: 100px; display: table-row; }
.comment-edit-bb {
list-style: none;
display: none;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
width: 75%;
}
.comment-edit-bb > li {
@@ -1638,21 +1762,21 @@ footer { height: 100px; display: table-row; }
text-decoration: none;
:hover {background-color: #ccc;}
}
-.boldbb { background-position: 0px 0px; }
-.boldbb:hover { background-position: 0px -16px; }
-.italicbb { background-position: -16px 0px; }
+.boldbb { background-position: 0 0; }
+.boldbb:hover { background-position: 0 -16px; }
+.italicbb { background-position: -16px 0; }
.italicbb:hover { background-position: -16px -16px; }
-.underlinebb { background-position: -32px 0px; }
+.underlinebb { background-position: -32px 0; }
.underlinebb:hover { background-position: -32px -16px; }
-.quotebb { background-position: -48px 0px; }
+.quotebb { background-position: -48px 0; }
.quotebb:hover { background-position: -48px -16px; }
-.codebb { background-position: -64px 0px; }
+.codebb { background-position: -64px 0; }
.codebb:hover { background-position: -64px -16px; }
-.imagebb { background-position: -80px 0px; }
+.imagebb { background-position: -80px 0; }
.imagebb:hover { background-position: -80px -16px; }
-.urlbb { background-position: -96px 0px; }
+.urlbb { background-position: -96px 0; }
.urlbb:hover { background-position: -96px -16px; }
-.videobb { background-position: -112px 0px; }
+.videobb { background-position: -112px 0; }
.videobb:hover { background-position: -112px -16px; }
@@ -1664,7 +1788,7 @@ footer { height: 100px; display: table-row; }
cursor:pointer;
border:1px solid #333;
width:200px;
- margin:10px 0px 10px 0px;
+ margin:10px 0 10px 0;
float: left;
}
@@ -1696,7 +1820,7 @@ footer { height: 100px; display: table-row; }
width: 20px!important;
font-size: 8pt;
margin-left: 10px;
- border: 0px;
+ border: 0;
color: @FieldHelpColor;
}
@@ -1710,13 +1834,13 @@ footer { height: 100px; display: table-row; }
.fbrowser {
overflow: auto;
position: absolute;
- top: 0px;
+ top: 0;
width: 100%;
height: 100%;
}
.fbrowser .path {
background-color: @NavbarBackground;
- a { padding: 5px; margin: 0px 2px; display: inline-block; }
+ a { padding: 5px; margin: 0 2px; display: inline-block; }
a, a:active, a:visited, a:link, a:hover { color: @Banner; text-decoration: none; outline: none; }
}
.fbrowser .folders ul { list-style: url("icons/folder.png"); padding-left: 22px;}
@@ -1729,4 +1853,3 @@ footer { height: 100px; display: table-row; }
.fbrowser.file p { display: inline; white-space: nowrap; }
.fbrowser .upload { clear: both; padding-top: 1em;}
-
diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl
index 0f0207b2b..2d59a8a25 100644
--- a/view/theme/quattro/templates/contact_template.tpl
+++ b/view/theme/quattro/templates/contact_template.tpl
@@ -1,5 +1,6 @@
+ {{if $contact.ignlnk}}{{/if}}
- {{if !$no_contacts_checkbox}}
+ {{if $multiselect}}
{{/if}}
{{if $contact.photo_menu}}
@@ -25,10 +26,19 @@
- {{$contact.name}}
+
+ {{$contact.name}}
+ {{if $contact.account_type}} ({{$contact.account_type}}){{/if}}
+
{{if $contact.alt_text}}{{$contact.alt_text}}
{{/if}}
- {{$contact.itemurl}}
- {{$contact.network}}
+ {{if $contact.itemurl}}{{$contact.itemurl}}
{{/if}}
+ {{if $contact.tags}}{{$contact.tags}}
{{/if}}
+ {{if $contact.details}}{{$contact.details}}
{{/if}}
+ {{if $contact.network}}{{$contact.network}}
{{/if}}
+
+ {{if $contact.connlnk}}
+
+ {{/if}}
diff --git a/view/theme/quattro/templates/event_form.tpl b/view/theme/quattro/templates/event_form.tpl
new file mode 100644
index 000000000..7cca2be36
--- /dev/null
+++ b/view/theme/quattro/templates/event_form.tpl
@@ -0,0 +1,46 @@
+
+{{$title}}
+ +{{$desc}}
+ + + + diff --git a/view/theme/quattro/templates/events-js.tpl b/view/theme/quattro/templates/events-js.tpl new file mode 100644 index 000000000..ec8aa586c --- /dev/null +++ b/view/theme/quattro/templates/events-js.tpl @@ -0,0 +1,7 @@ + +{{$tabs}} +{{$title}} {{$new_event.1}}
+ + + + diff --git a/view/theme/quattro/templates/events.tpl b/view/theme/quattro/templates/events.tpl new file mode 100644 index 000000000..7a50498eb --- /dev/null +++ b/view/theme/quattro/templates/events.tpl @@ -0,0 +1,24 @@ + +{{$tabs}} +{{$title}} {{$new_event.1}}
+ + + + + + +{{foreach $events as $event}} +
+ {{if $event.is_first}}
{{$event.item.author_name}}{{/if}}
+ {{$event.html}}
+ {{if $event.item.plink}}{{/if}}
+ {{if $event.edit}}{{/if}}
+
+
+
+{{/foreach}}
diff --git a/view/theme/quattro/templates/generic_links_widget.tpl b/view/theme/quattro/templates/generic_links_widget.tpl
index 6f7a082c1..1a26c9741 100644
--- a/view/theme/quattro/templates/generic_links_widget.tpl
+++ b/view/theme/quattro/templates/generic_links_widget.tpl
@@ -1,11 +1,11 @@
diff --git a/view/theme/quattro/templates/group_side.tpl b/view/theme/quattro/templates/group_side.tpl
index d0fb5d62b..620d2de75 100644
--- a/view/theme/quattro/templates/group_side.tpl
+++ b/view/theme/quattro/templates/group_side.tpl
@@ -7,7 +7,7 @@
-
+
diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl
index f72e3ccb4..41d633b25 100644
--- a/view/theme/quattro/templates/jot.tpl
+++ b/view/theme/quattro/templates/jot.tpl
@@ -6,7 +6,7 @@
{{/if}}
-
+
@@ -29,19 +29,21 @@
{{$event.d}}
{{/if}}
+ {{if $event.item.author_name}}
-
{{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
diff --git a/view/theme/quattro/templates/widget_forumlist.tpl b/view/theme/quattro/templates/widget_forumlist.tpl
new file mode 100644
index 000000000..35c54bc69
--- /dev/null
+++ b/view/theme/quattro/templates/widget_forumlist.tpl
@@ -0,0 +1,46 @@
+
+
+{{$item.like}}
- {{$item.dislike}}
+ {{if $item.responses}}
+ {{foreach $item.responses as $verb=>$response}}
+ {{$response.output}}
+ {{/foreach}}
+ {{/if}}
+
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index 1be5c0267..a1cd29ee7 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -6,151 +6,10 @@
* Maintainer: Fabio {{$title}}
+ +-
+ {{foreach $forums as $forum}}
+ {{if $forum.id <= $visible_forums}}
+
-
+
+
+
+ + {{$forum.name}} +
+ {{/if}}
+
+ {{if $forum.id > $visible_forums}}
+
+ {{/if}}
+ {{/foreach}}
+
+ {{if $total > $visible_forums }}
+
+ {{/if}}
+
+
diff --git a/view/theme/vier/templates/ch_helpers.tpl b/view/theme/vier/templates/ch_helpers.tpl
new file mode 100644
index 000000000..e10011e04
--- /dev/null
+++ b/view/theme/vier/templates/ch_helpers.tpl
@@ -0,0 +1 @@
+
+
+
+
+ 
+
+
+ {{$activeusers_title}}
+
+{{foreach $activeusers_items as $i}}
+ {{$i}}
+{{/foreach}}
+
+{{/if}}
diff --git a/view/theme/vier/templates/contact_template.tpl b/view/theme/vier/templates/contact_template.tpl
index 5271112d8..c4ed99caa 100644
--- a/view/theme/vier/templates/contact_template.tpl
+++ b/view/theme/vier/templates/contact_template.tpl
@@ -5,20 +5,21 @@
- {{$contact.name}}
+
+
+
+
diff --git a/view/theme/vier/templates/event_form.tpl b/view/theme/vier/templates/event_form.tpl
new file mode 100644
index 000000000..165234c26
--- /dev/null
+++ b/view/theme/vier/templates/event_form.tpl
@@ -0,0 +1,74 @@
+
+
+
+ {{$contact.name}}
+ {{if $contact.account_type}} ({{$contact.account_type}}){{/if}}
+
+ {{if $contact.alt_text}}{{$contact.alt_text}}
{{/if}}
+
+ {{if $contact.itemurl}}{{$contact.itemurl}}{{/if}}
+ {{if $contact.network}} ({{$contact.network}}){{/if}}
+
+ {{if $contact.tags}}{{$contact.tags}}
{{/if}}
+ {{if $contact.details}}{{$contact.details}}
{{/if}}
+ {{$title}}
+ ++{{$desc}} +
+ + + + diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl index 11add9e8a..77bad9370 100644 --- a/view/theme/vier/templates/nav.tpl +++ b/view/theme/vier/templates/nav.tpl @@ -7,6 +7,11 @@