diff options
62 files changed, 1317 insertions, 1319 deletions
@@ -562,6 +562,7 @@ define ( 'ITEM_BUILDBLOCK', 0x0100); // Named thusly to make sure nobody co define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche define ( 'ITEM_BUG', 0x0400); // Is a bug, can be used by the internal bug tracker define ( 'ITEM_PENDING_REMOVE', 0x0800); // deleted, notification period has lapsed +define ( 'ITEM_DOC', 0x1000); // hubzilla only, define here so that item import does the right thing /** * Item Flags diff --git a/include/Contact.php b/include/Contact.php index 9490fd2da..035e83a82 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -311,6 +311,24 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { intval(PAGE_REMOVED), intval($channel_id) ); + // if this was the default channel, set another one as default + if($a->account['account_default_channel'] == $channel_id) { + $r = q("select channel_id from channel where channel_account_id = %d and not ( channel_pageflags & %d)>0 limit 1", + intval($a->account['account_id']), + intval(PAGE_REMOVED)); + if ($r) { + $rr = q("update account set account_default_channel = %d where account_id = %d", + intval($r[0]['channel_id']), + intval($a->account['account_id'])); + logger("Default channel deleted, changing default to channel_id " . $r[0]['channel_id']); + } + else { + $rr = q("update account set account_default_channel = 0 where account_id = %d", + intval($r[0]['channel_id']), + intval($a->account['account_id'])); + } + } + $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_hash = '%s' and hubloc_url = '%s' ", intval(HUBLOC_FLAGS_DELETED), diff --git a/include/bbcode.php b/include/bbcode.php index e248c3771..ba9592a51 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -174,10 +174,14 @@ function bb_parse_app($match) { function bb_parse_element($match) { $j = json_decode(base64url_decode($match[1]),true); - if ($j) { + if ($j && local_channel()) { $text = sprintf( t('Install %s element: '), translate_design_element($j['type'])) . $j['pagetitle']; $o = EOL . '<a href="#" onclick="importElement(\'' . $match[1] . '\'); return false;" >' . $text . '</a>' . EOL; } + else { + $text = sprintf( t('This post contains an installable %s element, however you lack permissions to install it on this site.' ), translate_design_element($j['type'])) . $j['pagetitle']; + $o = EOL . $text . EOL; + } return $o; } diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 726efce9d..8671f1bd1 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -5,7 +5,7 @@ function contact_profile_assign($current) { $o = ''; - $o .= "<select id=\"contact-profile-selector\" name=\"profile_assign\" />\r\n"; + $o .= "<select id=\"contact-profile-selector\" name=\"profile_assign\" class=\"form-control\"/>\r\n"; $r = q("SELECT profile_guid, profile_name FROM `profile` WHERE `uid` = %d", intval($_SESSION['uid'])); diff --git a/include/dir_fns.php b/include/dir_fns.php index 77c78558c..83073154a 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -72,33 +72,20 @@ function check_upstream_directory() { set_config('system', 'directory_server', ''); } -function get_globaldir_setting($observer) { - - if($observer) - $globaldir = get_xconfig($observer,'directory','globaldir'); - else - $globaldir = ((array_key_exists('globaldir',$_SESSION)) ? intval($_SESSION['globaldir']) : false); - - if($globaldir === false) - $globaldir = get_config('directory','globaldir'); - - return $globaldir; -} - -function get_safemode_setting($observer) { +function get_directory_setting($observer, $setting) { if ($observer) - $safe_mode = get_xconfig($observer,'directory','safe_mode'); + $ret = get_xconfig($observer, 'directory', $setting); else - $safe_mode = ((array_key_exists('safemode',$_SESSION)) ? intval($_SESSION['safemode']) : false); + $ret = ((array_key_exists($setting,$_SESSION)) ? intval($_SESSION[$setting]) : false); - if($safe_mode === false) - $safe_mode = get_config('directory','safe_mode'); + if($ret === false) + $ret = get_config('directory', $setting); - if($safe_mode === false) - $safe_mode = 1; + if($setting == 'safemode' && $ret === false) + $ret = 1; - return $safe_mode; + return $ret; } /** @@ -110,49 +97,37 @@ function dir_sort_links() { $observer = get_observer_hash(); - $safe_mode = get_safemode_setting($observer); - $globaldir = get_globaldir_setting($observer); + $safe_mode = get_directory_setting($observer, 'safemode'); + $globaldir = get_directory_setting($observer, 'globaldir'); + $pubforums = get_directory_setting($observer, 'pubforums'); // Build urls without order and pubforums so it's easy to tack on the changed value // Probably there's an easier way to do this - $directory_sort_order = get_config('system','directory_sort_order'); if(! $directory_sort_order) $directory_sort_order = 'date'; - $current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : $directory_sort_order); - $url = 'directory?f='; + $suggest = (($_REQUEST['suggest']) ? '&suggest=' . $_REQUEST['suggest'] : ''); - $tmp = array_merge($_GET,$_POST); - unset($tmp['order']); - unset($tmp['q']); - unset($tmp['f']); - $sorturl = $url . http_build_query($tmp); + $url = 'directory?f='; $tmp = array_merge($_GET,$_POST); + unset($tmp['suggest']); unset($tmp['pubforums']); unset($tmp['global']); unset($tmp['safe']); unset($tmp['q']); unset($tmp['f']); - $forumsurl = $url . http_build_query($tmp); + $forumsurl = $url . http_build_query($tmp) . $suggest; $o = replace_macros(get_markup_template('dir_sort_links.tpl'), array( '$header' => t('Directory Options'), - '$normal' => t('Alphabetic'), - '$reverse' => t('Reverse Alphabetic'), - '$date' => t('Newest to Oldest'), - '$reversedate' => t('Oldest to Newest'), - '$sort' => t('Sort'), - '$selected_sort' => $current_order, - '$sorturl' => $sorturl, '$forumsurl' => $forumsurl, - '$safemode' => array('safemode', t('Safe Mode'),$safe_mode,'','',' onchange=\'window.location.href="' . $forumsurl . '&safe="+(this.checked ? 1 : 0)\''), - - '$pubforums' => array('pubforums', t('Public Forums Only'),(x($_REQUEST,'pubforums') ? $_REQUEST['pubforums'] : ''),'','',' onchange=\'window.location.href="' . $forumsurl . '&pubforums="+(this.checked ? 1 : 0)\''), - '$globaldir' => array('globaldir', t('This Website Only'), 1-intval($globaldir),'','',' onchange=\'window.location.href="' . $forumsurl . '&global="+(this.checked ? 0 : 1)\''), + '$safemode' => array('safemode', t('Safe Mode'),$safe_mode,'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&safe="+(this.checked ? 1 : 0)\''), + '$pubforums' => array('pubforums', t('Public Forums Only'),$pubforums,'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&pubforums="+(this.checked ? 1 : 0)\''), + '$globaldir' => array('globaldir', t('This Website Only'), 1-intval($globaldir),'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&global="+(this.checked ? 0 : 1)\''), )); return $o; diff --git a/include/items.php b/include/items.php index 1009530a4..73ed64116 100755 --- a/include/items.php +++ b/include/items.php @@ -1198,12 +1198,15 @@ function encode_item($item,$mirror = false) { case 2: $x['item_restrict'] |= ITEM_PDL; break; - case 2: + case 3: $x['item_restrict'] |= ITEM_WEBPAGE; break; - case 2: + case 4: $x['item_restrict'] |= ITEM_BUG; break; + case 5: + $x['item_restrict'] |= ITEM_DOC; + break; default: break; } diff --git a/include/security.php b/include/security.php index 91683cc98..bad39d805 100644 --- a/include/security.php +++ b/include/security.php @@ -422,6 +422,9 @@ function stream_perms_api_uids($perms = NULL, $limit = 0, $rand = 0 ) { $str .= intval($rr); } } + else + $str = "''"; + logger('stream_perms_api_uids: ' . $str, LOGGER_DEBUG); return $str; @@ -452,6 +455,9 @@ function stream_perms_xchans($perms = NULL ) { $str .= "'" . dbesc($rr) . "'"; } } + else + $str = "''"; + logger('stream_perms_xchans: ' . $str, LOGGER_DEBUG); return $str; diff --git a/include/taxonomy.php b/include/taxonomy.php index fa540ac56..a5da190d4 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -276,7 +276,7 @@ function dir_tagblock($link,$r) { $o = ''; $observer = get_observer_hash(); - if(! get_globaldir_setting($observer)) + if(! get_directory_setting($observer, 'globaldir')) return $o; @@ -407,4 +407,4 @@ function get_things($profile_hash,$uid) { //logger('things: ' . print_r($sorted_things,true)); return $sorted_things; -}
\ No newline at end of file +} diff --git a/include/text.php b/include/text.php index 7101d76da..02a038ef4 100644 --- a/include/text.php +++ b/include/text.php @@ -807,7 +807,7 @@ function contact_block() { $shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); if($shown === false) - $shown = 24; + $shown = 25; if($shown == 0) return; diff --git a/include/widgets.php b/include/widgets.php index 4a9032a21..032b1c67e 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -132,7 +132,7 @@ function widget_suggestions($arr) { 'profile' => $rr['xchan_url'], 'name' => $rr['xchan_name'], 'photo' => $rr['xchan_photo_m'], - 'ignlnk' => z_root() . '/suggest?ignore=' . $rr['xchan_hash'], + 'ignlnk' => z_root() . '/directory?ignore=' . $rr['xchan_hash'], 'conntxt' => t('Connect'), 'connlnk' => $connlnk, 'ignore' => t('Ignore/Hide') @@ -381,6 +381,7 @@ function widget_categories($arr) { $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); return categories_widget($srchurl, $cat); + } function widget_tagcloud_wall($arr) { @@ -409,6 +410,7 @@ function widget_catcloud_wall($arr) { $limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50); return catblock($a->profile['profile_uid'], $limit, $a->profile['channel_hash'], ITEM_WALL); + } diff --git a/include/zot.php b/include/zot.php index 34e7f3e42..95de349fe 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1110,13 +1110,18 @@ function zot_import($arr, $sender_url) { logger('specific recipients'); $recip_arr = array(); foreach($i['notify']['recipients'] as $recip) { - $recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']); + if(is_array($recip)) { + $recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']); + } + } + $r = false; + if($recip_arr) { + stringify_array_elms($recip_arr); + $recips = implode(',',$recip_arr); + $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d ) > 0 ", + intval(PAGE_REMOVED) + ); } - stringify_array_elms($recip_arr); - $recips = implode(',',$recip_arr); - $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d ) > 0 ", - intval(PAGE_REMOVED) - ); if(! $r) { logger('recips: no recipients on this site'); continue; @@ -2887,7 +2892,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { } if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) { - $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags'); + if(array_key_exists('channel_removed',$arr['channel'])) + $arr['channel_pageflags'] |= PAGE_REMOVED; + if(array_key_exists('channel_system',$arr['channel'])) + $arr['channel_pageflags'] |= PAGE_SYSTEM; + + $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_system'); $clean = array(); foreach($arr['channel'] as $k => $v) { @@ -3200,7 +3210,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { } if(count($clean)) { foreach($clean as $k => $v) { - $r = dbq("UPDATE profile set " . dbesc($k) . " = '" . dbesc($v) + $r = dbq("UPDATE profile set `" . dbesc($k) . "` = '" . dbesc($v) . "' where profile_guid = '" . dbesc($profile['profile_guid']) . "' and uid = " . intval($channel['channel_id'])); } } @@ -199,6 +199,17 @@ if(strlen($a->module)) { } } + /** + * This provides a place for plugins to register module handlers which don't otherwise exist on the system. + * If the plugin sets 'installed' to true we won't throw a 404 error for the specified module even if + * there is no specific module file or matching plugin name. + * The plugin should catch at least one of the module hooks for this URL. + */ + + $x = array('module' => $a->module, 'installed' => false); + call_hooks('module_loaded', $x); + if($x['installed']) + $a->module_loaded = true; /** * The URL provided does not resolve to a valid module. diff --git a/mod/connedit.php b/mod/connedit.php index 71166b2cc..d0cf71c73 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -144,7 +144,6 @@ function connedit_post(&$a) { dbesc($orig_record[0]['abook_xchan']) ); - if($z) { $record = $z[0]['xlink_id']; $w = q("update xlink set xlink_rating = '%d', xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s' @@ -493,59 +492,58 @@ function connedit_content(&$a) { $contact_id = $a->poi['abook_id']; $contact = $a->poi; + $buttons = array( - $tabs = array( - - array( + 'view' => array( 'label' => t('View Profile'), 'url' => chanlink_cid($contact['abook_id']), 'sel' => '', 'title' => sprintf( t('View %s\'s profile'), $contact['xchan_name']), ), - array( + 'refresh' => array( 'label' => t('Refresh Permissions'), 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/refresh', 'sel' => '', 'title' => t('Fetch updated permissions'), ), - array( + 'recent' => array( 'label' => t('Recent Activity'), 'url' => $a->get_baseurl(true) . '/network/?f=&cid=' . $contact['abook_id'], 'sel' => '', 'title' => t('View recent posts and comments'), - ) - ); + ), - $buttons = array( - array( + 'block' => array( 'label' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? t('Unblock') : t('Block')), 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/block', 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_BLOCKED) ? 'active' : ''), 'title' => t('Block (or Unblock) all communications with this connection'), ), - array( + 'ignore' => array( 'label' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? t('Unignore') : t('Ignore')), 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/ignore', 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_IGNORED) ? 'active' : ''), 'title' => t('Ignore (or Unignore) all inbound communications from this connection'), ), - array( + + 'archive' => array( 'label' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? t('Unarchive') : t('Archive')), 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/archive', 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? 'active' : ''), 'title' => t('Archive (or Unarchive) this connection - mark channel dead but keep content'), ), - array( + + 'hide' => array( 'label' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? t('Unhide') : t('Hide')), 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/hide', 'sel' => (($contact['abook_flags'] & ABOOK_FLAG_HIDDEN) ? 'active' : ''), 'title' => t('Hide or Unhide this connection from your other connections'), ), - array( + 'delete' => array( 'label' => t('Delete'), 'url' => $a->get_baseurl(true) . '/connedit/' . $contact['abook_id'] . '/drop', 'sel' => '', @@ -556,18 +554,9 @@ function connedit_content(&$a) { $self = false; - if(! ($contact['abook_flags'] & ABOOK_FLAG_SELF)) { - $tab_tpl = get_markup_template('common_tabs.tpl'); - $t = replace_macros($tab_tpl, array('$tabs'=>$tabs)); - } - else + if(($contact['abook_flags'] & ABOOK_FLAG_SELF)) $self = true; - $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array( - '$baseurl' => $a->get_baseurl(true), - '$editselect' => $editselect - )); - require_once('include/contact_selectors.php'); $tpl = get_markup_template("abook_edit.tpl"); @@ -616,7 +605,6 @@ function connedit_content(&$a) { $rating_text = $xl[0]['xlink_rating_text']; } - $poco_rating = get_config('system','poco_rating_enable'); // if unset default to enabled @@ -640,101 +628,78 @@ function connedit_content(&$a) { $global_perms = get_perms(); $existing = get_all_perms(local_channel(),$contact['abook_xchan']); - $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication')); - + $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'), array(t('No'),('Yes'))); + + $multiprofs = ((feature_enabled(local_channel(),'multi_profiles')) ? true : false); + + if($slide && !$multiprofs) + $affinity = t('Set Affinity'); + + if(!$slide && $multiprofs) + $affinity = t('Set Profile'); + + if($slide && $multiprofs) + $affinity = t('Set Affinity & Profile'); + foreach($global_perms as $k => $v) { $thisperm = (($contact['abook_my_perms'] & $v[1]) ? "1" : ''); + $checkinherited = ((($channel[$v[0]]) && ($channel[$v[0]] != PERMS_SPECIFIC)) ? "1" : ''); // For auto permissions (when $self is true) we don't want to look at existing // permissions because they are enabled for the channel owner - if((! $self) && ($existing[$k])) $thisperm = "1"; - $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC || $self) ? '' : '1'), $v[4]); + $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4], $checkinherited); } $o .= replace_macros($tpl,array( - '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connections: settings for %s'),$contact['xchan_name'])), - '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), ''), + '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), + '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), 'Connection requests will be approved without your interaction', array(t('No'),('Yes'))), '$addr' => $contact['xchan_addr'], + '$addr_text' => t('This connection\'s address is'), '$notself' => (($self) ? '' : '1'), '$self' => (($self) ? '1' : ''), - '$autolbl' => t('Apply the permissions indicated on this page to all new connections.'), + '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), '$buttons' => (($self) ? '' : $buttons), - '$viewprof' => t('View Profile'), - '$clickme' => t('Click to open/close'), '$lbl_slider' => t('Slide to adjust your degree of friendship'), - '$lbl_rating' => t('Rating (this information is public)'), - '$lbl_rating_txt' => t('Optionally explain your rating (this information is public)'), + '$lbl_rating' => t('Rating'), + '$lbl_rating_label' => t('Slide to adjust your rating'), + '$lbl_rating_txt' => t('Optionally explain your rating'), '$connfilter' => feature_enabled(local_channel(),'connfilter'), + '$connfilter_label' => t('Custom Filter'), '$incl' => array('abook_incl',t('Only import posts with this text'), $contact['abook_incl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')), '$excl' => array('abook_excl',t('Do not import posts with this text'), $contact['abook_excl'],t('words one per line or #tags or /patterns/, leave blank to import all posts')), - '$rating_text' => array('rating_text', t('Optionally explain your rating (this information is public)'),$rating_text,''), + '$rating_text' => array('rating_text', t('Optionally explain your rating'),$rating_text,''), + '$rating_info' => t('This information is public!'), '$rating' => $rating, '$rating_val' => $rating_val, '$slide' => $slide, - '$tabs' => $t, - '$tab_str' => $tab_str, - '$perms_step1' => t('Default permissions for your channel type have (just) been applied. They have not yet been submitted. Please review the permissions on this page and make any desired changes at this time. This new connection may <em>not</em> be able to communicate with you until you submit this page, which will install and apply the selected permissions.'), + '$affinity' => $affinity, + '$pending_label' => t('Connection Pending Approval'), + '$pending_modal_title' => t('Connection Request'), + '$pending_modal_body' => sprintf(t('(%s) would like to connect with you. Please approve this connection to allow communication.'), $contact['xchan_addr']), + '$pending_modal_approve' => t('Approve'), + '$pending_modal_dismiss' => t('Approve Later'), '$is_pending' => (($contact['abook_flags'] & ABOOK_FLAG_PENDING) ? 1 : ''), '$unapproved' => $unapproved, '$inherited' => t('inherited'), - '$approve' => t('Approve this connection'), - '$noperms' => (($contact['abook_my_perms']) ? false : true), - '$no_perms' => (((! $self) && (! $contact['abook_my_perms'])) ? t('Connection has no individual permissions!') : ''), - '$noperm_desc' => (((! $self) && (! $contact['abook_my_perms'])) ? t('This may be appropriate based on your <a href="settings">privacy settings</a>, though you may wish to review the "Advanced Permissions".') : ''), '$submit' => t('Submit'), - '$lbl_vis1' => t('Profile Visibility'), '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['xchan_name']), - '$lbl_info1' => t('Contact Information / Notes'), - '$infedit' => t('Edit contact notes'), '$close' => $contact['abook_closeness'], '$them' => t('Their Settings'), '$me' => t('My Settings'), '$perms' => $perms, - '$perms_new' => t('Default permissions for this channel type have (just) been applied. They have <em>not</em> been saved and there are currently no stored default permissions. Please review/edit the applied settings and click [Submit] to finalize.'), - '$clear' => t('Clear/Disable Automatic Permissions'), - '$forum' => t('Forum Members'), - '$soapbox' => t('Soapbox'), - '$full' => t('Full Sharing (typical social network permissions)'), - '$cautious' => t('Cautious Sharing '), - '$follow' => t('Follow Only'), '$permlbl' => t('Individual Permissions'), - '$permnote' => t('Some permissions may be inherited from your channel <a href="settings">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect.'), - '$advanced' => t('Advanced Permissions'), - '$quick' => t('Simple Permissions (select one and submit)'), - '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_channel() . '/' . $contact['id'], - '$all_friends' => $all_friends, - '$relation_text' => $relation_text, - '$visit' => sprintf( t('Visit %s\'s profile - %s'),$contact['xchan_name'],$contact['xchan_url']), - '$blockunblock' => t('Block/Unblock contact'), - '$ignorecont' => t('Ignore contact'), - '$lblcrepair' => t("Repair URL settings"), - '$lblrecent' => t('View conversations'), - '$lblsuggest' => $lblsuggest, - '$delete' => t('Delete contact'), - - '$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)), - '$poll_enabled' => $poll_enabled, + '$permnote' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here.'), + '$permnote_self' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes.'), '$lastupdtext' => t('Last update:'), - '$lost_contact' => $lost_contact, - '$updpub' => t('Update public posts'), '$last_update' => relative_date($contact['abook_connected']), - '$udnow' => t('Update now'), '$profile_select' => contact_profile_assign($contact['abook_profile']), - '$multiprofs' => feature_enabled(local_channel(),'multi_profiles'), + '$multiprofs' => $multiprofs, '$contact_id' => $contact['abook_id'], - '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ), - '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), - '$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''), - '$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''), - '$archived' => (($contact['archive']) ? t('Currently archived') : ''), - '$pending' => (($contact['archive']) ? t('Currently pending') : ''), - '$name' => $contact['name'], - '$alt_text' => $alt_text, - '$url' => $url + '$name' => $contact['xchan_name'], )); diff --git a/mod/directory.php b/mod/directory.php index 6d066a21b..44d80cff1 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -19,6 +19,7 @@ function directory_init(&$a) { $observer = get_observer_hash(); $global_changed = false; $safe_changed = false; + $pubforums_changed = false; if(array_key_exists('global',$_REQUEST)) { $globaldir = intval($_REQUEST['global']); @@ -28,7 +29,7 @@ function directory_init(&$a) { $_SESSION['globaldir'] = $globaldir; if($observer) set_xconfig($observer,'directory','globaldir',$globaldir); - } + } if(array_key_exists('safe',$_REQUEST)) { $safemode = intval($_REQUEST['safe']); @@ -37,9 +38,19 @@ function directory_init(&$a) { if($safe_changed) { $_SESSION['safemode'] = $safemode; if($observer) - set_xconfig($observer,'directory','safe_mode',$safemode); - } + set_xconfig($observer,'directory','safemode',$safemode); + } + + if(array_key_exists('pubforums',$_REQUEST)) { + $pubforums = intval($_REQUEST['pubforums']); + $pubforums_changed = true; + } + if($pubforums_changed) { + $_SESSION['pubforums'] = $pubforums; + if($observer) + set_xconfig($observer,'directory','pubforums',$pubforums); + } } function directory_content(&$a) { @@ -51,18 +62,14 @@ function directory_content(&$a) { $observer = get_observer_hash(); - $globaldir = get_globaldir_setting($observer); + $globaldir = get_directory_setting($observer, 'globaldir'); // override your personal global search pref if we're doing a navbar search of the directory if(intval($_REQUEST['navsearch'])) $globaldir = 1; - $safe_mode = get_safemode_setting($observer); + $safe_mode = get_directory_setting($observer, 'safemode'); - $pubforums = null; - if(array_key_exists('pubforums',$_REQUEST)) - $pubforums = intval($_REQUEST['pubforums']); - if(! $pubforums) - $pubforums = null; + $pubforums = get_directory_setting($observer, 'pubforums'); $o = ''; nav_set_selected('directory'); @@ -375,7 +382,13 @@ function directory_content(&$a) { '$entries' => $entries, '$dirlbl' => $suggest ? t('Channel Suggestions') : $dirtitle, '$submit' => t('Find'), - '$next' => alt_pager($a,$j['records'], t('next page'), t('previous page')) + '$next' => alt_pager($a,$j['records'], t('next page'), t('previous page')), + '$sort' => t('Sort options'), + '$normal' => t('Alphabetic'), + '$reverse' => t('Reverse Alphabetic'), + '$date' => t('Newest to Oldest'), + '$reversedate' => t('Oldest to Newest'), + '$suggest' => $suggest ? '&suggest=1' : '' )); diff --git a/mod/display.php b/mod/display.php index b5daea2de..8c4707bb2 100644 --- a/mod/display.php +++ b/mod/display.php @@ -52,6 +52,7 @@ function display_content(&$a, $update = 0, $load = false) { 'deny_gid' => $channel['channel_deny_gid'] ); + $x = array( 'is_owner' => true, 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), @@ -63,10 +64,13 @@ function display_content(&$a, $update = 0, $load = false) { 'bang' => '', 'visitor' => true, 'profile_uid' => local_channel(), - 'return_path' => 'channel/' . $channel['channel_address'] + 'return_path' => 'channel/' . $channel['channel_address'], + 'expanded' => true ); + $o = '<div id="jot-popup">'; $o .= status_editor($a,$x); + $o .= '</div>'; } diff --git a/mod/editblock.php b/mod/editblock.php index a0ece8133..faa283b63 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -108,12 +108,6 @@ function editblock_content(&$a) { else $mimeselect = mimetype_select($itm[0]['uid'],$mimetype); - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit Block'), - '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), - '$id' => $itm[0]['id'] - )); - $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => $a->get_baseurl(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), @@ -133,7 +127,7 @@ function editblock_content(&$a) { $rp = 'blocks/' . $channel['channel_address']; - $o .= replace_macros($tpl,array( + $editor = replace_macros($tpl,array( '$return_path' => $rp, '$action' => 'item', '$webpage' => ITEM_BUILDBLOCK, @@ -181,6 +175,13 @@ function editblock_content(&$a) { '$expires' => t('Set expiration date'), )); + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit Block'), + '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), + '$id' => $itm[0]['id'], + '$editor' => $editor + )); + return $o; } diff --git a/mod/editlayout.php b/mod/editlayout.php index 8ab5aab22..a39611a58 100644 --- a/mod/editlayout.php +++ b/mod/editlayout.php @@ -101,12 +101,6 @@ function editlayout_content(&$a) { $layout_title = $item_id[0]['sid']; $plaintext = true; - - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit Layout'), - '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), - '$id' => $itm[0]['id'] - )); $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => $a->get_baseurl(), @@ -132,7 +126,7 @@ function editlayout_content(&$a) { $rp = 'layouts/' . $which; - $o .= replace_macros($tpl,array( + $editor = replace_macros($tpl,array( '$return_path' => $rp, '$action' => 'item', '$webpage' => ITEM_PDL, @@ -178,6 +172,14 @@ function editlayout_content(&$a) { '$expires' => t('Set expiration date'), )); + + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit Layout'), + '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), + '$id' => $itm[0]['id'], + '$editor' => $editor + )); + return $o; } diff --git a/mod/editpost.php b/mod/editpost.php index 81bb91b2a..e907a07d0 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -38,11 +38,6 @@ function editpost_content(&$a) { $channel = $a->get_channel(); - $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit post') - )); - - $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => $a->get_baseurl(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), @@ -53,8 +48,6 @@ function editpost_content(&$a) { '$confirmdelete' => t('Delete item?'), )); - - if($itm[0]['item_flags'] & ITEM_OBSCURED) { $key = get_config('system','prvkey'); if($itm[0]['title']) @@ -107,7 +100,7 @@ function editpost_content(&$a) { $cipher = 'aes256'; - $o .= replace_macros($tpl,array( + $editor = replace_macros($tpl,array( '$return_path' => $_SESSION['return_url'], '$action' => 'item', '$share' => t('Edit'), @@ -161,6 +154,11 @@ function editpost_content(&$a) { '$expiryModalCANCEL' => t('Cancel'), )); + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit post'), + '$editor' => $editor + )); + return $o; } diff --git a/mod/import.php b/mod/import.php index 9877ce9f3..ccedb2c0b 100644 --- a/mod/import.php +++ b/mod/import.php @@ -414,7 +414,7 @@ function import_post(&$a) { } $group_members = $data['group_member']; - if($groups_members) { + if($group_members) { foreach($group_members as $group_member) { unset($group_member['id']); $group_member['uid'] = $channel['channel_id']; diff --git a/mod/menu.php b/mod/menu.php index f46dc9471..7763c4ed1 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -137,7 +137,9 @@ function menu_content(&$a) { $o = replace_macros(get_markup_template('menuedit.tpl'), array( '$header' => t('Edit Menu'), + '$sys' => $a->is_sys, '$menu_id' => intval(argv(1)), + '$menu_edit_link' => 'mitem/' . intval(argv(1)) . (($a->is_sys) ? '?f=&sys=1' : ''), '$hintedit' => t('Add or remove entries to this menu'), '$editcontents' => t('Edit menu contents'), '$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'), diff --git a/mod/mitem.php b/mod/mitem.php index c4c293d1e..bc93165ac 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -44,9 +44,6 @@ function mitem_post(&$a) { if(! $a->data['menu']) return; - - $channel = $a->get_channel(); - if(!$_REQUEST['mitem_desc'] || !$_REQUEST['mitem_link']) { notice( t('Unable to create element.') . EOL); return; @@ -90,9 +87,6 @@ function mitem_post(&$a) { } - - - } @@ -167,7 +161,8 @@ function mitem_content(&$a) { '$submit_more' => t('Submit and continue'), '$display' => $display, '$lockstate' => $lockstate, - '$menu_names' => $menu_names + '$menu_names' => $menu_names, + '$sys' => $a->is_sys )); $o .= replace_macros(get_markup_template('mitemlist.tpl'),array( diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 597b5f66d..c70e8fc94 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -135,7 +135,7 @@ function profile_photo_post(&$a) { $im = photo_factory($base_image['data'], $base_image['type']); if($im->is_valid()) { - $im->cropImage(175,$srcX,$srcY,$srcW,$srcH); + $im->cropImage(300,$srcX,$srcY,$srcW,$srcH); $aid = get_account_id(); @@ -411,7 +411,7 @@ function profile_photo_crop_ui_head(&$a, $ph){ $width = $ph->getWidth(); $height = $ph->getHeight(); - if($width < 175 || $height < 175) { + if($width < 300 || $height < 300) { $ph->scaleImageUp(200); $width = $ph->getWidth(); $height = $ph->getHeight(); diff --git a/mod/setup.php b/mod/setup.php index d88cf73f1..bba29921e 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -729,6 +729,6 @@ function what_next() { ."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') .t('Please see the file "install/INSTALL.txt".') ."</p><p>" - .t("Go to your new Red node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.") + .t("Go to your new hub <a href='$baseurl/register'>registration page</a> and register as new member. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.") ."</p>"; } diff --git a/util/add_addon_repo b/util/add_addon_repo index 4979c06bc..decd9e091 100755 --- a/util/add_addon_repo +++ b/util/add_addon_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/add_theme_repo b/util/add_theme_repo index 70a8c6432..d41eba6d9 100755 --- a/util/add_theme_repo +++ b/util/add_theme_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 2 ]; then diff --git a/util/add_widget_repo b/util/add_widget_repo index 449afe5db..347e8e4e1 100755 --- a/util/add_widget_repo +++ b/util/add_widget_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 2 ]; then echo usage: $0 repo_url nickname diff --git a/util/messages.po b/util/messages.po index c6c95dd42..b3ee12e89 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-06-26.1075\n" +"Project-Id-Version: 2015-07-10.1089\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-26 00:05-0700\n" +"POT-Creation-Date: 2015-07-10 00:04-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" @@ -305,7 +305,7 @@ msgid "remove from file" msgstr "" #: ../../include/text.php:1498 ../../include/text.php:1509 -#: ../../mod/connedit.php:661 +#: ../../mod/connedit.php:667 msgid "Click to open/close" msgstr "" @@ -333,7 +333,7 @@ msgstr "" msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1888 ../../include/diaspora.php:2101 +#: ../../include/text.php:1888 ../../include/diaspora.php:2115 #: ../../include/conversation.php:120 ../../mod/like.php:346 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 #: ../../mod/tagger.php:43 @@ -345,10 +345,9 @@ msgstr "" msgid "event" msgstr "" -#: ../../include/text.php:1894 ../../include/diaspora.php:2101 +#: ../../include/text.php:1894 ../../include/diaspora.php:2115 #: ../../include/conversation.php:148 ../../mod/like.php:346 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:51 msgid "status" msgstr "" @@ -398,30 +397,31 @@ msgstr "" msgid "Edit" msgstr "" -#: ../../include/diaspora.php:2130 ../../include/conversation.php:164 +#: ../../include/diaspora.php:2144 ../../include/conversation.php:164 #: ../../mod/like.php:394 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/diaspora.php:2476 +#: ../../include/diaspora.php:2490 msgid "Please choose" msgstr "" -#: ../../include/diaspora.php:2478 +#: ../../include/diaspora.php:2492 msgid "Agree" msgstr "" -#: ../../include/diaspora.php:2480 +#: ../../include/diaspora.php:2494 msgid "Disagree" msgstr "" -#: ../../include/diaspora.php:2482 +#: ../../include/diaspora.php:2496 msgid "Abstain" msgstr "" -#: ../../include/diaspora.php:2504 ../../include/diaspora.php:2515 -#: ../../include/enotify.php:59 ../../mod/p.php:46 +#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529 +#: ../../include/network.php:1586 ../../include/enotify.php:59 +#: ../../mod/p.php:46 msgid "$projectname" msgstr "" @@ -438,11 +438,11 @@ msgstr "" msgid "No username found in import file." msgstr "" -#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:142 +#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156 msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:490 +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 msgid "Import completed." msgstr "" @@ -524,7 +524,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:314 ../../include/account.php:341 -#: ../../include/account.php:401 +#: ../../include/account.php:401 ../../include/network.php:1632 msgid "Administrator" msgstr "" @@ -575,7 +575,7 @@ msgstr "" msgid "Required" msgstr "" -#: ../../include/datetime.php:262 ../../boot.php:2354 +#: ../../include/datetime.php:262 ../../boot.php:2355 msgid "never" msgstr "" @@ -703,42 +703,6 @@ msgstr "" msgid "Default" msgstr "" -#: ../../include/dir_fns.php:143 -msgid "Directory Options" -msgstr "" - -#: ../../include/dir_fns.php:144 -msgid "Alphabetic" -msgstr "" - -#: ../../include/dir_fns.php:145 -msgid "Reverse Alphabetic" -msgstr "" - -#: ../../include/dir_fns.php:146 -msgid "Newest to Oldest" -msgstr "" - -#: ../../include/dir_fns.php:147 -msgid "Oldest to Newest" -msgstr "" - -#: ../../include/dir_fns.php:148 -msgid "Sort" -msgstr "" - -#: ../../include/dir_fns.php:152 -msgid "Safe Mode" -msgstr "" - -#: ../../include/dir_fns.php:154 -msgid "Public Forums Only" -msgstr "" - -#: ../../include/dir_fns.php:155 -msgid "This Website Only" -msgstr "" - #: ../../include/event.php:19 ../../include/bb2diaspora.php:459 msgid "l F d, Y \\@ g:i A" msgstr "" @@ -752,7 +716,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:47 ../../include/bb2diaspora.php:481 -#: ../../include/identity.php:879 ../../mod/directory.php:296 +#: ../../include/identity.php:879 ../../mod/directory.php:302 #: ../../mod/events.php:647 msgid "Location:" msgstr "" @@ -835,7 +799,7 @@ msgstr "" #: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81 #: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941 #: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58 -#: ../../mod/import.php:520 ../../mod/chat.php:177 ../../mod/chat.php:211 +#: ../../mod/import.php:534 ../../mod/chat.php:177 ../../mod/chat.php:211 #: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105 #: ../../mod/sources.php:104 ../../mod/sources.php:138 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 @@ -846,9 +810,10 @@ msgstr "" #: ../../mod/settings.php:692 ../../mod/settings.php:718 #: ../../mod/settings.php:746 ../../mod/settings.php:769 #: ../../mod/settings.php:854 ../../mod/settings.php:1050 -#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:679 -#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/poll.php:68 -#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256 +#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:688 +#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/pconfig.php:108 +#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24 +#: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" @@ -1026,7 +991,7 @@ msgstr "" #: ../../mod/blocks.php:155 ../../mod/photos.php:1062 #: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225 #: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113 -#: ../../mod/settings.php:651 ../../mod/connedit.php:543 +#: ../../mod/settings.php:651 ../../mod/connedit.php:549 msgid "Delete" msgstr "" @@ -1047,6 +1012,23 @@ msgstr "" msgid "view full size" msgstr "" +#: ../../include/network.php:1585 ../../include/enotify.php:58 +msgid "$Projectname Notification" +msgstr "" + +#: ../../include/network.php:1588 ../../include/enotify.php:61 +msgid "Thank You," +msgstr "" + +#: ../../include/network.php:1590 ../../include/enotify.php:63 +#, php-format +msgid "%s Administrator" +msgstr "" + +#: ../../include/network.php:1646 +msgid "No Subject" +msgstr "" + #: ../../include/features.php:38 msgid "General Features" msgstr "" @@ -1234,66 +1216,112 @@ msgid "Filter stream activity by depth of relationships" msgstr "" #: ../../include/features.php:74 -msgid "Suggest Channels" +msgid "Connection Filtering" msgstr "" #: ../../include/features.php:74 +msgid "Filter incoming posts from connections based on keywords/content" +msgstr "" + +#: ../../include/features.php:75 +msgid "Suggest Channels" +msgstr "" + +#: ../../include/features.php:75 msgid "Show channel suggestions" msgstr "" -#: ../../include/features.php:79 +#: ../../include/features.php:80 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:80 +#: ../../include/features.php:81 msgid "Tagging" msgstr "" -#: ../../include/features.php:80 +#: ../../include/features.php:81 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:81 +#: ../../include/features.php:82 msgid "Post Categories" msgstr "" -#: ../../include/features.php:81 +#: ../../include/features.php:82 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:82 ../../include/widgets.php:304 +#: ../../include/features.php:83 ../../include/widgets.php:304 #: ../../include/contact_widgets.php:57 msgid "Saved Folders" msgstr "" -#: ../../include/features.php:82 +#: ../../include/features.php:83 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:83 +#: ../../include/features.php:84 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:83 +#: ../../include/features.php:84 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:84 +#: ../../include/features.php:85 msgid "Star Posts" msgstr "" -#: ../../include/features.php:84 +#: ../../include/features.php:85 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Provide a personal tag cloud on your channel page" msgstr "" +#: ../../include/dir_fns.php:126 +msgid "Directory Options" +msgstr "" + +#: ../../include/dir_fns.php:128 +msgid "Safe Mode" +msgstr "" + +#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129 +#: ../../include/dir_fns.php:130 ../../mod/api.php:106 +#: ../../mod/photos.php:568 ../../mod/menu.php:91 ../../mod/menu.php:145 +#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159 +#: ../../mod/admin.php:428 ../../mod/settings.php:579 ../../mod/mitem.php:163 +#: ../../mod/mitem.php:164 ../../mod/mitem.php:234 ../../mod/mitem.php:235 +#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555 +msgid "No" +msgstr "" + +#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129 +#: ../../include/dir_fns.php:130 ../../mod/api.php:105 +#: ../../mod/photos.php:568 ../../mod/menu.php:91 ../../mod/menu.php:145 +#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159 +#: ../../mod/admin.php:430 ../../mod/settings.php:579 ../../mod/mitem.php:163 +#: ../../mod/mitem.php:164 ../../mod/mitem.php:234 ../../mod/mitem.php:235 +#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555 +msgid "Yes" +msgstr "" + +#: ../../include/dir_fns.php:129 +msgid "Public Forums Only" +msgstr "" + +#: ../../include/dir_fns.php:130 +msgid "This Website Only" +msgstr "" + #: ../../include/widgets.php:35 ../../include/taxonomy.php:264 #: ../../include/contact_widgets.php:92 msgid "Categories" @@ -1322,7 +1350,7 @@ msgstr "" #: ../../include/widgets.php:136 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../include/conversation.php:945 -#: ../../include/identity.php:828 ../../mod/directory.php:310 +#: ../../include/identity.php:828 ../../mod/directory.php:316 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "" @@ -1373,11 +1401,11 @@ msgstr "" msgid "Archives" msgstr "" -#: ../../include/widgets.php:427 ../../mod/connedit.php:572 +#: ../../include/widgets.php:427 ../../mod/connedit.php:578 msgid "Me" msgstr "" -#: ../../include/widgets.php:428 ../../mod/connedit.php:573 +#: ../../include/widgets.php:428 ../../mod/connedit.php:579 msgid "Family" msgstr "" @@ -1386,16 +1414,16 @@ msgstr "" #: ../../include/profile_selectors.php:80 ../../mod/settings.php:345 #: ../../mod/settings.php:349 ../../mod/settings.php:350 #: ../../mod/settings.php:353 ../../mod/settings.php:364 -#: ../../mod/connedit.php:574 +#: ../../mod/connedit.php:580 msgid "Friends" msgstr "" -#: ../../include/widgets.php:430 ../../mod/connedit.php:575 +#: ../../include/widgets.php:430 ../../mod/connedit.php:581 msgid "Acquaintances" msgstr "" #: ../../include/widgets.php:431 ../../mod/connections.php:231 -#: ../../mod/connections.php:246 ../../mod/connedit.php:576 +#: ../../mod/connections.php:246 ../../mod/connedit.php:582 msgid "All" msgstr "" @@ -1431,7 +1459,7 @@ msgstr "" msgid "Export channel" msgstr "" -#: ../../include/widgets.php:530 ../../mod/connedit.php:653 +#: ../../include/widgets.php:530 ../../mod/connedit.php:659 msgid "Connection Default Permissions" msgstr "" @@ -1486,19 +1514,6 @@ msgstr "" msgid "Public Hubs" msgstr "" -#: ../../include/enotify.php:58 -msgid "$Projectname Notification" -msgstr "" - -#: ../../include/enotify.php:61 -msgid "Thank You," -msgstr "" - -#: ../../include/enotify.php:63 -#, php-format -msgid "%s Administrator" -msgstr "" - #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -1715,7 +1730,7 @@ msgstr "" #: ../../include/contact_selectors.php:79 ../../mod/admin.php:822 #: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16 -#: ../../boot.php:1552 +#: ../../boot.php:1553 msgid "Email" msgstr "" @@ -2057,7 +2072,7 @@ msgstr "" msgid "$Projectname event notification:" msgstr "" -#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1549 +#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1550 msgid "Logout" msgstr "" @@ -2074,7 +2089,7 @@ msgid "Your posts and conversations" msgstr "" #: ../../include/nav.php:91 ../../include/conversation.php:942 -#: ../../mod/connedit.php:494 ../../mod/connedit.php:660 +#: ../../mod/connedit.php:500 ../../mod/connedit.php:666 msgid "View Profile" msgstr "" @@ -2137,7 +2152,7 @@ msgstr "" msgid "Your webpages" msgstr "" -#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1550 +#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1551 msgid "Login" msgstr "" @@ -2162,7 +2177,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1526 +#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1527 msgid "Register" msgstr "" @@ -2987,47 +3002,47 @@ msgstr "" msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1249 +#: ../../include/items.php:1307 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1251 +#: ../../include/items.php:1309 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1253 +#: ../../include/items.php:1311 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1255 +#: ../../include/items.php:1313 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1257 +#: ../../include/items.php:1315 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1259 +#: ../../include/items.php:1317 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1261 +#: ../../include/items.php:1319 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1263 +#: ../../include/items.php:1321 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4076 ../../mod/thing.php:74 +#: ../../include/items.php:4198 ../../mod/thing.php:74 #: ../../mod/display.php:36 ../../mod/filestorage.php:27 #: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1025 #: ../../mod/admin.php:1225 msgid "Item not found." msgstr "" -#: ../../include/items.php:4149 ../../include/attach.php:137 +#: ../../include/items.php:4271 ../../include/attach.php:137 #: ../../include/attach.php:184 ../../include/attach.php:247 #: ../../include/attach.php:261 ../../include/attach.php:305 #: ../../include/attach.php:319 ../../include/attach.php:350 @@ -3057,7 +3072,7 @@ msgstr "" #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 #: ../../mod/editblock.php:65 ../../mod/register.php:72 #: ../../mod/settings.php:570 ../../mod/id.php:71 ../../mod/message.php:16 -#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:331 +#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:337 #: ../../mod/mail.php:114 ../../mod/notifications.php:66 #: ../../mod/regmod.php:17 ../../mod/new_channel.php:68 #: ../../mod/new_channel.php:99 ../../mod/appman.php:66 @@ -3070,26 +3085,26 @@ msgstr "" msgid "Permission denied." msgstr "" -#: ../../include/items.php:4551 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4673 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4567 +#: ../../include/items.php:4689 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4574 +#: ../../include/items.php:4696 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4584 +#: ../../include/items.php:4706 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4586 +#: ../../include/items.php:4708 msgid "Connection not found." msgstr "" @@ -3101,7 +3116,7 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2109 +#: ../../include/zot.php:2126 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -3153,12 +3168,12 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:26 ../../mod/directory.php:373 -#: ../../mod/directory.php:378 ../../mod/connections.php:413 +#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379 +#: ../../mod/directory.php:384 ../../mod/connections.php:413 msgid "Find" msgstr "" -#: ../../include/contact_widgets.php:27 ../../mod/directory.php:377 +#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383 #: ../../mod/suggest.php:60 msgid "Channel Suggestions" msgstr "" @@ -3416,7 +3431,7 @@ msgstr "" msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1163 ../../mod/directory.php:291 +#: ../../include/identity.php:1163 ../../mod/directory.php:297 msgid "Age:" msgstr "" @@ -3429,7 +3444,7 @@ msgstr "" msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1179 ../../mod/directory.php:307 +#: ../../include/identity.php:1179 ../../mod/directory.php:313 #: ../../mod/profiles.php:693 msgid "Hometown:" msgstr "" @@ -3446,7 +3461,7 @@ msgstr "" msgid "Religion:" msgstr "" -#: ../../include/identity.php:1187 ../../mod/directory.php:309 +#: ../../include/identity.php:1187 ../../mod/directory.php:315 msgid "About:" msgstr "" @@ -3840,7 +3855,7 @@ msgstr "" msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:264 +#: ../../include/bbcode.php:264 ../../mod/tagger.php:51 msgid "post" msgstr "" @@ -3940,72 +3955,92 @@ msgstr "" msgid "Delegated Channels" msgstr "" -#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13 +#: ../../mod/directory.php:59 ../../mod/photos.php:441 ../../mod/search.php:13 #: ../../mod/display.php:13 ../../mod/ratings.php:82 #: ../../mod/viewconnections.php:17 msgid "Public access denied." msgstr "" -#: ../../mod/directory.php:227 +#: ../../mod/directory.php:234 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "" msgstr[1] "" -#: ../../mod/directory.php:238 +#: ../../mod/directory.php:245 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:240 +#: ../../mod/directory.php:247 msgid "Status: " msgstr "" -#: ../../mod/directory.php:242 +#: ../../mod/directory.php:249 msgid "Homepage: " msgstr "" -#: ../../mod/directory.php:302 ../../mod/events.php:645 +#: ../../mod/directory.php:308 ../../mod/events.php:645 msgid "Description:" msgstr "" -#: ../../mod/directory.php:311 +#: ../../mod/directory.php:317 msgid "Public Forum:" msgstr "" -#: ../../mod/directory.php:314 +#: ../../mod/directory.php:320 msgid "Keywords: " msgstr "" -#: ../../mod/directory.php:317 +#: ../../mod/directory.php:323 msgid "Don't suggest" msgstr "" -#: ../../mod/directory.php:319 +#: ../../mod/directory.php:325 msgid "Common connections:" msgstr "" -#: ../../mod/directory.php:368 +#: ../../mod/directory.php:374 msgid "Global Directory" msgstr "" -#: ../../mod/directory.php:368 +#: ../../mod/directory.php:374 msgid "Local Directory" msgstr "" -#: ../../mod/directory.php:374 +#: ../../mod/directory.php:380 msgid "Finding:" msgstr "" -#: ../../mod/directory.php:379 +#: ../../mod/directory.php:385 msgid "next page" msgstr "" -#: ../../mod/directory.php:379 +#: ../../mod/directory.php:385 msgid "previous page" msgstr "" -#: ../../mod/directory.php:395 +#: ../../mod/directory.php:386 +msgid "Sort options" +msgstr "" + +#: ../../mod/directory.php:387 +msgid "Alphabetic" +msgstr "" + +#: ../../mod/directory.php:388 +msgid "Reverse Alphabetic" +msgstr "" + +#: ../../mod/directory.php:389 +msgid "Newest to Oldest" +msgstr "" + +#: ../../mod/directory.php:390 +msgid "Oldest to Newest" +msgstr "" + +#: ../../mod/directory.php:407 msgid "No entries (some entries may be hidden)." msgstr "" @@ -4039,26 +4074,6 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/photos.php:568 ../../mod/menu.php:91 -#: ../../mod/menu.php:145 ../../mod/filestorage.php:151 -#: ../../mod/filestorage.php:159 ../../mod/admin.php:430 -#: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 -#: ../../mod/mitem.php:234 ../../mod/mitem.php:235 ../../mod/removeme.php:60 -#: ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554 -msgid "Yes" -msgstr "" - -#: ../../mod/api.php:106 ../../mod/photos.php:568 ../../mod/menu.php:91 -#: ../../mod/menu.php:145 ../../mod/filestorage.php:151 -#: ../../mod/filestorage.php:159 ../../mod/admin.php:428 -#: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 -#: ../../mod/mitem.php:234 ../../mod/mitem.php:235 ../../mod/removeme.php:60 -#: ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554 -msgid "No" -msgstr "" - #: ../../mod/webpages.php:191 msgid "Page Title" msgstr "" @@ -4689,11 +4704,11 @@ msgstr "" msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connections.php:94 ../../mod/connedit.php:214 +#: ../../mod/connections.php:94 ../../mod/connedit.php:220 msgid "Connection updated." msgstr "" -#: ../../mod/connections.php:96 ../../mod/connedit.php:216 +#: ../../mod/connections.php:96 ../../mod/connedit.php:222 msgid "Failed to update connection record." msgstr "" @@ -4782,11 +4797,6 @@ msgstr "" msgid "Block Title" msgstr "" -#: ../../mod/tagger.php:96 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "" - #: ../../mod/cloud.php:120 msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgstr "" @@ -5041,55 +5051,64 @@ msgstr "" msgid "Imported file is empty." msgstr "" -#: ../../mod/import.php:121 +#: ../../mod/import.php:110 +msgid "The data provided is not compatible with this project." +msgstr "" + +#: ../../mod/import.php:115 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." +msgstr "" + +#: ../../mod/import.php:135 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/import.php:162 +#: ../../mod/import.php:176 msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/import.php:172 +#: ../../mod/import.php:186 msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:502 +#: ../../mod/import.php:516 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:507 +#: ../../mod/import.php:521 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:508 +#: ../../mod/import.php:522 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " "provide an export file." msgstr "" -#: ../../mod/import.php:509 +#: ../../mod/import.php:523 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:510 +#: ../../mod/import.php:524 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:511 +#: ../../mod/import.php:525 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:512 +#: ../../mod/import.php:526 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:513 +#: ../../mod/import.php:527 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:514 +#: ../../mod/import.php:528 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -5097,16 +5116,16 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:515 +#: ../../mod/import.php:529 msgid "Make this hub my primary location" msgstr "" -#: ../../mod/import.php:516 +#: ../../mod/import.php:530 msgid "" "Import existing posts if possible (experimental - limited by available memory" msgstr "" -#: ../../mod/import.php:517 +#: ../../mod/import.php:531 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -5231,7 +5250,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1558 +#: ../../mod/lostpass.php:85 ../../boot.php:1559 msgid "Password Reset" msgstr "" @@ -5289,11 +5308,12 @@ msgstr "" msgid "Remote Channel [%s] (not yet known on this site)" msgstr "" -#: ../../mod/rate.php:161 ../../mod/connedit.php:663 +#: ../../mod/rate.php:161 ../../mod/connedit.php:669 msgid "Rating (this information is public)" msgstr "" -#: ../../mod/rate.php:162 ../../mod/connedit.php:664 +#: ../../mod/rate.php:162 ../../mod/connedit.php:670 +#: ../../mod/connedit.php:674 msgid "Optionally explain your rating (this information is public)" msgstr "" @@ -6364,6 +6384,11 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" +#: ../../mod/tagger.php:96 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "" + #: ../../mod/uexport.php:33 ../../mod/uexport.php:34 msgid "Export Channel" msgstr "" @@ -6955,13 +6980,13 @@ msgstr "" msgid "Deny" msgstr "" -#: ../../mod/admin.php:827 ../../mod/connedit.php:517 -#: ../../mod/connedit.php:720 +#: ../../mod/admin.php:827 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 msgid "Block" msgstr "" -#: ../../mod/admin.php:828 ../../mod/connedit.php:517 -#: ../../mod/connedit.php:720 +#: ../../mod/admin.php:828 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 msgid "Unblock" msgstr "" @@ -8155,161 +8180,174 @@ msgid "" "removed from the network" msgstr "" -#: ../../mod/connedit.php:262 +#: ../../mod/connedit.php:268 msgid "is now connected to" msgstr "" -#: ../../mod/connedit.php:375 +#: ../../mod/connedit.php:381 msgid "Could not access address book record." msgstr "" -#: ../../mod/connedit.php:389 +#: ../../mod/connedit.php:395 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connedit.php:396 +#: ../../mod/connedit.php:402 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connedit.php:397 +#: ../../mod/connedit.php:403 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connedit.php:401 ../../mod/connedit.php:413 -#: ../../mod/connedit.php:425 ../../mod/connedit.php:437 -#: ../../mod/connedit.php:453 +#: ../../mod/connedit.php:407 ../../mod/connedit.php:419 +#: ../../mod/connedit.php:431 ../../mod/connedit.php:443 +#: ../../mod/connedit.php:459 msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connedit.php:408 +#: ../../mod/connedit.php:414 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connedit.php:409 +#: ../../mod/connedit.php:415 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connedit.php:420 +#: ../../mod/connedit.php:426 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connedit.php:421 +#: ../../mod/connedit.php:427 msgid "Channel has been archived" msgstr "" -#: ../../mod/connedit.php:432 +#: ../../mod/connedit.php:438 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connedit.php:433 +#: ../../mod/connedit.php:439 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connedit.php:448 +#: ../../mod/connedit.php:454 msgid "Channel has been approved" msgstr "" -#: ../../mod/connedit.php:449 +#: ../../mod/connedit.php:455 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connedit.php:477 +#: ../../mod/connedit.php:483 msgid "Connection has been removed." msgstr "" -#: ../../mod/connedit.php:497 +#: ../../mod/connedit.php:503 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connedit.php:501 +#: ../../mod/connedit.php:507 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connedit.php:504 +#: ../../mod/connedit.php:510 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connedit.php:508 +#: ../../mod/connedit.php:514 msgid "Recent Activity" msgstr "" -#: ../../mod/connedit.php:511 +#: ../../mod/connedit.php:517 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connedit.php:520 +#: ../../mod/connedit.php:526 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../mod/connedit.php:524 ../../mod/connedit.php:721 +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 msgid "Unignore" msgstr "" -#: ../../mod/connedit.php:524 ../../mod/connedit.php:721 +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 #: ../../mod/notifications.php:51 msgid "Ignore" msgstr "" -#: ../../mod/connedit.php:527 +#: ../../mod/connedit.php:533 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:536 msgid "Unarchive" msgstr "" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:536 msgid "Archive" msgstr "" -#: ../../mod/connedit.php:533 +#: ../../mod/connedit.php:539 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:542 msgid "Unhide" msgstr "" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:542 msgid "Hide" msgstr "" -#: ../../mod/connedit.php:539 +#: ../../mod/connedit.php:545 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../mod/connedit.php:546 +#: ../../mod/connedit.php:552 msgid "Delete this connection" msgstr "" -#: ../../mod/connedit.php:637 ../../mod/connedit.php:675 +#: ../../mod/connedit.php:643 ../../mod/connedit.php:684 msgid "Approve this connection" msgstr "" -#: ../../mod/connedit.php:637 +#: ../../mod/connedit.php:643 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connedit.php:653 +#: ../../mod/connedit.php:659 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connedit.php:654 +#: ../../mod/connedit.php:660 msgid "Apply these permissions automatically" msgstr "" -#: ../../mod/connedit.php:658 +#: ../../mod/connedit.php:664 msgid "Apply the permissions indicated on this page to all new connections." msgstr "" -#: ../../mod/connedit.php:662 +#: ../../mod/connedit.php:668 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connedit.php:671 +#: ../../mod/connedit.php:672 +msgid "Only import posts with this text" +msgstr "" + +#: ../../mod/connedit.php:672 ../../mod/connedit.php:673 +msgid "" +"words one per line or #tags or /patterns/, leave blank to import all posts" +msgstr "" + +#: ../../mod/connedit.php:673 +msgid "Do not import posts with this text" +msgstr "" + +#: ../../mod/connedit.php:680 msgid "" "Default permissions for your channel type have (just) been applied. They " "have not yet been submitted. Please review the permissions on this page and " @@ -8318,48 +8356,48 @@ msgid "" "install and apply the selected permissions." msgstr "" -#: ../../mod/connedit.php:674 +#: ../../mod/connedit.php:683 msgid "inherited" msgstr "" -#: ../../mod/connedit.php:677 +#: ../../mod/connedit.php:686 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connedit.php:678 +#: ../../mod/connedit.php:687 msgid "" "This may be appropriate based on your <a href=\"settings\">privacy settings</" "a>, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connedit.php:680 +#: ../../mod/connedit.php:689 msgid "Profile Visibility" msgstr "" -#: ../../mod/connedit.php:681 +#: ../../mod/connedit.php:690 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connedit.php:682 +#: ../../mod/connedit.php:691 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connedit.php:683 +#: ../../mod/connedit.php:692 msgid "Edit contact notes" msgstr "" -#: ../../mod/connedit.php:685 +#: ../../mod/connedit.php:694 msgid "Their Settings" msgstr "" -#: ../../mod/connedit.php:686 +#: ../../mod/connedit.php:695 msgid "My Settings" msgstr "" -#: ../../mod/connedit.php:688 +#: ../../mod/connedit.php:697 msgid "" "Default permissions for this channel type have (just) been applied. They " "have <em>not</em> been saved and there are currently no stored default " @@ -8367,99 +8405,99 @@ msgid "" "finalize." msgstr "" -#: ../../mod/connedit.php:689 +#: ../../mod/connedit.php:698 msgid "Clear/Disable Automatic Permissions" msgstr "" -#: ../../mod/connedit.php:690 +#: ../../mod/connedit.php:699 msgid "Forum Members" msgstr "" -#: ../../mod/connedit.php:691 +#: ../../mod/connedit.php:700 msgid "Soapbox" msgstr "" -#: ../../mod/connedit.php:692 +#: ../../mod/connedit.php:701 msgid "Full Sharing (typical social network permissions)" msgstr "" -#: ../../mod/connedit.php:693 +#: ../../mod/connedit.php:702 msgid "Cautious Sharing " msgstr "" -#: ../../mod/connedit.php:694 +#: ../../mod/connedit.php:703 msgid "Follow Only" msgstr "" -#: ../../mod/connedit.php:695 +#: ../../mod/connedit.php:704 msgid "Individual Permissions" msgstr "" -#: ../../mod/connedit.php:696 +#: ../../mod/connedit.php:705 msgid "" "Some permissions may be inherited from your channel <a href=\"settings" "\">privacy settings</a>, which have higher priority than individual " "settings. Changing those inherited settings on this page will have no effect." msgstr "" -#: ../../mod/connedit.php:697 +#: ../../mod/connedit.php:706 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connedit.php:698 +#: ../../mod/connedit.php:707 msgid "Simple Permissions (select one and submit)" msgstr "" -#: ../../mod/connedit.php:702 +#: ../../mod/connedit.php:711 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connedit.php:703 +#: ../../mod/connedit.php:712 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connedit.php:704 +#: ../../mod/connedit.php:713 msgid "Ignore contact" msgstr "" -#: ../../mod/connedit.php:705 +#: ../../mod/connedit.php:714 msgid "Repair URL settings" msgstr "" -#: ../../mod/connedit.php:706 +#: ../../mod/connedit.php:715 msgid "View conversations" msgstr "" -#: ../../mod/connedit.php:708 +#: ../../mod/connedit.php:717 msgid "Delete contact" msgstr "" -#: ../../mod/connedit.php:712 +#: ../../mod/connedit.php:721 msgid "Last update:" msgstr "" -#: ../../mod/connedit.php:714 +#: ../../mod/connedit.php:723 msgid "Update public posts" msgstr "" -#: ../../mod/connedit.php:716 +#: ../../mod/connedit.php:725 msgid "Update now" msgstr "" -#: ../../mod/connedit.php:722 +#: ../../mod/connedit.php:731 msgid "Currently blocked" msgstr "" -#: ../../mod/connedit.php:723 +#: ../../mod/connedit.php:732 msgid "Currently ignored" msgstr "" -#: ../../mod/connedit.php:724 +#: ../../mod/connedit.php:733 msgid "Currently archived" msgstr "" -#: ../../mod/connedit.php:725 +#: ../../mod/connedit.php:734 msgid "Currently pending" msgstr "" @@ -8721,6 +8759,21 @@ msgstr "" msgid "Insufficient permissions. Request redirected to profile page." msgstr "" +#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60 +msgid "This setting requires special processing and editing has been blocked." +msgstr "" + +#: ../../mod/pconfig.php:49 +msgid "Configuration Editor" +msgstr "" + +#: ../../mod/pconfig.php:50 +msgid "" +"Warning: Changing some settings could render your channel inoperable. Please " +"leave this page unless you are comfortable with and knowledgeable about how " +"to correctly use this feature." +msgstr "" + #: ../../mod/suggest.php:35 msgid "" "No suggestions available. If this is a new site, please try again in 24 " @@ -9026,51 +9079,51 @@ msgstr "" msgid "Set size of followup author photos" msgstr "" -#: ../../boot.php:1355 +#: ../../boot.php:1356 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1358 +#: ../../boot.php:1359 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1525 +#: ../../boot.php:1526 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1553 +#: ../../boot.php:1554 msgid "Password" msgstr "" -#: ../../boot.php:1554 +#: ../../boot.php:1555 msgid "Remember me" msgstr "" -#: ../../boot.php:1557 +#: ../../boot.php:1558 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2178 +#: ../../boot.php:2179 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2313 +#: ../../boot.php:2314 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2316 +#: ../../boot.php:2317 #, php-format msgid "[red] Website SSL error for %s" msgstr "" -#: ../../boot.php:2353 +#: ../../boot.php:2354 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2357 +#: ../../boot.php:2358 #, php-format msgid "[red] Cron tasks not running on %s" msgstr "" diff --git a/util/update_addon_repo b/util/update_addon_repo index 42bd3a71f..5b531e6a5 100755 --- a/util/update_addon_repo +++ b/util/update_addon_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 1 ]; then echo usage: $0 repository diff --git a/util/update_theme_repo b/util/update_theme_repo index 443b26591..cd71531d0 100755 --- a/util/update_theme_repo +++ b/util/update_theme_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 1 ]; then diff --git a/util/update_widget_repo b/util/update_widget_repo index c00c85708..045122619 100755 --- a/util/update_widget_repo +++ b/util/update_widget_repo @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f if [ $# -ne 1 ]; then echo usage: $0 repository diff --git a/version.inc b/version.inc index 92d861e4c..a8c5cc468 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-02.1081 +2015-07-15.1094 diff --git a/view/css/conversation.css b/view/css/conversation.css index bb6887d59..7d4930aac 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -196,10 +196,6 @@ a.wall-item-name-link { filter:alpha(opacity=100); } -.wall-item-wrapper-end { - clear: both; -} - .shared_header { margin-bottom: 20px; } diff --git a/view/css/default.css b/view/css/default.css index fb6705894..f0c89a087 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -17,12 +17,25 @@ main { aside { display: table-cell; vertical-align: top; - padding: 65px 7px 0px 7px; + padding: 80px 7px 0px 7px; + } section { width: 100%; display: table-cell; vertical-align: top; - padding: 65px 7px 200px 7px; + padding: 80px 7px 200px 7px; +} + +@media screen and (max-width: 767px) { + + section { + padding: 65px 7px 200px 7px; + } + + aside#region_1 { + padding: 65px 7px 0px 7px; + } + } diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css index 44a0a1abf..87eff66d4 100644 --- a/view/css/mod_connedit.css +++ b/view/css/mod_connedit.css @@ -1,188 +1,18 @@ - -.field_abook_help { - color: #000; -} -.abook-them { - padding: 5px; - text-align: center; -} +.abook-them, .abook-me { - padding: 5px 5px 5px 15px; - text-align: center; -} -.acheckbox { - margin-bottom: 5px !important; -} - -.abook-pending-contact, .abook-autotext { - background: orange; - font-weight: bold; - margin: 10px; - padding: 20px 5px 10px; -} - -.abook-perms-msg { - background: orange; - font-weight: bold; - margin: 10px; - padding: 20px 5px 10px; -} - -.abook-permschange { - width: 100%; -} - -.abook-perms-steps { - float: left; - width: 200px; - height: 210px; - background: orange; - font-weight: bold; - margin: 10px; - padding: 20px 5px 10px; - -} - -.abook-permssave { - margin-left: 10px; - clear: both; -} - -#contact-slider { - width: 600px !important; -} - -#rating-slider { - width: 600px !important; -} - -#rating-text { - width: 400px; - height: 60px; -} - -.abook-edit-them, .abook-edit-me { - float: left; - margin-left: 10px; - margin-right: 10px; -} -.field_abook_help { - float: left; -} - -#contacts-main { - margin-top: 20px; - margin-bottom: 20px; -} - - - -#contact-edit-wrapper { - margin-top: 10px; -} - -#contact-edit-banner-name { - font-size: 1.4em; font-weight: bold; } -#contact-edit-poll-wrapper { - margin-top: 15px; +.slider { + position: relative; + left: 1%; + padding-bottom: 15px; } -#contact-edit-poll-text { - margin-top: 15px; - margin-bottom: 5px; -} - -#contact-edit-update-now { - margin-top: 15px; -} - -#contact-edit-links{ - clear: both; -} - -#contact-edit-links ul { - list-style: none; - list-style-type: none; - margin-left: 0px; - padding-left: 0px; -} - -#contact-edit-links li { - margin-top: 5px; -} - -#contact-edit-drop-link { - float: right; - margin-right: 20px; -} - -#contact-edit-nav-end { - clear: both; -} - -#contact-edit-wrapper { +#perms-tool-table { width: 100%; } -#contact-edit-end { - clear: both; - margin-top: 15px; -} - -#contact-profile-selector { - width: 175px; - margin-left: 175px; -} - -.contact-edit-submit { - margin-top: 20px; -} - -.contact-entry-wrapper { - float: left; - width: 120px; - height: 120px; - padding: 10px; -} - -#contacts-search { - font-size: 1em; - width: 300px; -} - -#contacts-search-end { - margin-bottom: 10px; -} - -.contact-entry-photo-end { - clear: both; -} - -.contact-entry-name { - float: left; - margin-left: 0px; - margin-right: 10px; - width: 120px; - overflow: hidden; -} - -.contact-entry-end { - clear: both; -} - -#abook-advanced-panel, #abook-advanced { - opacity: 0.3; - filter:alpha(opacity=30); -} - -#abook-advanced-panel:hover, #abook-advanced:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - -#abook-advanced { - margin-top: 15px; +#perms-tool-table td { + vertical-align: top; } diff --git a/view/css/mod_display.css b/view/css/mod_display.css new file mode 100644 index 000000000..dde242d4e --- /dev/null +++ b/view/css/mod_display.css @@ -0,0 +1,3 @@ +#jot-popup { + display: none; +} diff --git a/view/css/widgets.css b/view/css/widgets.css index 0a901b1f9..5b6e8aeb9 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -13,6 +13,10 @@ border-bottom-right-radius: 0px; } +.tags { + word-wrap: break-word; +} + /* suggest */ .suggest-widget-more { @@ -35,7 +39,7 @@ padding: 5px; width: 100%; resize: vertical; - height: 150px; + height: 250px; } /* saved searches */ diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index ee34f0508..d6cc42175 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -1,23 +1,12 @@ +$(document).ready(function() { -function abook_perms_msg() { -// $('.abook-permsmsg').show(); -// $('.abook-permschange').html(aStr['permschange']); -// $('.abook-permssave').show(); -} - -function abook_perms_new() { -// $('.abook-permsnew').show(); -// $('.abook-permssave').show(); -} - + $('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings -$(document).ready(function() { if(typeof(after_following) !== 'undefined' && after_following) { if(typeof(connectDefaultShare) !== 'undefined') connectDefaultShare(); else connectFullShare(); - abook_perms_new(); } $('#id_pending').click(function() { @@ -25,16 +14,10 @@ $(document).ready(function() { connectDefaultShare(); else connectFullShare(); - abook_perms_new(); }); -// $('.abook-edit-me').click(function() { -// abook_perms_msg(); -// }); - }); - function connectFullShare() { $('.abook-edit-me').each(function() { if(! $(this).is(':disabled')) @@ -54,85 +37,4 @@ function connectFullShare() { $('#me_id_perms_view_storage').attr('checked','checked'); $('#me_id_perms_republish').attr('checked','checked'); $('#me_id_perms_post_like').attr('checked','checked'); -// abook_perms_msg(); } - -function connectCautiousShare() { - $('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).removeAttr('checked'); - }); - - $('#me_id_perms_view_stream').attr('checked','checked'); - $('#me_id_perms_view_profile').attr('checked','checked'); - $('#me_id_perms_view_photos').attr('checked','checked'); - $('#me_id_perms_view_storage').attr('checked','checked'); - $('#me_id_perms_view_pages').attr('checked','checked'); - $('#me_id_perms_send_stream').attr('checked','checked'); - $('#me_id_perms_post_comments').attr('checked','checked'); - $('#me_id_perms_post_mail').attr('checked','checked'); - $('#me_id_perms_post_like').attr('checked','checked'); -// abook_perms_msg(); - -} - -function connectForum() { - $('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).removeAttr('checked'); - }); - - $('#me_id_perms_view_stream').attr('checked','checked'); - $('#me_id_perms_view_profile').attr('checked','checked'); - $('#me_id_perms_view_photos').attr('checked','checked'); - $('#me_id_perms_view_contacts').attr('checked','checked'); - $('#me_id_perms_view_storage').attr('checked','checked'); - $('#me_id_perms_view_pages').attr('checked','checked'); - $('#me_id_perms_send_stream').attr('checked','checked'); - $('#me_id_perms_post_wall').attr('checked','checked'); - $('#me_id_perms_post_comments').attr('checked','checked'); - $('#me_id_perms_post_mail').attr('checked','checked'); - $('#me_id_perms_tag_deliver').attr('checked','checked'); - $('#me_id_perms_republish').attr('checked','checked'); - $('#me_id_perms_post_like').attr('checked','checked'); -// abook_perms_msg(); - -} - -function connectClear() { - $('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).removeAttr('checked'); - }); -// abook_perms_msg(); - -} - -function connectSoapBox() { - $('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).removeAttr('checked'); - }); - - $('#me_id_perms_view_stream').attr('checked','checked'); - $('#me_id_perms_view_profile').attr('checked','checked'); - $('#me_id_perms_view_photos').attr('checked','checked'); - $('#me_id_perms_view_contacts').attr('checked','checked'); - $('#me_id_perms_view_storage').attr('checked','checked'); - $('#me_id_perms_view_pages').attr('checked','checked'); -// abook_perms_msg(); - -} - - -function connectFollowOnly() { - $('.abook-edit-me').each(function() { - if(! $(this).is(':disabled')) - $(this).removeAttr('checked'); - }); - - $('#me_id_perms_send_stream').attr('checked','checked'); -// abook_perms_msg(); - -} - diff --git a/view/nl/messages.po b/view/nl/messages.po index fc3148bce..45d5eba67 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-26 00:05-0700\n" -"PO-Revision-Date: 2015-06-29 22:19+0000\n" +"POT-Creation-Date: 2015-07-03 00:04-0700\n" +"PO-Revision-Date: 2015-07-10 19:44+0000\n" "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n" +"Language-Team: Dutch (http://www.transifex.com/p/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -307,7 +307,7 @@ msgid "remove from file" msgstr "uit map verwijderen" #: ../../include/text.php:1498 ../../include/text.php:1509 -#: ../../mod/connedit.php:661 +#: ../../mod/connedit.php:667 msgid "Click to open/close" msgstr "Klik om te openen of te sluiten" @@ -335,7 +335,7 @@ msgstr "Opmaaktype pagina" msgid "Select an alternate language" msgstr "Kies een andere taal" -#: ../../include/text.php:1888 ../../include/diaspora.php:2101 +#: ../../include/text.php:1888 ../../include/diaspora.php:2115 #: ../../include/conversation.php:120 ../../mod/like.php:346 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 #: ../../mod/tagger.php:43 @@ -347,10 +347,9 @@ msgstr "foto" msgid "event" msgstr "gebeurtenis" -#: ../../include/text.php:1894 ../../include/diaspora.php:2101 +#: ../../include/text.php:1894 ../../include/diaspora.php:2115 #: ../../include/conversation.php:148 ../../mod/like.php:346 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:51 msgid "status" msgstr "bericht" @@ -400,30 +399,31 @@ msgstr "map" msgid "Edit" msgstr "Bewerken" -#: ../../include/diaspora.php:2130 ../../include/conversation.php:164 +#: ../../include/diaspora.php:2144 ../../include/conversation.php:164 #: ../../mod/like.php:394 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s vindt %3$s van %2$s leuk" -#: ../../include/diaspora.php:2476 +#: ../../include/diaspora.php:2490 msgid "Please choose" msgstr "Maak een keuze" -#: ../../include/diaspora.php:2478 +#: ../../include/diaspora.php:2492 msgid "Agree" msgstr "Eens" -#: ../../include/diaspora.php:2480 +#: ../../include/diaspora.php:2494 msgid "Disagree" msgstr "Oneens" -#: ../../include/diaspora.php:2482 +#: ../../include/diaspora.php:2496 msgid "Abstain" msgstr "onthouding" -#: ../../include/diaspora.php:2504 ../../include/diaspora.php:2515 -#: ../../include/enotify.php:59 ../../mod/p.php:46 +#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529 +#: ../../include/network.php:1586 ../../include/enotify.php:59 +#: ../../mod/p.php:46 msgid "$projectname" msgstr "$projectname" @@ -440,11 +440,11 @@ msgstr "gaf een reactie op een bericht van %s" msgid "No username found in import file." msgstr "Geen gebruikersnaam in het importbestand gevonden." -#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:142 +#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156 msgid "Unable to create a unique channel address. Import failed." msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt." -#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:490 +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 msgid "Import completed." msgstr "Import voltooid." @@ -526,7 +526,7 @@ msgid "Registration request at %s" msgstr "Registratiebevestiging voor %s" #: ../../include/account.php:314 ../../include/account.php:341 -#: ../../include/account.php:401 +#: ../../include/account.php:401 ../../include/network.php:1632 msgid "Administrator" msgstr "Beheerder" @@ -754,8 +754,8 @@ msgid "Finishes:" msgstr "Einde:" #: ../../include/event.php:47 ../../include/bb2diaspora.php:481 -#: ../../include/identity.php:879 ../../mod/directory.php:296 -#: ../../mod/events.php:647 +#: ../../include/identity.php:879 ../../mod/events.php:647 +#: ../../mod/directory.php:295 msgid "Location:" msgstr "Plaats:" @@ -837,7 +837,7 @@ msgstr "Omschrijving (optioneel)" #: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81 #: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941 #: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58 -#: ../../mod/import.php:520 ../../mod/chat.php:177 ../../mod/chat.php:211 +#: ../../mod/import.php:534 ../../mod/chat.php:177 ../../mod/chat.php:211 #: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105 #: ../../mod/sources.php:104 ../../mod/sources.php:138 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 @@ -848,9 +848,10 @@ msgstr "Omschrijving (optioneel)" #: ../../mod/settings.php:692 ../../mod/settings.php:718 #: ../../mod/settings.php:746 ../../mod/settings.php:769 #: ../../mod/settings.php:854 ../../mod/settings.php:1050 -#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:679 -#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/poll.php:68 -#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256 +#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:688 +#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/pconfig.php:108 +#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24 +#: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "Opslaan" @@ -1028,7 +1029,7 @@ msgstr "Laatst gewijzigd" #: ../../mod/blocks.php:155 ../../mod/photos.php:1062 #: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225 #: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113 -#: ../../mod/settings.php:651 ../../mod/connedit.php:543 +#: ../../mod/settings.php:651 ../../mod/connedit.php:549 msgid "Delete" msgstr "Verwijderen" @@ -1049,6 +1050,23 @@ msgstr "Bladwijzers van %1$s" msgid "view full size" msgstr "volledige grootte tonen" +#: ../../include/network.php:1585 ../../include/enotify.php:58 +msgid "$Projectname Notification" +msgstr "$Projectname-notificatie" + +#: ../../include/network.php:1588 ../../include/enotify.php:61 +msgid "Thank You," +msgstr "Bedankt," + +#: ../../include/network.php:1590 ../../include/enotify.php:63 +#, php-format +msgid "%s Administrator" +msgstr "Beheerder %s" + +#: ../../include/network.php:1646 +msgid "No Subject" +msgstr "Geen onderwerp" + #: ../../include/features.php:38 msgid "General Features" msgstr "Algemene functies" @@ -1236,63 +1254,71 @@ msgid "Filter stream activity by depth of relationships" msgstr "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag" #: ../../include/features.php:74 +msgid "Connection Filtering" +msgstr "Connectie-filters" + +#: ../../include/features.php:74 +msgid "Filter incoming posts from connections based on keywords/content" +msgstr "Filter binnenkomende berichten van connecties aan de hand van trefwoorden/inhoud" + +#: ../../include/features.php:75 msgid "Suggest Channels" msgstr "Kanalen voorstellen" -#: ../../include/features.php:74 +#: ../../include/features.php:75 msgid "Show channel suggestions" msgstr "Voor jou mogelijk interessante kanalen voorstellen" -#: ../../include/features.php:79 +#: ../../include/features.php:80 msgid "Post/Comment Tools" msgstr "Bericht- en reactiehulpmiddelen" -#: ../../include/features.php:80 +#: ../../include/features.php:81 msgid "Tagging" msgstr "Taggen" -#: ../../include/features.php:80 +#: ../../include/features.php:81 msgid "Ability to tag existing posts" msgstr "Mogelijkheid om bestaande berichten te taggen" -#: ../../include/features.php:81 +#: ../../include/features.php:82 msgid "Post Categories" msgstr "Categorieën berichten" -#: ../../include/features.php:81 +#: ../../include/features.php:82 msgid "Add categories to your posts" msgstr "Voeg categorieën toe aan je berichten" -#: ../../include/features.php:82 ../../include/widgets.php:304 +#: ../../include/features.php:83 ../../include/widgets.php:304 #: ../../include/contact_widgets.php:57 msgid "Saved Folders" msgstr "Bewaarde mappen" -#: ../../include/features.php:82 +#: ../../include/features.php:83 msgid "Ability to file posts under folders" msgstr "Mogelijkheid om berichten in mappen op te slaan" -#: ../../include/features.php:83 +#: ../../include/features.php:84 msgid "Dislike Posts" msgstr "Vind berichten niet leuk" -#: ../../include/features.php:83 +#: ../../include/features.php:84 msgid "Ability to dislike posts/comments" msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden" -#: ../../include/features.php:84 +#: ../../include/features.php:85 msgid "Star Posts" msgstr "Geef berichten een ster" -#: ../../include/features.php:84 +#: ../../include/features.php:85 msgid "Ability to mark special posts with a star indicator" msgstr "Mogelijkheid om speciale berichten met een ster te markeren" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Tag Cloud" msgstr "Tagwolk" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Provide a personal tag cloud on your channel page" msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina" @@ -1324,7 +1350,7 @@ msgstr "Persoonlijke app bewerken" #: ../../include/widgets.php:136 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../include/conversation.php:945 -#: ../../include/identity.php:828 ../../mod/directory.php:310 +#: ../../include/identity.php:828 ../../mod/directory.php:309 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "Verbinden" @@ -1375,11 +1401,11 @@ msgstr "Alles" msgid "Archives" msgstr "Archieven" -#: ../../include/widgets.php:427 ../../mod/connedit.php:572 +#: ../../include/widgets.php:427 ../../mod/connedit.php:578 msgid "Me" msgstr "Ik" -#: ../../include/widgets.php:428 ../../mod/connedit.php:573 +#: ../../include/widgets.php:428 ../../mod/connedit.php:579 msgid "Family" msgstr "Familie" @@ -1388,16 +1414,16 @@ msgstr "Familie" #: ../../include/profile_selectors.php:80 ../../mod/settings.php:345 #: ../../mod/settings.php:349 ../../mod/settings.php:350 #: ../../mod/settings.php:353 ../../mod/settings.php:364 -#: ../../mod/connedit.php:574 +#: ../../mod/connedit.php:580 msgid "Friends" msgstr "Vrienden" -#: ../../include/widgets.php:430 ../../mod/connedit.php:575 +#: ../../include/widgets.php:430 ../../mod/connedit.php:581 msgid "Acquaintances" msgstr "Kennissen" #: ../../include/widgets.php:431 ../../mod/connections.php:231 -#: ../../mod/connections.php:246 ../../mod/connedit.php:576 +#: ../../mod/connections.php:246 ../../mod/connedit.php:582 msgid "All" msgstr "Alles" @@ -1433,7 +1459,7 @@ msgstr "Verbonden applicaties" msgid "Export channel" msgstr "Kanaal exporteren" -#: ../../include/widgets.php:530 ../../mod/connedit.php:653 +#: ../../include/widgets.php:530 ../../mod/connedit.php:659 msgid "Connection Default Permissions" msgstr "Standaard permissies voor connecties" @@ -1488,19 +1514,6 @@ msgstr "Bekijk beoordelingen" msgid "Public Hubs" msgstr "Openbare hubs" -#: ../../include/enotify.php:58 -msgid "$Projectname Notification" -msgstr "$Projectname-notificatie" - -#: ../../include/enotify.php:61 -msgid "Thank You," -msgstr "Bedankt," - -#: ../../include/enotify.php:63 -#, php-format -msgid "%s Administrator" -msgstr "Beheerder %s" - #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -2077,7 +2090,7 @@ msgid "Your posts and conversations" msgstr "Jouw berichten en conversaties" #: ../../include/nav.php:91 ../../include/conversation.php:942 -#: ../../mod/connedit.php:494 ../../mod/connedit.php:660 +#: ../../mod/connedit.php:500 ../../mod/connedit.php:666 msgid "View Profile" msgstr "Profiel weergeven" @@ -2991,47 +3004,47 @@ msgstr "Toegang geweigerd" msgid "(Unknown)" msgstr "(Onbekend)" -#: ../../include/items.php:1249 +#: ../../include/items.php:1304 msgid "Visible to anybody on the internet." msgstr "Voor iedereen op het internet zichtbaar." -#: ../../include/items.php:1251 +#: ../../include/items.php:1306 msgid "Visible to you only." msgstr "Alleen voor jou zichtbaar." -#: ../../include/items.php:1253 +#: ../../include/items.php:1308 msgid "Visible to anybody in this network." msgstr "Voor iedereen in dit netwerk zichtbaar." -#: ../../include/items.php:1255 +#: ../../include/items.php:1310 msgid "Visible to anybody authenticated." msgstr "Voor iedereen die geauthenticeerd is zichtbaar." -#: ../../include/items.php:1257 +#: ../../include/items.php:1312 #, php-format msgid "Visible to anybody on %s." msgstr "Voor iedereen op %s zichtbaar." -#: ../../include/items.php:1259 +#: ../../include/items.php:1314 msgid "Visible to all connections." msgstr "Voor alle connecties zichtbaar." -#: ../../include/items.php:1261 +#: ../../include/items.php:1316 msgid "Visible to approved connections." msgstr "Voor alle goedgekeurde connecties zichtbaar." -#: ../../include/items.php:1263 +#: ../../include/items.php:1318 msgid "Visible to specific connections." msgstr "Voor specifieke connecties zichtbaar." -#: ../../include/items.php:4076 ../../mod/thing.php:74 +#: ../../include/items.php:4195 ../../mod/thing.php:74 #: ../../mod/display.php:36 ../../mod/filestorage.php:27 #: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1025 #: ../../mod/admin.php:1225 msgid "Item not found." msgstr "Item niet gevonden." -#: ../../include/items.php:4149 ../../include/attach.php:137 +#: ../../include/items.php:4268 ../../include/attach.php:137 #: ../../include/attach.php:184 ../../include/attach.php:247 #: ../../include/attach.php:261 ../../include/attach.php:305 #: ../../include/attach.php:319 ../../include/attach.php:350 @@ -3061,7 +3074,7 @@ msgstr "Item niet gevonden." #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 #: ../../mod/editblock.php:65 ../../mod/register.php:72 #: ../../mod/settings.php:570 ../../mod/id.php:71 ../../mod/message.php:16 -#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:331 +#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:337 #: ../../mod/mail.php:114 ../../mod/notifications.php:66 #: ../../mod/regmod.php:17 ../../mod/new_channel.php:68 #: ../../mod/new_channel.php:99 ../../mod/appman.php:66 @@ -3074,26 +3087,26 @@ msgstr "Item niet gevonden." msgid "Permission denied." msgstr "Toegang geweigerd" -#: ../../include/items.php:4551 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4670 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "Collectie niet gevonden." -#: ../../include/items.php:4567 +#: ../../include/items.php:4686 msgid "Collection is empty." msgstr "Collectie is leeg" -#: ../../include/items.php:4574 +#: ../../include/items.php:4693 #, php-format msgid "Collection: %s" msgstr "Collectie: %s" -#: ../../include/items.php:4584 +#: ../../include/items.php:4703 #, php-format msgid "Connection: %s" msgstr "Connectie: %s" -#: ../../include/items.php:4586 +#: ../../include/items.php:4705 msgid "Connection not found." msgstr "Connectie niet gevonden." @@ -3105,7 +3118,7 @@ msgstr "Datapakket ongeldig" msgid "Unable to verify channel signature" msgstr "Kanaalkenmerk kon niet worden geverifieerd. " -#: ../../include/zot.php:2109 +#: ../../include/zot.php:2126 #, php-format msgid "Unable to verify site signature for %s" msgstr "Hubkenmerk voor %s kon niet worden geverifieerd" @@ -3157,12 +3170,12 @@ msgstr "Verbinden/volgen" msgid "Examples: Robert Morgenstein, Fishing" msgstr "Voorbeeld: Robert Morgenstein, vissen" -#: ../../include/contact_widgets.php:26 ../../mod/directory.php:373 -#: ../../mod/directory.php:378 ../../mod/connections.php:413 +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413 +#: ../../mod/directory.php:372 ../../mod/directory.php:377 msgid "Find" msgstr "Vinden" -#: ../../include/contact_widgets.php:27 ../../mod/directory.php:377 +#: ../../include/contact_widgets.php:27 ../../mod/directory.php:376 #: ../../mod/suggest.php:60 msgid "Channel Suggestions" msgstr "Voorgestelde kanalen" @@ -3420,7 +3433,7 @@ msgstr "F j" msgid "Birthday:" msgstr "Geboortedatum:" -#: ../../include/identity.php:1163 ../../mod/directory.php:291 +#: ../../include/identity.php:1163 ../../mod/directory.php:290 msgid "Age:" msgstr "Leeftijd:" @@ -3433,7 +3446,7 @@ msgstr "voor %1$d %2$s" msgid "Sexual Preference:" msgstr "Seksuele voorkeur:" -#: ../../include/identity.php:1179 ../../mod/directory.php:307 +#: ../../include/identity.php:1179 ../../mod/directory.php:306 #: ../../mod/profiles.php:693 msgid "Hometown:" msgstr "Oorspronkelijk uit:" @@ -3450,7 +3463,7 @@ msgstr "Politieke overtuigingen:" msgid "Religion:" msgstr "Religie:" -#: ../../include/identity.php:1187 ../../mod/directory.php:309 +#: ../../include/identity.php:1187 ../../mod/directory.php:308 msgid "About:" msgstr "Over:" @@ -3844,7 +3857,7 @@ msgstr "QR-code" msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s schreef het volgende %2$s %3$s" -#: ../../include/bbcode.php:264 +#: ../../include/bbcode.php:264 ../../mod/tagger.php:51 msgid "post" msgstr "bericht" @@ -3944,75 +3957,6 @@ msgstr "%d nieuwe connectieverzoeken" msgid "Delegated Channels" msgstr "Uitbestede kanalen" -#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13 -#: ../../mod/display.php:13 ../../mod/ratings.php:82 -#: ../../mod/viewconnections.php:17 -msgid "Public access denied." -msgstr "Openbare toegang geweigerd." - -#: ../../mod/directory.php:227 -#, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "%d beoordeling" -msgstr[1] "%d beoordelingen" - -#: ../../mod/directory.php:238 -msgid "Gender: " -msgstr "Geslacht:" - -#: ../../mod/directory.php:240 -msgid "Status: " -msgstr "Status: " - -#: ../../mod/directory.php:242 -msgid "Homepage: " -msgstr "Homepagina: " - -#: ../../mod/directory.php:302 ../../mod/events.php:645 -msgid "Description:" -msgstr "Omschrijving:" - -#: ../../mod/directory.php:311 -msgid "Public Forum:" -msgstr "Openbaar forum:" - -#: ../../mod/directory.php:314 -msgid "Keywords: " -msgstr "Trefwoorden: " - -#: ../../mod/directory.php:317 -msgid "Don't suggest" -msgstr "Niet voorstellen" - -#: ../../mod/directory.php:319 -msgid "Common connections:" -msgstr "Gemeenschappelijke connecties:" - -#: ../../mod/directory.php:368 -msgid "Global Directory" -msgstr "Volledige kanalengids" - -#: ../../mod/directory.php:368 -msgid "Local Directory" -msgstr "Lokale kanalengids" - -#: ../../mod/directory.php:374 -msgid "Finding:" -msgstr "Gezocht naar:" - -#: ../../mod/directory.php:379 -msgid "next page" -msgstr "volgende pagina" - -#: ../../mod/directory.php:379 -msgid "previous page" -msgstr "vorige pagina" - -#: ../../mod/directory.php:395 -msgid "No entries (some entries may be hidden)." -msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)." - #: ../../mod/xchan.php:6 msgid "Xchan Lookup" msgstr "Xchan opzoeken" @@ -4439,6 +4383,10 @@ msgid "" "global holidays." msgstr "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen." +#: ../../mod/events.php:645 ../../mod/directory.php:301 +msgid "Description:" +msgstr "Omschrijving:" + #: ../../mod/events.php:649 msgid "Title:" msgstr "Titel:" @@ -4694,11 +4642,11 @@ msgstr "Kon geen toegang krijgen tot de connectie-gegevens." msgid "Could not locate selected profile." msgstr "Kon het gekozen profiel niet vinden." -#: ../../mod/connections.php:94 ../../mod/connedit.php:214 +#: ../../mod/connections.php:94 ../../mod/connedit.php:220 msgid "Connection updated." msgstr "Connectie bijgewerkt." -#: ../../mod/connections.php:96 ../../mod/connedit.php:216 +#: ../../mod/connections.php:96 ../../mod/connedit.php:222 msgid "Failed to update connection record." msgstr "Bijwerken van connectie-gegevens mislukt." @@ -4787,10 +4735,70 @@ msgstr "Bloknaam" msgid "Block Title" msgstr "Bloktitel" -#: ../../mod/tagger.php:96 +#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13 +#: ../../mod/display.php:13 ../../mod/ratings.php:82 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +msgstr "Openbare toegang geweigerd." + +#: ../../mod/directory.php:227 #, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "%1$s heeft het %3$s van %2$s getagd met %4$s" +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "%d beoordeling" +msgstr[1] "%d beoordelingen" + +#: ../../mod/directory.php:238 +msgid "Gender: " +msgstr "Geslacht:" + +#: ../../mod/directory.php:240 +msgid "Status: " +msgstr "Status: " + +#: ../../mod/directory.php:242 +msgid "Homepage: " +msgstr "Homepagina: " + +#: ../../mod/directory.php:310 +msgid "Public Forum:" +msgstr "Openbaar forum:" + +#: ../../mod/directory.php:313 +msgid "Keywords: " +msgstr "Trefwoorden: " + +#: ../../mod/directory.php:316 +msgid "Don't suggest" +msgstr "Niet voorstellen" + +#: ../../mod/directory.php:318 +msgid "Common connections:" +msgstr "Gemeenschappelijke connecties:" + +#: ../../mod/directory.php:367 +msgid "Global Directory" +msgstr "Volledige kanalengids" + +#: ../../mod/directory.php:367 +msgid "Local Directory" +msgstr "Lokale kanalengids" + +#: ../../mod/directory.php:373 +msgid "Finding:" +msgstr "Gezocht naar:" + +#: ../../mod/directory.php:378 +msgid "next page" +msgstr "volgende pagina" + +#: ../../mod/directory.php:378 +msgid "previous page" +msgstr "vorige pagina" + +#: ../../mod/directory.php:394 +msgid "No entries (some entries may be hidden)." +msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)." #: ../../mod/cloud.php:120 msgid "$Projectname - Guests: Username: {your email address}, Password: +++" @@ -5046,55 +5054,64 @@ msgstr "Niet in staat om gegevens van de oude hub te downloaden" msgid "Imported file is empty." msgstr "Geïmporteerde bestand is leeg" -#: ../../mod/import.php:121 +#: ../../mod/import.php:110 +msgid "The data provided is not compatible with this project." +msgstr "De geïmporteerde gegevens zijn niet compatibel met dit project." + +#: ../../mod/import.php:115 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." +msgstr "Waarschuwing: database-versies lopen %1$d updates achter." + +#: ../../mod/import.php:135 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt." -#: ../../mod/import.php:162 +#: ../../mod/import.php:176 msgid "Channel clone failed. Import failed." msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt." -#: ../../mod/import.php:172 +#: ../../mod/import.php:186 msgid "Cloned channel not found. Import failed." msgstr "Gekloond kanaal niet gevonden. Importeren mislukt." -#: ../../mod/import.php:502 +#: ../../mod/import.php:516 msgid "You must be logged in to use this feature." msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken." -#: ../../mod/import.php:507 +#: ../../mod/import.php:521 msgid "Import Channel" msgstr "Kanaal importeren" -#: ../../mod/import.php:508 +#: ../../mod/import.php:522 msgid "" "Use this form to import an existing channel from a different server/hub. You" " may retrieve the channel identity from the old server/hub via the network " "or provide an export file." msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken." -#: ../../mod/import.php:509 +#: ../../mod/import.php:523 msgid "File to Upload" msgstr "Bestand om te uploaden" -#: ../../mod/import.php:510 +#: ../../mod/import.php:524 msgid "Or provide the old server/hub details" msgstr "Of vul de gegevens van de oude hub in" -#: ../../mod/import.php:511 +#: ../../mod/import.php:525 msgid "Your old identity address (xyz@example.com)" msgstr "Jouw oude kanaaladres (xyz@example.com)" -#: ../../mod/import.php:512 +#: ../../mod/import.php:526 msgid "Your old login email address" msgstr "Het e-mailadres van je oude account" -#: ../../mod/import.php:513 +#: ../../mod/import.php:527 msgid "Your old login password" msgstr "Wachtwoord van jouw oude account" -#: ../../mod/import.php:514 +#: ../../mod/import.php:528 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be" @@ -5102,17 +5119,17 @@ msgid "" "primary location for files, photos, and media." msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen." -#: ../../mod/import.php:515 +#: ../../mod/import.php:529 msgid "Make this hub my primary location" msgstr "Stel deze hub als mijn primaire locatie in" -#: ../../mod/import.php:516 +#: ../../mod/import.php:530 msgid "" "Import existing posts if possible (experimental - limited by available " "memory" msgstr "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van hoeveelheid geheugen hub)" -#: ../../mod/import.php:517 +#: ../../mod/import.php:531 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -5295,11 +5312,12 @@ msgstr "Website:" msgid "Remote Channel [%s] (not yet known on this site)" msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)" -#: ../../mod/rate.php:161 ../../mod/connedit.php:663 +#: ../../mod/rate.php:161 ../../mod/connedit.php:669 msgid "Rating (this information is public)" msgstr "Beoordeling (deze informatie is openbaar)" -#: ../../mod/rate.php:162 ../../mod/connedit.php:664 +#: ../../mod/rate.php:162 ../../mod/connedit.php:670 +#: ../../mod/connedit.php:674 msgid "Optionally explain your rating (this information is public)" msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)" @@ -6373,6 +6391,11 @@ msgstr "OpenID-protocolfout. Geen ID terugontvangen." msgid "Welcome %s. Remote authentication successful." msgstr "Welkom %s. Authenticatie op afstand geslaagd." +#: ../../mod/tagger.php:96 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "%1$s heeft het %3$s van %2$s getagd met %4$s" + #: ../../mod/uexport.php:33 ../../mod/uexport.php:34 msgid "Export Channel" msgstr "Kanaal exporteren" @@ -6965,13 +6988,13 @@ msgstr "Goedkeuren" msgid "Deny" msgstr "Afkeuren" -#: ../../mod/admin.php:827 ../../mod/connedit.php:517 -#: ../../mod/connedit.php:720 +#: ../../mod/admin.php:827 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 msgid "Block" msgstr "Blokkeren" -#: ../../mod/admin.php:828 ../../mod/connedit.php:517 -#: ../../mod/connedit.php:720 +#: ../../mod/admin.php:828 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 msgid "Unblock" msgstr "Deblokkeren" @@ -8167,161 +8190,174 @@ msgid "" "removed from the network" msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het $Projectname-netwerk verwijderd" -#: ../../mod/connedit.php:262 +#: ../../mod/connedit.php:268 msgid "is now connected to" msgstr "is nu verbonden met" -#: ../../mod/connedit.php:375 +#: ../../mod/connedit.php:381 msgid "Could not access address book record." msgstr "Kon geen toegang krijgen tot de record van de connectie." -#: ../../mod/connedit.php:389 +#: ../../mod/connedit.php:395 msgid "Refresh failed - channel is currently unavailable." msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar" -#: ../../mod/connedit.php:396 +#: ../../mod/connedit.php:402 msgid "Channel has been unblocked" msgstr "Kanaal is gedeblokkeerd" -#: ../../mod/connedit.php:397 +#: ../../mod/connedit.php:403 msgid "Channel has been blocked" msgstr "Kanaal is geblokkeerd" -#: ../../mod/connedit.php:401 ../../mod/connedit.php:413 -#: ../../mod/connedit.php:425 ../../mod/connedit.php:437 -#: ../../mod/connedit.php:453 +#: ../../mod/connedit.php:407 ../../mod/connedit.php:419 +#: ../../mod/connedit.php:431 ../../mod/connedit.php:443 +#: ../../mod/connedit.php:459 msgid "Unable to set address book parameters." msgstr "Niet in staat om de parameters van connecties in te stellen." -#: ../../mod/connedit.php:408 +#: ../../mod/connedit.php:414 msgid "Channel has been unignored" msgstr "Kanaal wordt niet meer genegeerd" -#: ../../mod/connedit.php:409 +#: ../../mod/connedit.php:415 msgid "Channel has been ignored" msgstr "Kanaal wordt genegeerd" -#: ../../mod/connedit.php:420 +#: ../../mod/connedit.php:426 msgid "Channel has been unarchived" msgstr "Kanaal is niet meer gearchiveerd" -#: ../../mod/connedit.php:421 +#: ../../mod/connedit.php:427 msgid "Channel has been archived" msgstr "Kanaal is gearchiveerd" -#: ../../mod/connedit.php:432 +#: ../../mod/connedit.php:438 msgid "Channel has been unhidden" msgstr "Kanaal is niet meer verborgen" -#: ../../mod/connedit.php:433 +#: ../../mod/connedit.php:439 msgid "Channel has been hidden" msgstr "Kanaal is verborgen" -#: ../../mod/connedit.php:448 +#: ../../mod/connedit.php:454 msgid "Channel has been approved" msgstr "Connectie/kanaal is geaccepteerd" -#: ../../mod/connedit.php:449 +#: ../../mod/connedit.php:455 msgid "Channel has been unapproved" msgstr "Connectie/kanaal is afgewezen" -#: ../../mod/connedit.php:477 +#: ../../mod/connedit.php:483 msgid "Connection has been removed." msgstr "Connectie is verwijderd" -#: ../../mod/connedit.php:497 +#: ../../mod/connedit.php:503 #, php-format msgid "View %s's profile" msgstr "Profiel van %s weergeven" -#: ../../mod/connedit.php:501 +#: ../../mod/connedit.php:507 msgid "Refresh Permissions" msgstr "Permissies vernieuwen" -#: ../../mod/connedit.php:504 +#: ../../mod/connedit.php:510 msgid "Fetch updated permissions" msgstr "Aangepaste permissies ophalen" -#: ../../mod/connedit.php:508 +#: ../../mod/connedit.php:514 msgid "Recent Activity" msgstr "Recente activiteit" -#: ../../mod/connedit.php:511 +#: ../../mod/connedit.php:517 msgid "View recent posts and comments" msgstr "Recente berichten en reacties weergeven" -#: ../../mod/connedit.php:520 +#: ../../mod/connedit.php:526 msgid "Block (or Unblock) all communications with this connection" msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie" -#: ../../mod/connedit.php:524 ../../mod/connedit.php:721 +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 msgid "Unignore" msgstr "Niet meer negeren" -#: ../../mod/connedit.php:524 ../../mod/connedit.php:721 +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 #: ../../mod/notifications.php:51 msgid "Ignore" msgstr "Negeren" -#: ../../mod/connedit.php:527 +#: ../../mod/connedit.php:533 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:536 msgid "Unarchive" msgstr "Niet meer archiveren" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:536 msgid "Archive" msgstr "Archiveren" -#: ../../mod/connedit.php:533 +#: ../../mod/connedit.php:539 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:542 msgid "Unhide" msgstr "Niet meer verbergen" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:542 msgid "Hide" msgstr "Verbergen" -#: ../../mod/connedit.php:539 +#: ../../mod/connedit.php:545 msgid "Hide or Unhide this connection from your other connections" msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties" -#: ../../mod/connedit.php:546 +#: ../../mod/connedit.php:552 msgid "Delete this connection" msgstr "Deze connectie verwijderen" -#: ../../mod/connedit.php:637 ../../mod/connedit.php:675 +#: ../../mod/connedit.php:643 ../../mod/connedit.php:684 msgid "Approve this connection" msgstr "Deze connectie accepteren" -#: ../../mod/connedit.php:637 +#: ../../mod/connedit.php:643 msgid "Accept connection to allow communication" msgstr "Keur deze connectie goed om communicatie toe te staan" -#: ../../mod/connedit.php:653 +#: ../../mod/connedit.php:659 #, php-format msgid "Connections: settings for %s" msgstr "Connecties: instellingen voor %s" -#: ../../mod/connedit.php:654 +#: ../../mod/connedit.php:660 msgid "Apply these permissions automatically" msgstr "Deze permissies automatisch toepassen" -#: ../../mod/connedit.php:658 +#: ../../mod/connedit.php:664 msgid "Apply the permissions indicated on this page to all new connections." msgstr "Permissies die op deze pagina staan vermeldt op alle nieuwe connecties toepassen." -#: ../../mod/connedit.php:662 +#: ../../mod/connedit.php:668 msgid "Slide to adjust your degree of friendship" msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag" -#: ../../mod/connedit.php:671 +#: ../../mod/connedit.php:672 +msgid "Only import posts with this text" +msgstr "Importeer alleen berichten met deze tekst" + +#: ../../mod/connedit.php:672 ../../mod/connedit.php:673 +msgid "" +"words one per line or #tags or /patterns/, leave blank to import all posts" +msgstr "woorden (één per regel), #tags of /patterns/, laat leeg om alle berichten te importeren" + +#: ../../mod/connedit.php:673 +msgid "Do not import posts with this text" +msgstr "Importeer geen berichten met deze tekst" + +#: ../../mod/connedit.php:680 msgid "" "Default permissions for your channel type have (just) been applied. They " "have not yet been submitted. Please review the permissions on this page and " @@ -8330,48 +8366,48 @@ msgid "" "install and apply the selected permissions." msgstr "Voor jouw kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog niet opgeslagen. Controleer de permissies op deze pagina en verander ze eventueel. Deze nieuwe connectie kan mogelijk nog <em>niet</em> met jou communiceren totdat je deze pagina opslaat, wat ervoor zorgt dat de gekozen permissies actief worden." -#: ../../mod/connedit.php:674 +#: ../../mod/connedit.php:683 msgid "inherited" msgstr "geërfd" -#: ../../mod/connedit.php:677 +#: ../../mod/connedit.php:686 msgid "Connection has no individual permissions!" msgstr "Connectie heeft geen individuele permissies!" -#: ../../mod/connedit.php:678 +#: ../../mod/connedit.php:687 msgid "" "This may be appropriate based on your <a href=\"settings\">privacy " "settings</a>, though you may wish to review the \"Advanced Permissions\"." msgstr "Dit is mogelijk voldoende, wanneer er naar jouw <a href=\"settings\">privacy-instellingen</a> wordt gekeken. Hoewel je wellicht de geavanceerde rechten wil nagaan." -#: ../../mod/connedit.php:680 +#: ../../mod/connedit.php:689 msgid "Profile Visibility" msgstr "Zichtbaarheid profiel" -#: ../../mod/connedit.php:681 +#: ../../mod/connedit.php:690 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken." -#: ../../mod/connedit.php:682 +#: ../../mod/connedit.php:691 msgid "Contact Information / Notes" msgstr "Informatie/aantekeningen over connectie" -#: ../../mod/connedit.php:683 +#: ../../mod/connedit.php:692 msgid "Edit contact notes" msgstr "Bewerk aantekeningen over contact" -#: ../../mod/connedit.php:685 +#: ../../mod/connedit.php:694 msgid "Their Settings" msgstr "Hun instellingen" -#: ../../mod/connedit.php:686 +#: ../../mod/connedit.php:695 msgid "My Settings" msgstr "Mijn instellingen" -#: ../../mod/connedit.php:688 +#: ../../mod/connedit.php:697 msgid "" "Default permissions for this channel type have (just) been applied. They " "have <em>not</em> been saved and there are currently no stored default " @@ -8379,35 +8415,35 @@ msgid "" "finalize." msgstr "Voor dit kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog <em>niet</em> opgeslagen en er zijn momenteel geen standaard permissies aanwezig. Controleer/verander de permissies op deze pagina en klik op [Opslaan] om deze te activeren." -#: ../../mod/connedit.php:689 +#: ../../mod/connedit.php:698 msgid "Clear/Disable Automatic Permissions" msgstr "Verwijderen/uitschakelen automatische permissies" -#: ../../mod/connedit.php:690 +#: ../../mod/connedit.php:699 msgid "Forum Members" msgstr "Forumleden" -#: ../../mod/connedit.php:691 +#: ../../mod/connedit.php:700 msgid "Soapbox" msgstr "Zeepkist" -#: ../../mod/connedit.php:692 +#: ../../mod/connedit.php:701 msgid "Full Sharing (typical social network permissions)" msgstr "Voluit delen (vergelijkbaar met die van sociale netwerken)" -#: ../../mod/connedit.php:693 +#: ../../mod/connedit.php:702 msgid "Cautious Sharing " msgstr "Voorzichtig delen" -#: ../../mod/connedit.php:694 +#: ../../mod/connedit.php:703 msgid "Follow Only" msgstr "Alleen volgen" -#: ../../mod/connedit.php:695 +#: ../../mod/connedit.php:704 msgid "Individual Permissions" msgstr "Individuele permissies" -#: ../../mod/connedit.php:696 +#: ../../mod/connedit.php:705 msgid "" "Some permissions may be inherited from your channel <a " "href=\"settings\">privacy settings</a>, which have higher priority than " @@ -8415,64 +8451,64 @@ msgid "" "have no effect." msgstr "Sommige permissies kunnen worden overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect." -#: ../../mod/connedit.php:697 +#: ../../mod/connedit.php:706 msgid "Advanced Permissions" msgstr "Geavanceerde permissies" -#: ../../mod/connedit.php:698 +#: ../../mod/connedit.php:707 msgid "Simple Permissions (select one and submit)" msgstr "Eenvoudige permissies (selecteer er één en opslaan)" -#: ../../mod/connedit.php:702 +#: ../../mod/connedit.php:711 #, php-format msgid "Visit %s's profile - %s" msgstr "Profiel van %s bezoeken - %s" -#: ../../mod/connedit.php:703 +#: ../../mod/connedit.php:712 msgid "Block/Unblock contact" msgstr "Connectie blokkeren/deblokkeren" -#: ../../mod/connedit.php:704 +#: ../../mod/connedit.php:713 msgid "Ignore contact" msgstr "Connectie negeren" -#: ../../mod/connedit.php:705 +#: ../../mod/connedit.php:714 msgid "Repair URL settings" msgstr "URL-instellingen repareren" -#: ../../mod/connedit.php:706 +#: ../../mod/connedit.php:715 msgid "View conversations" msgstr "Conversaties weergeven" -#: ../../mod/connedit.php:708 +#: ../../mod/connedit.php:717 msgid "Delete contact" msgstr "Connectie verwijderen" -#: ../../mod/connedit.php:712 +#: ../../mod/connedit.php:721 msgid "Last update:" msgstr "Laatste wijziging:" -#: ../../mod/connedit.php:714 +#: ../../mod/connedit.php:723 msgid "Update public posts" msgstr "Openbare berichten updaten" -#: ../../mod/connedit.php:716 +#: ../../mod/connedit.php:725 msgid "Update now" msgstr "Nu updaten" -#: ../../mod/connedit.php:722 +#: ../../mod/connedit.php:731 msgid "Currently blocked" msgstr "Momenteel geblokkeerd" -#: ../../mod/connedit.php:723 +#: ../../mod/connedit.php:732 msgid "Currently ignored" msgstr "Momenteel genegeerd" -#: ../../mod/connedit.php:724 +#: ../../mod/connedit.php:733 msgid "Currently archived" msgstr "Momenteel gearchiveerd" -#: ../../mod/connedit.php:725 +#: ../../mod/connedit.php:734 msgid "Currently pending" msgstr "Moeten nog geaccepteerd of afgewezen worden" @@ -8731,6 +8767,21 @@ msgstr "Bladwijzers van mijn connecties" msgid "Insufficient permissions. Request redirected to profile page." msgstr "Onvoldoende permissies. Doorgestuurd naar profielpagina." +#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60 +msgid "This setting requires special processing and editing has been blocked." +msgstr "Deze instelling vereist een speciaal proces en bewerken is geblokkeerd." + +#: ../../mod/pconfig.php:49 +msgid "Configuration Editor" +msgstr "Configuratiebewerker" + +#: ../../mod/pconfig.php:50 +msgid "" +"Warning: Changing some settings could render your channel inoperable. Please" +" leave this page unless you are comfortable with and knowledgeable about how" +" to correctly use this feature." +msgstr "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. " + #: ../../mod/suggest.php:35 msgid "" "No suggestions available. If this is a new site, please try again in 24 " diff --git a/view/nl/strings.php b/view/nl/strings.php index a199b81af..a3aff3564 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -240,6 +240,10 @@ $a->strings["Create new folder"] = "Nieuwe map aanmaken"; $a->strings["Upload file"] = "Bestand uploaden"; $a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s"; $a->strings["view full size"] = "volledige grootte tonen"; +$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie"; +$a->strings["Thank You,"] = "Bedankt,"; +$a->strings["%s Administrator"] = "Beheerder %s"; +$a->strings["No Subject"] = "Geen onderwerp"; $a->strings["General Features"] = "Algemene functies"; $a->strings["Content Expiration"] = "Inhoud laten verlopen"; $a->strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen"; @@ -285,6 +289,8 @@ $a->strings["Network New Tab"] = "Nieuwe netwerktab"; $a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen"; $a->strings["Affinity Tool"] = "Verwantschapsfilter"; $a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag"; +$a->strings["Connection Filtering"] = "Connectie-filters"; +$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden/inhoud"; $a->strings["Suggest Channels"] = "Kanalen voorstellen"; $a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen"; $a->strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen"; @@ -344,9 +350,6 @@ $a->strings["photo/image"] = "foto/afbeelding"; $a->strings["Rate Me"] = "Beoordeel mij"; $a->strings["View Ratings"] = "Bekijk beoordelingen"; $a->strings["Public Hubs"] = "Openbare hubs"; -$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie"; -$a->strings["Thank You,"] = "Bedankt,"; -$a->strings["%s Administrator"] = "Beheerder %s"; $a->strings["%s <!item_type!>"] = "%s <!item_type!>"; $a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notificatie] Nieuw privébericht ontvangen op %s"; $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s."; @@ -933,25 +936,6 @@ $a->strings["Make Default"] = "Als standaard instellen"; $a->strings["%d new messages"] = "%d nieuwe berichten"; $a->strings["%d new introductions"] = "%d nieuwe connectieverzoeken"; $a->strings["Delegated Channels"] = "Uitbestede kanalen"; -$a->strings["Public access denied."] = "Openbare toegang geweigerd."; -$a->strings["%d rating"] = array( - 0 => "%d beoordeling", - 1 => "%d beoordelingen", -); -$a->strings["Gender: "] = "Geslacht:"; -$a->strings["Status: "] = "Status: "; -$a->strings["Homepage: "] = "Homepagina: "; -$a->strings["Description:"] = "Omschrijving:"; -$a->strings["Public Forum:"] = "Openbaar forum:"; -$a->strings["Keywords: "] = "Trefwoorden: "; -$a->strings["Don't suggest"] = "Niet voorstellen"; -$a->strings["Common connections:"] = "Gemeenschappelijke connecties:"; -$a->strings["Global Directory"] = "Volledige kanalengids"; -$a->strings["Local Directory"] = "Lokale kanalengids"; -$a->strings["Finding:"] = "Gezocht naar:"; -$a->strings["next page"] = "volgende pagina"; -$a->strings["previous page"] = "vorige pagina"; -$a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn)."; $a->strings["Xchan Lookup"] = "Xchan opzoeken"; $a->strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:"; $a->strings["Not found."] = "Niet gevonden."; @@ -1049,6 +1033,7 @@ $a->strings["Finish date/time is not known or not relevant"] = "Einddatum/-tijd $a->strings["Event Finishes:"] = "Einde gebeurtenis:"; $a->strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"; $a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen."; +$a->strings["Description:"] = "Omschrijving:"; $a->strings["Title:"] = "Titel:"; $a->strings["Share this event"] = "Deel deze gebeurtenis"; $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s"; @@ -1132,7 +1117,24 @@ $a->strings["Search your connections"] = "Doorzoek jouw connecties"; $a->strings["Finding: "] = "Zoeken naar: "; $a->strings["Block Name"] = "Bloknaam"; $a->strings["Block Title"] = "Bloktitel"; -$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s"; +$a->strings["Public access denied."] = "Openbare toegang geweigerd."; +$a->strings["%d rating"] = array( + 0 => "%d beoordeling", + 1 => "%d beoordelingen", +); +$a->strings["Gender: "] = "Geslacht:"; +$a->strings["Status: "] = "Status: "; +$a->strings["Homepage: "] = "Homepagina: "; +$a->strings["Public Forum:"] = "Openbaar forum:"; +$a->strings["Keywords: "] = "Trefwoorden: "; +$a->strings["Don't suggest"] = "Niet voorstellen"; +$a->strings["Common connections:"] = "Gemeenschappelijke connecties:"; +$a->strings["Global Directory"] = "Volledige kanalengids"; +$a->strings["Local Directory"] = "Lokale kanalengids"; +$a->strings["Finding:"] = "Gezocht naar:"; +$a->strings["next page"] = "volgende pagina"; +$a->strings["previous page"] = "vorige pagina"; +$a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn)."; $a->strings["\$Projectname - Guests: Username: {your email address}, Password: +++"] = "\$Projectname - gasttoegang: Accountnaam: {jouw e-mailadres}, wachtwoord: +++"; $a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen."; $a->strings["Album not found."] = "Album niet gevonden."; @@ -1195,6 +1197,8 @@ $a->strings["Your service plan only allows %d channels."] = "Jouw abonnement sta $a->strings["Nothing to import."] = "Niets gevonden om te importeren"; $a->strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden"; $a->strings["Imported file is empty."] = "Geïmporteerde bestand is leeg"; +$a->strings["The data provided is not compatible with this project."] = "De geïmporteerde gegevens zijn niet compatibel met dit project."; +$a->strings["Warning: Database versions differ by %1\$d updates."] = "Waarschuwing: database-versies lopen %1\$d updates achter."; $a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."; $a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt."; $a->strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt."; @@ -1501,6 +1505,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Wat nu</h1>"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."; $a->strings["OpenID protocol error. No ID returned."] = "OpenID-protocolfout. Geen ID terugontvangen."; $a->strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd."; +$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s"; $a->strings["Export Channel"] = "Kanaal exporteren"; $a->strings["Export your basic channel information to a small file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but\tdoes not contain your content."] = "Exporteer de basisinformatie van jouw kanaal naar een klein bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal."; $a->strings["Export Content"] = "Inhoud exporteren"; @@ -1971,6 +1976,9 @@ $a->strings["Connections: settings for %s"] = "Connecties: instellingen voor %s" $a->strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen"; $a->strings["Apply the permissions indicated on this page to all new connections."] = "Permissies die op deze pagina staan vermeldt op alle nieuwe connecties toepassen."; $a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag"; +$a->strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst"; +$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "woorden (één per regel), #tags of /patterns/, laat leeg om alle berichten te importeren"; +$a->strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst"; $a->strings["Default permissions for your channel type have (just) been applied. They have not yet been submitted. Please review the permissions on this page and make any desired changes at this time. This new connection may <em>not</em> be able to communicate with you until you submit this page, which will install and apply the selected permissions."] = "Voor jouw kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog niet opgeslagen. Controleer de permissies op deze pagina en verander ze eventueel. Deze nieuwe connectie kan mogelijk nog <em>niet</em> met jou communiceren totdat je deze pagina opslaat, wat ervoor zorgt dat de gekozen permissies actief worden."; $a->strings["inherited"] = "geërfd"; $a->strings["Connection has no individual permissions!"] = "Connectie heeft geen individuele permissies!"; @@ -2065,6 +2073,9 @@ $a->strings["Bookmark added"] = "Bladwijzer toegevoegd"; $a->strings["My Bookmarks"] = "Mijn bladwijzers"; $a->strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties"; $a->strings["Insufficient permissions. Request redirected to profile page."] = "Onvoldoende permissies. Doorgestuurd naar profielpagina."; +$a->strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces en bewerken is geblokkeerd."; +$a->strings["Configuration Editor"] = "Configuratiebewerker"; +$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "; $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer."; $a->strings["Poll"] = "Peiling"; $a->strings["View Results"] = "Bekijk resultaten"; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fcc089cf0..046d8471b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -264,12 +264,20 @@ footer { } /*TODO: we should use one class for all this. */ -/* -.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { - color: #444 !important; - text-decoration: none !important; + +.group-selected, +.fileas-selected, +.categories-selected, +.search-selected, +.active, +.group-selected:hover, +.fileas-selected:hover, +.categories-selected:hover, +.search-selected:hover, +.active:hover { + color: $font_colour; } -*/ + .fileas-all { text-decoration: none !important; @@ -347,7 +355,8 @@ footer { word-wrap: break-word; } -.vcard dl { +.vcard dl, +.vcard .title { margin-top: 10px; margin-bottom: 0px; } @@ -406,13 +415,19 @@ footer { #profile-photo-wrapper img { - padding: 10px; - width: 197px; - height: 197px; + width: 100%; + height: 100%; + max-width: 300px; + max-height: 300px; } #profile-photo-wrapper { - margin-top: 10px; + width: 251px; + height: 251px; + margin-top: -10px; + margin-bottom: 10px; + border: 1px solid #ccc; + border-radius: $radiuspx; } @@ -504,7 +519,6 @@ footer { display: block; } - .pager { padding: 10px; text-align: center; @@ -570,10 +584,6 @@ footer { margin-left: 5px; } -.photo { - border: 1px solid #AAAAAA; -} - .photo-top-photo, .photo-album-photo { /* padding: 10px; max-width: 300px; @@ -704,8 +714,8 @@ a.rateme, div.rateme { .contact-block-div { float: left; - width: 49px; - height: 49px; + width: 50px; + height: 50px; } .contact-block-textdiv { float: left; @@ -720,8 +730,8 @@ a.rateme, div.rateme { float: left; } .contact-block-img { - width:47px; - height:47px; + width:48px; + height:48px; } #tag-remove { @@ -741,8 +751,8 @@ a.rateme, div.rateme { } .wall-item-conv { - margin-top: 5px; - margin-bottom: 25px; + padding-top: 5px; + padding-bottom: 10px; } @@ -1274,12 +1284,6 @@ div.jGrowl div.jGrowl-notification { text-align: center; } -#contact-slider { - position: relative; - left: 5%; - width: 90%; -} - a.rconnect, a.rateme, div.rateme { color: $nav_active_icon_colour; text-decoration: none; @@ -1587,8 +1591,8 @@ img.mail-list-sender-photo { } .jothidden > input { - border: 1px solid $bgcolour; - background-color: $bgcolour; + border: 1px solid transparent; + background-color: transparent; } .jothidden > input:hover, .jothidden > input:focus { @@ -1922,7 +1926,7 @@ nav .dropdown-menu { .section-content-wrapper .section-content-warning-wrapper, .section-content-tools-wrapper .section-content-danger-wrapper, .section-content-wrapper .section-content-danger-wrapper { - margin-bottom: 0px; + margin-bottom: 10px; border-radius: $radiuspx; } @@ -1932,12 +1936,14 @@ nav .dropdown-menu { background-color: $comment_item_colour; border-bottom-left-radius: $radiuspx; border-bottom-right-radius: $radiuspx; + word-wrap: break-word; } .section-content-wrapper-np { background-color: $comment_item_colour; border-bottom-left-radius: $radiuspx; border-bottom-right-radius: $radiuspx; + word-wrap: break-word; } [id^="cloud-index-"]:hover td, @@ -1953,6 +1959,10 @@ nav .dropdown-menu { background-color: $item_colour; } +#perms-tool-table .highlight:hover { + background-color: $item_colour; +} + nav ul li .undefined, nav ul li .notify-seen, nav ul li .notify-unseen @@ -2107,6 +2117,7 @@ nav .badge.mail-update:hover { } @media screen and (max-width: 767px) { + aside#region_1 { background: rgba(0, 0, 0, .1); border-right: 1px solid $nav_bd; @@ -2285,4 +2296,3 @@ nav .badge.mail-update:hover { .channels_ckbx, .pending_ckbx, .users_ckbx { margin-top: -5px !important; } - diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 68190778c..302efc365 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -7,7 +7,7 @@ $(document).ready(function() { if( $('#css3-calc').width() == 10) { $(window).resize(function() { if($(window).width() < 767) { - $('main').css('width', $(window).width() + 231 ); + $('main').css('width', $(window).width() + 285 ); } else { $('main').css('width', '100%' ); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6e68d38d5..96dba59e5 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - $aside_width = 231; + $aside_width = 285; // left aside and right aside are is 231px + converse width if($converse_center) { diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css index 8d945a83e..ea983ffc8 100644 --- a/view/theme/redbasic/schema/focus.css +++ b/view/theme/redbasic/schema/focus.css @@ -16,12 +16,7 @@ background-color: #fff; } -#redbasic_converse_center_container { - display: none; -} - .wall-item-conv { - margin-bottom: 10px; - margin-top: 10px; - margin-left: 10px; + padding-top: 10px; + padding-left: 10px; } diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php index 2a6900271..1f1963764 100644 --- a/view/theme/redbasic/schema/focus.php +++ b/view/theme/redbasic/schema/focus.php @@ -46,7 +46,7 @@ if (! $radius) if (! $shadow) $shadow = "0"; if (! $converse_width) - $converse_width = "640"; + $converse_width = "790"; if(! $top_photo) $top_photo = '48px'; if(! $comment_indent) @@ -61,5 +61,3 @@ else { $nav_float_min_opacity = (float) $nav_min_opacity; $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; } - -$converse_center = "1"; diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index d118cbb9c..93f52be8d 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -1,140 +1,214 @@ -<div class="generic-content-wrapper-styled"> -<h2>{{$header}}</h2> - -<h3>{{$addr}}</h3> - -{{if $notself}} -<div id="connection-flag-tabs"> -{{$tabs}} -</div> -<div id="connection-edit-buttons"> -{{foreach $buttons as $b }} -<button class="btn btn-sm btn-default" title="{{$b.title}}" onclick="window.location.href='{{$b.url}}'; return false;">{{$b.label}}</button> -{{/foreach}} -{{/if}} - - -<div id="contact-edit-wrapper"> -<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" > - -<div class="abook-permsnew" style="display: none;"> -<div class="abook-perms-msg">{{$perms_step1}}</div> -</div> - -<div class="abook-permsmsg" style="display: none;"> -<div class="abook-perms-msg">{{$perms_new}}</div> -</div> - - -<div class="abook-permssave" style="display: none;"> -<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> -</div> - -{{if $last_update}} -{{$lastupdtext}} {{$last_update}} -{{/if}} - - -{{if $is_pending}} -<div class="abook-pending-contact"> -{{include file="field_checkbox.tpl" field=$unapproved}} -</div> -{{/if}} - - -{{if $notself}} -{{if $slide}} -<h3>{{$lbl_slider}}</h3> - -{{$slide}} - -{{/if}} - -{{if $connfilter}} - {{include file="field_textarea.tpl" field=$incl}} - {{include file="field_textarea.tpl" field=$excl}} -{{else}} - <input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" /> - <input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" /> -{{/if}} - -{{if $rating}} -<h3>{{$lbl_rating}}</h3> - -{{$rating}} - - -{{/if}} - - - -{{/if}} - - -{{if $self}} -<div class="abook-autotext"> -<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div> -{{include file="field_checkbox.tpl" field=$autoperms}} -</div> -{{/if}} - -<input type="hidden" name="contact_id" value="{{$contact_id}}"> -<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> -<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" /> - - -{{if $rating}} -{{if $notself}} - {{include file="field_textarea.tpl" field=$rating_text}} -{{/if}} -{{/if}} - -{{if $notself}} -{{if $multiprofs }} -<div> -<h3>{{$lbl_vis1}}</h3> -<div>{{$lbl_vis2}}</div> - -{{$profile_select}} -</div> -{{/if}} -{{/if}} - -<h3>{{$permlbl}}</h3> - -{{if $notself}} -<div id="connedit-perms-wrap" class="fakelink" onclick="openClose('connedit-perms');">{{$clickme}}</div> -<div id="connedit-perms" style="display: none;" > -{{/if}} - -<div id="perm-desc" class="descriptive-text">{{$permnote}}</div> -<table> -<tr><td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td><td></td></tr> -<tr><td colspan="5"><hr /></td></tr> -{{foreach $perms as $prm}} -{{include file="field_acheckbox.tpl" field=$prm}} -{{/foreach}} -<tr><td colspan="5"><hr /></td></tr> -</table> - -</div> - -{{if $notself}} -</div> -{{/if}} - -<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> - -{{if $self && $noperms}} -<script> - if(typeof(connectDefaultShare) !== 'undefined') - connectDefaultShare(); - else - connectFullShare(); - abook_perms_msg(); -</script> -{{/if}} - -</form> -</div> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $notself}} + <div class="dropdown pull-right"> + <button id="connection-dropdown" class="btn btn-default btn-xs" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <i class="icon-caret-down"></i> + </button> + <ul class="dropdown-menu" aria-labelledby="dLabel"> + <li><a href="{{$buttons.view.url}}" title="{{$buttons.view.title}}">{{$buttons.view.label}}</a></li> + <li><a href="{{$buttons.recent.url}}" title="{{$buttons.recent.title}}">{{$buttons.recent.label}}</a></li> + <li class="divider"></li> + <li><a href="#" title="{{$buttons.refresh.title}}" onclick="window.location.href='{{$buttons.refresh.url}}'; return false;">{{$buttons.refresh.label}}</a></li> + <li><a href="#" title="{{$buttons.block.title}}" onclick="window.location.href='{{$buttons.block.url}}'; return false;">{{$buttons.block.label}}</a></li> + <li><a href="#" title="{{$buttons.ignore.title}}" onclick="window.location.href='{{$buttons.ignore.url}}'; return false;">{{$buttons.ignore.label}}</a></li> + <li><a href="#" title="{{$buttons.archive.title}}" onclick="window.location.href='{{$buttons.archive.url}}'; return false;">{{$buttons.archive.label}}</a></li> + <li><a href="#" title="{{$buttons.hide.title}}" onclick="window.location.href='{{$buttons.hide.url}}'; return false;">{{$buttons.hide.label}}</a></li> + <li><a href="#" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</a></li> + </ul> + </div> + {{/if}} + <h2>{{$header}}</h2> + </div> + <div class="section-content-wrapper-np"> + {{if $notself}} + <div class="section-content-info-wrapper"> + <div> + {{$addr_text}} <strong>'{{$addr}}'</strong> + </div> + {{if $last_update}} + <div> + {{$lastupdtext}} {{$last_update}} + </div> + {{/if}} + </div> + {{/if}} + + <form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" > + + <input type="hidden" name="contact_id" value="{{$contact_id}}"> + + <div class="panel-group" id="contact-edit-tools" role="tablist" aria-multiselectable="true"> + {{if $notself}} + + {{if $is_pending}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="pending-tool"> + <h3> + <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse"> + {{$pending_label}} + </a> + </h3> + </div> + <div id="pending-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="pending-tool"> + <div class="section-content-tools-wrapper"> + {{include file="field_checkbox.tpl" field=$unapproved}} + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + <div class="modal" id="abook-pending-modal" tabindex="-1" role="dialog"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> + <h4 class="modal-title" id="myModalLabel">{{$pending_modal_title}}</h4> + </div> + <div class="modal-body"> + <strong>{{$name}}</strong> {{$pending_modal_body}} + </div> + <div class="modal-footer"> + <button class="btn btn-sm btn-danger pull-left" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</button> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$pending_modal_dismiss}}</button> + <button type="submit" class="btn btn-primary" name="pending" value="1">{{$pending_modal_approve}}</button> + </div> + </div> + </div> + </div> + <script>$('#abook-pending-modal').modal('show');</script> + {{/if}} + + {{if $affinity }} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="affinity-tool"> + <h3> + <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse"> + {{$affinity }} + </a> + </h3> + </div> + <div id="affinity-tool-collapse" class="panel-collapse collapse{{if !$is_pending}} in{{/if}}" role="tabpanel" aria-labelledby="affinity-tool"> + <div class="section-content-tools-wrapper"> + {{if $slide}} + <div class="form-group"><strong>{{$lbl_slider}}</strong></div> + {{$slide}} + <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> + {{/if}} + + {{if $multiprofs }} + <div class="form-group"> + <strong>{{$lbl_vis2}}</strong> + {{$profile_select}} + </div> + {{/if}} + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{/if}} + + {{if $connfilter}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="fitert-tool"> + <h3> + <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse"> + {{$connfilter_label}} + </a> + </h3> + </div> + <div id="fitert-tool-collapse" class="panel-collapse collapse{{if !$is_pending && !($slide || $multiprofs)}} in{{/if}}" role="tabpanel" aria-labelledby="fitert-tool"> + <div class="section-content-tools-wrapper"> + {{include file="field_textarea.tpl" field=$incl}} + {{include file="field_textarea.tpl" field=$excl}} + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{else}} + <input type="hidden" name="{{$incl.0}}" value="{{$incl.2}}" /> + <input type="hidden" name="{{$excl.0}}" value="{{$excl.2}}" /> + {{/if}} + + {{if $rating}} + <div class="panel"> + <div class="section-subtitle-wrapper" role="tab" id="rating-tool"> + <h3> + <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse"> + {{$lbl_rating}} + </a> + </h3> + </div> + <div id="rating-tool-collapse" class="panel-collapse collapse{{if !$is_pending && !($slide || $multiprofs) && !$connfilter}} in{{/if}}" role="tabpanel" aria-labelledby="rating-tool"> + <div class="section-content-tools-wrapper"> + <div class="section-content-warning-wrapper"> + {{$rating_info}} + </div> + <div class="form-group"><strong>{{$lbl_rating_label}}</strong></div> + {{$rating}} + {{include file="field_textarea.tpl" field=$rating_text}} + <input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" /> + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + {{/if}} + + {{/if}} + + <div class="panel"> + {{if $notself}} + <div class="section-subtitle-wrapper" role="tab" id="perms-tool"> + <h3> + <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> + {{$permlbl}} + </a> + </h3> + </div> + {{/if}} + <div id="perms-tool-collapse" class="panel-collapse collapse{{if $self}} in{{/if}}" role="tabpanel" aria-labelledby="perms-tool"> + <div class="section-content-tools-wrapper"> + <div class="section-content-warning-wrapper"> + {{if $notself}}{{$permnote}}{{/if}} + {{if $self}}{{$permnote_self}}{{/if}} + </div> + + <table id="perms-tool-table" class=form-group> + <tr> + <td></td> + {{if $notself}} + <td class="abook-them">{{$them}}</td> + {{/if}} + <td colspan="2" class="abook-me">{{$me}}</td> + </tr> + {{foreach $perms as $prm}} + {{include file="field_acheckbox.tpl" field=$prm}} + {{/foreach}} + </table> + + {{if $self}} + <div> + <div class="section-content-info-wrapper"> + {{$autolbl}} + </div> + {{include file="field_checkbox.tpl" field=$autoperms}} + </div> + {{/if}} + + <div class="settings-submit-wrapper" > + <button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button> + </div> + </div> + </div> + </div> + </div> + </form> + </div> </div> diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl index 5c15e1c2c..550abc147 100755 --- a/view/tpl/contact_slider.tpl +++ b/view/tpl/contact_slider.tpl @@ -1,4 +1,20 @@ -<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> +<div id="contact-slider" class="slider form-group"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> <script> - $("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); +$(document).ready(function() { + // The slider does not render correct if width is given in % and + // the slider container is hidden (display: none) during rendering. + // So let's unhide it to render and hide again afterwards. + if(!$("#affinity-tool-collapse").hasClass("in")) { + $("#affinity-tool-collapse").addClass("in"); + makeContactSlider(); + $("#affinity-tool-collapse").removeClass("in"); + } + else { + makeContactSlider(); + } +}); + +function makeContactSlider() { + $("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'98%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); +} </script> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 27632d770..30a007bd6 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -165,8 +165,7 @@ </div> <div class="clear"></div> </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> {{if $item.toplevel}} {{foreach $item.children as $child}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index cb2fb8959..5487d5937 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -179,8 +179,7 @@ </div> <div class="clear"></div> </div> - <div class="wall-item-wrapper-end"></div> - <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> {{if $item.comment_lastcollapsed}} diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl index da5b1e859..4794c0b83 100755 --- a/view/tpl/cropbody.tpl +++ b/view/tpl/cropbody.tpl @@ -25,8 +25,8 @@ 'croppa', { previewWrap: 'previewWrap', - minWidth: 175, - minHeight: 175, + minWidth: 300, + minHeight: 300, maxWidth: 640, maxHeight: 640, ratioDim: { x: 100, y:100 }, diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index 5cefe2f28..9346a7455 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -5,11 +5,4 @@ {{include file="field_checkbox.tpl" field=$globaldir}} {{include file="field_checkbox.tpl" field=$pubforums}} -{{$sort}}: <select onchange='window.location.href="{{$sorturl}}&order="+this.value'> -<option value='normal' {{if $selected_sort == 'normal'}}selected='selected'{{/if}}>{{$normal}}</option> -<option value='reverse' {{if $selected_sort == 'reverse'}}selected='selected'{{/if}}>{{$reverse}}</option> -<option value='date' {{if $selected_sort == 'date'}}selected='selected'{{/if}}>{{$date}}</option> -<option value='reversedate' {{if $selected_sort == 'reversedate'}}selected='selected'{{/if}}>{{$reversedate}}</option> -</select><br /> - </div> diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 26739efc3..79598fc9a 100755 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,6 +1,18 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> + <div class="btn-group pull-right"> + <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> + <i class="icon-sort"></i> + </button> + <ul class="dropdown-menu"> + <li><a href="directory?f=&order=date{{$suggest}}">{{$date}}</a></li> + <li><a href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a></li> + <li><a href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a></li> + <li><a href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a></li> + </ul> + </div> <h2>{{$dirlbl}}{{if $search}}: {{$safetxt}}{{/if}}</h2> + <div class="clear"></div> </div> {{foreach $entries as $entry}} {{include file="direntry.tpl"}} diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index 20e597909..3be40e978 100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -1,12 +1,14 @@ -<div class="section-title-wrapper"> - {{if $delete}} - <div class="pull-right"> - <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $delete}} + <div class="pull-right"> + <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a> + </div> + {{/if}} + <h2>{{$title}}</h2> + <div class="clear"></div> + </div> + <div id="webpage-editor" class="section-content-tools-wrapper"> + {{$editor}} </div> - {{/if}} - <h2>{{$title}}</h2> - <div class="clear"></div> -</div> -<div id="webpage-editor" class="section-content-tools-wrapper"> - {{$editor}} </div> diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 816af2a65..f96fd5fd6 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,17 +1,17 @@ -<tr> +<tr class="highlight"> <td> - <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> + <label class="mainlabel" for='me_id_{{$field.0}}'>{{$field.1}}</label><br> + <span class='field_abook_help'>{{$field.6}}</span> </td> + {{if $notself}} <td class="abook-them"> <input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> </td> + {{/if}} <td class="abook-me"> - <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> - </td> - <td> - {{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}} + <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}}{{if $notself && $field.5}} disabled="disabled"{{/if}}/> </td> <td> - <span class='field_abook_help'>{{$field.6}}</span> + {{if $field.5}}<span class="permission-inherited">{{$inherited}}{{if $self}}{{if $field.7}} <i class="icon-check"></i>{{else}} <i class="icon-check-empty"></i>{{/if}}{{/if}}</span>{{/if}} </td> -</tr>
\ No newline at end of file +</tr> diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 7fc17471c..5c8734ef7 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,8 +1,9 @@ {{if $header}} +<div class="generic-content-wrapper"> <div class="section-title-wrapper"> - {{if $menu_id}} + {{if $menu_edit_link}} <div class="pull-right"> - <a href="mitem/{{$menu_id}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="icon-edit"></i> {{$editcontents}}</a> + <a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="icon-edit"></i> {{$editcontents}}</a> </div> {{/if}} <h2>{{$header}}</h2> @@ -27,3 +28,6 @@ <div class="clear"></div> </form> </div> +{{if $header}} +</div> +{{/if}} diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index cdc022c5c..f9dc4e2cc 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -1,37 +1,42 @@ {{if $header}} -<div class="section-title-wrapper"> - <h2>{{$header}}</h2> -</div> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$header}}</h2> + </div> {{/if}} -<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> - <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" > - <input type="hidden" name="menu_id" value="{{$menu_id}}" /> - {{if $mitem_id}} - <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> - {{/if}} - {{include file="field_input.tpl" field=$mitem_desc}} - {{include file="field_input.tpl" field=$mitem_link}} - {{if $menu_names}} - <datalist id="menu-names"> - {{foreach $menu_names as $menu_name}} - <option value="{{$menu_name}}"> - {{/foreach}} - </datalist> - {{/if}} - {{include file="field_input.tpl" field=$mitem_order}} - {{include file="field_checkbox.tpl" field=$usezid}} - {{include file="field_checkbox.tpl" field=$newwin}} - <div class="pull-right form-group"> - <div class="btn-group"> - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> - </button> - {{if $submit_more}} - <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}} <i class="icon-caret-right"></i></button> - {{/if}} - <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + <div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> + <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" > + <input type="hidden" name="menu_id" value="{{$menu_id}}" /> + {{if $mitem_id}} + <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> + {{/if}} + {{include file="field_input.tpl" field=$mitem_desc}} + {{include file="field_input.tpl" field=$mitem_link}} + {{if $menu_names}} + <datalist id="menu-names"> + {{foreach $menu_names as $menu_name}} + <option value="{{$menu_name}}"> + {{/foreach}} + </datalist> + {{/if}} + {{include file="field_input.tpl" field=$mitem_order}} + {{include file="field_checkbox.tpl" field=$usezid}} + {{include file="field_checkbox.tpl" field=$newwin}} + <div class="pull-right form-group"> + <div class="btn-group"> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> + {{if $submit_more}} + <button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}} <i class="icon-caret-right"></i></button> + {{/if}} + <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + </div> + {{$aclselect}} </div> - {{$aclselect}} - </div> - </form> + <div class="clear"></div> + </form> + </div> +{{if $header}} </div> +{{/if}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 4e606654f..8686d4204 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -1,35 +1,34 @@ -<div class="section-title-wrapper"> - <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> + </div> + <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2> + <div class="clear"></div> </div> - <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2> - <div class="clear"></div> -</div> -{{$create}} + {{$create}} -{{if $mlist }} -<div id="mitemlist-content-wrapper" class="section-content-wrapper-np"> - <table id="mitem-list-table"> - <tr> - <th width="1%">{{$nametitle}}</th> - <th width="96%">{{$targettitle}}</th> - <th width="1%"></th> - <th width="1%"></th> - <th width="1%"></th> - </tr> - {{foreach $mlist as $m }} - <tr id="mitem-list-item-{{$m.mitem_id}}"> - <td width="1%">{{$m.mitem_desc}}</td> - <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> - <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> - <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> - <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> - </tr> - {{/foreach}} - </table> + {{if $mlist }} + <div id="mitemlist-content-wrapper" class="section-content-wrapper-np"> + <table id="mitem-list-table"> + <tr> + <th width="1%">{{$nametitle}}</th> + <th width="96%">{{$targettitle}}</th> + <th width="1%"></th> + <th width="1%"></th> + <th width="1%"></th> + </tr> + {{foreach $mlist as $m }} + <tr id="mitem-list-item-{{$m.mitem_id}}"> + <td width="1%">{{$m.mitem_desc}}</td> + <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> + <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="icon-lock dropdown-toggle lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> + <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> + <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> + </tr> + {{/foreach}} + </table> + </div> + {{/if}} </div> -{{/if}} - - - diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index 5328648b9..a320920c7 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -1,9 +1,14 @@ <div class="page"> - -<div class="generic-content-wrapper" id="page-content-wrapper" > - {{if $title}}<h2 class="page-title">{{$title}}</h2>{{/if}} - <div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> - <div class="page-date">{{$date}}</div> - <div class="page-body">{{$body}}</div> -</div> + <div class="generic-content-wrapper" id="page-content-wrapper" > + {{if $title}} + <div class="section-title-wrapper"> + <h2 class="page-title">{{$title}}</h2> + </div> + {{/if}} + <div class="section-content-wrapper"> + <div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> + <div class="page-date">{{$date}}</div> + <div class="page-body">{{$body}}</div> + </div> + </div> </div> diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index 16f9a76c2..2ea7aa9f3 100755 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -21,7 +21,7 @@ {{$comment}} - <div class="wall-item-outside-wrapper-end{{$indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 2964d9c4b..9eac48c6d 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,5 +1,5 @@ <div class="vcard"> - + <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> {{if $profile.edit}} <div class="dropdown"> <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> @@ -18,7 +18,6 @@ <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> {{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} - <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> diff --git a/view/tpl/rating_slider.tpl b/view/tpl/rating_slider.tpl index 4702fc65b..4c36504e6 100644 --- a/view/tpl/rating_slider.tpl +++ b/view/tpl/rating_slider.tpl @@ -1,4 +1,19 @@ -<div id="rating-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div> +<div id="rating-slider" class="slider form-group"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div> <script> - $("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'100%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); } }); +$(document).ready(function() { + // The slider does not render correct if width is given in % and + // the slider container is hidden (display: none) during rendering. + // So let's unhide it to render and hide again afterwards. + if(!$("#rating-tool-collapse").hasClass("in")) { + $("#rating-tool-collapse").addClass("in"); + makeRatingSlider(); + $("#rating-tool-collapse").removeClass("in"); + } + else { + makeRatingSlider(); + } +}); +function makeRatingSlider() { + $("#rating-range").jRange({ from: -10, to: 10, step: 1, width:'98%', showLabels: false, showScale: true, scale : [ '-10','-8','-6','-4','-2','0','2','4','6','8','10' ], onstatechange: function(v) { $("#contact-rating-mirror").val(v); } }); +} </script> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index dee33f1b3..256443b84 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -57,7 +57,7 @@ <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a> </div> {{/if}} - <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> + <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div> </div> </div> diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index ca0fe76be..2acbb24e4 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -1,6 +1,6 @@ <div class="vcard"> -<div class="fn">{{$name}}</div> <div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div> +<div class="fn">{{$name}}</div> </div> |