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

fix some directory anomolies

Browse Source
This commit is contained in:
friendica 2014-12-16 18:33:16 -08:00
parent 6c8ff37591
commit 2fcbb9c4b3
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/dir_fns.php
View File

@ -53,6 +53,8 @@ function check_upstream_directory() {
function dir_sort_links() { function dir_sort_links() {
// Build urls without order and pubforums so it's easy to tack on the changed value // 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 // Probably there's an easier way to do this
$current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : 'normal');
$url = 'directory?'; $url = 'directory?';
$tmp = $_REQUEST; $tmp = $_REQUEST;
unset($tmp['order']); unset($tmp['order']);
@ -71,7 +73,7 @@ function dir_sort_links() {
'$pubforums' => t('Public Forums Only'), '$pubforums' => t('Public Forums Only'),
'$pubforumsonly' => x($_REQUEST,'pubforums') ? $_REQUEST['pubforums'] : '', '$pubforumsonly' => x($_REQUEST,'pubforums') ? $_REQUEST['pubforums'] : '',
'$sort' => t('Sort'), '$sort' => t('Sort'),
'$selected_sort' => x($_REQUEST,'order') ? $_REQUEST['order'] : 'normal', '$selected_sort' => $current_order,
'$sorturl' => $sorturl, '$sorturl' => $sorturl,
'$forumsurl' => $forumsurl, '$forumsurl' => $forumsurl,
@ -230,7 +232,7 @@ function update_directory_entry($ud) {
function local_dir_update($uid,$force) { function local_dir_update($uid,$force) {
logger('local_dir_update', LOGGER_DEBUG); logger('local_dir_update: uid: ' . $uid, LOGGER_DEBUG);
$p = q("select channel.channel_hash, channel_address, channel_timezone, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1", $p = q("select channel.channel_hash, channel_address, channel_timezone, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1",
intval($uid) intval($uid)

2
mod/directory.php
View File

@ -130,7 +130,7 @@ function directory_content(&$a) {
if(! is_null($pubforums)) if(! is_null($pubforums))
$query .= '&pubforums=' . intval($pubforums); $query .= '&pubforums=' . intval($pubforums);
$sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : ''); $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : 'normal');
if($sort_order) if($sort_order)
$query .= '&order=' . urlencode($sort_order); $query .= '&order=' . urlencode($sort_order);

2
view/js/main.js
View File

@ -594,7 +594,7 @@ function updateConvItems(mode,data) {
function collapseHeight() { function collapseHeight() {
$(".wall-item-body, .directory-item").each(function() { $(".wall-item-body, .contact-info").each(function() {
if($(this).height() > divmore_height + 10) { if($(this).height() > divmore_height + 10) {
if(! $(this).hasClass('divmore')) { if(! $(this).hasClass('divmore')) {
$(this).divgrow({ initialHeight: divmore_height, moreText: aStr['divgrowmore'], lessText: aStr['divgrowless'], showBrackets: false }); $(this).divgrow({ initialHeight: divmore_height, moreText: aStr['divgrowmore'], lessText: aStr['divgrowless'], showBrackets: false });

2
view/js/mod_directory.js
View File

@ -8,4 +8,4 @@ function dirdetails(hash) {
$(document).ready(function() { $(document).ready(function() {
collapseHeight(); collapseHeight();
} });

2
view/tpl/direntry.tpl
View File

@ -1,4 +1,4 @@
<div class="directory-item lframe divmore" id="directory-item-{{$entry.id}}" > <div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" >
<div class="contact-photo" id="directory-photo-{{$entry.id}}" > <div class="contact-photo" id="directory-photo-{{$entry.id}}" >