diff --git a/src/web-chatview/chatview.css b/src/web-chatview/chatview.css
index b316af1c2e059aa52346ed5b00c9ca6b74c556d1..2e1d2cd39c82575da3251fa427617182d66f1877 100644
--- a/src/web-chatview/chatview.css
+++ b/src/web-chatview/chatview.css
@@ -228,11 +228,11 @@ body {
#invitation_text_container {
- top: 5%;
+ top: 10%;
}
#invitation_note_container {
- bottom: 20%;
+ bottom: 15%;
}
#invitation_text {
@@ -262,7 +262,7 @@ body {
position: absolute;
left: 50%;
- top: 50%;
+ top: 55%;
transform: translate(-50%, -75%);
transition: transform 0.8s;
@@ -314,11 +314,11 @@ body {
position: absolute;
margin: 0 auto;
- bottom: -40px;
+ bottom: 15%;
width: 240px;
- height: 20px;
- max-height: 20px;
- min-height: 20px;
+ height: 25px;
+ max-height: 25px;
+ min-height: 25px;
display: flex;
justify-content: space-between;
@@ -958,6 +958,7 @@ input[type=checkbox] {
font-size: 13px;
text-transform: uppercase;
font-weight: bold;
+ cursor: pointer;
}
diff --git a/src/web-chatview/chatview.html b/src/web-chatview/chatview.html
index 1761d730f12b2d9df3f8fcf6796c0a73f38afcc7..4893151de5640e777a7cb30c9f7ece887e2bb5b2 100644
--- a/src/web-chatview/chatview.html
+++ b/src/web-chatview/chatview.html
@@ -73,19 +73,28 @@
<div id="invitation_rect">
<div id="invite_image"></div>
<div id="quote_img_wrapper">
- <img id="quote_img" src="qrc:/images/icons/quote.svg"></img>
+ <svg width="47px" height="30px" viewBox="0 0 47 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g id="CONVERSATION-À-PLUS" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.7">
+ <g id="04_JAMI_CONV_Invitation" transform="translate(-702.000000, -310.000000)" fill="#1AB6FF" fill-rule="nonzero">
+ <g id="noun_Quote_3101618" transform="translate(702.000000, 310.000000)">
+ <path d="M9.24003238,27.2740291 C8.58821922,28.5250019 9.49495696,30 10.9415649,30 C11.5043326,30 12.0360615,29.7625927 12.4039467,29.349732 C14.4647143,27.033648 21.2225055,18.9494095 21.9282548,11.8341297 C21.9725231,11.4475374 22,11.0554933 22,10.6570059 C22,10.3333588 21.9811732,10.0458928 21.9542052,9.77527819 C21.4499531,3.84207854 15.9418521,-0.717231757 9.52090737,0.0936206879 C4.60101556,0.715637692 0.635182818,4.63161885 0.0734328381,9.40801556 C-0.615525018,15.279757 3.62660323,20.3376721 9.30414515,21.188175 C10.1823883,21.3210042 10.7538061,22.1482124 10.5085493,22.976412 L9.24003238,27.2740291 Z" id="Path"></path>
+ <path d="M34.2399734,27.2740291 C33.588666,28.5250019 34.4948991,30 35.9415138,30 C36.504284,30 37.0355066,29.7625927 37.4039023,29.349732 C39.4651882,27.033648 46.2225019,18.9494095 46.9287633,11.8341297 C46.972523,11.4475374 47,11.0554933 47,10.6570059 C47,10.3333588 46.9811731,10.0458928 46.954205,9.77527819 C46.4499506,3.84207854 40.9418241,-0.717231757 34.5203408,0.0936206879 C29.6004263,0.715637692 25.6345752,4.63161885 25.0733314,9.40851119 C24.3848792,15.279757 28.6270271,20.3376721 34.3045953,21.188175 C35.1828425,21.3210042 35.7542629,22.1482124 35.509005,22.976412 L34.2399734,27.2740291 Z" id="Path"></path>
+ </g>
+ </g>
+ </g>
+ </svg>
</div>
<div id="invite_text">
<div id="join_text"></div>
<div id="note_text"></div>
- </div>
- <div id="actions">
- <button id="blockButton" class="text-button" onclick="blockConversation()">
- </button>
- <button id="refuseButton" class="text-button" onclick="refuseInvitation()">
- </button>
- <button id="acceptButton" class="text-button text-button-green" onclick="acceptInvitation()">
- </button>
+ <div id="actions">
+ <button id="blockButton" class="text-button" onclick="blockConversation()">
+ </button>
+ <button id="refuseButton" class="text-button" onclick="refuseInvitation()">
+ </button>
+ <button id="acceptButton" class="text-button text-button-green" onclick="acceptInvitation()">
+ </button>
+ </div>
</div>
</div>
@@ -151,4 +160,4 @@
<div id="data_transfer_send_container"></div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/web-chatview/chatview.js b/src/web-chatview/chatview.js
index 9db899fb1155f0d89cc8614e5ebe4da6f0b3fb0b..290abc23cf85bfab11b9dab6f15c5be4734b1097 100644
--- a/src/web-chatview/chatview.js
+++ b/src/web-chatview/chatview.js
@@ -420,12 +420,12 @@ function showInvitation(contactAlias, contactId, isSwarm, isSyncing) {
}
invitationText.innerHTML = contactAlias + " " + (use_qt ?
i18nStringData["has sent you a conversation request."] :
- i18n.sprintf(i18n.gettext("%s has sent you a conversation request."), contactAlias))
+ i18n.gettext("has sent you a conversation request."))
+ "<br/>"
var joinTextValue = (isSyncing ?
"You have accepted the conversation request." :
- "Hello, do you want to join the conversation?")
+ "Hello, would you like to join the conversation?")
joinText.innerHTML = (use_qt ?
i18nStringData[joinTextValue] :
i18n.gettext(joinTextValue))
@@ -460,11 +460,13 @@ function showInvitation(contactAlias, contactId, isSwarm, isSyncing) {
if (isSyncing) {
actions.style.visibility = "collapse"
invitationText.style.visibility = "hidden"
+ invitationNoteText.style.visibility = "hidden"
quote_img.style.visibility = "collapse"
noteText.style.visibility = "visible"
} else {
actions.style.visibility = "visible"
invitationText.style.visibility = "visible"
+ invitationNoteText.style.visibility = "visible"
quote_img.style.visibility = "visible"
noteText.style.visibility = "collapse"
}