diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-06 14:56:59 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-06 14:56:59 +0100 |
| commit | a2b311991a90e1c78d30bad5504c18bb2a3c5c2a (patch) | |
| tree | 54b5e5dbc7230442a3e1ec894c4a4c385b2d78c7 /view | |
| parent | 419e3b5024efec40c98e48c3bf213c4e60d39fae (diff) | |
| parent | 7a522be20bd66a0a904dcddf33d53e59aa04a92d (diff) | |
| download | volse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.tar.gz volse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.tar.bz2 volse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.zip | |
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'view')
| -rw-r--r-- | view/tpl/chat.tpl | 15 | ||||
| -rw-r--r-- | view/tpl/chatrooms.tpl | 10 |
2 files changed, 23 insertions, 2 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index e4cd1d20b..7073a0a52 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -88,8 +88,19 @@ function update_chats(chats) { </script> <script> function isMobile() { - try{ document.createEvent("TouchEvent"); return true; } - catch(e){ return false; } +if( navigator.userAgent.match(/Android/i) + || navigator.userAgent.match(/webOS/i) + || navigator.userAgent.match(/iPhone/i) + || navigator.userAgent.match(/iPad/i) + || navigator.userAgent.match(/iPod/i) + || navigator.userAgent.match(/BlackBerry/i) + || navigator.userAgent.match(/Windows Phone/i) + ){ + return true; + } + else { + return false; + } } $(function(){ diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl new file mode 100644 index 000000000..c3dae6627 --- /dev/null +++ b/view/tpl/chatrooms.tpl @@ -0,0 +1,10 @@ +<h2>{{$header}}</h2> + +{{if $is_owner}} +<p> +<a href="{{$baseurl}}/chat/{{$nickname}}/new">{{$newroom}}</a> +</p> +{{/if}} + +{{$rooms}} + |