harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse Source
This commit is contained in:
redmatrix 2016-02-15 20:33:10 -08:00
commit c5827c8b4f
2 changed files with 36 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/connedit.php
View File

@ -365,6 +365,8 @@ function connedit_content(&$a) {
$my_perms = $x['perms_accept']; $my_perms = $x['perms_accept'];
} }
$yes_no = array(t('No'),t('Yes'));
if($my_perms) { if($my_perms) {
$o .= "<script>function connectDefaultShare() { $o .= "<script>function connectDefaultShare() {
\$('.abook-edit-me').each(function() { \$('.abook-edit-me').each(function() {
@ -690,7 +692,7 @@ function connedit_content(&$a) {
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), '$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'))), '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no),
'$addr' => $contact['xchan_addr'], '$addr' => $contact['xchan_addr'],
'$addr_text' => t('This connection\'s primary address is'), '$addr_text' => t('This connection\'s primary address is'),
'$loc_text' => t('Available locations:'), '$loc_text' => t('Available locations:'),

27
view/js/main.js
View File

@ -1231,21 +1231,8 @@ function zFormError(elm,x) {
$(window).scroll(function () { $(window).scroll(function () {
if(typeof buildCmd == 'function') { if(typeof buildCmd == 'function') {
// This is a content page with items and/or conversations // This is a content page with items and/or conversations
$('#more').hide(); if($(window).scrollTop() + $(window).height() > $(document).height() - 300) {
$('#no-more').hide();
if($(window).scrollTop() + $(window).height() > $(document).height() - 200) {
$('#more').css("top","400");
$('#more').show();
}
if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
// if($(window).scrollTop() > $(document).height() - ($(window).height() * 1.5 )) {
if((pageHasMoreContent) && (! loadingPage)) { if((pageHasMoreContent) && (! loadingPage)) {
$('#more').hide();
$('#no-more').hide();
next_page++; next_page++;
scroll_next = true; scroll_next = true;
loadingPage = true; loadingPage = true;
@ -1255,18 +1242,8 @@ $(window).scroll(function () {
} }
else { else {
// This is some other kind of page - perhaps a directory // This is some other kind of page - perhaps a directory
if($(window).scrollTop() + $(window).height() > $(document).height() - 300) {
if($(window).scrollTop() + $(window).height() > $(document).height() - 200) {
$('#more').css("top","400");
$('#more').show();
}
if($(window).scrollTop() + $(window).height() > $(document).height() - 100) {
// if($(window).scrollTop() > ($(document).height() - $(window).height() * 1.5 )) {
if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) {
$('#more').hide();
$('#no-more').hide();
next_page++; next_page++;
scroll_next = true; scroll_next = true;
loadingPage = true; loadingPage = true;