Skip to content
Snippets Groups Projects
Commit 85537d76 authored by Aurora Schmidt-Brekken Vollvik's avatar Aurora Schmidt-Brekken Vollvik
Browse files

Moved the "new group chat" button from the user list to the group chat list

parent c599079c
No related branches found
No related tags found
No related merge requests found
Pipeline #159811 passed
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
<ul id="userList"> <ul id="userList">
<li onclick="openCalculator(); toggleUserList();"><i class="fas fa-user userIcon"></i>Kalkulator</li> <li onclick="openCalculator(); toggleUserList();"><i class="fas fa-user userIcon"></i>Kalkulator</li>
<li onclick="openNewGroupChatForm(); toggleUserList();"><i class="fas fa-plus userIcon"></i>Gruppesamtale</li>
</ul> </ul>
<ul id="groupChatList"> <ul id="groupChatList">
<li onclick="openNewGroupChatForm(); toggleUserList();"><i class="fas fa-plus userIcon"></i>Gruppesamtale</li>
</ul> </ul>
<div class="popup" id="formpopup"> <div class="popup" id="formpopup">
...@@ -63,18 +63,18 @@ ...@@ -63,18 +63,18 @@
<div class="messages" id="messages"></div> <div class="messages" id="messages"></div>
<form class="chatInput" id="messageForm" autocomplete="off" onsubmit="postMessage(event)"> <form class="chatInput" id="messageForm" autocomplete="off" onsubmit="postMessage(event)">
<input id="messageInput" class="textfield" type="text" placeholder="Melding..." aria-label="Skriv melding"> <input id="messageInput" class="textfield" type="text" placeholder="Melding..." aria-labelledby="messageSubmitButton">
<button class="submitBtn">Send melding</button> <button id="messageSubmitButton" class="submitBtn">Send melding</button>
</form> </form>
<form class="chatInput" id="calculateForm" autocomplete="off" onsubmit="submitExpression(event)"> <form class="chatInput" id="calculateForm" autocomplete="off" onsubmit="submitExpression(event)">
<input id="expressionInput" class="textfield" type="text" placeholder="Regnestykke..." aria-label="Skriv regnestykke"> <input id="expressionInput" class="textfield" type="text" placeholder="Regnestykke..." aria-labelledby="expressionSubmitButton">
<button class="submitBtn">Send regnestykke</button> <button id="expressionSubmitButton" class="submitBtn">Send regnestykke</button>
</form> </form>
<form class="chatInput" id="groupChatForm" autocomplete="off" onsubmit="postGroupMessage(event)"> <form class="chatInput" id="groupChatForm" autocomplete="off" onsubmit="postGroupMessage(event)">
<input id="groupMessageInput" class="textfield" type="text" placeholder="Melding..." aria-label="Skriv melding til gruppechat"> <input id="groupMessageInput" class="textfield" type="text" placeholder="Melding..." aria-labelledby="groupChatMessageSubmitButton">
<button class="submitBtn">Send melding</button> <button id="groupChatMessageSubmitButton" class="submitBtn">Send melding</button>
</form> </form>
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment