aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-02-06 08:49:17 +0100
committermarijus <mario@localhost.localdomain>2014-02-06 08:49:17 +0100
commitd1bd6cdb25108e78173f92b2e11d03b617653ac8 (patch)
tree1caccd16860b746e97c646bb2c41d859f1b25632 /view
parentbd1849ddae165a85cb57377e9a35ea10b48fdddc (diff)
parent2c451d5c288d976b886338df4692249125dc8172 (diff)
downloadvolse-hubzilla-d1bd6cdb25108e78173f92b2e11d03b617653ac8.tar.gz
volse-hubzilla-d1bd6cdb25108e78173f92b2e11d03b617653ac8.tar.bz2
volse-hubzilla-d1bd6cdb25108e78173f92b2e11d03b617653ac8.zip
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view')
-rw-r--r--view/tpl/chat.tpl15
-rw-r--r--view/tpl/chatrooms.tpl10
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}}
+