aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-04 17:12:13 -0800
committerfriendica <info@friendica.com>2014-02-04 17:12:13 -0800
commitaede006970fb9124161b4732b9f44002a35d17ef (patch)
tree7d39ad22e8b3ac3f87903666fc454cc9c5dfc025 /view
parent3665bc38ef15137c7d36a12aa13a44c4d0304547 (diff)
downloadvolse-hubzilla-aede006970fb9124161b4732b9f44002a35d17ef.tar.gz
volse-hubzilla-aede006970fb9124161b4732b9f44002a35d17ef.tar.bz2
volse-hubzilla-aede006970fb9124161b4732b9f44002a35d17ef.zip
bookmarks - mop up and go home
Diffstat (limited to 'view')
-rw-r--r--view/js/mod_connedit.js2
-rw-r--r--view/js/mod_settings.js2
-rwxr-xr-xview/tpl/conv_item.tpl3
-rwxr-xr-xview/tpl/jot-header.tpl8
4 files changed, 12 insertions, 3 deletions
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 6bb39fb7a..7a33952dc 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -17,7 +17,7 @@ function connectFullShare() {
$('#me_id_perms_chat').attr('checked','checked');
$('#me_id_perms_view_storage').attr('checked','checked');
$('#me_id_perms_republish').attr('checked','checked');
- $('#me_id_perms_bookmark').attr('checked','checked');
+
}
function connectCautiousShare() {
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 7ede7fb73..16101db57 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -66,7 +66,7 @@ function channel_privacy_macro(n) {
$('#id_write_pages option').eq(1).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
$('#id_republish option').eq(0).attr('selected','selected');
- $('#id_bookmark option').eq(0).attr('selected','selected');
+ $('#id_bookmark option').eq(1).attr('selected','selected');
$('#id_profile_in_directory_onoff .off').removeClass('hidden');
$('#id_profile_in_directory_onoff .on').addClass('hidden');
$('#id_profile_in_directory').val(0);
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 50a243ff4..869692bfa 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -85,6 +85,9 @@
{{/if}}
{{if $item.filer}}
<i id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon-folder-open item-tool" title="{{$item.filer}}"></i>
+ {{/if}}
+ {{if $item.bookmark}}
+ <i id="bookmarker-{{$item.id}}" onclick="itemBookmark({{$item.id}}); return false;" class="bookmark-item icon-bookmark item-tool" title="{{$item.bookmark}}"></i>
{{/if}}
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 878e1e7da..80421d552 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -185,7 +185,6 @@ function enableOnUser(){
}
}
-
function jotGetLocation() {
reply = prompt("{{$whereareu}}", $('#jot-location').val());
if(reply && reply.length) {
@@ -295,6 +294,13 @@ function enableOnUser(){
}
+ function itemBookmark(id) {
+ $.get('{{$baseurl}}/bookmarks?f=&item=' + id);
+ if(timer) clearTimeout(timer);
+ timer = setTimeout(NavUpdate,1000);
+ }
+
+
function jotClearLocation() {
$('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide();