From 2a3aaca88ded68a8ce926577d3faea2f3ef0ab50 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 5 Mar 2012 23:36:22 -0500 Subject: [PATCH 01/13] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: some admin page fixes and cleanup changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero) string update some testbubble stuff can_write_wall documentation * master: From bc8b0149062dad50ca2296e6239a7ecbea3d9b6b Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 6 Mar 2012 16:18:26 -0500 Subject: [PATCH 02/13] styling fixes in dispy. fix typos in settings.tpl Signed-off-by: Simon L'nu --- view/settings.tpl | 4 +-- view/theme/dispy/style.css | 71 +++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/view/settings.tpl b/view/settings.tpl index 1172df8b9..b7f427b32 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -60,9 +60,9 @@ $suggestme {{inc field_input.tpl with $field=$expire.days }}{{endinc}}
- $expire.label + $expire.label
-
+

$expire.advanced

{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}} {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}} diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index bda163b8f..0032c4866 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -177,14 +177,14 @@ input[type=submit] { padding: 1em; } .pager { - padding-top: 30px; + margin-top: 60px; display: block; clear: both; text-align: center; } .pager span { padding: 4px; - margin:4px; + margin: 4px; } .pager_current { background-color: #729fcf; @@ -618,20 +618,28 @@ aside { } .vcard .fn { font-size: 1.7em; - font-weight: 700; + font-weight: bold; border-bottom: 1px solid #729fcf; - padding-top: 1px; + padding-top: 3px; } .vcard #profile-photo-wrapper { - margin: 10px 0px; + margin: 20px; +} +.vcard #profile-photo-wrapper img { + box-shadow: 3px 3px 10px 0; } aside h4 { font-size: 1.2em; } - aside #viewcontacts { text-align: right; } +.aprofile dt { + box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; +} #profile-extra-links ul { margin-left: 0px; padding-left: 0px; @@ -750,34 +758,27 @@ aside #viewcontacts { } #jot #jot-title { border: 0px; - margin: 0px; + margin: 0 0 5px; height: 20px; - width: 100%; + width: 90%; font-weight: bold; - border: 1px solid #ffffff; border-radius: 5px; -} -#jot #jot-title:-webkit-input-placeholder { - font-weight: normal; -} -#jot #jot-title:-moz-placeholder { - font-weight: normal; -} -#jot #jot-title:placeholder { - font-weight: normal; + vertical-align: middle; + padding: 5px 1px; } #jot #jot-title:hover, #jot #jot-title:focus { - border: 1px solid #999999; + border: 1px solid #999; border-radius: 5px; } #jot #character-counter { - width: 80px; + width: 40px; float: right; text-align: right; height: 20px; line-height: 20px; - padding-right: 20px; + padding: 5px; + margin: 0 0 5px; } #profile-jot-text_tbl { margin-bottom: 10px; @@ -796,10 +797,6 @@ aside #viewcontacts { float: left; margin-left: 10px; } -#character-counter { - float:right; - padding:8px 10px; -} #profile-rotator-wrapper { float: right; } @@ -1556,10 +1553,11 @@ div[id$="wrapper"] br { .view-contact-wrapper, .contact-entry-wrapper { float: left; - margin-right: 20px; - margin-bottom: 20px; + margin-right: 5px; + margin-bottom: 40px; width: 120px; - /*height: 120px;*/ + height: 120px; + padding: 3px; position: relative; } .contact-direction-wrapper { @@ -1703,13 +1701,15 @@ div[id$="wrapper"] br { } #settings-nickname-desc { - background-color: #def; + background-color: #eee; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; padding: 5px; } - +#settings-default-perms { + margin-bottom: 20px; +} #register-form div, #profile-edit-form div { clear: both; @@ -2112,17 +2112,16 @@ div[id$="wrapper"] br { display: block; font-size: 1.077em; /*font-weight: bold;*/ - margin-bottom: 0.2em; - margin: 0 10px 0.2em 0; + margin: 0 10px 0.5em 0; border: 1px #999 solid; padding: 5px; - background: #def; + background: #eee; vertical-align: middle; } .field input { width: 250px; height: 25px; - border: 1px #666 solid; + border: 1px #999 solid; } .field textarea { width: 80%; @@ -2147,8 +2146,8 @@ div[id$="wrapper"] br { text-decoration: none; } .field .onoff .on { - background: url("../../../images/onoff.jpg") no-repeat 42px 1px #def; - color: #333; + background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999; + color: #111; text-align: left; } .field .onoff .off { From 731b19c025a9505286d94bb8251e843dadb80de1 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 6 Mar 2012 13:57:38 -0800 Subject: [PATCH 03/13] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 429bfecb3..ea2178231 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1272' ); +define ( 'FRIENDICA_VERSION', '2.3.1273' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1131 ); From 8fb0ea4048745c09ece6c84f23bffdccfc59d67d Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 6 Mar 2012 14:27:53 -0800 Subject: [PATCH 04/13] bugs #312, #313 --- include/conversation.php | 2 +- mod/admin.php | 38 +++++++++++++++++++------------------- mod/network.php | 30 ++++++++++++++---------------- view/nets.tpl | 2 +- 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index f4740688c..b458923e5 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -217,7 +217,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if($update) $return_url = $_SESSION['return_url']; else - $return_url = $_SESSION['return_url'] = $a->cmd; + $return_url = $_SESSION['return_url'] = $a->query_string; load_contact_links(local_user()); diff --git a/mod/admin.php b/mod/admin.php index 2115f9241..93714bb5f 100755 --- a/mod/admin.php +++ b/mod/admin.php @@ -321,32 +321,32 @@ 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'), "Default system theme (which 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"), $theme_choices), - '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), "Maximum size in bytes of uploaded images. Default is 0, which means no limits."), + '$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.")), '$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices), - '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), "Will be displayed prominently on the registration page."), + '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), t("Will be displayed prominently on the registration page.")), '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), - '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"), - '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"), - '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), "Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."), - '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), "Check to force all profiles on this site to be listed in the site directory."), - '$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), "URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."), + '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), + '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), + '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")), + '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")), + '$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")), - '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), "Disallow users to register additional accounts for use as pages."), - '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), "OpenID support for registration and logins."), - '$no_gravatar' => array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), "Search new user's photo on Gravatar."), - '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), "Force users to register with a space between firstname and lastname in Full name, as an antispam measure"), - '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), "Use PHP UTF8 regular expressions"), - '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."), - '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."), - '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), "Provide built-in Diaspora network compatibility."), - '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), "All contacts must use Friendica protocols. All other built-in communication protocols disabled."), - '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."), + '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), + '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), + '$no_gravatar' => array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), t("Search new user's photo on Gravatar.")), + '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), + '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")), + '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")), + '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), + '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), + '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")), + '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), - '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), "Value is in seconds. Set to 0 for unlimited (not recommended)."), + '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")), )); diff --git a/mod/network.php b/mod/network.php index 894ac48ed..8da1561a0 100755 --- a/mod/network.php +++ b/mod/network.php @@ -51,14 +51,14 @@ function network_init(&$a) { function saved_searches($search) { - $srchurl = '/network' - . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') - . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') - . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '') - . ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '') - . ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '') - . ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '') - . ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : ''); + $srchurl = '/network?f=' + . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') + . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') + . ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '') + . ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '') + . ((x($_GET,'nets')) ? '&nets=' . $_GET['nets'] : '') + . ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '') + . ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : ''); $o = ''; @@ -164,33 +164,33 @@ function network_content(&$a, $update = 0) { $tabs = array( array( 'label' => t('Commented Order'), - 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : ''), + 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?f=&cid=' . $_GET['cid'] : ''), 'sel'=>$all_active, ), array( 'label' => t('Posted Order'), - 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), + 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 'sel'=>$postord_active, ), array( 'label' => t('Personal'), - 'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&conv=1', + 'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1', 'sel' => $conv_active, ), array( 'label' => t('New'), - 'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : ''), + 'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), 'sel' => $new_active, ), array( 'label' => t('Starred'), - 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1', + 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1', 'sel'=>$starred_active, ), array( 'label' => t('Bookmarks'), - 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1', + 'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1', 'sel'=>$bookmarked_active, ), // array( @@ -256,8 +256,6 @@ function network_content(&$a, $update = 0) { nav_set_selected('network'); - $_SESSION['return_url'] = $a->query_string; - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); $x = array( diff --git a/view/nets.tpl b/view/nets.tpl index 0953e66a6..cbadf1361 100755 --- a/view/nets.tpl +++ b/view/nets.tpl @@ -5,7 +5,7 @@ From 0badf3110f321ddafdc3d958e5da13626da6f60a Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 6 Mar 2012 17:52:12 -0500 Subject: [PATCH 05/13] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: bugs #312, #313 revup * master: From 21887a36fde1f287c73c7cc3a57ac9ba2ec2135b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 6 Mar 2012 14:53:14 -0800 Subject: [PATCH 06/13] [PRIVACY] privacy issue bug #314 --- mod/display.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mod/display.php b/mod/display.php index f510f793d..4f2e5ff9a 100755 --- a/mod/display.php +++ b/mod/display.php @@ -34,7 +34,7 @@ function display_content(&$a) { $contact = null; $remote_contact = false; - +dbg(1); if(remote_user()) { $contact_id = $_SESSION['visitor_id']; $groups = init_groups_visitor($contact_id); @@ -87,6 +87,9 @@ function display_content(&$a) { $sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups); + if(! local_user() && ! remote_user()) + $sql_extra .= " and `item`.`private` = 0 "; + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, @@ -135,7 +138,7 @@ function display_content(&$a) { } } - +dbg(0); return $o; } From edd450cf06f2f2cc0507b116d0aefeb5cb599501 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 6 Mar 2012 17:55:05 -0500 Subject: [PATCH 07/13] dispy, dispy, oh what a little lispy Signed-off-by: Simon L'nu --- view/theme/dispy/style.css | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 0032c4866..671d9652b 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -24,9 +24,9 @@ audio:not([controls]) { display: none; } -/* ============================================================================= - Base - ========================================================================== */ +/* + * Base + */ /* * 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units @@ -613,14 +613,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link aside { position: absolute; right: 15px; - width: 255px; + width: 230px; font-size: smaller; } .vcard .fn { font-size: 1.7em; font-weight: bold; border-bottom: 1px solid #729fcf; - padding-top: 3px; + padding-bottom: 3px; } .vcard #profile-photo-wrapper { margin: 20px; @@ -956,7 +956,7 @@ aside #viewcontacts { section { margin: 20px 6% 0 4%; font-size: 0.8em; - padding-right: 250px; + padding-right: 220px; min-width: 475px; } @@ -1002,7 +1002,6 @@ section { .wall-item-content-wrapper { position: relative; padding: 10px; - overflow-x: auto; width: auto; } .wall-item-outside-wrapper .wall-item-comment-wrapper { @@ -1107,9 +1106,9 @@ section { clear:both; } .wall-item-location { - margin-top: 5px; + margin-top: 10px; width: 100px; - overflow:hidden; + overflow: hidden; text-overflow: ellipsis; -o-text-overflow: ellipsis; } @@ -1130,14 +1129,14 @@ section { display: none; } .wallwall .wwto { - left:-10px; + left: 5px; margin: 0; - position:absolute; - top:65px; + position: absolute; + top: 75px; width: 30px; - z-index:10001; - width:30px; - height:30px; + z-index: 10001; + width: 30px; + height: 30px; } .wallwall .wwto img { width: 30px !important; @@ -1148,8 +1147,8 @@ section { } .wall-item-arrowphoto-wrapper { position: absolute; - left: 20px; - top: 70px; + left: 35px; + top: 80px; z-index: 10002; } .wall-item-photo-menu { @@ -1732,11 +1731,11 @@ div[id$="wrapper"] br { margin: 30px 0px; } .profile-edit-side-div { - margin-top: 10px; + margin-top: 0px; } .profile-edit-side-link { float: right; - margin: 10px 20px -16px 0; + margin: 0px 20px -18px 0; } .profile-listing { float: left; From 6a5c4bab9c4e06c65fb68b0586853f169197ab0b Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 7 Mar 2012 00:07:27 +0100 Subject: [PATCH 08/13] messages-menu translation, add scroll-to-top and theme-bug-report in theme --- include/nav.php | 3 +++ view/theme/diabook/icons/ftdevs.gif | Bin 0 -> 1188 bytes view/theme/diabook/icons/scroll_top.png | Bin 0 -> 296 bytes view/theme/diabook/nav.tpl | 19 ++++++------------- view/theme/diabook/style.css | 23 +++++++++++++++-------- 5 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 view/theme/diabook/icons/ftdevs.gif create mode 100755 view/theme/diabook/icons/scroll_top.png diff --git a/include/nav.php b/include/nav.php index 511ca07fc..aadfa82fd 100755 --- a/include/nav.php +++ b/include/nav.php @@ -122,6 +122,9 @@ function nav(&$a) { } $nav['messages'] = array('message', t('Messages'), "", t('Private mail')); + $nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox')); + $nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox')); + $nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message')); if(is_array($a->identities) && count($a->identities) > 1) { $nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages')); diff --git a/view/theme/diabook/icons/ftdevs.gif b/view/theme/diabook/icons/ftdevs.gif new file mode 100644 index 0000000000000000000000000000000000000000..e0fc257434792e0b64406320444d9bed3f9478e2 GIT binary patch literal 1188 zcmV;V1Y7$@Nk%w1VG;lm0O$MwFfJ!FF)1@KEHyDIHa0OWK}9q_MM6M28%twDMMN`6 zR!~MQNl8UjN-Zo=WCvP_Y)b$sRcHuXk5f-dC0TWAP!A?scTH75UQswETzDs3cn@Ke z7hsDIVwG@H3`vWKm;eV_j)XUTI5YWn(3Bon2~8S!-5hW@de5DspB?y2!MfqX@-)CgJ*$*e}IF9NsqFDgnyxfEw_OLi-c>n zf&`y~Jc5OViimrMiIS0ua*~T~XO*y(j&_ZZkB5?yn~-zDj|`2Hjd_-#mXUv#k$;(z zdUlzfn38~wl$Dy4c!rmshL@m&nWb)?wrQZemzSGtp}BIPwv(Ek$(tc@roYFYA<~@~ z(w-^4q&3x_C8497)SxJ>q<+|;B)_LPcdyR2r)#yRamcALrl+dirWcE_zp$&1r>m{r zsUNwle#EX_<*pvFu(05-H|w$)zq69=vlX?pv+lDO@Us}XwxRE|7R$G8!M2v}wH=?o z$;7#vv%A8^yr1p8CB?m<_`Dwby&B2Cqw&Bd{=OH#z`_2%82-N*{l6T{!J5p%n*YEU z@WDa#hd@c9kj{M#Kyk%#6Zr)tpCL#|Hc{r z#v9DWw*SW#|Hm2s$05tdy#L4<)ybO6%E`LV%*xHi+s%~!%|pb})Bn##&(PA+(a`eI zb?Mcg_tkm-*I579T=>^~``35>*l7RSR{z;x_}GE}*lqvWWZBu-_}PX3+j9Baisjw9 z`Q48A-ILkh+~(iB;^5ik;mhgc$>`+HjPf|J{XJjpEaAjv8b}=q6ASiWnX>MmANlHf`N>D{dAa*t~ zDJ&pybzy92ba@~>ATcm73IHqs0000I01^NI2>t;1VN+&Im#b8#NO7uj2hX2q{POXO zwXGdHb?C@_;|6XDnmu~*c;d&8jka{>V9k{MlE2fDMB14J_ zaOh(y2?>%ON*!x9NC=J_GiV@qAj#U14jNQU^->lqav zjBJ!Zp~6HFNo$CxWy>r~6KQiIXt0oh!W%b3_V$96?A4<}UQRerU?2g5CwqC#lJ!f~ zB1{Ja1Q-B-z!k-}T7ilr2#_2&apyjf78m{dE$u4$nav.contacts.1 @@ -38,9 +38,9 @@ {{ endif }} @@ -138,18 +138,11 @@ +
$langselector
-
+
-$nav.login.1 - - - - - {# {{ if $nav.logout }}$nav.logout.1 {{ endif }} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index ddbbc2e53..fe1d3d882 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -619,6 +619,7 @@ nav .nav-menu-search { margin: 3px 17px; margin-right: 0px; height: 17px; + width: 205px; } nav .nav-menu-icon { @@ -856,7 +857,7 @@ aside { /* background: #F1F1F1; */ } aside .vcard .fn { - font-size: 16px; + font-size: 18px; font-weight: bold; margin-bottom: 5px; } @@ -1427,12 +1428,13 @@ section { margin-top: 10px; } #profile-jot-form #jot-title { - border: 0px; - margin: 0px; - height: 20px; - width: 700px; - font-weight: bold; - border: 1px solid #ffffff; + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #ffffff; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -1883,7 +1885,12 @@ blockquote { padding-left: 9px; margin: 0 0 0 .8ex; } - +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } /* ================== */ /* = Contacts Block = */ /* ================== */ From a5e7c73e674967e439ea31fed4ddcaa2fd78e8c4 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 6 Mar 2012 15:09:57 -0800 Subject: [PATCH 09/13] string update --- util/messages.po | 325 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 224 insertions(+), 101 deletions(-) diff --git a/util/messages.po b/util/messages.po index 140ed0427..7f88e2288 100755 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1272\n" +"Project-Id-Version: 2.3.1273\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-05 16:34-0800\n" +"POT-Creation-Date: 2012-03-06 15:09-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,11 +48,11 @@ msgstr "" #: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159 #: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9 #: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9 -#: ../../mod/display.php:130 ../../mod/profiles.php:7 +#: ../../mod/display.php:133 ../../mod/profiles.php:7 #: ../../mod/profiles.php:229 ../../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:332 -#: ../../include/items.php:3005 ../../index.php:288 +#: ../../include/items.php:3030 ../../index.php:288 msgid "Permission denied." msgstr "" @@ -82,7 +82,7 @@ msgid "Return to contact editor" msgstr "" #: ../../mod/crepair.php:148 ../../mod/settings.php:462 -#: ../../mod/settings.php:488 ../../mod/admin.php:483 ../../mod/admin.php:492 +#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493 msgid "Name" msgstr "" @@ -126,8 +126,8 @@ msgstr "" #: ../../mod/localtime.php:45 ../../mod/contacts.php:319 #: ../../mod/settings.php:460 ../../mod/settings.php:603 #: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80 -#: ../../mod/admin.php:312 ../../mod/admin.php:480 ../../mod/admin.php:606 -#: ../../mod/admin.php:772 ../../mod/admin.php:852 ../../mod/profiles.php:375 +#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609 +#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375 #: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92 #: ../../addon/nsfw/nsfw.php:57 @@ -149,7 +149,8 @@ msgstr "" #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175 #: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355 -#: ../../addon/posterous/posterous.php:90 ../../include/conversation.php:552 +#: ../../addon/posterous/posterous.php:90 +#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552 msgid "Submit" msgstr "" @@ -539,7 +540,7 @@ msgid "Preview" msgstr "" #: ../../mod/photos.php:1320 ../../mod/settings.php:520 -#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:487 +#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488 #: ../../include/conversation.php:304 ../../include/conversation.php:573 msgid "Delete" msgstr "" @@ -772,7 +773,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:582 ../../include/items.php:2541 +#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566 msgid "[Name Withheld]" msgstr "" @@ -1225,7 +1226,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:486 msgid "Approve" msgstr "" @@ -1422,12 +1423,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:490 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:489 msgid "Block" msgstr "" @@ -1496,7 +1497,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:341 ../../mod/admin.php:901 +#: ../../mod/contacts.php:341 ../../mod/admin.php:905 msgid "Update now" msgstr "" @@ -1583,7 +1584,7 @@ msgstr "" #: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106 #: ../../mod/register.php:380 ../../mod/register.php:434 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726 -#: ../../include/items.php:2550 +#: ../../include/items.php:2575 msgid "Administrator" msgstr "" @@ -1850,7 +1851,7 @@ msgstr "" msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:461 +#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462 msgid "Normal Account" msgstr "" @@ -1858,7 +1859,7 @@ msgstr "" msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:462 +#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463 msgid "Soapbox Account" msgstr "" @@ -1866,7 +1867,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:463 +#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464 msgid "Community/Celebrity Account" msgstr "" @@ -1874,7 +1875,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:464 +#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465 msgid "Automatic Friend Account" msgstr "" @@ -2140,27 +2141,27 @@ msgstr[1] "" msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:300 +#: ../../mod/network.php:298 msgid "No such group" msgstr "" -#: ../../mod/network.php:311 +#: ../../mod/network.php:309 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:315 +#: ../../mod/network.php:313 msgid "Group: " msgstr "" -#: ../../mod/network.php:325 +#: ../../mod/network.php:323 msgid "Contact: " msgstr "" -#: ../../mod/network.php:327 +#: ../../mod/network.php:325 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:332 +#: ../../mod/network.php:330 msgid "Invalid contact." msgstr "" @@ -2488,7 +2489,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:540 ../../mod/admin.php:313 +#: ../../mod/register.php:540 ../../mod/admin.php:314 msgid "Registration" msgstr "" @@ -2542,9 +2543,9 @@ 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:521 ../../mod/admin.php:697 ../../mod/display.php:29 -#: ../../mod/display.php:134 ../../mod/viewd.php:14 -#: ../../include/items.php:2917 +#: ../../mod/admin.php:522 ../../mod/admin.php:700 ../../mod/display.php:29 +#: ../../mod/display.php:137 ../../mod/viewd.php:14 +#: ../../include/items.php:2942 msgid "Item not found." msgstr "" @@ -2778,23 +2779,23 @@ msgstr "" msgid "No friends to display." msgstr "" -#: ../../mod/admin.php:71 ../../mod/admin.php:311 +#: ../../mod/admin.php:71 ../../mod/admin.php:312 msgid "Site" msgstr "" -#: ../../mod/admin.php:72 ../../mod/admin.php:479 ../../mod/admin.php:491 +#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492 msgid "Users" msgstr "" -#: ../../mod/admin.php:73 ../../mod/admin.php:568 ../../mod/admin.php:605 +#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:74 ../../mod/admin.php:739 ../../mod/admin.php:771 +#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775 msgid "Themes" msgstr "" -#: ../../mod/admin.php:89 ../../mod/admin.php:851 +#: ../../mod/admin.php:89 ../../mod/admin.php:855 msgid "Logs" msgstr "" @@ -2802,333 +2803,439 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:160 ../../mod/admin.php:310 ../../mod/admin.php:478 -#: ../../mod/admin.php:567 ../../mod/admin.php:604 ../../mod/admin.php:738 -#: ../../mod/admin.php:770 ../../mod/admin.php:850 +#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479 +#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741 +#: ../../mod/admin.php:774 ../../mod/admin.php:854 msgid "Administration" msgstr "" -#: ../../mod/admin.php:161 +#: ../../mod/admin.php:162 msgid "Summary" msgstr "" -#: ../../mod/admin.php:162 +#: ../../mod/admin.php:163 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:164 +#: ../../mod/admin.php:165 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:165 +#: ../../mod/admin.php:166 msgid "Version" msgstr "" -#: ../../mod/admin.php:167 +#: ../../mod/admin.php:168 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:259 +#: ../../mod/admin.php:260 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:303 +#: ../../mod/admin.php:304 msgid "Closed" msgstr "" -#: ../../mod/admin.php:304 +#: ../../mod/admin.php:305 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:305 +#: ../../mod/admin.php:306 msgid "Open" msgstr "" -#: ../../mod/admin.php:314 +#: ../../mod/admin.php:315 msgid "File upload" msgstr "" -#: ../../mod/admin.php:315 +#: ../../mod/admin.php:316 msgid "Policies" msgstr "" -#: ../../mod/admin.php:316 +#: ../../mod/admin.php:317 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:320 ../../addon/statusnet/statusnet.php:523 +#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523 msgid "Site name" msgstr "" -#: ../../mod/admin.php:321 +#: ../../mod/admin.php:322 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:322 +#: ../../mod/admin.php:323 msgid "System language" msgstr "" -#: ../../mod/admin.php:323 +#: ../../mod/admin.php:324 msgid "System theme" msgstr "" -#: ../../mod/admin.php:325 +#: ../../mod/admin.php:324 +msgid "Default system theme - may be over-ridden by user profiles" +msgstr "" + +#: ../../mod/admin.php:326 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:327 -msgid "Register policy" +#: ../../mod/admin.php:326 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." msgstr "" #: ../../mod/admin.php:328 +msgid "Register policy" +msgstr "" + +#: ../../mod/admin.php:329 msgid "Register text" msgstr "" #: ../../mod/admin.php:329 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: ../../mod/admin.php:330 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:330 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:331 msgid "Allowed friend domains" msgstr "" #: ../../mod/admin.php:331 +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:332 msgid "Allowed email domains" msgstr "" #: ../../mod/admin.php:332 +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:333 msgid "Block public" msgstr "" #: ../../mod/admin.php:333 +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:334 msgid "Force publish" msgstr "" #: ../../mod/admin.php:334 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: ../../mod/admin.php:335 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:336 +#: ../../mod/admin.php:335 +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:337 msgid "Block multiple registrations" msgstr "" #: ../../mod/admin.php:337 +msgid "Disallow users to register additional accounts for use as pages." +msgstr "" + +#: ../../mod/admin.php:338 msgid "OpenID support" msgstr "" #: ../../mod/admin.php:338 +msgid "OpenID support for registration and logins." +msgstr "" + +#: ../../mod/admin.php:339 msgid "Gravatar support" msgstr "" #: ../../mod/admin.php:339 +msgid "Search new user's photo on Gravatar." +msgstr "" + +#: ../../mod/admin.php:340 msgid "Fullname check" msgstr "" #: ../../mod/admin.php:340 +msgid "" +"Force users to register with a space between firstname and lastname in Full " +"name, as an antispam measure" +msgstr "" + +#: ../../mod/admin.php:341 msgid "UTF-8 Regular expressions" msgstr "" #: ../../mod/admin.php:341 +msgid "Use PHP UTF8 regular expressions" +msgstr "" + +#: ../../mod/admin.php:342 msgid "Show Community Page" msgstr "" #: ../../mod/admin.php:342 +msgid "" +"Display a Community page showing all recent public postings on this site." +msgstr "" + +#: ../../mod/admin.php:343 msgid "Enable OStatus support" msgstr "" #: ../../mod/admin.php:343 +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:344 msgid "Enable Diaspora support" msgstr "" #: ../../mod/admin.php:344 +msgid "Provide built-in Diaspora network compatibility." +msgstr "" + +#: ../../mod/admin.php:345 msgid "Only allow Friendica contacts" msgstr "" #: ../../mod/admin.php:345 +msgid "" +"All contacts must use Friendica protocols. All other built-in communication " +"protocols disabled." +msgstr "" + +#: ../../mod/admin.php:346 msgid "Verify SSL" msgstr "" #: ../../mod/admin.php:346 -msgid "Proxy user" +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:347 -msgid "Proxy URL" +msgid "Proxy user" msgstr "" #: ../../mod/admin.php:348 +msgid "Proxy URL" +msgstr "" + +#: ../../mod/admin.php:349 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:369 +#: ../../mod/admin.php:349 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: ../../mod/admin.php:370 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:376 +#: ../../mod/admin.php:377 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:411 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:418 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:418 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:482 msgid "select all" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:483 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:484 msgid "Request date" msgstr "" -#: ../../mod/admin.php:483 ../../mod/admin.php:492 +#: ../../mod/admin.php:484 ../../mod/admin.php:493 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:485 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:487 msgid "Deny" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:493 msgid "Register date" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:493 msgid "Last login" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:493 msgid "Last item" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:493 msgid "Account" msgstr "" -#: ../../mod/admin.php:494 +#: ../../mod/admin.php:495 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:495 +#: ../../mod/admin.php:496 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:531 +#: ../../mod/admin.php:532 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:535 +#: ../../mod/admin.php:536 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:545 ../../mod/admin.php:721 +#: ../../mod/admin.php:546 ../../mod/admin.php:724 msgid "Disable" msgstr "" -#: ../../mod/admin.php:547 ../../mod/admin.php:723 +#: ../../mod/admin.php:548 ../../mod/admin.php:726 msgid "Enable" msgstr "" -#: ../../mod/admin.php:569 ../../mod/admin.php:740 +#: ../../mod/admin.php:570 ../../mod/admin.php:743 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:570 ../../mod/admin.php:741 ../../include/nav.php:130 +#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130 msgid "Settings" msgstr "" -#: ../../mod/admin.php:686 +#: ../../mod/admin.php:578 ../../mod/admin.php:753 +msgid "Author: " +msgstr "" + +#: ../../mod/admin.php:579 ../../mod/admin.php:754 +msgid "Maintainer: " +msgstr "" + +#: ../../mod/admin.php:689 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:776 +#: ../../mod/admin.php:780 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:777 +#: ../../mod/admin.php:781 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:800 +#: ../../mod/admin.php:804 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:853 +#: ../../mod/admin.php:857 msgid "Clear" msgstr "" -#: ../../mod/admin.php:859 +#: ../../mod/admin.php:863 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:860 +#: ../../mod/admin.php:864 msgid "Log file" msgstr "" -#: ../../mod/admin.php:860 +#: ../../mod/admin.php:864 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:861 +#: ../../mod/admin.php:865 msgid "Log level" msgstr "" -#: ../../mod/admin.php:902 +#: ../../mod/admin.php:906 msgid "Close" msgstr "" -#: ../../mod/admin.php:908 +#: ../../mod/admin.php:912 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:909 +#: ../../mod/admin.php:913 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:910 +#: ../../mod/admin.php:914 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:911 +#: ../../mod/admin.php:915 msgid "FTP Password" msgstr "" @@ -3247,7 +3354,7 @@ msgstr "" msgid "No friends in common." msgstr "" -#: ../../mod/display.php:127 +#: ../../mod/display.php:130 msgid "Item has been removed." msgstr "" @@ -4650,6 +4757,22 @@ msgstr "" msgid "Post to Posterous by default" msgstr "" +#: ../../view/theme/quattro/theme.php:17 +msgid "Theme settings" +msgstr "" + +#: ../../view/theme/quattro/theme.php:18 +msgid "Alignment" +msgstr "" + +#: ../../view/theme/quattro/theme.php:18 +msgid "Left" +msgstr "" + +#: ../../view/theme/quattro/theme.php:18 +msgid "Center" +msgstr "" + #: ../../include/profile_advanced.php:17 ../../boot.php:982 msgid "Gender:" msgstr "" @@ -5692,11 +5815,11 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/items.php:2548 +#: ../../include/items.php:2573 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2548 +#: ../../include/items.php:2573 msgid "You have a new follower at " msgstr "" From 94d4cad701ab6b618afb288c88165c0ec17ae238 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 6 Mar 2012 18:15:45 -0500 Subject: [PATCH 10/13] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: string update [PRIVACY] privacy issue bug #314 * master: From a464e4d33fbca9c02cd99abab092d43b631aa780 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 6 Mar 2012 15:15:59 -0800 Subject: [PATCH 11/13] search should be ok, but a little extra security won't hurt --- mod/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/search.php b/mod/search.php index fe09b671f..386592ea1 100755 --- a/mod/search.php +++ b/mod/search.php @@ -127,7 +127,7 @@ function search_content(&$a) { FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 0 ) + AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) OR `item`.`uid` = %d ) AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $search_alg From 7431bd950937929a21b7d158564a8f9a80d07c5f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 6 Mar 2012 15:28:27 -0800 Subject: [PATCH 12/13] fix html reshares when editplain in use --- mod/share.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/mod/share.php b/mod/share.php index bba527342..f6c025e3c 100755 --- a/mod/share.php +++ b/mod/share.php @@ -16,10 +16,18 @@ function share_init(&$a) { $o = ''; - $o .= '♲ ' . $r[0]['author-name'] . '
'; - if($r[0]['title']) - $o .= '' . $r[0]['title'] . '
'; - $o .= bbcode($r[0]['body'], true); - echo $o . '
'; + if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) { + $o .= '♲ [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]'; + if($r[0]['title']) + $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n"; + $o .= $r[0]['body'] . "\n"; + } + else { + $o .= '♲ ' . $r[0]['author-name'] . '
'; + if($r[0]['title']) + $o .= '' . $r[0]['title'] . '
'; + $o .= bbcode($r[0]['body'], true) . '
'; + } + echo $o; killme(); } From 49b5a1bf20fd1652288a3aa77a839c558bc96497 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 7 Mar 2012 00:47:43 +0100 Subject: [PATCH 13/13] fix in navbar --- view/theme/diabook/nav.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 3a36e7daa..027a8b7b7 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -142,6 +142,10 @@
$langselector
+ + {#