aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-23 17:24:25 -0800
committerfriendica <info@friendica.com>2013-12-23 17:24:25 -0800
commitb08d4cc1fe2b8dd45de7546f05cf9a9601aeca03 (patch)
tree6833e203577682e909bccd4ca92dc0b5e652fd9d /view
parent49d2ada4f893e4de17567b40873b31e5a63ec01e (diff)
downloadvolse-hubzilla-b08d4cc1fe2b8dd45de7546f05cf9a9601aeca03.tar.gz
volse-hubzilla-b08d4cc1fe2b8dd45de7546f05cf9a9601aeca03.tar.bz2
volse-hubzilla-b08d4cc1fe2b8dd45de7546f05cf9a9601aeca03.zip
first cut at a directory popup. It's a bit annoying at the moment, so we'll have to make it less so. Also had second thoughts about the project homepage changes made yesterday. Just because a bunch of Reddit trolls can't get social networking out of their brain long enough to explore other technologies or even read the project page doesn't mean we should pander to them and explain how or why we either are or aren't a social network.
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css2
-rw-r--r--view/js/mod_directory.js8
-rwxr-xr-xview/tpl/direntry.tpl2
-rwxr-xr-xview/tpl/direntry_large.tpl16
-rwxr-xr-xview/tpl/jot.tpl2
5 files changed, 28 insertions, 2 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 8125b6278..493ce9cd5 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -55,6 +55,8 @@
#profile-expires,
#profile-expires,
#jot-perms-icon,
+#jot-preview-link,
+#profile-encrypt,
.hover, .focus {
cursor: pointer;
}
diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js
new file mode 100644
index 000000000..96a38a109
--- /dev/null
+++ b/view/js/mod_directory.js
@@ -0,0 +1,8 @@
+function dirdetails(hash) {
+
+ $.get('dirprofile' + '?f=&hash=' + hash, function( data ) {
+ $.colorbox({ html: data });
+ });
+
+}
+
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 35bbbe0fd..ae2291d01 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -7,7 +7,7 @@
</div>
</div>
-<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div>
+<div class="contact-name" id="directory-name-{{$entry.id}}" ><span onmouseover="dirdetails('{{$entry.hash}}');" class="fakelink" >{{$entry.name}}</span></div>
{{if $entry.connect}}
<div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div>
{{/if}}
diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl
new file mode 100755
index 000000000..cf45d8f48
--- /dev/null
+++ b/view/tpl/direntry_large.tpl
@@ -0,0 +1,16 @@
+<div class="directory-item lframe" id="directory-item-{{$id}}" >
+<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" src="{{$photo}}" alt="{{$alttext}}" title="{{$alttext}}" /></a>
+</div>
+</div>
+
+<div class="contact-name" id="directory-name-{{$id}}" >{{$name}}</div>
+{{if $entry.connect}}
+<div class="directory-connect"><a href="{{$connect}}">{{$conn_label}}</a></div>
+{{/if}}
+<div class="contact-details">{{$details}}</div>
+</div>
+</div>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 9038155be..e1e1e3080 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -70,7 +70,7 @@
</div>
{{/if}}
- {{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}}
+ {{if $preview}}<span onclick="preview_post();" id="jot-preview-link"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}}
<div id="profile-jot-perms-end"></div>