keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2085 from annando/1511-forumlist-fix

Browse source 
This is a quick fix for the the forumlist.
This commit is contained in:
fabrixxm 2015-11-18 09:04:10 +01:00
commit a4f66ea4ca
4 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/forums.php
View file

@ -2,13 +2,13 @@
/** /**
* @file include/forums.php * @file include/forums.php
* @brief Functions related to forum functionality * * @brief Functions related to forum functionality *
*/ */
/** /**
* @brief Function to list all forums a user is connected with * @brief Function to list all forums a user is connected with
* *
* @param int $uid of the profile owner * @param int $uid of the profile owner
* @param boolean $showhidden * @param boolean $showhidden
* Show frorums which are not hidden * Show frorums which are not hidden
@ -16,7 +16,7 @@
* Sort by lastitem * Sort by lastitem
* @param boolean $showprivate * @param boolean $showprivate
* Show private groups * Show private groups
* *
* @returns array * @returns array
* 'url' => forum url * 'url' => forum url
* 'name' => forum name * 'name' => forum name
@ -27,16 +27,17 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false
$forumlist = array(); $forumlist = array();
$order = (($showhidden) ? '' : ' AND `hidden` = 0 '); $order = (($showhidden) ? '' : ' AND NOT `hidden` ');
$order .= (($lastitem) ? ' ORDER BY `last-item` ASC ' : ' ORDER BY `name` ASC '); $order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC ');
$select = '`forum` = 1'; $select = '`forum` ';
if ($showprivate) { if ($showprivate) {
$select = '( `forum` = 1 OR `prv` = 1 )'; $select = '(`forum` OR `prv`)';
} }
$contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` FROM contact $contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` FROM `contact`
WHERE `network`= 'dfrn' AND $select AND `uid` = %d WHERE `network`= 'dfrn' AND $select AND `uid` = %d
AND `blocked` = 0 AND `hidden` = 0 AND `pending` = 0 AND `archive` = 0 AND NOT `blocked` AND NOT `hidden` AND NOT `pending` AND NOT `archive`
AND `success_update` > `failure_update`
$order ", $order ",
intval($uid) intval($uid)
); );

6
view/templates/widget_forumlist.tpl
View file

@ -37,9 +37,9 @@ function showHideForumlist() {
{{/foreach}} {{/foreach}}
{{if $total > $visible_forums }} {{if $total > $visible_forums }}
<ul class="forum-widget-ul"> <div id="forum-widget-showmore" class="forum-widget-entry" role="menuitem">
<li onclick="showHideForumlist(); return false;" id="forum-widget-collapse" class="fakelink tool">{{$showmore}}</li> <a onclick="showHideForumlist(); return false;" id="forum-widget-collapse" class="forum-widget-link">{{$showmore}}</a>
</ul> </div>
{{/if}} {{/if}}
</div> </div>

19
view/theme/vier/style.css
View file

@ -401,7 +401,7 @@ code {
} }
.sidebar-group-li:hover, #sidebar-new-group:hover, #hide-forum-list:hover, .sidebar-group-li:hover, #sidebar-new-group:hover, #hide-forum-list:hover,
#sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forum-list div:hover, #forum-list-right div:hover, #sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forumlist-sidebar div:hover, #forum-list-right div:hover,
.nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover { .nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover {
/* background-color: #ddd; */ /* background-color: #ddd; */
/* background-color: #e5e5e5; */ /* background-color: #e5e5e5; */
@ -420,7 +420,7 @@ code {
font-weight: bold; font-weight: bold;
} }
#sidebar-new-group, #hide-forum-list, #forum-list, #forum-list-right, #sidebar-ungrouped, #forum-widget-showmore, #sidebar-new-group, #hide-forum-list, #forum-list-right, #sidebar-ungrouped,
.side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new { .side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
padding-left: 10px; padding-left: 10px;
padding-top: 3px; padding-top: 3px;
@ -429,6 +429,17 @@ code {
display: block; display: block;
} }
#forumlist-sidebar {
padding-top: 3px;
padding-bottom: 3px;
display: block;
}
.forum-widget-entry {
padding-left: 10px;
padding-right: 5px;
}
a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a, right_aside h4 a { a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a, right_aside h4 a {
display: block; display: block;
color: #737373; color: #737373;
@ -456,11 +467,11 @@ a.sidebar-group-element {
color: black; color: black;
} }
#forum-list a, #forum-list-right a, .tool a, .admin.link a { #forumlist-sidebar a, #forum-list-right a, .tool a, .admin.link a {
color: #737373; color: #737373;
} }
#forum-list, #forum-list-right { #forumlist-sidebar, #forum-list-right {
margin-top: 2px; margin-top: 2px;
} }

3
view/theme/vier/theme.php
View file

@ -33,7 +33,8 @@ function vier_init(&$a) {
$a->page['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n"; $a->page['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n";
} }
#$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n"; // deactivated since it doesn't work with desktop browsers at the moment (To-Do)
//$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen and (max-width: 1000px)"/>'."\n";
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= <<< EOT
<link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' /> <link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' />