aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zotlabs/Module/Common.php31
-rw-r--r--Zotlabs/Module/Item.php2
-rw-r--r--Zotlabs/Module/Ping.php59
-rw-r--r--include/contact_widgets.php8
-rw-r--r--include/nav.php2
-rw-r--r--view/css/bootstrap-red.css4
-rw-r--r--view/js/main.js4
-rw-r--r--view/pdl/mod_channel.pdl5
-rwxr-xr-xview/tpl/common_friends.tpl24
-rwxr-xr-xview/tpl/nav.tpl35
-rwxr-xr-xview/tpl/remote_friends_common.tpl36
-rw-r--r--view/tpl/wiki.tpl68
12 files changed, 177 insertions, 101 deletions
diff --git a/Zotlabs/Module/Common.php b/Zotlabs/Module/Common.php
index 2f3c57267..eebc56d2b 100644
--- a/Zotlabs/Module/Common.php
+++ b/Zotlabs/Module/Common.php
@@ -25,7 +25,7 @@ class Common extends \Zotlabs\Web\Controller {
}
- function get() {
+ function get() {
$o = '';
@@ -34,38 +34,37 @@ class Common extends \Zotlabs\Web\Controller {
$observer_hash = get_observer_hash();
-
if(! perm_is_allowed(\App::$profile['profile_uid'],$observer_hash,'view_contacts')) {
notice( t('Permission denied.') . EOL);
return;
}
- $o .= '<h2>' . t('Common connections') . '</h2>';
-
$t = count_common_friends(\App::$profile['profile_uid'],$observer_hash);
if(! $t) {
notice( t('No connections in common.') . EOL);
- return $o;
+ return;
}
$r = common_friends(\App::$profile['profile_uid'],$observer_hash);
if($r) {
-
- $tpl = get_markup_template('common_friends.tpl');
-
foreach($r as $rr) {
- $o .= replace_macros($tpl,array(
- '$url' => $rr['xchan_url'],
- '$name' => $rr['xchan_name'],
- '$photo' => $rr['xchan_photo_m'],
- '$tags' => ''
- ));
+ $items[] = [
+ 'url' => $rr['xchan_url'],
+ 'name' => $rr['xchan_name'],
+ 'photo' => $rr['xchan_photo_m'],
+ 'tags' => ''
+ ];
}
-
- $o .= cleardiv();
}
+
+ $tpl = get_markup_template('common_friends.tpl');
+
+ $o = replace_macros($tpl, [
+ '$title' => t('View Common Connections'),
+ '$items' => $items
+ ]);
return $o;
}
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 34e818578..9e5dcfaff 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -694,7 +694,7 @@ class Item extends \Zotlabs\Web\Controller {
foreach($t as $t1) {
$post_tags[] = array(
'uid' => $profile_uid,
- 'ttype' => $t1['type'],
+ 'ttype' => $t1['ttype'],
'otype' => TERM_OBJ_POST,
'term' => $t1['term'],
'url' => $t1['url'],
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 1a76f4f7b..3cda6a277 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -340,6 +340,30 @@ class Ping extends \Zotlabs\Web\Controller {
killme();
}
+ if((argc() > 1 && (argv(1) === 'register')) && is_site_admin()) {
+ $result = array();
+
+ $r = q("SELECT account_email, account_created from account where (account_flags & %d) > 0",
+ intval(ACCOUNT_PENDING)
+ );
+ if($r) {
+ foreach($r as $rr) {
+ $result[] = array(
+ 'notify_link' => z_root() . '/admin/accounts',
+ 'name' => $rr['account_email'],
+ 'url' => '',
+ 'photo' => get_default_profile_photo(48),
+ 'when' => relative_date($rr['account_created']),
+ 'hclass' => ('notify-unseen'),
+ 'message' => t('requires approval')
+ );
+ }
+ }
+ logger('ping (register): ' . print_r($result, true), LOGGER_DATA);
+ echo json_encode(array('notify' => $result));
+ killme();
+ }
+
if(argc() > 1 && (argv(1) === 'all_events')) {
$bd_format = t('g A l F d') ; // 8 AM Friday January 18
@@ -377,6 +401,39 @@ class Ping extends \Zotlabs\Web\Controller {
killme();
}
+ if(argc() > 1 && (argv(1) === 'files')) {
+ $result = array();
+
+ $r = q("SELECT item.created, xchan.xchan_name, xchan.xchan_url, xchan.xchan_photo_s FROM item
+ LEFT JOIN xchan on author_xchan = xchan_hash
+ WHERE item.verb = '%s'
+ AND item.obj_type = '%s'
+ AND item.uid = %d
+ AND item.owner_xchan != '%s'
+ AND item.item_unseen = 1",
+ dbesc(ACTIVITY_POST),
+ dbesc(ACTIVITY_OBJ_FILE),
+ intval(local_channel()),
+ dbesc($ob_hash)
+ );
+ if($r) {
+ foreach($r as $rr) {
+ $result[] = array(
+ 'notify_link' => z_root() . '/sharedwithme',
+ 'name' => $rr['xchan_name'],
+ 'url' => $rr['xchan_url'],
+ 'photo' => $rr['xchan_photo_s'],
+ 'when' => relative_date($rr['created']),
+ 'hclass' => ('notify-unseen'),
+ 'message' => t('shared a file with you')
+ );
+ }
+ }
+ logger('ping (files): ' . print_r($result, true), LOGGER_DATA);
+ echo json_encode(array('notify' => $result));
+ killme();
+ }
+
/**
* Normal ping - just the counts, no detail
*/
@@ -406,7 +463,7 @@ class Ping extends \Zotlabs\Web\Controller {
$result['files'] = intval($files[0]['total']);
}
- $t2 = dba_timer();
+ $t3 = dba_timer();
if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) {
$r = q("SELECT id, item_wall FROM item
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index e5bb696f8..a13f87573 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -143,7 +143,7 @@ function cardcategories_widget($baseurl,$selected = '') {
-function common_friends_visitor_widget($profile_uid,$cnt = 10) {
+function common_friends_visitor_widget($profile_uid,$cnt = 25) {
if(local_channel() == $profile_uid)
return;
@@ -161,14 +161,14 @@ function common_friends_visitor_widget($profile_uid,$cnt = 10) {
return;
$r = common_friends($profile_uid,$observer_hash,0,$cnt,true);
-
+
return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
- '$desc' => sprintf( t('Common connections: %d'), $t),
+ '$desc' => t('Common Connections'),
'$base' => z_root(),
'$uid' => $profile_uid,
'$cid' => $observer,
'$linkmore' => (($t > $cnt) ? 'true' : ''),
- '$more' => t('show more'),
+ '$more' => sprintf( t('View all %d common connections'), $t),
'$items' => $r
));
diff --git a/include/nav.php b/include/nav.php
index 01decb2bf..eccb89764 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -180,6 +180,8 @@ EOT;
$nav['intros'] = array('connections/ifpending', t('Connections'), "", t('Connections'),'connections_nav_btn');
+ if(is_site_admin())
+ $nav['registrations'] = array('admin/accounts', t('Registrations'), "", t('Registrations'),'registrations_nav_btn');
$nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications'),'notifications_nav_btn');
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index e0018989d..fb6ea911e 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -7,6 +7,10 @@ nav .badge {
font-size: 0.75rem;
}
+nav .dropdown-menu {
+ min-width: 16rem;
+}
+
@media screen and (min-width: 767px) {
nav .badge {
top: 0px;
diff --git a/view/js/main.js b/view/js/main.js
index 73b2f3616..dc40db360 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -444,7 +444,7 @@ function NavUpdate() {
updateCountsOnly = false;
- if(data.network || data.home || data.intros || data.mail || data.all_events || data.notify || data.files || data.pubs) {
+ if(data.network || data.home || data.intros || data.register || data.mail || data.all_events || data.notify || data.files || data.pubs) {
$('#notifications-btn').css('opacity', 1);
}
else {
@@ -490,7 +490,7 @@ function NavUpdate() {
if(data.notify == 0) { data.notify = ''; $('.notify-update, .notify-button').hide(); } else { $('.notify-update, .notify-button').show(); }
$('.notify-update').html(data.notify);
- if(data.register == 0) { data.register = ''; $('.register-update').removeClass('show'); } else { $('.register-update').addClass('show'); }
+ if(data.register == 0) { data.register = ''; $('.register-update, .register-button').hide(); } else { $('.register-update, .register-button').show(); }
$('.register-update').html(data.register);
if(data.events == 0) { data.events = ''; $('.events-update, .events-button').hide(); } else { $('.events-update, .events-button').show(); }
diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl
index 967dd89b4..45ce31720 100644
--- a/view/pdl/mod_channel.pdl
+++ b/view/pdl/mod_channel.pdl
@@ -3,12 +3,9 @@
[/region]
[region=aside]
[widget=fullprofile][/widget]
+[widget=common_friends][/widget]
[widget=archive][var=wall]1[/var][/widget]
[widget=categories][/widget]
[widget=tagcloud_wall][var=limit]24[/var][/widget]
[/region]
-[region=content]
-[widget=common_friends][/widget]
-$content
-[/region]
diff --git a/view/tpl/common_friends.tpl b/view/tpl/common_friends.tpl
index fa2cf5a13..b99075210 100755
--- a/view/tpl/common_friends.tpl
+++ b/view/tpl/common_friends.tpl
@@ -1,15 +1,17 @@
<div class="generic-content-wrapper">
- <div class="profile-match-photo">
- <a href="{{$url}}">
- <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
- </a>
+ <div class="section-title-wrapper">
+ <h2>{{$title}}</h2>
</div>
- <div class="profile-match-break"></div>
- <div class="profile-match-name">
- <a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
+ <div class="section-content-wrapper clearfix">
+ {{foreach $items as $item}}
+ <div class="float-left mr-4">
+ <a href="{{$item.url}}">
+ <img class="contact-block-img" src="{{$item.photo}}" alt="{{$item.name}}" title="{{$item.name}} [{{$item.url}}]" />
+ </a>
+ <div>
+ {{$item.name}}
+ </div>
+ </div>
+ {{/foreach}}
</div>
- {{if $note}}
- <div class="profile-match-note">{{$note}}</div>
- {{/if}}
- <div class="profile-match-end"></div>
</div>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 72860aebe..82cdc0dd0 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -128,7 +128,7 @@
{{/if}}
{{if $nav.intros}}
<li class="nav-item dropdown intro-button" style="display: none;">
- <a class="nav-link" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu">
+ <a class="nav-link" href="#" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu">
<i class="fa fa-fw fa-users"></i>
<span class="badge badge-pill badge-danger intro-update"></span>
</a>
@@ -138,9 +138,20 @@
</div>
</li>
{{/if}}
+ {{if $nav.registrations}}
+ <li class="nav-item dropdown register-button" style="display: none;">
+ <a class="nav-link" href="#" title="{{$nav.registrations.3}}" id="{{$nav.registrations.4}}" data-toggle="dropdown" rel="#nav-register-menu">
+ <i class="fa fa-fw fa-user-o"></i>
+ <span class="badge badge-pill badge-danger register-update"></span>
+ </a>
+ <div id="nav-register-menu" class="dropdown-menu" rel="register">
+ {{$emptynotifications}}
+ </div>
+ </li>
+ {{/if}}
{{if $nav.notifications}}
<li class="nav-item dropdown notify-button" style="display: none;">
- <a class="nav-link" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu">
+ <a class="nav-link" href="#" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu">
<i class="fa fa-fw fa-exclamation"></i>
<span class="badge badge-pill badge-danger notify-update"></span>
</a>
@@ -151,6 +162,17 @@
</div>
</li>
{{/if}}
+ {{if $nav.files}}
+ <li class="nav-item dropdown files-button" style="display: none;">
+ <a class="nav-link" href="#" title="{{$nav.files.3}}" id="{{$nav.files.4}}" data-toggle="dropdown" rel="#nav-files-menu">
+ <i class="fa fa-fw fa-folder"></i>
+ <span class="badge badge-pill badge-danger files-update"></span>
+ </a>
+ <div id="nav-files-menu" class="dropdown-menu" rel="files">
+ {{$emptynotifications}}
+ </div>
+ </li>
+ {{/if}}
{{if $nav.login && !$userinfo}}
<li class="nav-item d-none d-md-flex">
<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a>
@@ -166,14 +188,7 @@
<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
</li>
{{/if}}
- {{if $nav.files}}
- <li class="nav-item dropdown files-button" style="display: none;">
- <a class="nav-link" href="{{$nav.files.0}}" title="{{$nav.files.3}}" id="{{$nav.files.4}}" rel="#nav-files-menu">
- <i class="fa fa-fw fa-folder"></i>
- <span class="badge badge-pill badge-primary files-update"></span>
- </a>
- </li>
- {{/if}}
+
{{if $nav.pubs}}
<li class="nav-item dropdown pubs-button" style="display: none;">
<a class="nav-link" href="{{$nav.pubs.0}}" title="{{$nav.pubs.3}}" id="{{$nav.pubs.4}}" rel="#nav-pubs-menu">
diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
index 7ec1a2e6b..9e149b574 100755
--- a/view/tpl/remote_friends_common.tpl
+++ b/view/tpl/remote_friends_common.tpl
@@ -1,28 +1,16 @@
<div class="widget">
- <div class="panel">
- <div class="section-subtitle-wrapper" role="tab" id="common-friends-visitor">
- <h3><a data-toggle="collapse" href="#common-friends-collapse">{{$desc}}</a></h3>
- </div>
- <div id="common-friends-collapse" class="collapse" role="tabpanel" aria-labelledby="common-friends-visitor">
- {{if $items}}
- {{foreach $items as $item}}
- <div class="profile-match-wrapper">
- <div class="profile-match-photo">
- <a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}">
- <img src="{{$item.xchan_photo_m}}" width="80" height="80" alt="{{$item.xchan_name}}" title="{{$item.xchan_name}}" />
- </a>
- </div>
- <div class="profile-match-break"></div>
- <div class="profile-match-name">
- <a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}" title="{{$item.xchan_name}}">{{$item.xchan_name}}</a>
- </div>
- <div class="profile-match-end"></div>
- </div>
- {{/foreach}}
- {{/if}}
- <div id="rfic-end" class="clear"></div>
- {{if $linkmore}}<button class="btn btn-default"><a href="{{$base}}/common/{{$uid}}">{{$more}}</a></button>{{/if}}
+ <h3>{{$desc}}</h3>
+ {{if $linkmore}}
+ <a class="allcontact-link" href="{{$base}}/common/{{$uid}}">{{$more}}</a>
+ {{/if}}
+ {{if $items}}
+ <div class="contact-block-content">
+ {{foreach $items as $item}}
+ <div class="contact-block-div">
+ <a class="contact-block-link mpfriend" href="{{$base}}/chanview?f=&url={{$item.xchan_url}}"><img class="contact-block-img mpfriend" src="{{$item.xchan_photo_s}}"alt="{{$item.xchan_name}}" title="{{$item.xchan_name}} [{{$item.xchan_addr}}]" /></a>
</div>
+ {{/foreach}}
</div>
-</div>
+ {{/if}}
+<div>
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 70a13806d..22480be5b 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -1,7 +1,7 @@
-<div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
+<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <span class="wiki-typename">[{{$typename}}]&nbsp;</span>
+ <span class="text-muted wiki-typename">[{{$typename}}]&nbsp;</span>
{{if $showPageControls}}
<div id="page-tools" class="btn-group" style="display: none;">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
@@ -53,18 +53,6 @@
<textarea id="editor">{{$content}}</textarea>
</div>
{{/if}}
- {{if $showPageControls}}
- <div>
- <div id="id_{{$commitMsg.0}}_wrapper" class="field input">
- <div class="input-group">
- <input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
- <div class="input-group-btn">
- <button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
- </div>
- </div>
- </div>
- </div>
- {{/if}}
</div>
<div id="preview-pane" class="tab-pane active">
<div id="wiki-preview">
@@ -74,6 +62,16 @@
<div id="page-history-pane" class="tab-pane">
<div id="page-history-list"></div>
</div>
+ {{if $showPageControls}}
+ <div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none">
+ <div class="input-group">
+ <input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
+ <div class="input-group-btn">
+ <button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
+ </div>
+ </div>
+ </div>
+ {{/if}}
</div>
</div>
</div>
@@ -106,6 +104,7 @@
window.wiki_page_name = '{{$page}}';
window.wiki_page_content = '{{$content|escape:'javascript'}}';
window.wiki_page_commit = '{{$commit}}';
+ window.saved = true;
$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
$("#generic-modal-ok-{{$wikiModalID}}").addClass('btn-danger');
@@ -174,10 +173,16 @@
adjustInlineEditorHeight();
}
}, 500); // Return the focus to the editor allowing immediate text entry
- $('#page-tools').show();
+ $('#page-tools, #id_{{$commitMsg.0}}_wrapper').show();
});
$('#wiki-get-preview').click(function (ev) {
+ if(window.saved) {
+ $('#page-tools, #id_{{$commitMsg.0}}_wrapper').hide();
+ }
+ else {
+ $('#page-tools').hide();
+ }
$.post("wiki/{{$channel_address}}/preview", {
{{if !$mimeType || $mimeType == 'text/markdown'}}
content: editor.getValue(),
@@ -188,30 +193,34 @@
mimetype: '{{$mimeType}}'
},
function (data) {
- if (data.success) {
- $('#wiki-preview').html(data.html);
- {{if !$mimeType || $mimeType == 'text/markdown'}}
- $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
- {{/if}}
- $('#page-tools').hide();
- } else {
- window.console.log('Error previewing page.');
- }
+ if (data.success) {
+ $('#wiki-preview').html(data.html);
+ {{if !$mimeType || $mimeType == 'text/markdown'}}
+ $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
+ {{/if}}
+ } else {
+ window.console.log('Error previewing page.');
+ }
}, 'json');
ev.preventDefault();
});
$('#wiki-get-history').click(function (ev) {
+ if(window.saved) {
+ $('#page-tools, #id_{{$commitMsg.0}}_wrapper').hide();
+ }
+ else {
+ $('#page-tools').hide();
+ }
$.post("wiki/{{$channel_address}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
if (data.success) {
$('#page-history-list').html(data.historyHTML);
- $('#page-tools').hide();
} else {
window.console.log('Error getting page history.');
}
- }, 'json');
- ev.preventDefault();
- });
+ }, 'json');
+ ev.preventDefault();
+ });
function wiki_refresh_page_list() {
if (window.wiki_resource_id === '') {
@@ -254,6 +263,7 @@
},
function (data) {
if (data.success) {
+ window.saved = true;
window.console.log('Page saved successfully.');
window.wiki_page_content = currentContent;
$('#id_commitMsg').val(''); // Clear the commit message box
@@ -446,6 +456,7 @@
{{if !$mimeType || $mimeType == 'text/markdown'}}
$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
window.editor.on("input", function() {
+ window.saved = false;
if(window.editor.getSession().getUndoManager().isClean()) {
$('#save-page').addClass('disabled');
} else {
@@ -454,6 +465,7 @@
});
{{else}}
window.editor.on("input", function() {
+ window.saved = false;
$('#save-page').removeClass('disabled');
});
{{if $mimeType == 'text/bbcode'}}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 11:32:14 +0000