diff options
| author | friendica <info@friendica.com> | 2014-01-08 14:11:39 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-08 14:11:39 -0800 |
| commit | 29db2369811ba35515d285491ce089d937ed8d29 (patch) | |
| tree | 961e460561b94f9a16c7fda4de965ec983649684 | |
| parent | 73102f0c261be1ca54bf454264ea85fa266bfab8 (diff) | |
| download | volse-hubzilla-29db2369811ba35515d285491ce089d937ed8d29.tar.gz volse-hubzilla-29db2369811ba35515d285491ce089d937ed8d29.tar.bz2 volse-hubzilla-29db2369811ba35515d285491ce089d937ed8d29.zip | |
qr enhancements
| -rw-r--r-- | include/bbcode.php | 2 | ||||
| -rw-r--r-- | mod/dirprofile.php | 3 | ||||
| -rw-r--r-- | view/css/mod_directory.css | 5 | ||||
| -rwxr-xr-x | view/tpl/direntry_large.tpl | 11 |
4 files changed, 17 insertions, 4 deletions
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/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/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/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> |