From a50706317435d09cacb95cad0a6ccaf8ae5b5f6c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 26 Mar 2016 18:43:38 +0100 Subject: move link to /locs to settings menu if we have more than one location and some template work on locs --- view/tpl/channel.tpl | 4 --- view/tpl/locmanage.tpl | 77 ++++++++++++++++++++++++++------------------------ 2 files changed, 40 insertions(+), 41 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 17713aef4..d306f0aa0 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -44,10 +44,6 @@ {{if $channel.intros != 0}}{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}{{/if}} -
- - {{$locs}} -
{{/if}} diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index c94cf60a7..95847d559 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -1,38 +1,41 @@ -
-

{{$header}}

- - - -
{{$sync_text}}
-
-
{{$drop_text}}
-
{{$last_resort}}
-
- - - - - - -{{foreach $hubs as $hub}} -{{if ! $hub.deleted }} - - - - -{{/if}} -{{/foreach}} -
{{$loc}}{{$mkprm}}{{$drop}}
-{{$hub.hubloc_url}} ({{$hub.hubloc_addr}}) -{{if $hub.primary}}{{else}}{{/if}} -
+
+
+ + +

{{$header}}

+
+
+
+ {{$sync_text}} +
+
+ {{$drop_text}}
+ {{$last_resort}} +
+ + + + + + + + {{foreach $hubs as $hub}} + {{if ! $hub.deleted }} + + + + + + + {{/if}} + {{/foreach}} +
{{$loc}}{{$addr}}{{$mkprm}}{{$drop}}
{{$hub.hubloc_url}}{{$hub.hubloc_addr}}{{if $hub.primary}}{{else}}{{/if}}
+
-
- -- cgit v1.2.3 From 97eef2b88c5e2e709b8efdb2ea597a5803783e24 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 26 Mar 2016 19:34:38 +0100 Subject: removed link to connected apps by accident --- view/tpl/locmanage.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index 95847d559..6d8e90ad2 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -21,16 +21,16 @@
- + {{foreach $hubs as $hub}} {{if ! $hub.deleted }} - + -- cgit v1.2.3 From ba0812c4477fcae0b910f63de8134529797d51dc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 27 Mar 2016 22:37:07 +0200 Subject: highlight table row on hover --- view/tpl/locmanage.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index 6d8e90ad2..89d5295ad 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -28,7 +28,7 @@ {{foreach $hubs as $hub}} {{if ! $hub.deleted }} - + -- cgit v1.2.3 From 5462453bf2bde50166c68f90b08d24826dd07ba8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 Mar 2016 14:31:55 +0200 Subject: some work on mod chat --- view/tpl/chat.tpl | 2 +- view/tpl/chatroom_new.tpl | 24 +++++++++++------------- view/tpl/chatroomlist.tpl | 16 ++++++++-------- view/tpl/chatrooms.tpl | 47 +++++++++++++++++++++++++++++++++++++---------- 4 files changed, 57 insertions(+), 32 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 18576fd56..5ea1ae22e 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -5,7 +5,7 @@
- + {{/if}} diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index c64f21c97..8acff2ff5 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -1,14 +1,12 @@ -
-

{{$header}}

- -
-{{include file="field_input.tpl" field=$name}} -{{include file="field_input.tpl" field=$chat_expire}} - -{{$acl}} -
-
-
- - +
+
+ {{include file="field_input.tpl" field=$name}} + {{include file="field_input.tpl" field=$chat_expire}} + {{$acl}} +
+ + +
+
+
diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl index 71fec8200..ac0f7cf9b 100644 --- a/view/tpl/chatroomlist.tpl +++ b/view/tpl/chatroomlist.tpl @@ -1,11 +1,11 @@
-

{{$header}}

-{{if $items}} -
{{$loc}} {{$addr}} {{$mkprm}} {{$drop}}
{{$hub.hubloc_url}} {{$hub.hubloc_addr}} {{if $hub.primary}}{{else}}{{/if}}
{{$hub.hubloc_addr}} {{if $hub.primary}}{{else}}{{/if}}
-{{foreach $items as $item}} - -{{/foreach}} -
{{$item.cr_name}}{{$item.cr_inroom}}
-{{/if}} +

{{$header}}

+ {{if $items}} + + {{/if}} diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index 570aef1c7..c7333efcf 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -1,12 +1,39 @@ -
-

{{$header}}

- -{{if $is_owner}} -

-{{$newroom}} -

-{{/if}} - -{{$rooms}} +
+
+ {{if $is_owner}} + + {{/if}} +

{{$header}}

+
+ {{if $is_owner}} + {{$chatroom_new}} + {{/if}} + {{if $rooms}} +
+ + + + + + + {{foreach $rooms as $room}} + + + + + + {{/foreach}} +
name
{{$room.cr_name}} + {{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} + + + {{/if}} + {{$room.cr_inroom}}
+
+ {{else}} +
+ {{$norooms}} +
+ {{/if}}
-- cgit v1.2.3 From 08461c7049ee5c9788e815537b540b9987a5eace Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 30 Mar 2016 14:44:03 +0200 Subject: more on mod chat --- view/tpl/chatroomlist.tpl | 1 + view/tpl/chatrooms.tpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl index ac0f7cf9b..dfdce8afb 100644 --- a/view/tpl/chatroomlist.tpl +++ b/view/tpl/chatroomlist.tpl @@ -2,6 +2,7 @@

{{$header}}

{{if $items}}
    +
  • {{$overview}}
    • {{foreach $items as $item}}
  • {{$item.cr_inroom}}{{$item.cr_name}}
    • {{/foreach}} diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index c7333efcf..e3d0eb5b5 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -12,7 +12,7 @@
    - + -- cgit v1.2.3 From df891f4ad2eee3b07bad73d703a46364dad03508 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 31 Mar 2016 00:37:40 +0200 Subject: more work on mod chat --- view/tpl/chat.tpl | 156 +++++++++++++++++++++++++++++++++------------- view/tpl/chatroomlist.tpl | 3 + 2 files changed, 117 insertions(+), 42 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 5ea1ae22e..a040cbd3f 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,44 +1,101 @@ -
    - - {{if $is_owner}} -
    -
    - - - - -
    - {{/if}} - -

    {{$room_name}}

    - - -
    - -
    -
    -
    - -
    - -

    +
    +
    + {{if $is_owner}} +
    +
    + + + + +
    + {{/if}} +

    {{$room_name}}

    +
    -
    -
    -
    - -
    - -
    - - - -
    -
    - {{$leave}} | {{$away}} | {{$online}}{{if $bookmark_link}} | {{$bookmark}}{{/if}} +
    +
    +
    +
    + + +
    + +
    +
    +
    + + +
    + +
    +
    +
    + + + +
    +
    +
    + + + + + +
    + + {{if $feature_encrypt}} + + {{/if}} +
    + + +
    + + +
    +
    +
    +
    +
    +
    + +
    -
    -- cgit v1.2.3 From 90a5ba01a35aeb3629ebe76069e68c64b913a4d5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 31 Mar 2016 23:13:40 +0200 Subject: make fullscreen mode available for other modules and some cleanup --- view/tpl/chat.tpl | 73 ++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 39 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 1001f28b3..47b1e83b1 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,8 +1,8 @@
    - - + + {{if $is_owner}}
    @@ -109,12 +109,16 @@ $(document).ready(function() { chat_timer = setTimeout(load_chats,300); $('#chatroom_bookmarks, #vcard').hide(); $('#chatroom_list, #chatroom_members').show(); - $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23 ); + adjustInlineTopBarHeight(); }); $(window).resize(function () { - var navHeight = $('.generic-content-wrapper').hasClass('fullscreen') ? 0 : $('nav').outerHeight(true); - $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - navHeight - 23); + if($('.generic-content-wrapper').hasClass('fullscreen')) { + adjustFullscreenTopBarHeight(); + } + else { + adjustInlineTopBarHeight(); + } $('#chatTopBar').scrollTop($('#chatTopBar').scrollTop() + $('#chatTopBar').outerHeight(true)); }); @@ -177,7 +181,6 @@ function update_chats(chats) { } - function chatJotGetLink() { reply = prompt("{{$linkurl}}"); if(reply && reply.length) { @@ -194,47 +197,39 @@ function addmailtext(data) { $("#chatText").val(currentText + data); } -function makeFullScreen() { - $('#fullscreen, aside').hide(); - $('#inline').show(); - $('.generic-content-wrapper').addClass('fullscreen'); +function adjustFullscreenTopBarHeight() { $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23); - } -function makeInline() { - $('#fullscreen, aside').show(); - $('#inline').hide(); - $('.generic-content-wrapper').removeClass('fullscreen'); +function adjustInlineTopBarHeight() { $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23); } - - -- cgit v1.2.3 From 50d9b2934742ad9fb0dc8354d405789e3c14cd00 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Apr 2016 00:16:39 +0200 Subject: slightly change the way fullscreen works and bring it to mod mail --- view/tpl/chat.tpl | 4 ++-- view/tpl/mail_display.tpl | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 47b1e83b1..4750f81fd 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,8 +1,8 @@
    - - + + {{if $is_owner}} diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 24e763571..a7754daf2 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,8 +1,12 @@
    - {{if $mailbox == 'combined'}} - {{$delete}} - {{/if}} +
    + + + {{if $mailbox == 'combined'}} + {{$delete}} + {{/if}} +

    {{$prvmsg_header}}

    -- cgit v1.2.3 From c6d9100649a4bea9ee37780811a8235ca0f7f80a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Apr 2016 08:36:02 +0200 Subject: missing template --- view/tpl/chatroom_members.tpl | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 view/tpl/chatroom_members.tpl (limited to 'view/tpl') diff --git a/view/tpl/chatroom_members.tpl b/view/tpl/chatroom_members.tpl new file mode 100644 index 000000000..ea5fbede8 --- /dev/null +++ b/view/tpl/chatroom_members.tpl @@ -0,0 +1,5 @@ +
    +

    {{$header}}

    +
    +
    + -- cgit v1.2.3 From a564f495a7f10016fd63e63ac31d515e19180727 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Apr 2016 10:20:10 +0200 Subject: improve scroll to bottom in chat --- view/tpl/chat.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 4750f81fd..5afa7a029 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -119,7 +119,7 @@ $(window).resize(function () { else { adjustInlineTopBarHeight(); } - $('#chatTopBar').scrollTop($('#chatTopBar').scrollTop() + $('#chatTopBar').outerHeight(true)); + $('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight')); }); $('#chat-form').submit(function(ev) { -- cgit v1.2.3 From bbe93d0e1dc23729bcd5904810bb86f9b6b489e9 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Apr 2016 10:29:58 +0200 Subject: scroll chat to bottom on fullscreen toggle --- view/tpl/chat.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 5afa7a029..2da7abe34 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -199,10 +199,12 @@ function addmailtext(data) { function adjustFullscreenTopBarHeight() { $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23); + $('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight')); } function adjustInlineTopBarHeight() { $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23); + $('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight')); } function isMobile() { -- cgit v1.2.3 From 5b55726a93eb6ee94e4c23a15f18c71b511c752e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Apr 2016 11:13:04 +0200 Subject: on update only jump to bottom if we actually got a new message --- view/tpl/chat.tpl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 2da7abe34..633437069 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -175,10 +175,9 @@ function update_chats(chats) { $('#chatLineHolder').append(newNode); $(".autotime").timeago(); - }); - var elem = document.getElementById('chatTopBar'); - elem.scrollTop = elem.scrollHeight; - + var elem = document.getElementById('chatTopBar'); + elem.scrollTop = elem.scrollHeight; + }); } function chatJotGetLink() { -- cgit v1.2.3 From 3edd4ce78fcf6a5384ec503249c4e1f0fb6143ff Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 00:04:05 +0200 Subject: ease transition between fullscreen and inline view for small screens --- view/tpl/chat.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 633437069..eb219f128 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -119,7 +119,6 @@ $(window).resize(function () { else { adjustInlineTopBarHeight(); } - $('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight')); }); $('#chat-form').submit(function(ev) { @@ -197,7 +196,7 @@ function addmailtext(data) { } function adjustFullscreenTopBarHeight() { - $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23); + $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 16); $('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight')); } -- cgit v1.2.3 From b8d8be701382b72b3556ff9a3d67aabfc85223f5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 11:34:07 +0200 Subject: show chat expiration time in overview and minor fixes --- view/tpl/chat.tpl | 12 ++++++------ view/tpl/chatrooms.tpl | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index eb219f128..fbc00bf88 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -32,7 +32,7 @@
    - +
    {{if $feature_encrypt}} -
    name{{$name}}
    - + + {{foreach $rooms as $room}} - +
    {{$name}}{{$name}}{{$expire}}
    {{$room.cr_name}} + {{$room.cr_expire}} min {{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} -- cgit v1.2.3 From db4e9aeaadc15700aca737a620fb0a56c4ed3531 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 12:19:49 +0200 Subject: fullscreen mode for events --- view/tpl/events-js.tpl | 2 ++ view/tpl/events_cal-js.tpl | 2 ++ 2 files changed, 4 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index c29d80347..5c9eb2814 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,6 +1,8 @@
    + +
    diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl index bc8a3aa31..abffb2a92 100755 --- a/view/tpl/events_cal-js.tpl +++ b/view/tpl/events_cal-js.tpl @@ -2,6 +2,8 @@
    + +
    -- cgit v1.2.3 From 53311a30ad5399e6e981aaab11ffa13af926a3d2 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 15:27:10 +0200 Subject: reduce chat-item-title fontsize to match wall-item-ago --- view/tpl/chat.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index fbc00bf88..19b025820 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -165,11 +165,11 @@ function update_chats(chats) { if(item.self) { newNode.setAttribute('class', 'chat-item-self clear'); - $(newNode).html('
    ' + item.name + ' ' + item.localtime + '
    ' + item.text + '
    ' + item.name + ''); + $(newNode).html('
    ' + item.name + ' ' + item.localtime + '
    ' + item.text + '
    ' + item.name + ''); } else { newNode.setAttribute('class', 'chat-item clear'); - $(newNode).html('' + item.name + '
    ' + item.name + ' ' + item.localtime + '
    ' + item.text + '
    '); + $(newNode).html('' + item.name + '
    ' + item.name + ' ' + item.localtime + '
    ' + item.text + '
    '); } $('#chatLineHolder').append(newNode); $(".autotime").timeago(); -- cgit v1.2.3 From f13096a6f3b26d9e88dc0d6c07c63a1d5f75346e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 3 Apr 2016 18:00:03 +0200 Subject: various fixes --- view/tpl/chat.tpl | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 19b025820..9cf5968cb 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -18,17 +18,12 @@
    - -
    -
    -
    -
    - +
    @@ -65,7 +60,7 @@ {{if $feature_encrypt}} - -
    @@ -113,7 +106,7 @@ $(document).ready(function() { }); $(window).resize(function () { - if($('.generic-content-wrapper').hasClass('fullscreen')) { + if($('main').hasClass('fullscreen')) { adjustFullscreenTopBarHeight(); } else { -- cgit v1.2.3