Commit ec36e743 by Lee Munkyeong

Merge branch 'feature/42984_modify_offline_display_elements' into 'develop'

42984,42983_オフラインの時の非表示、非活性項目修正

See merge request !149
parents 23735ee1 e30e30f9
......@@ -108,8 +108,10 @@
</a>
</div>
<div class="footer_item">
<img src="icon/icon_paste.png" alt="文書アイコン" onclick="CHAT_UI.startCollaboration(COLLABORATION_TYPE.DOCUMENT);">
<a href="javascript:CHAT_UI.startCollaboration(COLLABORATION_TYPE.DOCUMENT);">
<img src="icon/icon_paste.png" alt="文書アイコン">
<p>文書</p>
</a>
</div>
<div class="footer_item">
<a href="javascript:CHAT_UI.startCollaboration(COLLABORATION_TYPE.CAMERA);">
......@@ -125,8 +127,10 @@
</div>
<!--リリース後開発予定-->
<div class="footer_item">
<img src="icon/icon_whiteboard_gray.png" alt="ホワイトボードアイコン" onclick="javascript:CHAT_UI.startCollaboration(COLLABORATION_TYPE.BOARD);">
<a href="javascript:CHAT_UI.startCollaboration(COLLABORATION_TYPE.BOARD);">
<img src="icon/icon_whiteboard_gray.png" alt="ホワイトボードアイコン">
<p>ボード</p>
</a>
</div>
</div>
</div>
......
......@@ -2538,7 +2538,8 @@ CHAT_UI.refreshForOnline = function() {
$('#messageInput').prop('disabled', false);
$('#messageInput').prop('placeholder', 'メッセージを入力してください');
$('#favoriteButton').prop('disabled', false);
$('#roomMenu').show();
$('#room_name_change_button').removeClass('ui-state-disabled');
$('#add_user_button').removeClass('ui-state-disabled');
$('.fa-download').show();
if (typeof $('#roomTitle').val() != 'undefined') {
CHAT_SOCKET.connectSocket();
......@@ -2557,7 +2558,8 @@ CHAT_UI.refreshForOffline = function() {
$('#messageInput').prop('disabled', true);
$('#messageInput').prop('placeholder', '');
$('#favoriteButton').prop('disabled', true);
$('#roomMenu').hide();
$('#room_name_change_button').addClass('ui-state-disabled');
$('#add_user_button').addClass('ui-state-disabled');
$('.fa-download').hide();
}
......
......@@ -10,10 +10,10 @@
</div>
<div class="modal-body">
<ul>
<li><a href="chat_change_room_name.html"><img src="icon/icon_change_room_name.png" alt="ルーム名変更">ルーム名変更</a>
<li><a id="room_name_change_button" href="chat_change_room_name.html"><img src="icon/icon_change_room_name.png" alt="ルーム名変更">ルーム名変更</a>
</li>
<li><a href="chat_add_user.html"><img src="icon/icon_add_user.png" alt="ユーザー招待">ユーザー招待</a></li>
<li ><a href="javascript:return false;" onclick="CHAT_UI.roomDisplayOff();"><img src="icon/icon_display_off_chatroom.png" alt="ユーザー招待">部屋非表示</a></li>
<li><a id="add_user_button" href="chat_add_user.html"><img src="icon/icon_add_user.png" alt="ユーザー招待">ユーザー招待</a></li>
<li ><a id="display_off_button" href="javascript:return false;" onclick="CHAT_UI.roomDisplayOff();"><img src="icon/icon_display_off_chatroom.png" alt="ユーザー招待">部屋非表示</a></li>
</ul>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment