Skip to content
This repository has been archived by the owner on Jul 5, 2022. It is now read-only.

Messaging #92

Merged
merged 8 commits into from
Sep 7, 2017
Merged

Messaging #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6a36798
Move user preferences to UserController
Kaik Sep 4, 2017
e5f686f
MessageController and messaging part 1
Kaik Sep 5, 2017
58431e4
Add select2 version 4.0.3
Kaik Sep 5, 2017
bb9a877
Switch to $autocomplete. Mostly working normal message creation.
Kaik Sep 6, 2017
062e73e
Inbox, sent, draft, stored, trash, labels, templates and many more.
Kaik Sep 7, 2017
4218947
Fixes and styles.
Kaik Sep 7, 2017
b949446
Style 2
Kaik Sep 7, 2017
bcd8657
Style 3
Kaik Sep 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 4 additions & 32 deletions Container/LinkContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private function getAccount()
];

$links[] = [
'url' => $this->router->generate('zikulaintercommodule_messages_preferences'),
'url' => $this->router->generate('zikulaintercommodule_user_preferences'),
'text' => $this->translator->__('Messages settings'),
'title' => $this->translator->__('Private messaging settings'),
'icon' => 'wrench',
Expand Down Expand Up @@ -181,7 +181,6 @@ private function getUser()
return $links;
}

// //if ($this->variableApi->get('mode') == 0) {
$links[] = [
'url' => $this->router->generate('zikulaintercommodule_messages_getmessages', ['box' => 'inbox']),
'text' => $this->translator->__('Inbox'),
Expand All @@ -191,7 +190,7 @@ private function getUser()
$links[] = [
'url' => $this->router->generate('zikulaintercommodule_messages_getmessages', ['box' => 'sent']),
'text' => $this->translator->__('Sent'),
'title' => $this->translator->__('Messages send by you'),
'title' => $this->translator->__('Messages sent by you'),
'icon' => 'envelope',
];
$links[] = [
Expand All @@ -217,7 +216,7 @@ private function getUser()
$labelsLinks = [];
foreach ($defaultLabels as $dLabel) {
$labelsLinks[] = [
'url' => $this->router->generate('zikulaintercommodule_messages_newmessage'),
'url' => $this->router->generate('zikulaintercommodule_messages_getmessages', ['box' => 'labels', 'label' => $dLabel->getUrlName()]),
'text' => $this->translator->__($dLabel->getName()),
'icon' => 'tag',
];
Expand All @@ -230,7 +229,7 @@ private function getUser()
'links' => $labelsLinks,
];
$links[] = [
'url' => $this->router->generate('zikulaintercommodule_messages_preferences'),
'url' => $this->router->generate('zikulaintercommodule_user_preferences'),
'text' => $this->translator->__('Settings'),
'title' => $this->translator->__('Private messaging settings'),
'icon' => 'wrench',
Expand All @@ -241,33 +240,6 @@ private function getUser()
'title' => $this->translator->__('Click here to compose new message'),
'icon' => 'file',
];
// // }
// if ($this->variableApi->get('mode') == 1) {
// $links[] = array(
// 'url' => $this->router->generate('zikulaintercommodule_conversations_list'),
// 'text' => $this->translator->__('Conversations'),
// 'title' => $this->translator->__('See all of your conversations'),
// 'icon' => 'coffee'
// );
// $links[] = array(
// 'url' => $this->router->generate('zikulaintercommodule_archive_list'),
// 'text' => $this->translator->__('Archive'),
// 'title' => $this->translator->__('Your saved conversations'),
// 'icon' => 'archive'
// );
// $links[] = array(
// 'url' => $this->router->generate('zikulaintercommodule_user_preferences'),
// 'text' => $this->translator->__('Display messages settings'),
// 'title' => $this->translator->__('Private messaging settings'),
// 'icon' => 'wrench'
// );
// $links[] = array(
// 'url' => $this->router->generate('zikulaintercommodule_conversations_list'),
// 'text' => $this->translator->__('Start new conversation'),
// 'title' => $this->translator->__('New conversation'),
// 'icon' => 'file'
// );
// }

return $links;
}
Expand Down
Loading