diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-05 13:43:16 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-05 13:43:16 +0100 |
| commit | 9e993bb4fd7e6ff6ba44586479371c163ee6aad8 (patch) | |
| tree | d3754aa1d251308eb6178fe4ab138463ceaaf135 /view/tpl | |
| parent | 4253581733d4c6c7f0dce5c3ea7566c6af4af936 (diff) | |
| parent | 0844110f7b154a0fb5102362fe732c2b091222d7 (diff) | |
| download | volse-hubzilla-9e993bb4fd7e6ff6ba44586479371c163ee6aad8.tar.gz volse-hubzilla-9e993bb4fd7e6ff6ba44586479371c163ee6aad8.tar.bz2 volse-hubzilla-9e993bb4fd7e6ff6ba44586479371c163ee6aad8.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/conv_item.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/menuedit.tpl | 4 |
3 files changed, 14 insertions, 1 deletions
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(); diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 324dbe426..1ccfb3d68 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -10,6 +10,10 @@ {{if $menu_id}} <input type="hidden" name="menu_id" value="{{$menu_id}}" /> {{/if}} +{{if $menu_system}} +<input type="hidden" name="menu_system" value="{{$menu_system}}" /> +{{/if}} + {{include file="field_input.tpl" field=$menu_name}} {{include file="field_input.tpl" field=$menu_desc}} |