Merge remote branch 'upstream/master'
This commit is contained in:
commit
466c65592a
Binary file not shown.
|
@ -1,4 +1,3 @@
|
|||
section {
|
||||
padding-left: 0px;
|
||||
|
||||
}
|
||||
section {padding-left: 0px;}
|
||||
|
||||
iframe {border: none;}
|
14
page/page.css
Normal file
14
page/page.css
Normal file
|
@ -0,0 +1,14 @@
|
|||
|
||||
|
||||
|
||||
#page-settings-label, #page-random-label {
|
||||
float: left;
|
||||
width: 200px;
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
#page-max-pages, #page-random {
|
||||
float: left;
|
||||
}
|
||||
|
||||
|
103
page/page.php
103
page/page.php
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/**
|
||||
* Name: Page
|
||||
* Description: Shows lists of community pages (improved performance over 'pages')
|
||||
* Description: Shows list of subscribed community pages/forums on network sidebar
|
||||
* Version: 1.0
|
||||
* Author: Mike Macgirvin <mike@macgirvin.com>
|
||||
* based on pages plugin by
|
||||
|
@ -10,22 +10,32 @@
|
|||
*/
|
||||
|
||||
function page_install() {
|
||||
register_hook('page_end', 'addon/page/page.php', 'page_page_end');
|
||||
register_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init');
|
||||
register_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings');
|
||||
register_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post');
|
||||
|
||||
}
|
||||
|
||||
function page_uninstall() {
|
||||
unregister_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init');
|
||||
unregister_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings');
|
||||
unregister_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post');
|
||||
|
||||
// remove only - obsolete
|
||||
unregister_hook('page_end', 'addon/page/page.php', 'page_page_end');
|
||||
}
|
||||
|
||||
|
||||
function page_getpage($uid) {
|
||||
function page_getpage($uid,$randomise = false) {
|
||||
|
||||
|
||||
$pagelist = array();
|
||||
|
||||
$order = (($randomise) ? ' order by rand() ' : ' order by name asc ');
|
||||
|
||||
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
|
||||
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
|
||||
order by name asc ",
|
||||
$order ",
|
||||
intval($uid)
|
||||
);
|
||||
|
||||
|
@ -55,7 +65,7 @@ function page_page_end($a,&$b) {
|
|||
$more = false;
|
||||
|
||||
foreach($contacts as $contact) {
|
||||
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label" target="external-link">'.
|
||||
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="external-link">'.
|
||||
$contact["name"]."</a></li>";
|
||||
$total_shown ++;
|
||||
if($total_shown == 6) {
|
||||
|
@ -71,5 +81,88 @@ function page_page_end($a,&$b) {
|
|||
$a->page['aside'] = $page . $a->page['aside'];
|
||||
}
|
||||
|
||||
function page_network_mod_init($a,$b) {
|
||||
|
||||
$page = '<div id="page-sidebar" class="widget">
|
||||
<div class="title tool">
|
||||
<h3>'.t("Forums").'</h3></div>
|
||||
<div id="sidebar-page-list"><ul>';
|
||||
|
||||
$show_total = intval(get_pconfig(local_user(),'page','max_pages'));
|
||||
if($show_total === false)
|
||||
$show_total = 6;
|
||||
$randomise = intval(get_pconfig(local_user(),'page','randomise'));
|
||||
|
||||
$contacts = page_getpage($a->user['uid'],$randomise);
|
||||
|
||||
$total_shown = 0;
|
||||
$more = false;
|
||||
|
||||
foreach($contacts as $contact) {
|
||||
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="external-link">'.
|
||||
$contact["name"]."</a></li>";
|
||||
$total_shown ++;
|
||||
if(($show_total) && ($total_shown == $show_total)) {
|
||||
$more = true;
|
||||
$page .= '</ul><div id="hide-comments-page-widget" class="fakelink" onclick="showHideComments(\'page-widget\');" >' . t('show more')
|
||||
. '</div><div id="collapsed-comments-page-widget" style="display: none;" ><ul>';
|
||||
}
|
||||
}
|
||||
if($more)
|
||||
$page .= '</div>';
|
||||
$page .= "</ul></div></div>";
|
||||
if (sizeof($contacts) > 0)
|
||||
$a->page['aside'] = $page . $a->page['aside'];
|
||||
}
|
||||
|
||||
function page_plugin_settings_post($a,$post) {
|
||||
if(! local_user() || (! x($_POST,'page-settings-submit')))
|
||||
return;
|
||||
|
||||
set_pconfig(local_user(),'page','max_pages',intval($_POST['page_max_pages']));
|
||||
set_pconfig(local_user(),'page','randomise',intval($_POST['page_random']));
|
||||
|
||||
info( t('Page settings updated.') . EOL);
|
||||
}
|
||||
|
||||
|
||||
function page_plugin_settings(&$a,&$s) {
|
||||
|
||||
if(! local_user())
|
||||
return;
|
||||
|
||||
/* Add our stylesheet to the page so we can make our settings look nice */
|
||||
|
||||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/page/page.css' . '" media="all" />' . "\r\n";
|
||||
|
||||
/* Get the current state of our config variable */
|
||||
|
||||
$max_pages = get_pconfig(local_user(),'page','max_pages');
|
||||
if($max_pages === false)
|
||||
$max_pages = 6;
|
||||
|
||||
$randomise = intval(get_pconfig(local_user(),'page','randomise'));
|
||||
$randomise_checked = (($randomise) ? ' checked="checked" ' : '');
|
||||
|
||||
|
||||
/* Add some HTML to the existing form */
|
||||
|
||||
$s .= '<div class="settings-block">';
|
||||
$s .= '<h3>' . t('Page Settings') . '</h3>';
|
||||
$s .= '<div id="page-settings-wrapper">';
|
||||
$s .= '<label id="page-settings-label" for="page-max-pages">' . t('How many forums to display on sidebar without paging') . '</label>';
|
||||
$s .= '<input id="page-max-pages" type="text" name="page_max_pages" value="' . intval($max_pages) . '" ' . '/>';
|
||||
$s .= '<div class="clear"></div>';
|
||||
$s .= '<label id="page-random-label" for="page-random">' . t('Randomise Page/Forum list') . '</label>';
|
||||
$s .= '<input id="page-random" type="checkbox" name="page_random" value="1" ' . $randomise_checked . '/>';
|
||||
$s .= '<div class="clear"></div>';
|
||||
|
||||
$s .= '</div>';
|
||||
|
||||
/* provide a submit button */
|
||||
|
||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="page-settings-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue