diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-14 13:15:25 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-14 13:15:25 +0200 |
| commit | 4e220ec391514fbdeaa7d64abfd1752a9b44bbaa (patch) | |
| tree | 1cb3cb621221e948be9e0e91916aac0dd6fccb0e | |
| parent | 572678fef95816deaa1ecafe5cbcfb8cc65963c9 (diff) | |
| parent | 0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e (diff) | |
| download | volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.tar.gz volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.tar.bz2 volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.zip | |
Merge commit 'upstream/master'
98 files changed, 2464 insertions, 911 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1309' ); +define ( 'FRIENDICA_VERSION', '2.3.1311' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); @@ -206,6 +206,7 @@ define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' ); define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' ); define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' ); define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm' ); +define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' ); /** * item weight for query ordering @@ -1493,11 +1494,13 @@ function get_my_url() { return false; } -function zrl($s) { +function zrl($s,$force = false) { if(! strlen($s)) return $s; - if(! strpos($s,'/profile/')) + if((! strpos($s,'/profile/')) && (! $force)) return $s; + if($force && substr($s,-1,1) !== '/') + $s = $s . '/'; $achar = strpos($s,'?') ? '&' : '?'; $mine = get_my_url(); if($mine and ! link_compare($mine,$s)) diff --git a/include/Contact.php b/include/Contact.php index 8d893cf70..388819b01 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -176,10 +176,24 @@ function random_profile() { } -function contacts_not_grouped($uid) { - $r = q("select * from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) ", +function contacts_not_grouped($uid,$start = 0,$count = 0) { + + if(! $count) { + $r = q("select count(*) as total from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) ", + intval($uid), + intval($uid) + ); + + return $r; + + + } + + $r = q("select * from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) and blocked = 0 and pending = 0 limit %d, %d", + intval($uid), intval($uid), - intval($uid) + intval($start), + intval($count) ); return $r; diff --git a/include/group.php b/include/group.php index 4a35912e5..edb547de6 100644 --- a/include/group.php +++ b/include/group.php @@ -212,6 +212,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0 '$title' => t('Groups'), '$edittext' => t('Edit group'), '$createtext' => t('Create a new group'), + '$ungrouped' => (($every === 'contacts') ? t('Contacts not in any group') : ''), '$groups' => $groups, '$add' => t('add'), )); diff --git a/include/network.php b/include/network.php index 23ef50b21..8c678a443 100644 --- a/include/network.php +++ b/include/network.php @@ -587,13 +587,14 @@ function fetch_xrd_links($url) { if(! function_exists('validate_url')) { function validate_url(&$url) { - // no naked subdomains - if(strpos($url,'.') === false) + + // no naked subdomains (allow localhost for tests) + if(strpos($url,'.') === false && strpos($url,'/localhost/') === false) return false; if(substr($url,0,4) != 'http') $url = 'http://' . $url; $h = @parse_url($url); - + if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR))) { return true; } diff --git a/include/profile_selectors.php b/include/profile_selectors.php index 92579f64a..a2cef959d 100644 --- a/include/profile_selectors.php +++ b/include/profile_selectors.php @@ -30,7 +30,7 @@ function sexpref_selector($current="",$suffix="") { function marital_selector($current="",$suffix="") { $o = ''; - $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Partners'), t('Cohabiting'), t('Happy'), t('Not Looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Widowed'), t('Uncertain'), t('Complicated'), t('Don\'t care'), t('Ask me') ); + $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me') ); $o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >"; foreach($select as $selection) { diff --git a/include/text.php b/include/text.php index 4ec59a665..8c8db66a9 100644 --- a/include/text.php +++ b/include/text.php @@ -1068,10 +1068,12 @@ function unamp($s) { if(! function_exists('lang_selector')) { function lang_selector() { global $lang; - $o = '<div id="lang-select-icon" class="icon language" title="' . t('Select an alternate language') . '" onclick="openClose(\'language-selector\');" ></div>'; - $o .= '<div id="language-selector" style="display: none;" >'; - $o .= '<form action="#" method="post" ><select name="system_language" onchange="this.form.submit();" >'; + $langs = glob('view/*/strings.php'); + + $lang_options = array(); + $selected = ""; + if(is_array($langs) && count($langs)) { $langs[] = ''; if(! in_array('view/en/strings.php',$langs)) @@ -1079,17 +1081,22 @@ function lang_selector() { asort($langs); foreach($langs as $l) { if($l == '') { - $default_selected = ((! x($_SESSION,'language')) ? ' selected="selected" ' : ''); - $o .= '<option value="" ' . $default_selected . '>' . t('default') . '</option>'; + $lang_options[""] = t('default'); continue; } $ll = substr($l,5); $ll = substr($ll,0,strrpos($ll,'/')); - $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? ' selected="selected" ' : ''); - $o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>'; + $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? $ll : $selected); + $lang_options[$ll]=$ll; } } - $o .= '</select></form></div>'; + + $tpl = get_markup_template("lang_selector.tpl"); + $o = replace_macros($tpl, array( + '$title' => t('Select an alternate language'), + '$langs' => array($lang_options, $selected), + + )); return $o; }} @@ -1510,4 +1517,4 @@ function fix_mce_lf($s) { $s = str_replace("\r\n","\n",$s); $s = str_replace("\n\n","\n",$s); return $s; -}
\ No newline at end of file +} diff --git a/mod/admin.php b/mod/admin.php index 961002786..7386dc5a3 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -40,6 +40,20 @@ function admin_post(&$a){ goaway($a->get_baseurl(true) . '/admin/plugins/' . $a->argv[2] ); return; // NOTREACHED break; + case 'themes': + $theme = $a->argv[2]; + if (is_file("view/theme/$theme/config.php")){ + require_once("view/theme/$theme/config.php"); + if (function_exists("theme_admin_post")){ + theme_admin_post($a); + } + } + info(t('Theme settings updated.')); + if(is_ajax()) return; + + goaway($a->get_baseurl(true) . '/admin/themes/' . $theme ); + return; + break; case 'logs': admin_page_logs_post($a); break; @@ -129,7 +143,13 @@ function admin_content(&$a) { } else { $o = admin_page_summary($a); } - return $o; + + if(is_ajax()) { + echo $o; + killme(); + } else { + return $o; + } } @@ -362,7 +382,7 @@ function admin_page_site(&$a) { '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""), '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), - '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles"), $theme_choices), + '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices), '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), @@ -768,14 +788,22 @@ function admin_page_themes(&$a){ } $readme=Null; - if (is_file("view/$theme/README.md")){ - $readme = file_get_contents("view/$theme/README.md"); + if (is_file("view/theme/$theme/README.md")){ + $readme = file_get_contents("view/theme/$theme/README.md"); $readme = Markdown($readme); - } else if (is_file("view/$theme/README")){ - $readme = "<pre>". file_get_contents("view/$theme/README") ."</pre>"; + } else if (is_file("view/theme/$theme/README")){ + $readme = "<pre>". file_get_contents("view/theme/$theme/README") ."</pre>"; } $admin_form=""; + if (is_file("view/theme/$theme/config.php")){ + require_once("view/theme/$theme/config.php"); + if(function_exists("theme_admin")){ + $admin_form = theme_admin($a); + } + + } + $screenshot = array( get_theme_screenshot($theme), t('Screenshot')); if(! stristr($screenshot[0],$theme)) @@ -793,10 +821,10 @@ function admin_page_themes(&$a){ '$status' => $status, '$action' => $action, '$info' => get_theme_info($theme), - '$function' => 'themes', + '$function' => 'themes', '$admin_form' => $admin_form, '$str_author' => t('Author: '), - '$str_maintainer' => t('Maintainer: '), + '$str_maintainer' => t('Maintainer: '), '$screenshot' => $screenshot, '$readme' => $readme )); @@ -805,7 +833,7 @@ function admin_page_themes(&$a){ /** - * List plugins + * List themes */ $xthemes = array(); diff --git a/mod/directory.php b/mod/directory.php index 7f18bd026..367438845 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -44,7 +44,7 @@ function directory_content(&$a) { $gdirpath = dirname(get_config('system','directory_submit_url')); if(strlen($gdirpath)) { $globaldir = '<ul><li><div id="global-directory-link"><a href="' - . $gdirpath . '">' . t('Global Directory') . '</a></div></li></ul>'; + . zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>'; } $admin = ''; diff --git a/mod/nogroup.php b/mod/nogroup.php new file mode 100644 index 000000000..bd1ec82ed --- /dev/null +++ b/mod/nogroup.php @@ -0,0 +1,65 @@ +<?php + +require_once('include/Contact.php'); +require_once('include/socgraph.php'); +require_once('include/contact_selectors.php'); + +function nogroup_init(&$a) { + + if(! local_user()) + return; + + require_once('include/group.php'); + require_once('include/contact_widgets.php'); + + if(! x($a->page,'aside')) + $a->page['aside'] = ''; + + $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id); +} + + +function nogroup_content(&$a) { + + if(! local_user()) { + notice( t('Permission denied.') . EOL); + return ''; + } + + require_once('include/Contact.php'); + $r = contacts_not_grouped(local_user()); + if(count($r)) { + $a->set_pager_total($r[0]['total']); + } + $r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']); + if(count($r)) { + foreach($r as $rr) { + + + $contacts[] = array( + 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']), + 'edit_hover' => t('Edit contact'), + 'photo_menu' => contact_photo_menu($rr), + 'id' => $rr['id'], + 'alt_text' => $alt_text, + 'dir_icon' => $dir_icon, + 'thumb' => $rr['thumb'], + 'name' => $rr['name'], + 'username' => $rr['name'], + 'sparkle' => $sparkle, + 'itemurl' => $rr['url'], + 'url' => $url, + 'network' => network_to_name($rr['network']), + ); + } + } + $tpl = get_markup_template("nogroup-template.tpl"); + $o .= replace_macros($tpl,array( + '$header' => t('Contacts who are not members of a group'), + '$contacts' => $contacts, + '$paginate' => paginate($a), + )); + + return $o; + +} diff --git a/mod/notifications.php b/mod/notifications.php index 690a99562..b28b1478d 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -151,7 +151,7 @@ function notifications_content(&$a) { '$fullname' => $rr['fname'], '$url' => zrl($rr['furl']), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), + '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), '$knowyou' => $knowyou, '$approve' => t('Approve'), @@ -198,7 +198,7 @@ function notifications_content(&$a) { '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"), '$fullname' => $rr['name'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), + '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), '$url' => zrl($rr['url']), '$knowyou' => $knowyou, '$approve' => t('Approve'), diff --git a/mod/profiles.php b/mod/profiles.php index eef58bb06..7a33a03e4 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -51,6 +51,7 @@ function profiles_post(&$a) { if($orig[0]['name'] != $name) $namechanged = true; + $pdesc = notags(trim($_POST['pdesc'])); $gender = notags(trim($_POST['gender'])); $address = notags(trim($_POST['address'])); @@ -61,15 +62,16 @@ function profiles_post(&$a) { $pub_keywords = notags(trim($_POST['pub_keywords'])); $prv_keywords = notags(trim($_POST['prv_keywords'])); $marital = notags(trim($_POST['marital'])); - if($marital != $orig[0]['marital']) - $maritalchanged = true; $with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : ''); // linkify the relationship target if applicable + $withchanged = false; + if(strlen($with)) { if($with != strip_tags($orig[0]['with'])) { + $withchanged = true; $prf = ''; $lookup = $with; if(strpos($lookup,'@') === 0) @@ -134,6 +136,27 @@ function profiles_post(&$a) { $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); + + + $changes = array(); + if($is_default) { + if($marital != $orig[0]['marital']) $changes[] = '♥ ' . t('Marital Status'); + if($withchanged) $changes[] = '♥ ' . t('Romantic Partner'); + if($work != $orig[0]['work']) $changes[] = t('Work/Employment'); + if($religion != $orig[0]['religion']) $changes[] = t('Religion'); + if($politic != $orig[0]['politic']) $changes[] = t('Political Views'); + if($gender != $orig[0]['gender']) $changes[] = t('Gender'); + if($sexual != $orig[0]['sexual']) $changes[] = t('Sexual Preference'); + if($homepage != $orig[0]['homepage']) $changes[] = t('Homepage'); + if($interest != $orig[0]['interest']) $changes[] = t('Interests'); + if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region'] + || $country_name != $orig[0]['country_name']) + $changes[] = t('Location'); + + profile_activity($changes); + + } + $r = q("UPDATE `profile` SET `profile-name` = '%s', `name` = '%s', @@ -195,7 +218,7 @@ function profiles_post(&$a) { dbesc($education), intval($hide_friends), intval($a->argv[1]), - intval($_SESSION['uid']) + intval(local_user()) ); if($r) @@ -222,6 +245,79 @@ function profiles_post(&$a) { } +function profile_activity($changed) { + $a = get_app(); + + if(! local_user() || ! is_array($changed) || ! count($changed)) + return; + + if($a->user['hidewall'] || get_config('system','block_public')) + return; + + if(! get_pconfig(local_user(),'system','post_profilechange')) + return; + + require_once('include/items.php'); + + $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", + intval(local_user()) + ); + + if(! count($self)) + return; + + $arr = array(); + $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user()); + $arr['uid'] = local_user(); + $arr['contact-id'] = $self[0]['id']; + $arr['wall'] = 1; + $arr['type'] = 'wall'; + $arr['gravity'] = 0; + $arr['origin'] = 1; + $arr['author-name'] = $arr['owner-name'] = $self[0]['name']; + $arr['author-link'] = $arr['owner-link'] = $self[0]['url']; + $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; + $arr['verb'] = ACTIVITY_UPDATE; + $arr['object-type'] = ACTIVITY_OBJ_PROFILE; + + $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]'; + + + $changes = ''; + $t = count($changed); + $z = 0; + foreach($changed as $ch) { + if(strlen($changes)) { + if ($z == ($t - 1)) + $changes .= ' and '; + else + $changes .= ', '; + } + $z ++; + $changes .= $ch; + } + + $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]'; + + $arr['body'] = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes); + + $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PROFILE . '</type><title>' . $self[0]['name'] . '</title>' + . '<id>' . $self[0]['url'] . '/' . $self[0]['name'] . '</id>'; + $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $self[0]['url'] . '?tab=profile' . '" />' . "\n"); + $arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $self[0]['thumb'] . '" />' . "\n"); + $arr['object'] .= '</link></object>' . "\n"; + $arr['last-child'] = 1; + + $arr['allow_cid'] = $a->user['allow_cid']; + $arr['allow_gid'] = $a->user['allow_gid']; + $arr['deny_cid'] = $a->user['deny_cid']; + $arr['deny_gid'] = $a->user['deny_gid']; + + $i = item_store($arr); + if($i) + proc_run('php',"include/notifier.php","activity","$i"); + +} function profiles_content(&$a) { diff --git a/mod/settings.php b/mod/settings.php index 2dd9fb9a6..721468437 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -346,6 +346,8 @@ function settings_post(&$a) { $suggestme = ((x($_POST,'suggestme')) ? intval($_POST['suggestme']) : 0); $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); + $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0); + $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0); $notify = 0; @@ -428,6 +430,8 @@ function settings_post(&$a) { set_pconfig(local_user(),'expire','photos', $expire_photos); set_pconfig(local_user(),'system','suggestme', $suggestme); + set_pconfig(local_user(),'system','post_newfriend', $post_newfriend); + set_pconfig(local_user(),'system','post_profilechange', $post_profilechange); $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d LIMIT 1", @@ -790,6 +794,11 @@ function settings_content(&$a) { $suggestme = get_pconfig(local_user(), 'system','suggestme'); $suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0 + $post_newfriend = get_pconfig(local_user(), 'system','post_newfriend'); + $post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0 + + $post_profilechange = get_pconfig(local_user(), 'system','post_profilechange'); + $post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0 if(! strlen($a->user['timezone'])) @@ -878,6 +887,8 @@ function settings_content(&$a) { )); + + $invisible = (((! $profile['publish']) && (! $profile['net-publish'])) ? true : false); @@ -958,6 +969,9 @@ function settings_content(&$a) { '$h_not' => t('Notification Settings'), + '$activity_options' => t('By default post a status message when:'), + '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, ''), + '$post_profilechange' => array('post_profilechange', t('making an <em>interesting</em> profile change'), $post_profilechange, ''), '$lbl_not' => t('Send a notification email when:'), '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''), '$notify2' => array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''), diff --git a/util/messages.po b/util/messages.po index 09c3dec92..d09b1cfc0 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1309\n" +"Project-Id-Version: 2.3.1311\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-11 10:00-0700\n" +"POT-Creation-Date: 2012-04-13 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -39,8 +39,8 @@ msgstr "" #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 -#: ../../mod/settings.php:62 ../../mod/settings.php:473 -#: ../../mod/settings.php:478 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/settings.php:99 ../../mod/settings.php:514 +#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -50,12 +50,13 @@ msgstr "" #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 #: ../../mod/profile_photo.php:163 ../../mod/message.php:38 #: ../../mod/message.php:90 ../../mod/allfriends.php:9 -#: ../../mod/wall_upload.php:46 ../../mod/follow.php:8 ../../mod/common.php:9 -#: ../../mod/display.php:138 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:233 ../../mod/delegate.php:6 -#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 -#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:461 -#: ../../include/items.php:3121 ../../index.php:305 +#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46 +#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138 +#: ../../mod/profiles.php:7 ../../mod/profiles.php:329 +#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 +#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 +#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3132 +#: ../../index.php:305 msgid "Permission denied." msgstr "" @@ -84,8 +85,8 @@ msgstr "" msgid "Return to contact editor" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/settings.php:531 -#: ../../mod/settings.php:558 ../../mod/admin.php:524 ../../mod/admin.php:533 +#: ../../mod/crepair.php:148 ../../mod/settings.php:534 +#: ../../mod/settings.php:560 ../../mod/admin.php:544 ../../mod/admin.php:553 msgid "Name" msgstr "" @@ -127,14 +128,14 @@ msgstr "" #: ../../mod/photos.php:1274 ../../mod/photos.php:1305 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:325 -#: ../../mod/settings.php:529 ../../mod/settings.php:679 -#: ../../mod/settings.php:741 ../../mod/settings.php:926 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:354 -#: ../../mod/admin.php:521 ../../mod/admin.php:650 ../../mod/admin.php:822 -#: ../../mod/admin.php:902 ../../mod/profiles.php:402 ../../mod/invite.php:119 +#: ../../mod/settings.php:532 ../../mod/settings.php:678 +#: ../../mod/settings.php:739 ../../mod/settings.php:930 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:374 +#: ../../mod/admin.php:541 ../../mod/admin.php:670 ../../mod/admin.php:850 +#: ../../mod/admin.php:930 ../../mod/profiles.php:498 ../../mod/invite.php:119 #: ../../addon/facebook/facebook.php:552 ../../addon/yourls/yourls.php:76 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 -#: ../../addon/planets/planets.php:180 +#: ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 @@ -154,8 +155,9 @@ msgstr "" #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 -#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:90 -#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555 +#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 +#: ../../addon/posterous/posterous.php:90 +#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 msgid "Submit" msgstr "" @@ -213,11 +215,11 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:244 -#: ../../view/theme/diabook-blue/theme.php:244 +#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243 +#: ../../view/theme/diabook-blue/theme.php:243 #: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52 -#: ../../boot.php:1469 +#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52 +#: ../../boot.php:1470 msgid "Events" msgstr "" @@ -267,7 +269,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:395 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:1081 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1082 msgid "Location:" msgstr "" @@ -276,8 +278,8 @@ msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:530 -#: ../../mod/settings.php:557 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533 +#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -321,24 +323,24 @@ msgid "" msgstr "" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:740 -#: ../../mod/settings.php:841 ../../mod/settings.php:847 -#: ../../mod/settings.php:855 ../../mod/settings.php:859 -#: ../../mod/settings.php:864 ../../mod/settings.php:870 -#: ../../mod/settings.php:876 ../../mod/settings.php:882 -#: ../../mod/settings.php:916 ../../mod/settings.php:917 -#: ../../mod/settings.php:918 ../../mod/settings.php:919 -#: ../../mod/register.php:532 ../../mod/profiles.php:379 +#: ../../mod/settings.php:844 ../../mod/settings.php:850 +#: ../../mod/settings.php:858 ../../mod/settings.php:862 +#: ../../mod/settings.php:867 ../../mod/settings.php:873 +#: ../../mod/settings.php:879 ../../mod/settings.php:885 +#: ../../mod/settings.php:921 ../../mod/settings.php:922 +#: ../../mod/settings.php:923 ../../mod/settings.php:924 +#: ../../mod/register.php:532 ../../mod/profiles.php:475 msgid "Yes" msgstr "" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:741 -#: ../../mod/settings.php:841 ../../mod/settings.php:847 -#: ../../mod/settings.php:855 ../../mod/settings.php:859 -#: ../../mod/settings.php:864 ../../mod/settings.php:870 -#: ../../mod/settings.php:876 ../../mod/settings.php:882 -#: ../../mod/settings.php:916 ../../mod/settings.php:917 -#: ../../mod/settings.php:918 ../../mod/settings.php:919 -#: ../../mod/register.php:533 ../../mod/profiles.php:380 +#: ../../mod/settings.php:844 ../../mod/settings.php:850 +#: ../../mod/settings.php:858 ../../mod/settings.php:862 +#: ../../mod/settings.php:867 ../../mod/settings.php:873 +#: ../../mod/settings.php:879 ../../mod/settings.php:885 +#: ../../mod/settings.php:921 ../../mod/settings.php:922 +#: ../../mod/settings.php:923 ../../mod/settings.php:924 +#: ../../mod/register.php:533 ../../mod/profiles.php:476 msgid "No" msgstr "" @@ -349,10 +351,10 @@ msgstr "" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880 #: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383 #: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook-red/theme.php:114 -#: ../../view/theme/diabook-blue/theme.php:114 +#: ../../view/theme/diabook-red/theme.php:113 +#: ../../view/theme/diabook-blue/theme.php:113 #: ../../view/theme/diabook/theme.php:117 -#: ../../view/theme/diabook-aerith/theme.php:115 +#: ../../view/theme/diabook-aerith/theme.php:114 msgid "Contact Photos" msgstr "" @@ -360,7 +362,7 @@ msgstr "" msgid "Upload New Photos" msgstr "" -#: ../../mod/photos.php:69 ../../mod/settings.php:24 +#: ../../mod/photos.php:69 ../../mod/settings.php:20 msgid "everybody" msgstr "" @@ -375,10 +377,10 @@ msgstr "" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook-red/theme.php:115 -#: ../../view/theme/diabook-blue/theme.php:115 +#: ../../view/theme/diabook-red/theme.php:114 +#: ../../view/theme/diabook-blue/theme.php:114 #: ../../view/theme/diabook/theme.php:118 -#: ../../view/theme/diabook-aerith/theme.php:116 +#: ../../view/theme/diabook-aerith/theme.php:115 msgid "Profile Photos" msgstr "" @@ -400,10 +402,10 @@ msgstr "" #: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook-red/theme.php:86 -#: ../../view/theme/diabook-blue/theme.php:86 +#: ../../view/theme/diabook-red/theme.php:85 +#: ../../view/theme/diabook-blue/theme.php:85 #: ../../view/theme/diabook/theme.php:89 -#: ../../view/theme/diabook-aerith/theme.php:87 ../../include/text.php:1297 +#: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -551,7 +553,7 @@ msgstr "" #: ../../mod/photos.php:1233 ../../mod/photos.php:1273 #: ../../mod/photos.php:1304 ../../include/conversation.php:554 -#: ../../boot.php:494 +#: ../../boot.php:495 msgid "Comment" msgstr "" @@ -560,8 +562,8 @@ msgstr "" msgid "Preview" msgstr "" -#: ../../mod/photos.php:1332 ../../mod/settings.php:593 -#: ../../mod/settings.php:677 ../../mod/group.php:168 ../../mod/admin.php:528 +#: ../../mod/photos.php:1332 ../../mod/settings.php:595 +#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:548 #: ../../include/conversation.php:318 ../../include/conversation.php:576 msgid "Delete" msgstr "" @@ -578,10 +580,10 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:246 -#: ../../view/theme/diabook-blue/theme.php:246 +#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245 +#: ../../view/theme/diabook-blue/theme.php:245 #: ../../view/theme/diabook/theme.php:253 -#: ../../view/theme/diabook-aerith/theme.php:247 ../../include/nav.php:101 +#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101 msgid "Community" msgstr "" @@ -633,7 +635,7 @@ msgstr "" msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:95 ../../mod/settings.php:592 +#: ../../mod/editpost.php:95 ../../mod/settings.php:594 #: ../../include/conversation.php:563 msgid "Edit" msgstr "" @@ -1174,7 +1176,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1025 +#: ../../include/contact_widgets.php:9 ../../boot.php:1026 msgid "Connect" msgstr "" @@ -1222,10 +1224,10 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:240 -#: ../../view/theme/diabook-blue/theme.php:240 +#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239 +#: ../../view/theme/diabook-blue/theme.php:239 #: ../../view/theme/diabook/theme.php:247 -#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:77 +#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77 #: ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1274,7 +1276,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:526 +#: ../../mod/admin.php:546 msgid "Approve" msgstr "" @@ -1471,12 +1473,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:303 ../../mod/contacts.php:350 -#: ../../mod/admin.php:530 +#: ../../mod/admin.php:550 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:303 ../../mod/contacts.php:350 -#: ../../mod/admin.php:529 +#: ../../mod/admin.php:549 msgid "Block" msgstr "" @@ -1512,7 +1514,7 @@ msgid "Edit contact notes" msgstr "" #: ../../mod/contacts.php:334 ../../mod/contacts.php:507 -#: ../../mod/viewcontacts.php:62 +#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "" @@ -1545,7 +1547,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:347 ../../mod/admin.php:951 +#: ../../mod/contacts.php:347 ../../mod/admin.php:979 msgid "Update now" msgstr "" @@ -1598,14 +1600,14 @@ msgstr "" msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:508 +#: ../../mod/contacts.php:508 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:242 -#: ../../view/theme/diabook-blue/theme.php:242 +#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241 +#: ../../view/theme/diabook-blue/theme.php:241 #: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:139 +#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -1641,7 +1643,6 @@ msgstr "" #: ../../addon/facebook/facebook.php:622 #: ../../addon/facebook/facebook.php:1076 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2661 -#: ../../boot.php:679 msgid "Administrator" msgstr "" @@ -1651,7 +1652,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:808 +#: ../../mod/lostpass.php:83 ../../boot.php:809 msgid "Password Reset" msgstr "" @@ -1695,151 +1696,139 @@ msgstr "" msgid "Reset" msgstr "" -#: ../../mod/settings.php:89 +#: ../../mod/settings.php:49 ../../include/nav.php:137 +msgid "Account settings" +msgstr "" + +#: ../../mod/settings.php:54 +msgid "Display settings" +msgstr "" + +#: ../../mod/settings.php:60 +msgid "Connector settings" +msgstr "" + +#: ../../mod/settings.php:65 +msgid "Plugin settings" +msgstr "" + +#: ../../mod/settings.php:70 +msgid "Connected apps" +msgstr "" + +#: ../../mod/settings.php:75 +msgid "Export personal data" +msgstr "" + +#: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817 +#: ../../include/nav.php:137 +msgid "Settings" +msgstr "" + +#: ../../mod/settings.php:126 msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:92 ../../mod/settings.php:556 ../../mod/admin.php:75 +#: ../../mod/settings.php:129 ../../mod/settings.php:558 +#: ../../mod/admin.php:89 msgid "Update" msgstr "" -#: ../../mod/settings.php:197 +#: ../../mod/settings.php:234 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: ../../mod/settings.php:202 +#: ../../mod/settings.php:239 msgid "Email settings updated." msgstr "" -#: ../../mod/settings.php:261 +#: ../../mod/settings.php:298 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/settings.php:266 +#: ../../mod/settings.php:303 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/settings.php:277 +#: ../../mod/settings.php:314 msgid "Password changed." msgstr "" -#: ../../mod/settings.php:279 +#: ../../mod/settings.php:316 msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:340 +#: ../../mod/settings.php:379 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:342 +#: ../../mod/settings.php:381 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:348 +#: ../../mod/settings.php:387 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:350 +#: ../../mod/settings.php:389 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:450 +#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450 #: ../../addon/impressum/impressum.php:75 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:288 -#: ../../view/theme/diabook-blue/theme.php:287 -#: ../../view/theme/diabook/theme.php:298 -#: ../../view/theme/diabook-aerith/theme.php:288 ../../include/nav.php:137 -msgid "Account settings" -msgstr "" - -#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:293 -#: ../../view/theme/diabook-blue/theme.php:292 -#: ../../view/theme/diabook/theme.php:303 -#: ../../view/theme/diabook-aerith/theme.php:293 -msgid "Display settings" -msgstr "" - -#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:302 -#: ../../view/theme/diabook-blue/theme.php:301 -#: ../../view/theme/diabook/theme.php:312 -#: ../../view/theme/diabook-aerith/theme.php:302 -msgid "Connector settings" -msgstr "" - -#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:307 -#: ../../view/theme/diabook-blue/theme.php:306 -#: ../../view/theme/diabook/theme.php:317 -#: ../../view/theme/diabook-aerith/theme.php:307 -msgid "Plugin settings" -msgstr "" - -#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:312 -#: ../../view/theme/diabook-blue/theme.php:311 -#: ../../view/theme/diabook/theme.php:322 -#: ../../view/theme/diabook-aerith/theme.php:312 -msgid "Connections" -msgstr "" - -#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:317 -#: ../../view/theme/diabook-blue/theme.php:316 -#: ../../view/theme/diabook/theme.php:327 -#: ../../view/theme/diabook-aerith/theme.php:317 -msgid "Export personal data" -msgstr "" - -#: ../../mod/settings.php:528 ../../mod/settings.php:555 -#: ../../mod/settings.php:591 +#: ../../mod/settings.php:531 ../../mod/settings.php:557 +#: ../../mod/settings.php:593 msgid "Add application" msgstr "" -#: ../../mod/settings.php:532 ../../mod/settings.php:559 +#: ../../mod/settings.php:535 ../../mod/settings.php:561 #: ../../addon/statusnet/statusnet.php:547 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:533 ../../mod/settings.php:560 +#: ../../mod/settings.php:536 ../../mod/settings.php:562 #: ../../addon/statusnet/statusnet.php:546 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:534 ../../mod/settings.php:561 +#: ../../mod/settings.php:537 ../../mod/settings.php:563 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:535 ../../mod/settings.php:562 +#: ../../mod/settings.php:538 ../../mod/settings.php:564 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:546 +#: ../../mod/settings.php:549 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:590 +#: ../../mod/settings.php:592 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:594 +#: ../../mod/settings.php:596 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:595 +#: ../../mod/settings.php:597 msgid "No name" msgstr "" -#: ../../mod/settings.php:596 +#: ../../mod/settings.php:598 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:608 +#: ../../mod/settings.php:609 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:616 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "" @@ -1864,321 +1853,333 @@ msgstr "" msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:666 +#: ../../mod/settings.php:665 msgid "Email/Mailbox Setup" msgstr "" -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:666 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:667 msgid "Last successful email check:" msgstr "" -#: ../../mod/settings.php:669 +#: ../../mod/settings.php:668 msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/settings.php:670 +#: ../../mod/settings.php:669 msgid "IMAP server name:" msgstr "" -#: ../../mod/settings.php:671 +#: ../../mod/settings.php:670 msgid "IMAP port:" msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:671 msgid "Security:" msgstr "" -#: ../../mod/settings.php:672 ../../mod/settings.php:677 +#: ../../mod/settings.php:671 ../../mod/settings.php:676 msgid "None" msgstr "" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:672 msgid "Email login name:" msgstr "" -#: ../../mod/settings.php:674 +#: ../../mod/settings.php:673 msgid "Email password:" msgstr "" -#: ../../mod/settings.php:675 +#: ../../mod/settings.php:674 msgid "Reply-to address:" msgstr "" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:675 msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/settings.php:677 +#: ../../mod/settings.php:676 msgid "Action after import:" msgstr "" -#: ../../mod/settings.php:677 +#: ../../mod/settings.php:676 msgid "Mark as seen" msgstr "" -#: ../../mod/settings.php:677 +#: ../../mod/settings.php:676 msgid "Move to folder" msgstr "" -#: ../../mod/settings.php:678 +#: ../../mod/settings.php:677 msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:739 +#: ../../mod/settings.php:737 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:745 +#: ../../mod/settings.php:743 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:746 +#: ../../mod/settings.php:744 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:746 +#: ../../mod/settings.php:744 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:747 +#: ../../mod/settings.php:745 msgid "Number of items to display on the network page:" msgstr "" -#: ../../mod/settings.php:747 +#: ../../mod/settings.php:745 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:748 +#: ../../mod/settings.php:746 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:502 +#: ../../mod/settings.php:811 ../../mod/admin.php:162 ../../mod/admin.php:522 msgid "Normal Account" msgstr "" -#: ../../mod/settings.php:809 +#: ../../mod/settings.php:812 msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:503 +#: ../../mod/settings.php:815 ../../mod/admin.php:163 ../../mod/admin.php:523 msgid "Soapbox Account" msgstr "" -#: ../../mod/settings.php:813 +#: ../../mod/settings.php:816 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:504 +#: ../../mod/settings.php:819 ../../mod/admin.php:164 ../../mod/admin.php:524 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/settings.php:817 +#: ../../mod/settings.php:820 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:505 +#: ../../mod/settings.php:823 ../../mod/admin.php:165 ../../mod/admin.php:525 msgid "Automatic Friend Account" msgstr "" -#: ../../mod/settings.php:821 +#: ../../mod/settings.php:824 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/settings.php:831 +#: ../../mod/settings.php:834 msgid "OpenID:" msgstr "" -#: ../../mod/settings.php:831 +#: ../../mod/settings.php:834 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:841 +#: ../../mod/settings.php:844 msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/settings.php:847 +#: ../../mod/settings.php:850 msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/settings.php:855 +#: ../../mod/settings.php:858 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: ../../mod/settings.php:859 +#: ../../mod/settings.php:862 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/settings.php:864 +#: ../../mod/settings.php:867 msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/settings.php:870 +#: ../../mod/settings.php:873 msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/settings.php:876 +#: ../../mod/settings.php:879 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:885 msgid "Permit unknown people to send you private mail?" msgstr "" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:896 msgid "Profile is <strong>not published</strong>." msgstr "" -#: ../../mod/settings.php:897 ../../mod/profile_photo.php:211 +#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211 msgid "or" msgstr "" -#: ../../mod/settings.php:902 +#: ../../mod/settings.php:907 msgid "Your Identity Address is" msgstr "" -#: ../../mod/settings.php:913 +#: ../../mod/settings.php:918 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:913 +#: ../../mod/settings.php:918 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:914 +#: ../../mod/settings.php:919 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:915 +#: ../../mod/settings.php:920 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:916 +#: ../../mod/settings.php:921 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:917 +#: ../../mod/settings.php:922 msgid "Expire personal notes:" msgstr "" -#: ../../mod/settings.php:918 +#: ../../mod/settings.php:923 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:919 +#: ../../mod/settings.php:924 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:924 +#: ../../mod/settings.php:928 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:937 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:934 +#: ../../mod/settings.php:938 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:935 +#: ../../mod/settings.php:939 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:935 +#: ../../mod/settings.php:939 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:943 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:940 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "" -#: ../../mod/settings.php:941 +#: ../../mod/settings.php:945 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:942 +#: ../../mod/settings.php:946 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:943 +#: ../../mod/settings.php:947 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:948 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:947 +#: ../../mod/settings.php:951 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:953 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:949 ../../mod/settings.php:964 +#: ../../mod/settings.php:953 ../../mod/settings.php:968 msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/settings.php:950 +#: ../../mod/settings.php:954 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:955 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:968 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:971 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:968 +#: ../../mod/settings.php:972 +msgid "By default post a status message when:" +msgstr "" + +#: ../../mod/settings.php:973 +msgid "accepting a friend request" +msgstr "" + +#: ../../mod/settings.php:974 +msgid "making an <em>interesting</em> profile change" +msgstr "" + +#: ../../mod/settings.php:975 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:969 +#: ../../mod/settings.php:976 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:970 +#: ../../mod/settings.php:977 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:971 +#: ../../mod/settings.php:978 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:972 +#: ../../mod/settings.php:979 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:973 +#: ../../mod/settings.php:980 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:974 +#: ../../mod/settings.php:981 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:975 +#: ../../mod/settings.php:982 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:985 msgid "Advanced Page Settings" msgstr "" @@ -2208,7 +2209,7 @@ msgstr "" msgid "Saved Searches" msgstr "" -#: ../../mod/network.php:92 ../../include/group.php:216 +#: ../../mod/network.php:92 ../../include/group.php:217 msgid "add" msgstr "" @@ -2268,7 +2269,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1474 +#: ../../mod/notes.php:44 ../../boot.php:1475 msgid "Personal Notes" msgstr "" @@ -2515,12 +2516,12 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:241 -#: ../../view/theme/diabook-blue/theme.php:241 +#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240 +#: ../../view/theme/diabook-blue/theme.php:240 #: ../../view/theme/diabook/theme.php:248 -#: ../../view/theme/diabook-aerith/theme.php:242 +#: ../../view/theme/diabook-aerith/theme.php:241 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76 -#: ../../include/nav.php:50 ../../boot.php:1456 +#: ../../include/nav.php:50 ../../boot.php:1457 msgid "Profile" msgstr "" @@ -2669,7 +2670,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:553 ../../mod/admin.php:355 +#: ../../mod/register.php:553 ../../mod/admin.php:375 msgid "Registration" msgstr "" @@ -2692,7 +2693,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:774 +#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775 msgid "Register" msgstr "" @@ -2704,13 +2705,13 @@ msgstr "" #: ../../addon/facebook/facebook.php:1549 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook-red/theme.php:81 -#: ../../view/theme/diabook-red/theme.php:90 -#: ../../view/theme/diabook-blue/theme.php:81 -#: ../../view/theme/diabook-blue/theme.php:90 +#: ../../view/theme/diabook-red/theme.php:80 +#: ../../view/theme/diabook-red/theme.php:89 +#: ../../view/theme/diabook-blue/theme.php:80 +#: ../../view/theme/diabook-blue/theme.php:89 #: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93 -#: ../../view/theme/diabook-aerith/theme.php:82 -#: ../../view/theme/diabook-aerith/theme.php:91 +#: ../../view/theme/diabook-aerith/theme.php:81 +#: ../../view/theme/diabook-aerith/theme.php:90 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 @@ -2719,10 +2720,10 @@ msgstr "" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1553 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook-red/theme.php:95 -#: ../../view/theme/diabook-blue/theme.php:95 +#: ../../view/theme/diabook-red/theme.php:94 +#: ../../view/theme/diabook-blue/theme.php:94 #: ../../view/theme/diabook/theme.php:98 -#: ../../view/theme/diabook-aerith/theme.php:96 +#: ../../view/theme/diabook-aerith/theme.php:95 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2733,9 +2734,9 @@ msgstr "" msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127 -#: ../../mod/admin.php:562 ../../mod/admin.php:741 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3033 +#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141 +#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3044 msgid "Item not found." msgstr "" @@ -2952,483 +2953,485 @@ msgstr "" msgid "No friends to display." msgstr "" -#: ../../mod/admin.php:71 ../../mod/admin.php:353 +#: ../../mod/admin.php:51 +msgid "Theme settings updated." +msgstr "" + +#: ../../mod/admin.php:85 ../../mod/admin.php:373 msgid "Site" msgstr "" -#: ../../mod/admin.php:72 ../../mod/admin.php:520 ../../mod/admin.php:532 +#: ../../mod/admin.php:86 ../../mod/admin.php:540 ../../mod/admin.php:552 msgid "Users" msgstr "" -#: ../../mod/admin.php:73 ../../mod/admin.php:609 ../../mod/admin.php:649 +#: ../../mod/admin.php:87 ../../mod/admin.php:629 ../../mod/admin.php:669 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:74 ../../mod/admin.php:787 ../../mod/admin.php:821 +#: ../../mod/admin.php:88 ../../mod/admin.php:815 ../../mod/admin.php:849 msgid "Themes" msgstr "" -#: ../../mod/admin.php:89 ../../mod/admin.php:901 +#: ../../mod/admin.php:103 ../../mod/admin.php:929 msgid "Logs" msgstr "" -#: ../../mod/admin.php:94 +#: ../../mod/admin.php:108 msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:157 ../../mod/admin.php:352 ../../mod/admin.php:519 -#: ../../mod/admin.php:608 ../../mod/admin.php:648 ../../mod/admin.php:786 -#: ../../mod/admin.php:820 ../../mod/admin.php:900 +#: ../../mod/admin.php:177 ../../mod/admin.php:372 ../../mod/admin.php:539 +#: ../../mod/admin.php:628 ../../mod/admin.php:668 ../../mod/admin.php:814 +#: ../../mod/admin.php:848 ../../mod/admin.php:928 msgid "Administration" msgstr "" -#: ../../mod/admin.php:158 +#: ../../mod/admin.php:178 msgid "Summary" msgstr "" -#: ../../mod/admin.php:159 +#: ../../mod/admin.php:179 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:161 +#: ../../mod/admin.php:181 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:162 +#: ../../mod/admin.php:182 msgid "Version" msgstr "" -#: ../../mod/admin.php:164 +#: ../../mod/admin.php:184 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:295 +#: ../../mod/admin.php:315 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:339 +#: ../../mod/admin.php:359 msgid "Closed" msgstr "" -#: ../../mod/admin.php:340 +#: ../../mod/admin.php:360 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:341 +#: ../../mod/admin.php:361 msgid "Open" msgstr "" -#: ../../mod/admin.php:345 +#: ../../mod/admin.php:365 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:346 +#: ../../mod/admin.php:366 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:347 +#: ../../mod/admin.php:367 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:356 +#: ../../mod/admin.php:376 msgid "File upload" msgstr "" -#: ../../mod/admin.php:357 +#: ../../mod/admin.php:377 msgid "Policies" msgstr "" -#: ../../mod/admin.php:358 +#: ../../mod/admin.php:378 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:362 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:382 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "" -#: ../../mod/admin.php:363 +#: ../../mod/admin.php:383 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:364 +#: ../../mod/admin.php:384 msgid "System language" msgstr "" -#: ../../mod/admin.php:365 +#: ../../mod/admin.php:385 msgid "System theme" msgstr "" -#: ../../mod/admin.php:365 -msgid "Default system theme - may be over-ridden by user profiles" +#: ../../mod/admin.php:385 +msgid "" +"Default system theme - may be over-ridden by user profiles - <a href='#' " +"id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../mod/admin.php:366 +#: ../../mod/admin.php:386 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:366 +#: ../../mod/admin.php:386 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:367 +#: ../../mod/admin.php:387 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:367 +#: ../../mod/admin.php:387 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:369 +#: ../../mod/admin.php:389 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:370 +#: ../../mod/admin.php:390 msgid "Register text" msgstr "" -#: ../../mod/admin.php:370 +#: ../../mod/admin.php:390 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:371 +#: ../../mod/admin.php:391 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:371 +#: ../../mod/admin.php:391 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:372 +#: ../../mod/admin.php:392 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:372 +#: ../../mod/admin.php:392 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:373 +#: ../../mod/admin.php:393 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:373 +#: ../../mod/admin.php:393 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:374 +#: ../../mod/admin.php:394 msgid "Block public" msgstr "" -#: ../../mod/admin.php:374 +#: ../../mod/admin.php:394 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:375 +#: ../../mod/admin.php:395 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:375 +#: ../../mod/admin.php:395 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:376 +#: ../../mod/admin.php:396 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:376 +#: ../../mod/admin.php:396 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:378 +#: ../../mod/admin.php:398 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:378 +#: ../../mod/admin.php:398 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:379 +#: ../../mod/admin.php:399 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:379 +#: ../../mod/admin.php:399 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:380 +#: ../../mod/admin.php:400 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:380 +#: ../../mod/admin.php:400 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:381 +#: ../../mod/admin.php:401 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:381 +#: ../../mod/admin.php:401 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:382 +#: ../../mod/admin.php:402 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:382 +#: ../../mod/admin.php:402 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:383 +#: ../../mod/admin.php:403 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:383 +#: ../../mod/admin.php:403 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: ../../mod/admin.php:384 +#: ../../mod/admin.php:404 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:384 +#: ../../mod/admin.php:404 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:405 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:405 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:386 +#: ../../mod/admin.php:406 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:386 +#: ../../mod/admin.php:406 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: ../../mod/admin.php:387 +#: ../../mod/admin.php:407 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:388 +#: ../../mod/admin.php:408 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:389 +#: ../../mod/admin.php:409 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:389 +#: ../../mod/admin.php:409 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:430 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:437 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:471 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:478 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:478 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:522 +#: ../../mod/admin.php:542 msgid "select all" msgstr "" -#: ../../mod/admin.php:523 +#: ../../mod/admin.php:543 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:524 +#: ../../mod/admin.php:544 msgid "Request date" msgstr "" -#: ../../mod/admin.php:524 ../../mod/admin.php:533 +#: ../../mod/admin.php:544 ../../mod/admin.php:553 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:525 +#: ../../mod/admin.php:545 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:527 +#: ../../mod/admin.php:547 msgid "Deny" msgstr "" -#: ../../mod/admin.php:533 +#: ../../mod/admin.php:553 msgid "Register date" msgstr "" -#: ../../mod/admin.php:533 +#: ../../mod/admin.php:553 msgid "Last login" msgstr "" -#: ../../mod/admin.php:533 +#: ../../mod/admin.php:553 msgid "Last item" msgstr "" -#: ../../mod/admin.php:533 +#: ../../mod/admin.php:553 msgid "Account" msgstr "" -#: ../../mod/admin.php:535 +#: ../../mod/admin.php:555 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:536 +#: ../../mod/admin.php:556 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:572 +#: ../../mod/admin.php:592 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:576 +#: ../../mod/admin.php:596 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:586 ../../mod/admin.php:765 +#: ../../mod/admin.php:606 ../../mod/admin.php:785 msgid "Disable" msgstr "" -#: ../../mod/admin.php:588 ../../mod/admin.php:767 +#: ../../mod/admin.php:608 ../../mod/admin.php:787 msgid "Enable" msgstr "" -#: ../../mod/admin.php:610 ../../mod/admin.php:788 +#: ../../mod/admin.php:630 ../../mod/admin.php:816 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:611 ../../mod/admin.php:789 ../../include/nav.php:137 -msgid "Settings" -msgstr "" - -#: ../../mod/admin.php:618 ../../mod/admin.php:798 +#: ../../mod/admin.php:638 ../../mod/admin.php:826 msgid "Author: " msgstr "" -#: ../../mod/admin.php:619 ../../mod/admin.php:799 +#: ../../mod/admin.php:639 ../../mod/admin.php:827 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:730 +#: ../../mod/admin.php:750 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:780 +#: ../../mod/admin.php:808 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:826 +#: ../../mod/admin.php:854 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:827 +#: ../../mod/admin.php:855 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:850 +#: ../../mod/admin.php:878 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:903 +#: ../../mod/admin.php:931 msgid "Clear" msgstr "" -#: ../../mod/admin.php:909 +#: ../../mod/admin.php:937 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:910 +#: ../../mod/admin.php:938 msgid "Log file" msgstr "" -#: ../../mod/admin.php:910 +#: ../../mod/admin.php:938 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:911 +#: ../../mod/admin.php:939 msgid "Log level" msgstr "" -#: ../../mod/admin.php:952 +#: ../../mod/admin.php:980 msgid "Close" msgstr "" -#: ../../mod/admin.php:958 +#: ../../mod/admin.php:986 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:959 +#: ../../mod/admin.php:987 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:960 +#: ../../mod/admin.php:988 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:961 +#: ../../mod/admin.php:989 msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:20 ../../boot.php:938 +#: ../../mod/profile.php:20 ../../boot.php:939 msgid "Requested profile is not available." msgstr "" @@ -3485,6 +3488,10 @@ msgstr "" msgid "{0} mentioned you in a post" msgstr "" +#: ../../mod/nogroup.php:58 +msgid "Contacts who are not members of a group" +msgstr "" + #: ../../mod/openid.php:24 msgid "OpenID protocol error. No ID returned." msgstr "" @@ -3568,8 +3575,8 @@ msgstr "" msgid "Search This Site" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:243 -#: ../../mod/profiles.php:357 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:339 +#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -3577,213 +3584,259 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:202 +#: ../../mod/profiles.php:143 +msgid "Marital Status" +msgstr "" + +#: ../../mod/profiles.php:144 +msgid "Romantic Partner" +msgstr "" + +#: ../../mod/profiles.php:145 +msgid "Work/Employment" +msgstr "" + +#: ../../mod/profiles.php:146 +msgid "Religion" +msgstr "" + +#: ../../mod/profiles.php:147 +msgid "Political Views" +msgstr "" + +#: ../../mod/profiles.php:148 +msgid "Gender" +msgstr "" + +#: ../../mod/profiles.php:149 +msgid "Sexual Preference" +msgstr "" + +#: ../../mod/profiles.php:150 +msgid "Homepage" +msgstr "" + +#: ../../mod/profiles.php:151 +msgid "Interests" +msgstr "" + +#: ../../mod/profiles.php:154 +msgid "Location" +msgstr "" + +#: ../../mod/profiles.php:225 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:262 +#: ../../mod/profiles.php:300 +msgid "public profile" +msgstr "" + +#: ../../mod/profiles.php:302 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "" + +#: ../../mod/profiles.php:358 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:280 ../../mod/profiles.php:314 +#: ../../mod/profiles.php:376 ../../mod/profiles.php:410 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:299 ../../mod/profiles.php:341 +#: ../../mod/profiles.php:395 ../../mod/profiles.php:437 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:320 +#: ../../mod/profiles.php:416 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:378 +#: ../../mod/profiles.php:474 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:401 +#: ../../mod/profiles.php:497 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:403 +#: ../../mod/profiles.php:499 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:404 +#: ../../mod/profiles.php:500 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:405 +#: ../../mod/profiles.php:501 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:406 +#: ../../mod/profiles.php:502 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:407 +#: ../../mod/profiles.php:503 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:408 +#: ../../mod/profiles.php:504 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:409 +#: ../../mod/profiles.php:505 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:410 +#: ../../mod/profiles.php:506 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:411 +#: ../../mod/profiles.php:507 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:412 +#: ../../mod/profiles.php:508 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:413 +#: ../../mod/profiles.php:509 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:414 +#: ../../mod/profiles.php:510 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:415 +#: ../../mod/profiles.php:511 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:416 +#: ../../mod/profiles.php:512 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:417 +#: ../../mod/profiles.php:513 msgid "<span class=\"heart\">♥</span> Marital Status:" msgstr "" -#: ../../mod/profiles.php:418 +#: ../../mod/profiles.php:514 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:419 +#: ../../mod/profiles.php:515 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:420 ../../include/profile_advanced.php:43 +#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:421 +#: ../../mod/profiles.php:517 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:422 ../../include/profile_advanced.php:49 +#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:423 +#: ../../mod/profiles.php:519 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:424 +#: ../../mod/profiles.php:520 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:425 +#: ../../mod/profiles.php:521 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:426 +#: ../../mod/profiles.php:522 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:427 +#: ../../mod/profiles.php:523 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:428 +#: ../../mod/profiles.php:524 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:429 +#: ../../mod/profiles.php:525 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:430 +#: ../../mod/profiles.php:526 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:431 +#: ../../mod/profiles.php:527 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:432 +#: ../../mod/profiles.php:528 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:433 +#: ../../mod/profiles.php:529 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:434 +#: ../../mod/profiles.php:530 msgid "Television" msgstr "" -#: ../../mod/profiles.php:435 +#: ../../mod/profiles.php:531 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:436 +#: ../../mod/profiles.php:532 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:437 +#: ../../mod/profiles.php:533 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:438 +#: ../../mod/profiles.php:534 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:443 +#: ../../mod/profiles.php:539 msgid "" "This is your <strong>public</strong> profile.<br />It <strong>may</strong> " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:453 ../../mod/directory.php:111 +#: ../../mod/profiles.php:549 ../../mod/directory.php:111 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:488 ../../view/theme/diabook-red/theme.php:298 -#: ../../view/theme/diabook-blue/theme.php:297 -#: ../../view/theme/diabook/theme.php:308 -#: ../../view/theme/diabook-aerith/theme.php:298 +#: ../../mod/profiles.php:584 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:489 ../../boot.php:1047 +#: ../../mod/profiles.php:585 ../../boot.php:1048 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:490 ../../boot.php:1048 +#: ../../mod/profiles.php:586 ../../boot.php:1049 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:501 ../../boot.php:1058 +#: ../../mod/profiles.php:597 ../../boot.php:1059 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:503 ../../boot.php:1061 +#: ../../mod/profiles.php:599 ../../boot.php:1062 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:504 ../../boot.php:1062 +#: ../../mod/profiles.php:600 ../../boot.php:1063 msgid "Edit visibility" msgstr "" @@ -3835,10 +3888,10 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:150 -#: ../../view/theme/diabook-blue/theme.php:150 +#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149 +#: ../../view/theme/diabook-blue/theme.php:149 #: ../../view/theme/diabook/theme.php:153 -#: ../../view/theme/diabook-aerith/theme.php:151 +#: ../../view/theme/diabook-aerith/theme.php:150 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -3853,10 +3906,10 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:148 -#: ../../view/theme/diabook-blue/theme.php:148 +#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147 +#: ../../view/theme/diabook-blue/theme.php:147 #: ../../view/theme/diabook/theme.php:151 -#: ../../view/theme/diabook-aerith/theme.php:149 +#: ../../view/theme/diabook-aerith/theme.php:148 msgid "Global Directory" msgstr "" @@ -4348,11 +4401,11 @@ msgstr "" msgid "Forums" msgstr "" -#: ../../addon/planets/planets.php:172 +#: ../../addon/planets/planets.php:150 msgid "Planets Settings" msgstr "" -#: ../../addon/planets/planets.php:174 +#: ../../addon/planets/planets.php:152 msgid "Enable Planets Plugin" msgstr "" @@ -4360,7 +4413,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:795 +#: ../../include/nav.php:64 ../../boot.php:796 msgid "Login" msgstr "" @@ -4388,10 +4441,10 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook-red/theme.php:78 -#: ../../view/theme/diabook-blue/theme.php:78 +#: ../../view/theme/diabook-red/theme.php:77 +#: ../../view/theme/diabook-blue/theme.php:77 #: ../../view/theme/diabook/theme.php:81 -#: ../../view/theme/diabook-aerith/theme.php:79 ../../include/text.php:1295 +#: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -5082,7 +5135,7 @@ msgid "Show More Settings saved." msgstr "" #: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 -#: ../../boot.php:495 +#: ../../boot.php:496 msgid "show more" msgstr "" @@ -5192,11 +5245,27 @@ msgstr "" msgid "Consumer secret" msgstr "" -#: ../../addon/irc/irc.php:25 -msgid "IRC Chatroom" +#: ../../addon/irc/irc.php:44 +msgid "IRC Settings" msgstr "" #: ../../addon/irc/irc.php:46 +msgid "Channel(s) to auto connect (comma separated)" +msgstr "" + +#: ../../addon/irc/irc.php:51 +msgid "Popular Channels (comma separated)" +msgstr "" + +#: ../../addon/irc/irc.php:69 +msgid "IRC settings saved." +msgstr "" + +#: ../../addon/irc/irc.php:74 +msgid "IRC Chatroom" +msgstr "" + +#: ../../addon/irc/irc.php:96 msgid "Popular Channels" msgstr "" @@ -5252,182 +5321,182 @@ msgstr "" msgid "Post to Posterous by default" msgstr "" -#: ../../view/theme/diabook-red/theme.php:27 -#: ../../view/theme/diabook-blue/theme.php:27 +#: ../../view/theme/diabook-red/theme.php:26 +#: ../../view/theme/diabook-blue/theme.php:26 #: ../../view/theme/diabook/theme.php:30 -#: ../../view/theme/diabook-aerith/theme.php:28 +#: ../../view/theme/diabook-aerith/theme.php:27 msgid "Last users" msgstr "" -#: ../../view/theme/diabook-red/theme.php:56 -#: ../../view/theme/diabook-blue/theme.php:56 +#: ../../view/theme/diabook-red/theme.php:55 +#: ../../view/theme/diabook-blue/theme.php:55 #: ../../view/theme/diabook/theme.php:59 -#: ../../view/theme/diabook-aerith/theme.php:57 +#: ../../view/theme/diabook-aerith/theme.php:56 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook-red/theme.php:101 -#: ../../view/theme/diabook-blue/theme.php:101 +#: ../../view/theme/diabook-red/theme.php:100 +#: ../../view/theme/diabook-blue/theme.php:100 #: ../../view/theme/diabook/theme.php:104 -#: ../../view/theme/diabook-aerith/theme.php:102 +#: ../../view/theme/diabook-aerith/theme.php:101 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook-red/theme.php:146 -#: ../../view/theme/diabook-blue/theme.php:146 +#: ../../view/theme/diabook-red/theme.php:145 +#: ../../view/theme/diabook-blue/theme.php:145 #: ../../view/theme/diabook/theme.php:149 -#: ../../view/theme/diabook-aerith/theme.php:147 +#: ../../view/theme/diabook-aerith/theme.php:146 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook-red/theme.php:147 -#: ../../view/theme/diabook-blue/theme.php:147 +#: ../../view/theme/diabook-red/theme.php:146 +#: ../../view/theme/diabook-blue/theme.php:146 #: ../../view/theme/diabook/theme.php:150 -#: ../../view/theme/diabook-aerith/theme.php:148 +#: ../../view/theme/diabook-aerith/theme.php:147 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook-red/theme.php:149 -#: ../../view/theme/diabook-blue/theme.php:149 +#: ../../view/theme/diabook-red/theme.php:148 +#: ../../view/theme/diabook-blue/theme.php:148 #: ../../view/theme/diabook/theme.php:152 -#: ../../view/theme/diabook-aerith/theme.php:150 +#: ../../view/theme/diabook-aerith/theme.php:149 #: ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook-red/theme.php:151 -#: ../../view/theme/diabook-blue/theme.php:151 +#: ../../view/theme/diabook-red/theme.php:150 +#: ../../view/theme/diabook-blue/theme.php:150 #: ../../view/theme/diabook/theme.php:154 -#: ../../view/theme/diabook-aerith/theme.php:152 +#: ../../view/theme/diabook-aerith/theme.php:151 #: ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook-red/theme.php:166 -#: ../../view/theme/diabook-red/theme.php:247 -#: ../../view/theme/diabook-blue/theme.php:166 -#: ../../view/theme/diabook-blue/theme.php:247 +#: ../../view/theme/diabook-red/theme.php:165 +#: ../../view/theme/diabook-red/theme.php:246 +#: ../../view/theme/diabook-blue/theme.php:165 +#: ../../view/theme/diabook-blue/theme.php:246 #: ../../view/theme/diabook/theme.php:170 #: ../../view/theme/diabook/theme.php:254 -#: ../../view/theme/diabook-aerith/theme.php:167 -#: ../../view/theme/diabook-aerith/theme.php:248 +#: ../../view/theme/diabook-aerith/theme.php:166 +#: ../../view/theme/diabook-aerith/theme.php:247 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook-red/theme.php:199 -#: ../../view/theme/diabook-blue/theme.php:199 +#: ../../view/theme/diabook-red/theme.php:198 +#: ../../view/theme/diabook-blue/theme.php:198 #: ../../view/theme/diabook/theme.php:203 -#: ../../view/theme/diabook-aerith/theme.php:200 +#: ../../view/theme/diabook-aerith/theme.php:199 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook-red/theme.php:205 -#: ../../view/theme/diabook-blue/theme.php:205 +#: ../../view/theme/diabook-red/theme.php:204 +#: ../../view/theme/diabook-blue/theme.php:204 #: ../../view/theme/diabook/theme.php:209 -#: ../../view/theme/diabook-aerith/theme.php:206 +#: ../../view/theme/diabook-aerith/theme.php:205 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook-red/theme.php:211 -#: ../../view/theme/diabook-blue/theme.php:211 +#: ../../view/theme/diabook-red/theme.php:210 +#: ../../view/theme/diabook-blue/theme.php:210 #: ../../view/theme/diabook/theme.php:215 -#: ../../view/theme/diabook-aerith/theme.php:212 +#: ../../view/theme/diabook-aerith/theme.php:211 msgid "PostIt to Friendica" msgstr "" -#: ../../view/theme/diabook-red/theme.php:211 -#: ../../view/theme/diabook-blue/theme.php:211 +#: ../../view/theme/diabook-red/theme.php:210 +#: ../../view/theme/diabook-blue/theme.php:210 #: ../../view/theme/diabook/theme.php:215 -#: ../../view/theme/diabook-aerith/theme.php:212 +#: ../../view/theme/diabook-aerith/theme.php:211 msgid "Post to Friendica" msgstr "" -#: ../../view/theme/diabook-red/theme.php:212 -#: ../../view/theme/diabook-blue/theme.php:212 +#: ../../view/theme/diabook-red/theme.php:211 +#: ../../view/theme/diabook-blue/theme.php:211 #: ../../view/theme/diabook/theme.php:216 -#: ../../view/theme/diabook-aerith/theme.php:213 +#: ../../view/theme/diabook-aerith/theme.php:212 msgid " from anywhere by bookmarking this Link." msgstr "" -#: ../../view/theme/diabook-red/theme.php:240 -#: ../../view/theme/diabook-blue/theme.php:240 +#: ../../view/theme/diabook-red/theme.php:239 +#: ../../view/theme/diabook-blue/theme.php:239 #: ../../view/theme/diabook/theme.php:247 -#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:49 +#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook-red/theme.php:241 -#: ../../view/theme/diabook-blue/theme.php:241 +#: ../../view/theme/diabook-red/theme.php:240 +#: ../../view/theme/diabook-blue/theme.php:240 #: ../../view/theme/diabook/theme.php:248 -#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:50 +#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook-red/theme.php:242 -#: ../../view/theme/diabook-blue/theme.php:242 +#: ../../view/theme/diabook-red/theme.php:241 +#: ../../view/theme/diabook-blue/theme.php:241 #: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook-aerith/theme.php:243 +#: ../../view/theme/diabook-aerith/theme.php:242 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook-red/theme.php:243 -#: ../../view/theme/diabook-blue/theme.php:243 +#: ../../view/theme/diabook-red/theme.php:242 +#: ../../view/theme/diabook-blue/theme.php:242 #: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51 -#: ../../boot.php:1461 +#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51 +#: ../../boot.php:1462 msgid "Photos" msgstr "" -#: ../../view/theme/diabook-red/theme.php:243 -#: ../../view/theme/diabook-blue/theme.php:243 +#: ../../view/theme/diabook-red/theme.php:242 +#: ../../view/theme/diabook-blue/theme.php:242 #: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51 +#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook-red/theme.php:244 -#: ../../view/theme/diabook-blue/theme.php:244 +#: ../../view/theme/diabook-red/theme.php:243 +#: ../../view/theme/diabook-blue/theme.php:243 #: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52 +#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook-red/theme.php:245 -#: ../../view/theme/diabook-blue/theme.php:245 +#: ../../view/theme/diabook-red/theme.php:244 +#: ../../view/theme/diabook-blue/theme.php:244 #: ../../view/theme/diabook/theme.php:252 -#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53 +#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook-red/theme.php:245 -#: ../../view/theme/diabook-blue/theme.php:245 +#: ../../view/theme/diabook-red/theme.php:244 +#: ../../view/theme/diabook-blue/theme.php:244 #: ../../view/theme/diabook/theme.php:252 -#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53 +#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/quattro/config.php:23 +#: ../../view/theme/quattro/config.php:54 msgid "Theme settings" msgstr "" -#: ../../view/theme/quattro/config.php:24 +#: ../../view/theme/quattro/config.php:55 msgid "Alignment" msgstr "" -#: ../../view/theme/quattro/config.php:24 +#: ../../view/theme/quattro/config.php:55 msgid "Left" msgstr "" -#: ../../view/theme/quattro/config.php:24 +#: ../../view/theme/quattro/config.php:55 msgid "Center" msgstr "" -#: ../../view/theme/quattro/config.php:25 +#: ../../view/theme/quattro/config.php:56 msgid "Color scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1083 +#: ../../include/profile_advanced.php:17 ../../boot.php:1084 msgid "Gender:" msgstr "" @@ -5448,11 +5517,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1086 +#: ../../include/profile_advanced.php:37 ../../boot.php:1087 msgid "Status:" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:1088 +#: ../../include/profile_advanced.php:45 ../../boot.php:1089 msgid "Homepage:" msgstr "" @@ -5936,27 +6005,27 @@ msgstr "" msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1071 -msgid "Select an alternate language" +#: ../../include/text.php:1084 +msgid "default" msgstr "" -#: ../../include/text.php:1083 -msgid "default" +#: ../../include/text.php:1096 +msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1299 +#: ../../include/text.php:1306 msgid "activity" msgstr "" -#: ../../include/text.php:1301 +#: ../../include/text.php:1308 msgid "comment" msgstr "" -#: ../../include/text.php:1302 +#: ../../include/text.php:1309 msgid "post" msgstr "" -#: ../../include/text.php:1457 +#: ../../include/text.php:1464 msgid "Item filed" msgstr "" @@ -5973,7 +6042,7 @@ msgstr "" msgid "[Relayed] Comment authored by %s from network %s" msgstr "" -#: ../../include/network.php:822 +#: ../../include/network.php:823 msgid "view full size" msgstr "" @@ -6012,7 +6081,11 @@ msgstr "" msgid "Create a new group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:794 +#: ../../include/group.php:215 +msgid "Contacts not in any group" +msgstr "" + +#: ../../include/nav.php:46 ../../boot.php:795 msgid "Logout" msgstr "" @@ -6020,7 +6093,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1451 +#: ../../include/nav.php:49 ../../boot.php:1452 msgid "Status" msgstr "" @@ -6100,11 +6173,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1041 +#: ../../include/nav.php:138 ../../boot.php:1042 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1041 +#: ../../include/nav.php:138 ../../boot.php:1042 msgid "Manage/edit profiles" msgstr "" @@ -6283,26 +6356,10 @@ msgid "Image/photo" msgstr "" #: ../../include/dba.php:41 -msgid "Server name of user name are missing. " -msgstr "" - -#: ../../include/dba.php:50 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/dba.php:84 -msgid "There is no db connection. " -msgstr "" - -#: ../../include/dba.php:107 ../../include/dba.php:109 -msgid " results" -msgstr "" - -#: ../../include/dba.php:113 -msgid "SQL returned " -msgstr "" - #: ../../include/message.php:15 ../../include/message.php:171 msgid "[no subject]" msgstr "" @@ -6542,28 +6599,28 @@ msgid "" "form has been opened for too long (>3 hours) before subitting it." msgstr "" -#: ../../include/Contact.php:137 ../../include/conversation.php:813 +#: ../../include/Contact.php:145 ../../include/conversation.php:813 msgid "View Status" msgstr "" -#: ../../include/Contact.php:138 ../../include/conversation.php:814 +#: ../../include/Contact.php:146 ../../include/conversation.php:814 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:139 ../../include/conversation.php:815 +#: ../../include/Contact.php:147 ../../include/conversation.php:815 msgid "View Photos" msgstr "" -#: ../../include/Contact.php:140 ../../include/Contact.php:153 +#: ../../include/Contact.php:148 ../../include/Contact.php:161 #: ../../include/conversation.php:816 msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:141 ../../include/conversation.php:817 +#: ../../include/Contact.php:149 ../../include/conversation.php:817 msgid "Edit Contact" msgstr "" -#: ../../include/Contact.php:142 ../../include/Contact.php:153 +#: ../../include/Contact.php:150 ../../include/Contact.php:161 #: ../../include/conversation.php:818 msgid "Send PM" msgstr "" @@ -6758,75 +6815,70 @@ msgstr "" msgid "permissions" msgstr "" -#: ../../boot.php:493 +#: ../../boot.php:494 msgid "Delete this item?" msgstr "" -#: ../../boot.php:496 +#: ../../boot.php:497 msgid "show fewer" msgstr "" -#: ../../boot.php:676 -#, php-format -msgid "Update Error at %s" -msgstr "" - -#: ../../boot.php:773 +#: ../../boot.php:774 msgid "Create a New Account" msgstr "" -#: ../../boot.php:797 +#: ../../boot.php:798 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:798 +#: ../../boot.php:799 msgid "Password: " msgstr "" -#: ../../boot.php:801 +#: ../../boot.php:802 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:807 +#: ../../boot.php:808 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:973 +#: ../../boot.php:974 msgid "Edit profile" msgstr "" -#: ../../boot.php:1033 +#: ../../boot.php:1034 msgid "Message" msgstr "" -#: ../../boot.php:1149 ../../boot.php:1221 +#: ../../boot.php:1150 ../../boot.php:1222 msgid "g A l F d" msgstr "" -#: ../../boot.php:1150 ../../boot.php:1222 +#: ../../boot.php:1151 ../../boot.php:1223 msgid "F d" msgstr "" -#: ../../boot.php:1175 +#: ../../boot.php:1176 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1176 +#: ../../boot.php:1177 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1199 ../../boot.php:1264 +#: ../../boot.php:1200 ../../boot.php:1265 msgid "[today]" msgstr "" -#: ../../boot.php:1245 +#: ../../boot.php:1246 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1246 +#: ../../boot.php:1247 msgid "Events this week:" msgstr "" -#: ../../boot.php:1258 +#: ../../boot.php:1259 msgid "[No description]" msgstr "" diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl index cbaef2d66..aaa366f65 100644 --- a/view/admin_plugins_details.tpl +++ b/view/admin_plugins_details.tpl @@ -17,7 +17,7 @@ </p> {{ if $screenshot }} - <a href="$screenshot.0" ><img src="$screenshot.0" width="320" height="240" alt="$screenshot.1" /></a> + <a href="$screenshot.0" class='screenshot'><img src="$screenshot.0" alt="$screenshot.1" /></a> {{ endif }} {{ if $admin_form }} diff --git a/view/admin_site.tpl b/view/admin_site.tpl index ec144fbba..9de6bd9c5 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -1,3 +1,39 @@ +<script> + $(function(){ + + $("#cnftheme").fancybox({ + width: 800, + autoDimensions: false, + onStart: function(){ + var theme = $("#id_theme :selected").val(); + $("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme); + }, + onComplete: function(){ + $("div#fancybox-content form").submit(function(e){ + var url = $(this).attr('action'); + // can't get .serialize() to work... + var data={}; + $(this).find("input").each(function(){ + data[$(this).attr('name')] = $(this).val(); + }); + $(this).find("select").each(function(){ + data[$(this).attr('name')] = $(this).children(":selected").val(); + }); + console.log(":)", url, data); + + $.post(url, data, function(data) { + if(timer) clearTimeout(timer); + NavUpdate(); + $.fancybox.close(); + }) + + return false; + }); + + } + }); + }); +</script> <div id='adminpage'> <h1>$title - $page</h1> diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl index 725df4cdf..afab29243 100644 --- a/view/field_checkbox.tpl +++ b/view/field_checkbox.tpl @@ -1,6 +1,6 @@ <div class='field checkbox'> <label for='id_$field.0'>$field.1</label> - <input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="true"{{ endif }}> + <input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}> <span class='field_help'>$field.3</span> </div> diff --git a/view/field_themeselect.tpl b/view/field_themeselect.tpl index f9f99492c..5847d8664 100644 --- a/view/field_themeselect.tpl +++ b/view/field_themeselect.tpl @@ -1,4 +1,4 @@ - + <script>$(function(){ previewTheme($("#id_$field.0")[0]); });</script> <div class='field select'> <label for='id_$field.0'>$field.1</label> <select name='$field.0' id='id_$field.0' onchange="previewTheme(this);" > diff --git a/view/group_side.tpl b/view/group_side.tpl index 0353b1d2c..ebb194d9c 100644 --- a/view/group_side.tpl +++ b/view/group_side.tpl @@ -23,6 +23,11 @@ <div id="sidebar-new-group"> <a href="group/new">$createtext</a> </div> + {{ if $ungrouped }} + <div id="sidebar-ungrouped"> + <a href="nogroup">$ungrouped</a> + </div> + {{ endif }} </div> diff --git a/view/lang_selector.tpl b/view/lang_selector.tpl new file mode 100644 index 000000000..b3a527b40 --- /dev/null +++ b/view/lang_selector.tpl @@ -0,0 +1,10 @@ +<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" >lang</div> +<div id="language-selector" style="display: none;" > + <form action="#" method="post" > + <select name="system_language" onchange="this.form.submit();" > + {{ for $langs.0 as $v=>$l }} + <option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option> + {{ endfor }} + </select> + </form> +</div> diff --git a/view/nogroup-template.tpl b/view/nogroup-template.tpl new file mode 100644 index 000000000..dd00ed097 --- /dev/null +++ b/view/nogroup-template.tpl @@ -0,0 +1,12 @@ +<h1>$header</h1> + +{{ for $contacts as $contact }} + {{ inc contact_template.tpl }}{{ endinc }} +{{ endfor }} +<div id="contact-edit-end"></div> + +$paginate + + + + diff --git a/view/settings.tpl b/view/settings.tpl index ebca4875f..59c669a87 100644 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -99,7 +99,13 @@ $unkmail <h3 class="settings-heading">$h_not</h3> -<div id="settings-notify-desc">$lbl_not </div> +<strong>$activity_options</strong> + +{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}} +{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}} + + +<div id="settings-notify-desc"><strong>$lbl_not </strong></div> <div class="group"> {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}} diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl index 225a5dd5c..09fd8da3d 100644 --- a/view/theme/diabook-aerith/comment_item.tpl +++ b/view/theme/diabook-aerith/comment_item.tpl @@ -12,13 +12,13 @@ </div> <div class="comment-edit-photo-end"></div> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> - <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> - <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> - <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook-aerith/config.php b/view/theme/diabook-aerith/config.php new file mode 100644 index 000000000..afd3119f2 --- /dev/null +++ b/view/theme/diabook-aerith/config.php @@ -0,0 +1,71 @@ +<?php +/** + * Theme settings + */ + + + +function theme_content(&$a){ + if(!local_user()) + return; + + $font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' ); + $line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['diabook-aerith-settings-submit'])){ + set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']); + set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']); + } +} + + +function theme_admin(&$a){ + $font_size = get_config('diabook-aerith', 'font_size' ); + $line_height = get_config('diabook-aerith', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_admin_post(&$a){ + if (isset($_POST['diabook-aerith-settings-submit'])){ + set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']); + set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']); + } +} + + +function diabook_form(&$a, $font_size, $line_height){ + $line_heights = array( + "1.4"=>"1.4", + "1.3"=>"1.3", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '14'=>'14', + '13.5'=>'13.5', + '13'=>'13', + '12.5'=>'12.5', + '12'=>'12', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + )); + return $o; +} diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl index af183d04d..642019049 100755 --- a/view/theme/diabook-aerith/group_side.tpl +++ b/view/theme/diabook-aerith/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook-aerith/icons/selected.png +++ b/view/theme/diabook-aerith/icons/selected.png diff --git a/view/theme/diabook-aerith/icons/unselected.png b/view/theme/diabook-aerith/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook-aerith/icons/unselected.png diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl index fe4baf8d1..5addf38b1 100644 --- a/view/theme/diabook-aerith/nets.tpl +++ b/view/theme/diabook-aerith/nets.tpl @@ -3,7 +3,7 @@ <div id="nets-desc">$desc</div> <ul class="nets-ul"> - <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> {{ for $nets as $net }} <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> {{ endfor }} diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index b9754ac32..17335389d 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1380,10 +1380,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 078b6d01f..3dea20697 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1358,10 +1358,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index b26c76910..a9269f21d 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1230,6 +1230,50 @@ aside #likes a:hover{ float: left; margin-right: 20px; } +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + 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; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; +} /* widget */ .widget { margin-bottom: 2em; @@ -1410,10 +1454,10 @@ body .pageheader{ color: #999; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content img { @@ -1555,10 +1599,10 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-aerith/style.php b/view/theme/diabook-aerith/style.php new file mode 100644 index 000000000..1ae62503c --- /dev/null +++ b/view/theme/diabook-aerith/style.php @@ -0,0 +1,120 @@ +<?php + $line_height=false; + $diabook_font_size=false; + $site_line_height = get_config("diabook-aerith","line_height"); + $site_diabook_font_size = get_config("diabook-aerith", "font_size" ); + + if (local_user()) { + $line_height = get_pconfig(local_user(), "diabook-aerith","line_height"); + $diabook_font_size = get_pconfig(local_user(), "diabook-aerith", "font_size"); + } + + if ($line_height===false) $line_height=$site_line_height; + if ($line_height===false) $line_height="1.3"; + if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size; + if ($diabook_font_size===false) $diabook_font_size="13"; + + + if (file_exists("$THEMEPATH/style.css")){ + echo file_get_contents("$THEMEPATH/style.css"); + } + + if($diabook_font_size == "14"){ + echo " + .wall-item-container .wall-item-content { + font-size: 14px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 14px; + } + "; + } + if($diabook_font_size == "13.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13.5px; + } + "; + } + if($diabook_font_size == "13"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13px; + } + "; + } + if($diabook_font_size == "12.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12.5px; + } + "; + } + if($diabook_font_size == "12"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12px; + } + "; + } + if($line_height == "1.4"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.4; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.4; + } + "; + } + if($line_height == "1.3"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.3; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.3; + } + "; + } + if($line_height == "1.2"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.2; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.2; + } + "; + } + if($line_height == "1.1"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.1; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.1; + } + "; + } diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index a7d20a7ce..53c564a94 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.017) + * Version: (Version: 1.018) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-aerith (Version: 1.017)"; +$diabook_version = "Diabook-aerith (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); @@ -462,10 +462,10 @@ function restore_boxes(){ $a->page['htmlhead'] .= ' <script type="text/javascript"> -function insertFormatting(BBcode,id) { +function insertFormatting(comment,BBcode,id) { var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == "Kommentar") { + if(tmpStr == comment) { tmpStr = ""; $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); diff --git a/view/theme/diabook-aerith/theme_settings.tpl b/view/theme/diabook-aerith/theme_settings.tpl new file mode 100644 index 000000000..002923a2a --- /dev/null +++ b/view/theme/diabook-aerith/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +<div class="settings-submit-wrapper"> + <input type="submit" value="$submit" class="settings-submit" name="diabook-aerith-settings-submit" /> +</div> + diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl index 225a5dd5c..09fd8da3d 100644 --- a/view/theme/diabook-blue/comment_item.tpl +++ b/view/theme/diabook-blue/comment_item.tpl @@ -12,13 +12,13 @@ </div> <div class="comment-edit-photo-end"></div> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> - <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> - <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> - <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook-blue/config.php b/view/theme/diabook-blue/config.php new file mode 100644 index 000000000..3ad88b5bb --- /dev/null +++ b/view/theme/diabook-blue/config.php @@ -0,0 +1,71 @@ +<?php +/** + * Theme settings + */ + + + +function theme_content(&$a){ + if(!local_user()) + return; + + $font_size = get_pconfig(local_user(), 'diabook-blue', 'font_size' ); + $line_height = get_pconfig(local_user(), 'diabook-blue', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['diabook-blue-settings-submit'])){ + set_pconfig(local_user(), 'diabook-blue', 'font_size', $_POST['diabook-blue_font_size']); + set_pconfig(local_user(), 'diabook-blue', 'line_height', $_POST['diabook-blue_line_height']); + } +} + + +function theme_admin(&$a){ + $font_size = get_config('diabook-blue', 'font_size' ); + $line_height = get_config('diabook-blue', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_admin_post(&$a){ + if (isset($_POST['diabook-blue-settings-submit'])){ + set_config('diabook-blue', 'font_size', $_POST['diabook-blue_font_size']); + set_config('diabook-blue', 'line_height', $_POST['diabook-blue_line_height']); + } +} + + +function diabook_form(&$a, $font_size, $line_height){ + $line_heights = array( + "1.4"=>"1.4", + "1.3"=>"1.3", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '14'=>'14', + '13.5'=>'13.5', + '13'=>'13', + '12.5'=>'12.5', + '12'=>'12', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook-blue_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook-blue_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + )); + return $o; +} diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl index af183d04d..642019049 100755 --- a/view/theme/diabook-blue/group_side.tpl +++ b/view/theme/diabook-blue/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook-blue/icons/selected.png b/view/theme/diabook-blue/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook-blue/icons/selected.png +++ b/view/theme/diabook-blue/icons/selected.png diff --git a/view/theme/diabook-blue/icons/unselected.png b/view/theme/diabook-blue/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook-blue/icons/unselected.png diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl index fe4baf8d1..5addf38b1 100644 --- a/view/theme/diabook-blue/nets.tpl +++ b/view/theme/diabook-blue/nets.tpl @@ -3,7 +3,7 @@ <div id="nets-desc">$desc</div> <ul class="nets-ul"> - <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> {{ for $nets as $net }} <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> {{ endfor }} diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 021edc45e..2f25372a9 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1342,10 +1342,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index ae7fa8d14..f0b4fbd02 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1325,10 +1325,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 1b8fe1e72..923e63e3e 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -1190,6 +1190,50 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + 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; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; +} /* widget */ .widget { margin-bottom: 2em; @@ -1367,10 +1411,10 @@ body .pageheader{ color: #999; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content img { @@ -1513,10 +1557,10 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-blue/style.php b/view/theme/diabook-blue/style.php new file mode 100644 index 000000000..330911b77 --- /dev/null +++ b/view/theme/diabook-blue/style.php @@ -0,0 +1,120 @@ +<?php + $line_height=false; + $diabook_font_size=false; + $site_line_height = get_config("diabook-blue","line_height"); + $site_diabook_font_size = get_config("diabook-blue", "font_size" ); + + if (local_user()) { + $line_height = get_pconfig(local_user(), "diabook-blue","line_height"); + $diabook_font_size = get_pconfig(local_user(), "diabook-blue", "font_size"); + } + + if ($line_height===false) $line_height=$site_line_height; + if ($line_height===false) $line_height="1.3"; + if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size; + if ($diabook_font_size===false) $diabook_font_size="13"; + + + if (file_exists("$THEMEPATH/style.css")){ + echo file_get_contents("$THEMEPATH/style.css"); + } + + if($diabook_font_size == "14"){ + echo " + .wall-item-container .wall-item-content { + font-size: 14px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 14px; + } + "; + } + if($diabook_font_size == "13.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13.5px; + } + "; + } + if($diabook_font_size == "13"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13px; + } + "; + } + if($diabook_font_size == "12.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12.5px; + } + "; + } + if($diabook_font_size == "12"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12px; + } + "; + } + if($line_height == "1.4"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.4; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.4; + } + "; + } + if($line_height == "1.3"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.3; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.3; + } + "; + } + if($line_height == "1.2"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.2; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.2; + } + "; + } + if($line_height == "1.1"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.1; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.1; + } + "; + } diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 379f67008..844682943 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-blue * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.017) + * Version: (Version: 1.018) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-blue (Version: 1.017)"; +$diabook_version = "Diabook-blue (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages @@ -462,10 +462,10 @@ function restore_boxes(){ $a->page['htmlhead'] .= ' <script type="text/javascript"> -function insertFormatting(BBcode,id) { +function insertFormatting(comment,BBcode,id) { var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == "Kommentar") { + if(tmpStr == comment) { tmpStr = ""; $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); diff --git a/view/theme/diabook-blue/theme_settings.tpl b/view/theme/diabook-blue/theme_settings.tpl new file mode 100644 index 000000000..a40e0e298 --- /dev/null +++ b/view/theme/diabook-blue/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +<div class="settings-submit-wrapper"> + <input type="submit" value="$submit" class="settings-submit" name="diabook-blue-settings-submit" /> +</div> + diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl index 225a5dd5c..09fd8da3d 100644 --- a/view/theme/diabook-red/comment_item.tpl +++ b/view/theme/diabook-red/comment_item.tpl @@ -12,13 +12,13 @@ </div> <div class="comment-edit-photo-end"></div> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> - <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> - <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> - <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook-red/config.php b/view/theme/diabook-red/config.php new file mode 100644 index 000000000..0b09a8751 --- /dev/null +++ b/view/theme/diabook-red/config.php @@ -0,0 +1,71 @@ +<?php +/** + * Theme settings + */ + + + +function theme_content(&$a){ + if(!local_user()) + return; + + $font_size = get_pconfig(local_user(), 'diabook-red', 'font_size' ); + $line_height = get_pconfig(local_user(), 'diabook-red', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['diabook-blue-settings-submit'])){ + set_pconfig(local_user(), 'diabook-red', 'font_size', $_POST['diabook-red_font_size']); + set_pconfig(local_user(), 'diabook-red', 'line_height', $_POST['diabook-red_line_height']); + } +} + + +function theme_admin(&$a){ + $font_size = get_config('diabook-red', 'font_size' ); + $line_height = get_config('diabook-red', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_admin_post(&$a){ + if (isset($_POST['diabook-red-settings-submit'])){ + set_config('diabook-red', 'font_size', $_POST['diabook-red_font_size']); + set_config('diabook-red', 'line_height', $_POST['diabook-red_line_height']); + } +} + + +function diabook_form(&$a, $font_size, $line_height){ + $line_heights = array( + "1.4"=>"1.4", + "1.3"=>"1.3", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '14'=>'14', + '13.5'=>'13.5', + '13'=>'13', + '12.5'=>'12.5', + '12'=>'12', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook-red_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook-red_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + )); + return $o; +} diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl index af183d04d..642019049 100755 --- a/view/theme/diabook-red/group_side.tpl +++ b/view/theme/diabook-red/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook-red/icons/selected.png b/view/theme/diabook-red/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook-red/icons/selected.png +++ b/view/theme/diabook-red/icons/selected.png diff --git a/view/theme/diabook-red/icons/unselected.png b/view/theme/diabook-red/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook-red/icons/unselected.png diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl index fe4baf8d1..5addf38b1 100644 --- a/view/theme/diabook-red/nets.tpl +++ b/view/theme/diabook-red/nets.tpl @@ -3,7 +3,7 @@ <div id="nets-desc">$desc</div> <ul class="nets-ul"> - <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> {{ for $nets as $net }} <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> {{ endfor }} diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index ca32be231..17b7af09b 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1376,10 +1376,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 242c08c68..74566d5c5 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1338,10 +1338,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 8cca19801..a722dbae9 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1219,6 +1219,50 @@ aside #side-peoplefind-url { float: left; margin-right: 20px; } +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + 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; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; +} /* widget */ .widget { margin-bottom: 2em; @@ -1396,10 +1440,10 @@ body .pageheader{ color: #999; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content img { @@ -1541,10 +1585,10 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-red/style.php b/view/theme/diabook-red/style.php new file mode 100644 index 000000000..35b82ee96 --- /dev/null +++ b/view/theme/diabook-red/style.php @@ -0,0 +1,120 @@ +<?php + $line_height=false; + $diabook_font_size=false; + $site_line_height = get_config("diabook-red","line_height"); + $site_diabook_font_size = get_config("diabook-red", "font_size" ); + + if (local_user()) { + $line_height = get_pconfig(local_user(), "diabook-red","line_height"); + $diabook_font_size = get_pconfig(local_user(), "diabook-red", "font_size"); + } + + if ($line_height===false) $line_height=$site_line_height; + if ($line_height===false) $line_height="1.3"; + if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size; + if ($diabook_font_size===false) $diabook_font_size="13"; + + + if (file_exists("$THEMEPATH/style.css")){ + echo file_get_contents("$THEMEPATH/style.css"); + } + + if($diabook_font_size == "14"){ + echo " + .wall-item-container .wall-item-content { + font-size: 14px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 14px; + } + "; + } + if($diabook_font_size == "13.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13.5px; + } + "; + } + if($diabook_font_size == "13"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13px; + } + "; + } + if($diabook_font_size == "12.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12.5px; + } + "; + } + if($diabook_font_size == "12"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12px; + } + "; + } + if($line_height == "1.4"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.4; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.4; + } + "; + } + if($line_height == "1.3"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.3; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.3; + } + "; + } + if($line_height == "1.2"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.2; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.2; + } + "; + } + if($line_height == "1.1"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.1; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.1; + } + "; + } diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 22956f4f9..c7fa77985 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.017) + * Version: (Version: 1.018) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-red (Version: 1.017)"; +$diabook_version = "Diabook-red (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages @@ -461,10 +461,10 @@ function restore_boxes(){ $a->page['htmlhead'] .= ' <script type="text/javascript"> -function insertFormatting(BBcode,id) { +function insertFormatting(comment,BBcode,id) { var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == "Kommentar") { + if(tmpStr == comment) { tmpStr = ""; $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); diff --git a/view/theme/diabook-red/theme_settings.tpl b/view/theme/diabook-red/theme_settings.tpl new file mode 100644 index 000000000..9e83ae8f2 --- /dev/null +++ b/view/theme/diabook-red/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +<div class="settings-submit-wrapper"> + <input type="submit" value="$submit" class="settings-submit" name="diabook-red-settings-submit" /> +</div> + diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl index c5231be40..09fd8da3d 100644 --- a/view/theme/diabook/comment_item.tpl +++ b/view/theme/diabook/comment_item.tpl @@ -12,13 +12,13 @@ </div> <div class="comment-edit-photo-end"></div> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> - <a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a> - <a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a> - <a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a> - <a class="icon underline" onclick="insertFormatting('u',$id);">u</a> - <a class="icon italic" onclick="insertFormatting('i',$id);">i</a> - <a class="icon bold" onclick="insertFormatting('b',$id);">b</a> - <a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a> + <a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a> + <a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a> + <a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a> + <a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a> + <a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a> + <a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a> + <a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a> {{ if $qcomment }} <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <option value=""></option> diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php new file mode 100644 index 000000000..25b3c4b54 --- /dev/null +++ b/view/theme/diabook/config.php @@ -0,0 +1,71 @@ +<?php +/** + * Theme settings + */ + + + +function theme_content(&$a){ + if(!local_user()) + return; + + $font_size = get_pconfig(local_user(), 'diabook', 'font_size' ); + $line_height = get_pconfig(local_user(), 'diabook', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['diabook-settings-submit'])){ + set_pconfig(local_user(), 'diabook', 'font_size', $_POST['diabook_font_size']); + set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']); + } +} + + +function theme_admin(&$a){ + $font_size = get_config('diabook', 'font_size' ); + $line_height = get_config('diabook', 'line_height' ); + + return diabook_form($a,$font_size, $line_height); +} + +function theme_admin_post(&$a){ + if (isset($_POST['diabook-settings-submit'])){ + set_config('diabook', 'font_size', $_POST['diabook_font_size']); + set_config('diabook', 'line_height', $_POST['diabook_line_height']); + } +} + + +function diabook_form(&$a, $font_size, $line_height){ + $line_heights = array( + "1.4"=>"1.4", + "1.3"=>"1.3", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '14'=>'14', + '13.5'=>'13.5', + '13'=>'13', + '12.5'=>'12.5', + '12'=>'12', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + )); + return $o; +} diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl index af183d04d..642019049 100755 --- a/view/theme/diabook/group_side.tpl +++ b/view/theme/diabook/group_side.tpl @@ -1,18 +1,18 @@ -<div id="group-sidebar" class="widget"> - <div class="title tool"> - <h3 class="label">$title</h3> - <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a> +<div id="profile_side" > + <div class=""> + <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3> </div> <div id="sidebar-group-list"> - <ul> + <ul class="menu-profile-side"> {{ for $groups as $group }} - <li class="tool {{ if $group.selected }}selected{{ endif }}"> - <a href="$group.href" class="label"> + <li class="menu-profile-list"> + <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span> + <a href="$group.href" class="menu-profile-list-item"> $group.text </a> {{ if $group.edit }} - <a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a> + <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a> {{ endif }} {{ if $group.cid }} <input type="checkbox" diff --git a/view/theme/diabook/icons/selected.png b/view/theme/diabook/icons/selected.png Binary files differindex 2a30ae252..3fcb95c29 100755..100644 --- a/view/theme/diabook/icons/selected.png +++ b/view/theme/diabook/icons/selected.png diff --git a/view/theme/diabook/icons/unselected.png b/view/theme/diabook/icons/unselected.png Binary files differnew file mode 100644 index 000000000..9e9cead4b --- /dev/null +++ b/view/theme/diabook/icons/unselected.png diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl index fe4baf8d1..5addf38b1 100644 --- a/view/theme/diabook/nets.tpl +++ b/view/theme/diabook/nets.tpl @@ -3,7 +3,7 @@ <div id="nets-desc">$desc</div> <ul class="nets-ul"> - <li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> + <li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li> {{ for $nets as $net }} <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> {{ endfor }} diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index e9fa9d8ba..1e57041e4 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1318,10 +1318,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 31e1f056c..ff39a0456 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1298,10 +1298,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 8a1a185a1..e73bd1f57 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1241,8 +1241,49 @@ aside #side-peoplefind-url { min-height: 16px; list-style: none; } -.widget .tool.selected { +.group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + 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; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; } /* widget: search */ #add-search-popup { @@ -1394,17 +1435,17 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/style.php b/view/theme/diabook/style.php new file mode 100644 index 000000000..72e8899d4 --- /dev/null +++ b/view/theme/diabook/style.php @@ -0,0 +1,120 @@ +<?php + $line_height=false; + $diabook_font_size=false; + $site_line_height = get_config("diabook","line_height"); + $site_diabook_font_size = get_config("diabook", "font_size" ); + + if (local_user()) { + $line_height = get_pconfig(local_user(), "diabook","line_height"); + $diabook_font_size = get_pconfig(local_user(), "diabook", "font_size"); + } + + if ($line_height===false) $line_height=$site_line_height; + if ($line_height===false) $line_height="1.3"; + if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size; + if ($diabook_font_size===false) $diabook_font_size="13"; + + + if (file_exists("$THEMEPATH/style.css")){ + echo file_get_contents("$THEMEPATH/style.css"); + } + + if($diabook_font_size == "14"){ + echo " + .wall-item-container .wall-item-content { + font-size: 14px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 14px; + } + "; + } + if($diabook_font_size == "13.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13.5px; + } + "; + } + if($diabook_font_size == "13"){ + echo " + .wall-item-container .wall-item-content { + font-size: 13px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 13px; + } + "; + } + if($diabook_font_size == "12.5"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12.5px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12.5px; + } + "; + } + if($diabook_font_size == "12"){ + echo " + .wall-item-container .wall-item-content { + font-size: 12px; + } + + .wall-item-photo-container .wall-item-content { + font-size: 12px; + } + "; + } + if($line_height == "1.4"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.4; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.4; + } + "; + } + if($line_height == "1.3"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.3; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.3; + } + "; + } + if($line_height == "1.2"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.2; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.2; + } + "; + } + if($line_height == "1.1"){ + echo " + .wall-item-container .wall-item-content { + line-height: 1.1; + } + + .wall-item-photo-container .wall-item-content { + line-height: 1.1; + } + "; + } diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 612650e90..b039e1b82 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.017) + * Version: (Version: 1.018) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.017)"; +$diabook_version = "Diabook (Version: 1.018)"; $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages @@ -469,18 +469,19 @@ function restore_boxes(){ } </script>';} + $a->page['htmlhead'] .= ' -<script type="text/javascript"> -function insertFormatting(BBcode,id) { +<script> +function insertFormatting(comment,BBcode,id) { var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == "Kommentar") { + 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); - } + } textarea = document.getElementById("comment-edit-text-" +id); if (document.selection) { diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl new file mode 100644 index 000000000..564ecc283 --- /dev/null +++ b/view/theme/diabook/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +<div class="settings-submit-wrapper"> + <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" /> +</div> + diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php index 32393f08d..b02f41947 100644 --- a/view/theme/dispy-dark/default.php +++ b/view/theme/dispy-dark/default.php @@ -1,13 +1,13 @@ <!DOCTYPE html> <html> <head> - <title><?php if(x($page,'title')) echo $page['title'] ?></title> + <title><?php if(x($page,'title')) echo $page['title']; ?></title> <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script> - <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> + <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?> </head> <body> <header> - <!-- header stuff will go here --> + <?php if(x($page, 'header')) echo $page['header']; ?> </header> <article id="articlemain"> <?php if(x($page,'nav')) echo $page['nav']; ?> diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl index cd6f5ca97..d1bdc256b 100644 --- a/view/theme/dispy-dark/head.tpl +++ b/view/theme/dispy-dark/head.tpl @@ -91,8 +91,4 @@ $('#hide-comments-' + id).html('$showfewer'); } } - - </script> - - diff --git a/view/theme/dispy-dark/header.tpl b/view/theme/dispy-dark/header.tpl new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/view/theme/dispy-dark/header.tpl diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl index 5838729cc..44120da40 100644 --- a/view/theme/dispy-dark/jot-header.tpl +++ b/view/theme/dispy-dark/jot-header.tpl @@ -36,7 +36,7 @@ function initEditor(cb) { entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, - force_p_newlines : false, + force_p_newlines : true, force_br_newlines : true, forced_root_block : '', convert_urls: false, diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl index 34aba50de..b58ae7e3a 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -4,7 +4,7 @@ <!-- yes, they're going the other way. seems that's how the template renderer works --> - +<a name="top" id="top"></a> <div id="nav-floater"> <div id="nav-buttons"> {{ if $nav.help }} @@ -116,6 +116,12 @@ works --> $langselector </div> +<div id="scrollup"> +<a href="#top"><img + src="view/theme/dispy/icons/scroll_top.png" + alt="back to top" title="Back to top" /></a> +</div> + <div class="search-box"> <form method="get" action="$nav.search.0"> <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 68d7e230f..a87317d9b 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -311,6 +311,7 @@ ul#user-menu-popup { -webkit-border-radius: 0 0 5px 5px; -moz-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; + box-shadow: 5px 10px 10px 0 #111; z-index: 10000; } ul#user-menu-popup li { @@ -543,7 +544,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 10em; color: #eec; } +#scrollup { + position: fixed; + right: 5px; + bottom: 40px; + z-index: 100; +} +#scrollup a:hover { + text-decoration: none; + border: 0; +} #user-menu { + box-shadow: 5px 0 10px 0 #111; display: block; width: 75%; margin: 3px 0 0 0; @@ -880,12 +892,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link line-height: 20px; padding: 2px 20px 5px 0; } +#profile-jot-text_parent { + /*border-radius: 10px;*/ + box-shadow: 5px 0 10px 0 #111; +} #profile-jot-text_tbl { margin-bottom: 10px; + /*border-radius: 10px;*/ + background: #888; } #profile-jot-text_ifr { width:99.900002% !important; } +#profile-jot-text_toolbargroup { + background: #888; +} +.mceCenter table tr { + background: #888; +} [id$="jot-text_ifr"] { width: 99.900002% !important; color: #2e2f2e; @@ -895,6 +919,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link color: #2e2f2e; background: #eec; } +.mceFirst tr { + background: #888; +} +.mceFirst td { + /*border-radius: 10px 10px 0px 0px;*/ +} +.mceLast td { + /*border-radius: 0 0 10px 10px;*/ +} #profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, @@ -1121,6 +1154,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link .wall-item-outside-wrapper { border: 1px solid #aaa; border-radius: 5px; + box-shadow: 5px 0 10px 0 #111; } .wall-item-outside-wrapper.comment { margin-top: 5px; @@ -1946,7 +1980,7 @@ div[id$="wrapper"] br { position: absolute; text-decoration: none; top: 113px; - right: 250px; + right: 260px; } #profile-edit-links ul { margin: 20px 0; @@ -2812,6 +2846,7 @@ footer { background: #fff url("../../../images/search_18.png") no-repeat right center; padding-right: 20px; margin: 6px; + color: #111; } #acl-showall { float: left; diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index c9028b9a9..affffc9cb 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -114,11 +114,27 @@ function dispy_dark_init(&$a) { return false; }); - // (attempt) to change the text colour in a top post + // (attempt to) change the text colour in a top post $('#profile-jot-text').focusin(function() { $(this).css({color: '#eec'}); }); + $('a[href=#top]').click(function() { + $('html, body').animate({scrollTop:0}, '500'); + return false; + }); + + }); + // shadowing effect for floating toolbars + $(document).scroll(function(e) { + var pageTop = $('html').scrollTop(); + if (pageTop) { + $('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + $('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + } else { + $('#nav-floater').css({boxShadow: '0 0 0 0'}); + $('.search-box').css({boxShadow: '0 0 0 0'}); + } }); </script> EOT; diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php index 32393f08d..b02f41947 100644 --- a/view/theme/dispy/default.php +++ b/view/theme/dispy/default.php @@ -1,13 +1,13 @@ <!DOCTYPE html> <html> <head> - <title><?php if(x($page,'title')) echo $page['title'] ?></title> + <title><?php if(x($page,'title')) echo $page['title']; ?></title> <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script> - <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> + <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?> </head> <body> <header> - <!-- header stuff will go here --> + <?php if(x($page, 'header')) echo $page['header']; ?> </header> <article id="articlemain"> <?php if(x($page,'nav')) echo $page['nav']; ?> diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl index cd6f5ca97..d1bdc256b 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -91,8 +91,4 @@ $('#hide-comments-' + id).html('$showfewer'); } } - - </script> - - diff --git a/view/theme/dispy/icons/scroll_top.png b/view/theme/dispy/icons/scroll_top.png Binary files differnew file mode 100644 index 000000000..fa6736086 --- /dev/null +++ b/view/theme/dispy/icons/scroll_top.png diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 5838729cc..44120da40 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -36,7 +36,7 @@ function initEditor(cb) { entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, - force_p_newlines : false, + force_p_newlines : true, force_br_newlines : true, forced_root_block : '', convert_urls: false, diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 34aba50de..b58ae7e3a 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -4,7 +4,7 @@ <!-- yes, they're going the other way. seems that's how the template renderer works --> - +<a name="top" id="top"></a> <div id="nav-floater"> <div id="nav-buttons"> {{ if $nav.help }} @@ -116,6 +116,12 @@ works --> $langselector </div> +<div id="scrollup"> +<a href="#top"><img + src="view/theme/dispy/icons/scroll_top.png" + alt="back to top" title="Back to top" /></a> +</div> + <div class="search-box"> <form method="get" action="$nav.search.0"> <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" /> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 66d19e091..47e1d1132 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -312,6 +312,7 @@ ul#user-menu-popup { -webkit-border-radius: 0 0 5px 5px; -moz-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; + box-shadow: 5px 10px 10px 0 #111; z-index: 10000; } ul#user-menu-popup li { @@ -544,7 +545,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 10em; color: #eec; } +#scrollup { + position: fixed; + right: 5px; + bottom: 40px; + z-index: 100; +} +#scrollup a:hover { + text-decoration: none; + border: 0; +} #user-menu { + box-shadow: 5px 0 10px 0 #111; display: block; width: 75%; margin: 3px 0 0 0; @@ -881,12 +893,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link line-height: 20px; padding: 2px 20px 5px 0; } +#profile-jot-text_parent { + /*border-radius: 10px;*/ + box-shadow: 5px 0 10px 0 #111; +} #profile-jot-text_tbl { margin-bottom: 10px; + /*border-radius: 10px;*/ + background: #888; } #profile-jot-text_ifr { width:99.900002% !important; } +#profile-jot-text_toolbargroup { + background: #888; +} +.mceCenter table tr { + background: #888; +} [id$="jot-text_ifr"] { width: 99.900002% !important; color: #2e2f2e; @@ -896,6 +920,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link color: #2e2f2e; background: #eec; } +.mceFirst tr { + background: #888; +} +.mceFirst td { + /*border-radius: 10px 10px 0px 0px;*/ +} +.mceLast td { + /*border-radius: 0 0 10px 10px;*/ +} #profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, @@ -1122,6 +1155,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link .wall-item-outside-wrapper { border: 1px solid #aaa; border-radius: 5px; + box-shadow: 5px 0 10px 0 #999; } .wall-item-outside-wrapper.comment { margin-top: 5px; @@ -1947,7 +1981,7 @@ div[id$="wrapper"] br { position: absolute; text-decoration: none; top: 113px; - right: 250px; + right: 260px; } #profile-edit-links ul { margin: 20px 0; @@ -2813,6 +2847,7 @@ footer { background: #fff url("../../../images/search_18.png") no-repeat right center; padding-right: 20px; margin: 6px; + color: #111; } #acl-showall { float: left; diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 5df193aa6..8af61d78b 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -114,11 +114,27 @@ function dispy_init(&$a) { return false; }); - // (attempt) to change the text colour in a top post + // (attempt to) change the text colour in a top post $('#profile-jot-text').focusin(function() { $(this).css({color: '#eec'}); }); + $('a[href=#top]').click(function() { + $('html, body').animate({scrollTop:0}, '500'); + return false; + }); + + }); + // shadowing effect for floating toolbars + $(document).scroll(function(e) { + var pageTop = $('html').scrollTop(); + if (pageTop) { + $('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + $('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + } else { + $('#nav-floater').css({boxShadow: '0 0 0 0'}); + $('.search-box').css({boxShadow: '0 0 0 0'}); + } }); </script> EOT; diff --git a/view/theme/quattro/TODO b/view/theme/quattro/TODO new file mode 100644 index 000000000..12638551a --- /dev/null +++ b/view/theme/quattro/TODO @@ -0,0 +1,2 @@ +jot.tpl: <!-- TODO: waiting for a better placement +nav.tpl: <!-- TODO: better icons! --> diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php index c9ab3a4a1..c261a78ec 100644 --- a/view/theme/quattro/config.php +++ b/view/theme/quattro/config.php @@ -11,6 +11,37 @@ function theme_content(&$a){ $align = get_pconfig(local_user(), 'quattro', 'align' ); $color = get_pconfig(local_user(), 'quattro', 'color' ); + + return quattro_form($a,$align, $color); +} + +function theme_post(&$a){ + if(! local_user()) + return; + + if (isset($_POST['quattro-settings-submit'])){ + set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']); + set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']); + } +} + + +function theme_admin(&$a){ + $align = get_config('quattro', 'align' ); + $color = get_config('quattro', 'color' ); + + return quattro_form($a,$align, $color); +} + +function theme_admin_post(&$a){ + if (isset($_POST['quattro-settings-submit'])){ + set_config('quattro', 'align', $_POST['quattro_align']); + set_config('quattro', 'color', $_POST['quattro_color']); + } +} + + +function quattro_form(&$a, $align, $color){ $colors = array( "dark"=>"Quattro", "green"=>"Green" @@ -26,14 +57,3 @@ function theme_content(&$a){ )); return $o; } - -function theme_post(&$a){ - if(! local_user()) - return; - - if (isset($_POST['quattro-settings-submit'])){ - set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']); - set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']); - } -} - diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl index ff202bbe4..7bb7cd2fd 100644 --- a/view/theme/quattro/conversation.tpl +++ b/view/theme/quattro/conversation.tpl @@ -9,8 +9,11 @@ {{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}} - {{ inc $item.template }}{{ endinc }} - + {{ if $item.type == tag }} + {{ inc wall_item_tag.tpl }}{{ endinc }} + {{ else }} + {{ inc $item.template }}{{ endinc }} + {{ endif }} {{ endfor }} </div> diff --git a/view/theme/quattro/dark/colors.less b/view/theme/quattro/dark/colors.less index b6d487f92..42fdd34bb 100644 --- a/view/theme/quattro/dark/colors.less +++ b/view/theme/quattro/dark/colors.less @@ -38,7 +38,7 @@ @Link: @Blue3; @LinkHover: @Blue3; @LinkVisited: @Blue3; - +@LinkDimmed: @Blue2; @ButtonColor: @Grey1; @ButtonBackgroundColor: @Grey5; @@ -73,9 +73,13 @@ @FieldHelpColor: @Grey3; -@ThreadBackgroundColor: #f6f7f8; +@ThreadBackgroundColor: #eff0f1; +@ThreadBottomBorderColor: @Grey2; @ShinyBorderColor: @Yellow1; +@ItemColor: @Grey5; +@ItemColorDimmed: @Grey3; + @CommentBoxEmptyColor: @Grey3; @CommentBoxEmptyBorderColor: @Grey3; @CommentBoxFullColor: @Grey5; diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 16c786d20..1fa03b253 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -66,6 +66,9 @@ .icon.s10.type-text { background-image: url("../../../images/icons/10/text.png"); } +.icon.s10.language { + background-image: url("icons/language.png"); +} .icon.s10.text { padding: 2px 0px 0px 15px; } @@ -121,6 +124,9 @@ .icon.s16.type-text { background-image: url("../../../images/icons/16/text.png"); } +.icon.s16.language { + background-image: url("icons/language.png"); +} .icon.s16.text { padding: 4px 0px 0px 20px; } @@ -176,6 +182,9 @@ .icon.s22.type-text { background-image: url("../../../images/icons/22/text.png"); } +.icon.s22.language { + background-image: url("icons/language.png"); +} .icon.s22.text { padding: 10px 0px 0px 25px; } @@ -231,6 +240,9 @@ .icon.s48.type-text { background-image: url("../../../images/icons/48/text.png"); } +.icon.s48.language { + background-image: url("icons/language.png"); +} /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; @@ -314,6 +326,10 @@ code { float: right; } /* popup notifications */ +#jGrowl.top-right { + top: 30px; + right: 15px; +} div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -565,7 +581,7 @@ ul.menu-popup .toolbar a:hover { color: #9eabb0; display: block; } -/* aside */ +/* aside 230px*/ aside { display: table-cell; vertical-align: top; @@ -772,20 +788,21 @@ aside #profiles-menu { width: 200px; top: 18px; } -/* section */ +/* section 800px */ section { display: table-cell; vertical-align: top; - width: 800px; + width: 770px; padding: 0px 20px 0px 10px; } /* wall item */ .tread-wrapper { - background-color: #f6f7f8; + background-color: #eff0f1; position: relative; padding: 10px; margin-bottom: 20px; - width: 780px; + width: 750px; + border-bottom: 1px solid #cccccc; } .wall-item-decor { position: absolute; @@ -798,7 +815,7 @@ section { } .wall-item-container { display: table; - width: 780px; + width: 750px; } .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -890,26 +907,42 @@ section { .wall-item-container .wall-item-actions-tools input { float: right; } -.wall-item-container.comment { - /*margin-top: 50px;*/ - +.wall-item-container.comment .contact-photo-wrapper { + margin-left: 16px; } .wall-item-container.comment .contact-photo { width: 32px; height: 32px; - margin-left: 16px; - /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ - } .wall-item-container.comment .contact-photo-menu-button { top: 15px !important; - left: 15px !important; + left: 0px !important; } .wall-item-container.comment .wall-item-links { padding-left: 12px; } +/* 'tag' item type */ +.wall-item-container.item-tag .wall-item-content { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container.item-tag .contact-photo-wrapper { + margin-left: 32px; +} +.wall-item-container.item-tag .contact-photo { + width: 16px; + height: 16px; +} +.wall-item-container.item-tag .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; +} .wall-item-comment-wrapper { - margin: 30px 2em 2em 60px; + margin: 1em 2em 1em 60px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -961,6 +994,9 @@ section { #jot-preview-content .tread-wrapper { background-color: #fce94f; } +.hide-comments-outer { + margin-bottom: 0.8em; +} .wall-item-tags { padding-top: 5px; } @@ -1087,7 +1123,7 @@ section { padding: 0px; height: 40px; overflow: none; - width: 800px; + width: 770px; background-color: #0e232e; border-bottom: 2px solid #9eabb0; } @@ -1162,7 +1198,7 @@ section { border: 0px; margin: 0px; height: 20px; - width: 700px; + width: 500px; font-weight: bold; border: 1px solid #ffffff; } @@ -1179,13 +1215,26 @@ section { border: 1px solid #999999; } #jot #character-counter { - width: 80px; + width: 40px; float: right; text-align: right; height: 20px; line-height: 20px; padding-right: 20px; } +#jot #jot-category { + border: 0px; + margin: 0px; + height: 20px; + width: 200px; + border: 1px solid #ffffff; +} +#jot #jot-category:hover { + border: 1px solid #999999; +} +#jot #jot-category:focus { + border: 1px solid #999999; +} /** buttons **/ /*input[type="submit"] { border: 0px; @@ -1592,44 +1641,19 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -/* mail view */ -/* -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.mail-conv-outside-wrapper-end { - clear: both; -} - -.mail-conv-outside-wrapper { - margin-top: 30px; -} - -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; +/* theme screenshot */ +.screenshot, +#theme-preview { + position: absolute; + width: 202px; + left: 70%; + top: 50px; } - -.mail-conv-delete-icon { - border: none; +.screenshot img, +#theme-preview img { + width: 200px; + height: 150px; } - -*/ /* page footer */ footer { height: 100px; diff --git a/view/theme/quattro/green/colors.less b/view/theme/quattro/green/colors.less index bc78c3fda..1f1df4c55 100644 --- a/view/theme/quattro/green/colors.less +++ b/view/theme/quattro/green/colors.less @@ -74,7 +74,8 @@ @FieldHelpColor: @Grey3; -@ThreadBackgroundColor: #f6f7f8; +@ThreadBackgroundColor: #eff0f1; +@ThreadBottomBorderColor: @Grey2; @ShinyBorderColor: @Green4; @CommentBoxEmptyColor: @Grey3; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index df43aa152..317112f6f 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -66,6 +66,9 @@ .icon.s10.type-text { background-image: url("../../../images/icons/10/text.png"); } +.icon.s10.language { + background-image: url("icons/language.png"); +} .icon.s10.text { padding: 2px 0px 0px 15px; } @@ -121,6 +124,9 @@ .icon.s16.type-text { background-image: url("../../../images/icons/16/text.png"); } +.icon.s16.language { + background-image: url("icons/language.png"); +} .icon.s16.text { padding: 4px 0px 0px 20px; } @@ -176,6 +182,9 @@ .icon.s22.type-text { background-image: url("../../../images/icons/22/text.png"); } +.icon.s22.language { + background-image: url("icons/language.png"); +} .icon.s22.text { padding: 10px 0px 0px 25px; } @@ -231,6 +240,9 @@ .icon.s48.type-text { background-image: url("../../../images/icons/48/text.png"); } +.icon.s48.language { + background-image: url("icons/language.png"); +} /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; @@ -314,6 +326,10 @@ code { float: right; } /* popup notifications */ +#jGrowl.top-right { + top: 30px; + right: 15px; +} div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -565,7 +581,7 @@ ul.menu-popup .toolbar a:hover { color: #9eabb0; display: block; } -/* aside */ +/* aside 230px*/ aside { display: table-cell; vertical-align: top; @@ -772,20 +788,21 @@ aside #profiles-menu { width: 200px; top: 18px; } -/* section */ +/* section 800px */ section { display: table-cell; vertical-align: top; - width: 800px; + width: 770px; padding: 0px 20px 0px 10px; } /* wall item */ .tread-wrapper { - background-color: #f6f7f8; + background-color: #eff0f1; position: relative; padding: 10px; margin-bottom: 20px; - width: 780px; + width: 750px; + border-bottom: 1px solid #cccccc; } .wall-item-decor { position: absolute; @@ -798,7 +815,7 @@ section { } .wall-item-container { display: table; - width: 780px; + width: 750px; } .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -890,26 +907,42 @@ section { .wall-item-container .wall-item-actions-tools input { float: right; } -.wall-item-container.comment { - /*margin-top: 50px;*/ - +.wall-item-container.comment .contact-photo-wrapper { + margin-left: 16px; } .wall-item-container.comment .contact-photo { width: 32px; height: 32px; - margin-left: 16px; - /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ - } .wall-item-container.comment .contact-photo-menu-button { top: 15px !important; - left: 15px !important; + left: 0px !important; } .wall-item-container.comment .wall-item-links { padding-left: 12px; } +/* 'tag' item type */ +.wall-item-container.item-tag .wall-item-content { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container.item-tag .contact-photo-wrapper { + margin-left: 32px; +} +.wall-item-container.item-tag .contact-photo { + width: 16px; + height: 16px; +} +.wall-item-container.item-tag .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; +} .wall-item-comment-wrapper { - margin: 30px 2em 2em 60px; + margin: 1em 2em 1em 60px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -961,6 +994,9 @@ section { #jot-preview-content .tread-wrapper { background-color: #ddffdd; } +.hide-comments-outer { + margin-bottom: 0.8em; +} .wall-item-tags { padding-top: 5px; } @@ -1087,7 +1123,7 @@ section { padding: 0px; height: 40px; overflow: none; - width: 800px; + width: 770px; background-color: #009100; border-bottom: 2px solid #9eabb0; } @@ -1162,7 +1198,7 @@ section { border: 0px; margin: 0px; height: 20px; - width: 700px; + width: 500px; font-weight: bold; border: 1px solid #ffffff; } @@ -1179,13 +1215,26 @@ section { border: 1px solid #999999; } #jot #character-counter { - width: 80px; + width: 40px; float: right; text-align: right; height: 20px; line-height: 20px; padding-right: 20px; } +#jot #jot-category { + border: 0px; + margin: 0px; + height: 20px; + width: 200px; + border: 1px solid #ffffff; +} +#jot #jot-category:hover { + border: 1px solid #999999; +} +#jot #jot-category:focus { + border: 1px solid #999999; +} /** buttons **/ /*input[type="submit"] { border: 0px; @@ -1592,44 +1641,19 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -/* mail view */ -/* -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.mail-conv-outside-wrapper-end { - clear: both; -} - -.mail-conv-outside-wrapper { - margin-top: 30px; -} - -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; +/* theme screenshot */ +.screenshot, +#theme-preview { + position: absolute; + width: 202px; + left: 70%; + top: 50px; } - -.mail-conv-delete-icon { - border: none; +.screenshot img, +#theme-preview img { + width: 200px; + height: 150px; } - -*/ /* page footer */ footer { height: 100px; diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less index 3688ae021..24e96b5aa 100644 --- a/view/theme/quattro/icons.less +++ b/view/theme/quattro/icons.less @@ -19,6 +19,9 @@ &.type-video{ background-image: url("../../../images/icons/@{size}/video.png"); } &.type-image{ background-image: url("../../../images/icons/@{size}/image.png"); } &.type-text { background-image: url("../../../images/icons/@{size}/text.png"); } + + &.language { background-image: url("icons/language.png"); } + } diff --git a/view/theme/quattro/icons/language.png b/view/theme/quattro/icons/language.png Binary files differnew file mode 100644 index 000000000..8029c0155 --- /dev/null +++ b/view/theme/quattro/icons/language.png diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl index 2f89d4372..95c0ff6b1 100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/quattro/jot.tpl @@ -1,8 +1,10 @@ <form id="profile-jot-form" action="$action" method="post"> <div id="jot"> <div id="profile-jot-desc" class="jothidden"> </div> - <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /> + <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" title="$placeholdertitle" value="$title" class="jothidden" style="display:none" /><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" title="$placeholdercategory" value="$category" class="jothidden" style="display:none" /> <div id="character-counter" class="grey jothidden"></div> + + <input type="hidden" name="type" value="$ptyp" /> <input type="hidden" name="profile_uid" value="$profile_uid" /> @@ -20,8 +22,10 @@ <li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li> <li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li> <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li> + <!-- TODO: waiting for a better placement <li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li> <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li> + --> <li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li> $jotplugins diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl index 26f04f134..af1fc9414 100644 --- a/view/theme/quattro/nav.tpl +++ b/view/theme/quattro/nav.tpl @@ -43,6 +43,7 @@ <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> <span id="notify-update" class="nav-notify"></span> <ul id="nav-notifications-menu" class="menu-popup"> + <!-- TODO: better icons! --> <li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li> <li class="empty">$emptynotifications</li> </ul> @@ -91,3 +92,4 @@ <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> </ul> +<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div> diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 0660a3ad7..4c3279943 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -87,6 +87,10 @@ code { /* popup notifications */ +#jGrowl.top-right { + top: 30px; + right: 15px; +} div.jGrowl div.notice { background: @NoticeBackgroundColor url("../../../images/icons/48/notice.png") no-repeat 5px center; color: @NoticeColor; @@ -270,7 +274,7 @@ ul.menu-popup { -/* aside */ +/* aside 230px*/ aside { display: table-cell; vertical-align: top; @@ -403,11 +407,11 @@ aside { } -/* section */ +/* section 800px */ section { display: table-cell; vertical-align: top; - width: 800px; + width: 770px; padding:0px 20px 0px 10px; } @@ -417,14 +421,15 @@ section { position: relative; padding: 10px; margin-bottom: 20px; - width: 780px; + width: 750px; + border-bottom: 1px solid @ThreadBottomBorderColor; } .wall-item-decor { position: absolute; left: 97%; top: -10px; width: 16px;} .unstarred { display: none; } .wall-item-container { display: table; - width: 780px; + width: 750px; .wall-item-item, .wall-item-bottom { display: table-row; } @@ -478,19 +483,35 @@ section { .wall-item-container.comment { - /*margin-top: 50px;*/ - .contact-photo { width: 32px; height: 32px; margin-left: 16px; - /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + .contact-photo-wrapper { margin-left: 16px; } + .contact-photo { + width: 32px; height: 32px; } .contact-photo-menu-button { top: 15px !important; - left: 15px !important; + left: 0px !important; } .wall-item-links { padding-left: 12px; } } +/* 'tag' item type */ +.wall-item-container.item-tag { + .wall-item-content { + .opaque(0.5); + } + .contact-photo-wrapper { margin-left: 32px; } + .contact-photo { + width: 16px; height: 16px; + } + .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; + } +} + + .wall-item-comment-wrapper { - margin: 30px 2em 2em 60px; + margin: 1em 2em 1em 60px; .comment-edit-photo { display: none; } textarea { height: 1em; width: 100%; font-size: 10px; @@ -522,13 +543,12 @@ section { .wall-item-container { width: 700px; } .tread-wrapper { width: 700px; padding: 0; margin: 10px 0;} - - } .shiny { border-right:10px solid @ShinyBorderColor; } #jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; } +.hide-comments-outer {margin-bottom: 0.8em; } .wall-item-tags { padding-top: 5px; } .tag { @@ -638,7 +658,7 @@ section { #jot-tools { margin: 0px; padding: 0px; height: 40px; overflow: none; - width: 800px; + width: 770px; background-color: @JotToolsBackgroundColor; border-bottom: 2px solid @JotToolsBorderColor; li { @@ -710,7 +730,7 @@ section { border: 0px; margin: 0px; height: 20px; - width: 700px; + width: 500px; font-weight: bold; border: 1px solid @BodyBackground; @@ -727,14 +747,23 @@ section { } #character-counter { - width: 80px; + width: 40px; float: right; text-align: right; height: 20px; line-height: 20px; padding-right: 20px; } - + + #jot-category { + border: 0px; + margin: 0px; + height: 20px; + width: 200px; + border: 1px solid @BodyBackground; + &:hover { border: 1px solid @CommentBoxEmptyBorderColor } + &:focus { border: 1px solid @CommentBoxEmptyBorderColor } + } } @@ -1106,46 +1135,15 @@ ul.tabs { } -/* mail view */ -/* -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.mail-conv-outside-wrapper-end { - clear: both; -} - -.mail-conv-outside-wrapper { - margin-top: 30px; -} - -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; -} - -.mail-conv-delete-icon { - border: none; +/* theme screenshot */ +.screenshot, #theme-preview { + position: absolute; + width:202px; + left: 70%; + top: 50px; + img { width: 200px; height: 150px; } } -*/ - - /* page footer */ footer { height: 100px; display: table-row; } diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php index b6104a170..fa02a04b6 100644 --- a/view/theme/quattro/style.php +++ b/view/theme/quattro/style.php @@ -1,11 +1,18 @@ <?php - $color = false; + $color=false; + $quattro_align=false; + $site_color = get_config("quattro","color"); + $site_quattro_align = get_config("quattro", "align" ); + if (local_user()) { $color = get_pconfig(local_user(), "quattro","color"); $quattro_align = get_pconfig(local_user(), 'quattro', 'align' ); } + if ($color===false) $color=$site_color; if ($color===false) $color="dark"; + if ($quattro_align===false) $quattro_align=$site_quattro_align; + if (file_exists("$THEMEPATH/$color/style.css")){ echo file_get_contents("$THEMEPATH/$color/style.css"); diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php new file mode 100644 index 000000000..0a13c2035 --- /dev/null +++ b/view/theme/quattro/theme.php @@ -0,0 +1,12 @@ +<?php +/** + * Name: Quattro + * Version: 0.5 + * Author: Fabio <http://kirgroup.com/profile/fabrixxm> + * Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm> + * Maintainer: Tobias <https://diekershoff.homeunix.net/friendika/profile/tobias> + */ + + $a->theme_info = array(); + + diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl new file mode 100644 index 000000000..926fc929d --- /dev/null +++ b/view/theme/quattro/wall_item_tag.tpl @@ -0,0 +1,23 @@ +<div class="wall-item-container item-tag $item.indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper"> + <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id"> + <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" /> + </a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id"> + $item.item_photo_menu + </ul> + + </div> + <div class="wall-item-location">$item.location</div> + </div> + <div class="wall-item-content"> + $item.body + </div> + </div> +</div> + +<div class="wall-item-comment-wrapper" > + $item.comment +</div> |
