Merge branch 'master' of git.task-on.com:ktask/task-on.com

common/modules/triggers/views/trigger-admin/testing.php

@@ -13,11 +13,17 @@ $newListObject=Json::decode($newList);
 if (array_key_exists('result', $newListObject) && array_key_exists('id', $newListObject['result'])) {
     $newListId=$newListObject['result']['id'];
     // Subscribe user to new List
-    $sender->subscribe(['list_ids' => $newListId, 'fields' => ['email' => $email]]);
+    $sender->subscribe(['list_ids' => $newListId, 'fields[email]' => $email]);
     // Create new message
-    $newMessageId=$sender->createEmailMessage('bystrov', $email, 'Testing Subject', 'Testing Body <br><a href="http://www.google.com/">Testing link</a><a href="{{_UnsubscribeUrl}}">Отписаться</a>', $newListId);
-    // Create new campaign
-    $newCampaign = $sender->createCampaign($newMessageId);
+    $newMessage=$sender->createEmailMessage('bystrov', $email, 'Testing Subject', 'Testing Body <br><a href="http://www.google.com/">Testing link</a><a href="{{_UnsubscribeUrl}}">Отписаться</a>', $newListId);
+    // Decode result
+    $newMessageObject=Json::decode($newMessage);
+    if (array_key_exists('result', $newMessageObject) && array_key_exists('message_id', $newMessageObject['result'])) {
+        // Get the message ID
+        $newMessageId=$newMessageObject['result']['message_id'];
+        // Create new campaign
+        $newCampaign = $sender->createCampaign($newMessageId);
+    }
 }
 
 echo 'Рассылка: '.((isset($newCampaign)) ? $newCampaign : 'Not found');

frontend/web/css/custom.css

@@ -10,10 +10,10 @@
     border: 1px solid #E9A2A2;
 }
 /* EAuth widget */
-.eauth-service-id-vk .eauth-service-link:before {
+.eauth-list .eauth-service-id-vk .eauth-service-link:before {
 	background-position: 0 -136px;
 }
-.eauth-service-id-google .eauth-service-link:before {
+.eauth-list .eauth-service-id-google .eauth-service-link:before {
 	background-position: 0 -34px;
 }
 .eauth-service {
@@ -24,6 +24,9 @@
     margin: 0 !important;
     margin-top: 10px !important;
 }
+.eauth-list .eauth-service-link:before, .eauth-service-link:after {
+    background: url("/images/auth.png") 0 0 no-repeat;
+}
 section .container ul:not([class]),
 section .container ul:not([class]) li,
 section .container ol:not([class]),