diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 43 | ||||
| -rw-r--r-- | view/tpl/chat.tpl | 43 | ||||
| -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 | 6 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 5 | ||||
| -rwxr-xr-x | view/tpl/siteinfo.tpl | 1 |
8 files changed, 79 insertions, 38 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 590213fd3..274d0d5de 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -30,19 +30,10 @@ {{/if}} - -<h3>{{$permlbl}}</h3> -<div id="perm-desc" class="descriptive-text">{{$permnote}}</div> - <form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" > <input type="hidden" name="contact_id" value="{{$contact_id}}"> <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> -{{if $noperms}} -<div id="noperm-msg" class="warning-text">{{$noperms}}</div> -<div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div> -{{/if}} - {{if $is_pending}} <div class="abook-pending-contact"> @@ -50,8 +41,29 @@ </div> {{/if}} +{{if $multiprofs }} +<div> +<h3>{{$lbl_vis1}}</h3> +<div>{{$lbl_vis2}}</div> + +{{$profile_select}} +</div> +{{/if}} + +<h3>{{$permlbl}}</h3> +<div id="perm-desc" class="descriptive-text">{{$permnote}}</div> + + +{{* {{if $noperms}} +<div id="noperm-msg" class="warning-text">{{$noperms}}</div> +<div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div> +{{/if}} +*}} + + + <br /> -<b>{{$quick}}</b> +<h3>{{$quick}}</h3> <ul> {{if $self}} <li><span class="fakelink" onclick="connectForum(); // $('#abook-edit-form').submit();">{{$forum}}</span></li> @@ -62,6 +74,9 @@ <li><span class="fakelink" onclick="connectFollowOnly(); // $('#abook-edit-form').submit();">{{$follow}}</span></li> </ul> +<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> + + <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div> <div id="abook-advanced-panel" style="display: block;"> @@ -76,14 +91,6 @@ </div> -{{if $multiprofs }} -<div> -<h3>{{$lbl_vis1}}</h3> -<div>{{$lbl_vis2}}</div> - -{{$profile_select}} -</div> -{{/if}} <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 19b3425da..e4cd1d20b 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,13 +1,14 @@ -<div id="chatContainer" style="height: 100%; width: 100%;"> +<h1>{{$room_name}}</h1> +<div id="chatContainer""> - <div id="chatTopBar" style="float: left; height: 400px; width: 650px; overflow-y: auto;"> + <div id="chatTopBar"> <div id="chatLineHolder"></div> </div> - <div id="chatUsers" style="float: right; width: 120px; height: 100%; border: 1px solid #000;" ></div> + <div id="chatUsers"></div> <div class="clear"></div> - <div id="chatBottomBar" style="position: relative; bottom: 0; height: 150px; margin-top: 20px;"> + <div id="chatBottomBar"> <div class="tip"></div> <form id="chat-form" method="post" action="#"> @@ -16,14 +17,11 @@ <input type="submit" name="submit" value="{{$submit}}" /> </form> + <a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a> + </div> </div> -<style> -section { - padding-bottom: 0; -} -</style> <script> var room_id = {{$room_id}}; @@ -49,8 +47,8 @@ $('#chat-form').submit(function(ev) { function load_chats() { - $.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat,function(data) { - if(data.success) { + $.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) { + if(data.success && (! stopped)) { update_inroom(data.inroom); update_chats(data.chats); } @@ -65,7 +63,7 @@ function update_inroom(inroom) { var count = inroom.length; $.each( inroom, function(index, item) { var newNode = document.createElement('div'); - $(newNode).html('<img style="height: 32px; width: 32px;" src="' + item.img + '" alt="' + item.name + '" />'); + $(newNode).html('<img style="height: 32px; width: 32px;" src="' + item.img + '" alt="' + item.name + '" /> ' + item.status + '<br />' + item.name + '<br/>'); html.appendChild(newNode); }); $('#chatUsers').html(html); @@ -77,8 +75,10 @@ function update_chats(chats) { $.each( chats, function(index, item) { last_chat = item.id; var newNode = document.createElement('div'); - $(newNode).html('<div style="margin-bottom: 5px; clear: both;"><img style="height: 32px; width: 32px; float: left;" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body; style="float: left; width: 80%;">' + item.text + '</div></div>'); + $(newNode).html('<div style="margin-bottom: 5px; clear: both;"><img style="height: 32px; width: 32px; float: left;" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body" style="float: left; width: 80%; margin-left: 15px; font-size: 14px;">' + item.name + ' <span class="autotime" title="' + item.isotime + '">' + item.localtime + '</span><br />' + item.text + '</div></div>'); $('#chatLineHolder').append(newNode); + $(".autotime").timeago(); + }); var elem = document.getElementById('chatTopBar'); elem.scrollTop = elem.scrollHeight; @@ -86,3 +86,20 @@ function update_chats(chats) { } </script> +<script> +function isMobile() { + try{ document.createEvent("TouchEvent"); return true; } + catch(e){ return false; } +} +$(function(){ + + $('#chatText').keypress(function(e){ + if (e.keyCode == 13 && e.shiftKey||isMobile()) { + } + else if (e.keyCode == 13) { + e.preventDefault(); + $(this).parent('form').trigger('submit'); + } + }); +}); +</script> 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 ea9e775e2..1ccfb3d68 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -10,10 +10,14 @@ {{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}} - +{{include file="field_checkbox.tpl" field=$menu_bookmark}} <div class="menuedit-submit-wrapper" > <input type="submit" name="submit" class="menuedit-submit" value="{{$submit}}" /> </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 93e9abfa5..8c19d39d7 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -14,10 +14,12 @@ <div id="photo-photo-end"></div> <div id="photo-caption">{{$desc}}</div> {{if $tags}} -<div id="in-this-photo-text">{{$tags.0}}</div> -<div id="in-this-photo">{{$tags.1}}</div> +<div id="in-this-photo-text">{{$tag_hdr}}</div> +{{foreach $tags as $t}} +<div id="in-this-photo">{{$t.0}}</div> +{{if $edit}}<div id="tag-remove"><a href="{{$t.1}}">{{$t.2}}</a></div>{{/if}} +{{/foreach}} {{/if}} -{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}} {{if $edit}} <div id="photo-edit-edit-wrapper" class="fakelink" onclick="openClose('photo-edit-edit');">{{$edit.edit}}</div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index b1a4f956d..c4b89a543 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -25,15 +25,16 @@ {{include file="field_checkbox.tpl" field=$hide_presence}} -<div id="settings-privacy-macros">{{$lbl_pmacro}}</div> +<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3> <ul> -<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> <li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li> <li><a href="#" onclick="channel_privacy_macro(1); return false" id="settings_pmacro1">{{$pmacro1}}</a></li> +<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> <li><a href="#" onclick="channel_privacy_macro(0); return false" id="settings_pmacro0">{{$pmacro0}}</a></li> </ul> +<h3 id="settings-perm-advanced">{{$lbl_p2macro}}</h3> <div id="settings-permissions-wrapper"> {{foreach $permiss_arr as $permit}} diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index 4baa1969b..d956a7228 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -14,3 +14,4 @@ {{if $plugins_list}} <div style="margin-left: 25px; margin-right: 25px;">{{$plugins_list}}</div> {{/if}} +<p>{{$donate}}</p> |