Skip to content

Commit 5e4f7d0

Browse files
committed
fixed some style issues and improved demo-mode 'parrot'
1 parent 516c0ff commit 5e4f7d0

File tree

5 files changed

+41
-18
lines changed

5 files changed

+41
-18
lines changed

www/css/sepiaFW-skin-grid.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ html {
7878
#sepiaFW-assist-btn-area button {
7979
border: 1px solid #fff;
8080
box-shadow: 0 0 5px #fff, inset 0 0 5px #fff;
81-
background: #142534;
81+
background: #142534 !important;
8282
}
8383
#sepiaFW-assist-btn-orbiters {
8484
top: 2px;
@@ -96,6 +96,11 @@ html {
9696
border-radius: 3px;
9797
}
9898

99+
#sepiaFW-chat-controls-speech-box > div {
100+
background: rgba(19, 38, 58, 0.92);
101+
color: #fff;
102+
}
103+
99104
.sepiaFW-menu {
100105
background: rgba(21, 171, 195, 0.95);
101106
color: #fff;

www/css/sepiaFW-skin-neo-sepia-dark.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ html {
3131
#sepiaFW-aC2 { background-color: #08a0c8; }
3232
#sepiaFW-asC { background-color: #ceff1a; }
3333
#sepiaFW-adC { background-color: #ceff1a; }
34-
#sepiaFW-lC { background-color: rgba(150, 150, 150, 0.50); }
34+
#sepiaFW-lC { background-color: #535557; }
3535

3636
#sepiaFW-login-box {
3737
background: #212327;
@@ -98,6 +98,11 @@ html {
9898
}
9999
*/
100100

101+
#sepiaFW-chat-controls-speech-box > div {
102+
background: #08a0c8;
103+
color: #fff;
104+
}
105+
101106
.sepiaFW-menu {
102107
background: #101418;
103108
color: #ECEBE7;

www/css/sepiaFW-skin-neo-sepia.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ html {
1919
#sepiaFW-aC2 { background-color: #4ec48f; } /* Accent color 2 - e.g. used during speaking in assistant button */
2020
#sepiaFW-asC { background-color: #CEFF1A; } /*#c4ff3e, #69d177;*/ /* Assistant color - the signature color of the assistant */
2121
#sepiaFW-adC { background-color: #ffeb3b; } /* Await-dialog color - used during "wait for interaction" in assistant button */
22-
#sepiaFW-lC { background-color: rgba(30, 30, 30, 0.50); } /* Loading color - used during loading in assistant button */
22+
#sepiaFW-lC { background-color: #8e8e8e; } /* Loading color - used during loading in assistant button */
2323

2424
#sepiaFW-login-box, #sepiaFW-nav-bar, #sepiaFW-chat-controls-form, #sepiaFW-chat-controls-right {
2525
background: #000000;
@@ -66,6 +66,11 @@ html {
6666
display: none !important;
6767
}
6868

69+
#sepiaFW-chat-controls-speech-box > div {
70+
background: #16abc3;
71+
color: #fff;
72+
}
73+
6974
.sepiaFW-menu {
7075
/*background: rgba(206, 255, 26, 0.95);*/
7176
background:#000;

www/css/sepiaFW-style.css

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,13 +1371,15 @@ body {
13711371
margin: 2px;
13721372
padding: 2px;
13731373
}
1374+
#sepiaFW-chat-controls-speech-box > div {
1375+
background: #2f3035;
1376+
color: #fff;
1377+
}
13741378
#sepiaFW-chat-controls-speech-box-edit {
13751379
flex: 0 1 50px;
13761380
display: flex;
13771381
align-items: center;
13781382
justify-content: center;
1379-
background: #2f3035;
1380-
color: #fff;
13811383
border-radius: 3px 0 0 3px;
13821384
min-width: 50px;
13831385
padding: 5px;
@@ -1387,8 +1389,6 @@ body {
13871389
#sepiaFW-chat-controls-speech-box-bubble {
13881390
flex: 1 0 auto;
13891391
max-width: calc(100% - 100px);
1390-
background: #2f3035;
1391-
color: #fff;
13921392
border-radius: 0px;
13931393
padding: 8px;
13941394
margin: 0 0px;
@@ -1401,8 +1401,6 @@ body {
14011401
display: flex;
14021402
align-items: center;
14031403
justify-content: center;
1404-
background: #2f3035;
1405-
color: #fff;
14061404
border-radius: 0 3px 3px 0;
14071405
min-width: 50px;
14081406
padding: 5px;

www/scripts/sepiaFW.offline.js

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,26 @@ function sepiaFW_build_offline(){
150150
}
151151
//console.log(serviceResult); //DEBUG
152152
}
153+
var senderUiIdOrName = undefined; //default
153154
if (!serviceResult || !serviceResult.result == "success"){
154-
//just repeat input
155+
//just repeat input for demo-mode
156+
var command = "chat";
157+
var answerText = message.text;
158+
var lang = message.data.parameters.lang;
159+
serviceResult = SepiaFW.embedded.services.buildServiceResult(
160+
userId, lang, command, answerText, '', '', ''
161+
);
162+
senderUiIdOrName = 'Parrot'; //overwrite (to make clear this is no real answer ... and for fun)
163+
/* Old version that lacks e.g. TTS:
155164
var dataOut = { sender: 'Parrot', senderType: 'assistant' };
156165
SepiaFW.ui.showCustomChatMessage(message.text, dataOut);
157-
}else{
158-
//build a message-object and send it to 'real' message handler (as if we got a server reply)
159-
var id = message.msgId;
160-
var resultMessage = Offline.buildAssistAnswerMessageForHandler(id, serviceResult);
161-
Offline.sendToClienMessagetHandler(resultMessage);
166+
return;
167+
*/
162168
}
169+
//build a message-object and send it to 'real' message handler (as if we got a server reply)
170+
var id = message.msgId;
171+
var resultMessage = Offline.buildAssistAnswerMessageForHandler(id, serviceResult, senderUiIdOrName);
172+
Offline.sendToClienMessagetHandler(resultMessage);
163173
}, 600);
164174
}
165175

@@ -169,9 +179,9 @@ function sepiaFW_build_offline(){
169179
}
170180

171181
//Message builder
172-
Offline.buildAssistAnswerMessageForHandler = function(msgId, serviceResult){
173-
var receiver = 'userid'; //e.g. uid1010
174-
var sender = 'UI'; //e.g. uid1005 (assistant usually)
182+
Offline.buildAssistAnswerMessageForHandler = function(msgId, serviceResult, assistantIdOrName){
183+
var receiver = 'userid'; //e.g. uid1010
184+
var sender = assistantIdOrName || 'UI'; //e.g. uid1005 (assistant usually)
175185
var senderType = 'assistant';
176186
var channelId = SepiaFW.client.getActiveChannel(); //TODO: does this work with an empty channel?
177187
var timeUnix = new Date().getTime();

0 commit comments

Comments
 (0)