diff options
| -rw-r--r-- | include/ItemObject.php | 6 | ||||
| -rw-r--r-- | include/bbcode.php | 2 | ||||
| -rw-r--r-- | include/conversation.php | 3 | ||||
| -rw-r--r-- | mod/channel.php | 1 | ||||
| -rw-r--r-- | mod/dirprofile.php | 3 | ||||
| -rw-r--r-- | mod/display.php | 1 | ||||
| -rw-r--r-- | mod/network.php | 1 | ||||
| -rw-r--r-- | mod/photos.php | 2 | ||||
| -rw-r--r-- | mod/ping.php | 2 | ||||
| -rw-r--r-- | mod/search.php | 1 | ||||
| -rw-r--r-- | view/css/mod_directory.css | 5 | ||||
| -rwxr-xr-x | view/tpl/build_query.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/direntry_large.tpl | 11 |
13 files changed, 35 insertions, 5 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 170f013a1..40f85f5ef 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -10,6 +10,7 @@ require_once('boot.php'); /** * An item */ + class Item extends BaseObject { public $data = array(); private $template = 'conv_item.tpl'; @@ -458,6 +459,11 @@ class Item extends BaseObject { return $this->template; } + + private function set_template($t) { + $this->template = $t; + } + /** * Check if this is a toplevel post */ diff --git a/include/bbcode.php b/include/bbcode.php index 35ce2b918..dfb0b9fb8 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -133,7 +133,7 @@ function bb_parse_crypt($match) { } function bb_qr($match) { - return '<img class="zrl" src="' . z_root() . '/photo/qr?f=&qr=' . urlencode($match[1]) . '" alt="' . t('QR code') . '" />'; + return '<img class="zrl" src="' . z_root() . '/photo/qr?f=&qr=' . urlencode($match[1]) . '" alt="' . t('QR code') . '" title="' . urlencode($match[1]) . '" />'; } diff --git a/include/conversation.php b/include/conversation.php index 99252027d..62db34974 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -782,6 +782,9 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ // $tx1 = dba_timer(); $item_object = new Item($item); $conv->add_thread($item_object); + if($page_mode === 'list') + $item_object->set_template('conv_list.tpl'); + // $tx2 = dba_timer(); // if($mode === 'network') // profiler($tx1,$tx2,'add thread ' . $item['id']); diff --git a/mod/channel.php b/mod/channel.php index 5d7c24206..205a89fa3 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -253,6 +253,7 @@ function channel_content(&$a, $update = 0, $load = false) { '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), '$search' => '', '$order' => '', + '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$file' => '', '$cats' => (($category) ? $category : ''), '$mid' => $mid, diff --git a/mod/dirprofile.php b/mod/dirprofile.php index ba056e864..0cd84b910 100644 --- a/mod/dirprofile.php +++ b/mod/dirprofile.php @@ -70,6 +70,8 @@ function dirprofile_init(&$a) { $profile_link = chanlink_url($rr['url']); $pdesc = (($rr['description']) ? $rr['description'] . '<br />' : ''); + + $qrlink = zid($rr['url']); $connect_link = ((local_user()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); if(in_array($rr['hash'],$contacts)) @@ -145,6 +147,7 @@ function dirprofile_init(&$a) { $entry = replace_macros(get_markup_template('direntry_large.tpl'), array( '$id' => ++$t, '$profile_link' => $profile_link, + '$qrlink' => $qrlink, '$photo' => $rr['photo_l'], '$alttext' => $rr['name'] . ' ' . $rr['address'], '$name' => $rr['name'], diff --git a/mod/display.php b/mod/display.php index 65114272a..b20eb3e4f 100644 --- a/mod/display.php +++ b/mod/display.php @@ -125,6 +125,7 @@ function display_content(&$a, $update = 0, $load = false) { '$nouveau' => '0', '$wall' => '0', '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), + '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$search' => '', '$order' => '', '$file' => '', diff --git a/mod/network.php b/mod/network.php index 7f67f62d0..191fe55ed 100644 --- a/mod/network.php +++ b/mod/network.php @@ -237,6 +237,7 @@ function network_content(&$a, $update = 0, $load = false) { '$spam' => (($spam) ? $spam : '0'), '$nouveau' => (($nouveau) ? $nouveau : '0'), '$wall' => '0', + '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), '$search' => (($search) ? $search : ''), '$order' => $order, diff --git a/mod/photos.php b/mod/photos.php index 4a0fb01b8..51a680828 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -854,6 +854,8 @@ function photos_content(&$a) { '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale'] . '.' .$ext, '$imgalt' => $imgalt_e, '$desc'=> $desc_e, + '$ext' => $ext, + '$hash'=> $rr['resource_id'], )); } diff --git a/mod/ping.php b/mod/ping.php index a0938cb15..dda87dec2 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -209,7 +209,7 @@ function ping_init(&$a) { if($r) { foreach($r as $rr) { $result[] = array( - 'notify_link' => $a->get_baseurl() . '/connections/' . $rr['abook_id'], + 'notify_link' => $a->get_baseurl() . '/connedit/' . $rr['abook_id'], 'name' => $rr['xchan_name'], 'url' => $rr['xchan_url'], 'photo' => $rr['xchan_photo_s'], diff --git a/mod/search.php b/mod/search.php index 32c8ca38e..d13c613c2 100644 --- a/mod/search.php +++ b/mod/search.php @@ -96,6 +96,7 @@ function search_content(&$a,$update = 0, $load = false) { '$spam' => '0', '$nouveau' => '0', '$wall' => '0', + '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), '$search' => (($tag) ? urlencode('#') : '') . $search, '$order' => '', diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css index 578777054..bc8054937 100644 --- a/view/css/mod_directory.css +++ b/view/css/mod_directory.css @@ -37,3 +37,8 @@ div.dirtagblock.widget { overflow: hidden; } + +.dirpopup { + float: left; + width: 225px; +} diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 53a8c0f6b..98a1c7846 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -15,6 +15,7 @@ var bParam_new = {{$nouveau}}; var bParam_page = {{$page}}; var bParam_wall = {{$wall}}; + var bParam_list = {{$list}}; var bParam_search = "{{$search}}"; var bParam_order = "{{$order}}"; @@ -38,6 +39,7 @@ if(bParam_spam != 0) bCmd = bCmd + "&spam=" + bParam_spam; if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new; if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall; + if(bParam_list != 0) bCmd = bCmd + "&list=" + bParam_list; if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search; if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order; if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file; diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl index a1800c994..befd2a27a 100755 --- a/view/tpl/direntry_large.tpl +++ b/view/tpl/direntry_large.tpl @@ -2,11 +2,16 @@ <div class="generic-content-wrapper"> <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > -<div class="contact-photo" id="directory-photo-{{$id}}" > -<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" style="height:175px; width:175px;" src="{{$photo}}" alt="{{$alttext}}" title="{{$alttext}}" /></a> -</div> + <div class="contact-photo dirpopup" id="directory-photo-{{$id}}" > + <a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" style="height:175px; width:175px;" src="{{$photo}}" alt="{{$alttext}}" title="{{$alttext}}" /></a> + </div> + <div class="contact-photo dirpopup" id="directory-qr-{{$id}}" > + <img class="directory-photo-img" style="height:175px; width:175px;" src="photo/qr?f=&qr={{$qrlink}}" alt="QR" title="{{$qrlink}}" /> + </div> </div> +<div class="clear"></div> + <div class="contact-name" id="directory-name-{{$id}}" >{{$name}}</div> {{if $connect}} <div class="directory-connect"><a href="{{$connect}}">{{$conn_label}}</a></div> |