From 7021cb983e04ff8b79f1d974ea416b0ec1a2dee8 Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Fri, 29 Aug 2014 12:55:41 +0000 Subject: [PATCH] Move takeover confirmation page template to chat style --- .../Chat/OperatorChatController.php | 4 +- src/mibew/styles/dialogs/default/chat.css | 24 ++++++- src/mibew/styles/dialogs/default/chat_ie7.css | 3 +- .../server_side/confirm.handlebars | 13 ++++ .../styles/pages/default/css/default.css | 14 ---- .../server_side/confirm.handlebars | 67 ------------------- 6 files changed, 38 insertions(+), 87 deletions(-) create mode 100644 src/mibew/styles/dialogs/default/templates_src/server_side/confirm.handlebars delete mode 100644 src/mibew/styles/pages/default/templates_src/server_side/confirm.handlebars diff --git a/src/mibew/libs/classes/Mibew/Controller/Chat/OperatorChatController.php b/src/mibew/libs/classes/Mibew/Controller/Chat/OperatorChatController.php index b002c880..1389ea0b 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Chat/OperatorChatController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Chat/OperatorChatController.php @@ -124,11 +124,9 @@ class OperatorChatController extends AbstractController 'link' => $link, 'title' => getlocal('Change operator'), ); - $page_style = new PageStyle(PageStyle::getCurrentStyle()); // Show confirmation page. - // TODO: Move this template to chat style. - return $page_style->render('confirm', $page); + return $this->render('confirm', $page); } } diff --git a/src/mibew/styles/dialogs/default/chat.css b/src/mibew/styles/dialogs/default/chat.css index c55fa203..bd08fb8b 100644 --- a/src/mibew/styles/dialogs/default/chat.css +++ b/src/mibew/styles/dialogs/default/chat.css @@ -344,7 +344,7 @@ a:hover .iclosewin { /* #send */ #postmessage { } -#send-message { +#send-message, .submit-button { float: right; width: 190px; height: 33px; @@ -355,7 +355,7 @@ a:hover .iclosewin { color: #495151; background: url("images/submit.gif") no-repeat 0 0 transparent; } -#send-message:hover { +#send-message:hover, .submit-button:hover { color: #000; background: url("images/submit.gif") no-repeat -190px 0 transparent; } @@ -517,3 +517,23 @@ ul li { color: #000; } /* ----- */ + +/* Confirmation */ +.messagetxt .visitor { + color: blue; +} +.messagetxt .operator { + color: green; +} +#confirmpane { + width: 100%; +} +#confirmpane .button-wrapper { + width: 400px; + margin: 140px auto 0; +} +#confirmpane .submit-button { + float: none; + display: inline-block; +} +/* ----- */ diff --git a/src/mibew/styles/dialogs/default/chat_ie7.css b/src/mibew/styles/dialogs/default/chat_ie7.css index 75d8ac75..2dec3b9b 100644 --- a/src/mibew/styles/dialogs/default/chat_ie7.css +++ b/src/mibew/styles/dialogs/default/chat_ie7.css @@ -18,7 +18,8 @@ .control, .user-name-control-set, .user-name-control-change, -.user-name-control-input-bg +.user-name-control-input-bg, +#confirmpane .submit-button { display: inline; zoom: 1; diff --git a/src/mibew/styles/dialogs/default/templates_src/server_side/confirm.handlebars b/src/mibew/styles/dialogs/default/templates_src/server_side/confirm.handlebars new file mode 100644 index 00000000..315a37d3 --- /dev/null +++ b/src/mibew/styles/dialogs/default/templates_src/server_side/confirm.handlebars @@ -0,0 +1,13 @@ +{{#extends "_layout"}} + {{#override "message"}} + {{l10n "Visitor {0} is already being assisted by {1}.
Are you really sure you want to start chatting the visitor?" user agent}} + {{/override}} + + {{#override "content"}} +
+
+ {{l10n "Yes. I'm sure"}} {{l10n "No. Close the window"}} +
+
+ {{/override}} +{{/extends}} \ No newline at end of file diff --git a/src/mibew/styles/pages/default/css/default.css b/src/mibew/styles/pages/default/css/default.css index 13fa1174..69cde75b 100644 --- a/src/mibew/styles/pages/default/css/default.css +++ b/src/mibew/styles/pages/default/css/default.css @@ -788,12 +788,6 @@ table.awaiting .no-threads, table.awaiting .no-visitors { /* nice button */ -#confirmpane { - width:450px; - margin:0px auto 5px; - padding-top: 70px; -} - .nicebutton { border: none; float: left; @@ -813,14 +807,6 @@ table.awaiting .no-threads, table.awaiting .no-visitors { vertical-align: top; } -#confirmpane .visitor { - color: blue; -} - -#confirmpane .operator { - color: green; -} - /* thread log */ .logpane { diff --git a/src/mibew/styles/pages/default/templates_src/server_side/confirm.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/confirm.handlebars deleted file mode 100644 index fdd81d35..00000000 --- a/src/mibew/styles/pages/default/templates_src/server_side/confirm.handlebars +++ /dev/null @@ -1,67 +0,0 @@ -{{#extends "_layout"}} - {{#override "content"}} -
-
-
-
-
- -
- {{l10n "Visitor {0} is already being assisted by {1}.
Are you really sure you want to start chatting the visitor?" user agent}} - -
-
-
- -
- - - - - - -
- - - - - - {{l10n "Yes. I'm sure"}} - - - - - -
- - - - - - - -
- - - - - - {{l10n "No. Close the window"}} - - - - - -
- -
-
-
- -
-
-
-
-
- {{/override}} -{{/extends}} \ No newline at end of file