Commit 5bd8f0ba by Takatoshi Miura

アーカイブ一覧 新デザイン適用

parent 9ca6a036
......@@ -1403,3 +1403,111 @@ input:checked + .tab_class + .content_class {
text-align: center;
overflow: hidden;
}
/**************************** archive *************************/
.archive_list ul {
padding: 0;
overflow-y: scroll;
height: calc(100vh - 195px);
}
.arhive_img .img_wrap {
width: 50px;
height: 50px;
border-radius: 50%;
text-align: center;
line-height: 46px;
}
.arhive_img img {
width: 40px;
height: 40px;
}
.archive_list ul li {
list-style: none;
border-bottom: 1px solid #e2e8f0;
position: relative;
}
.archive_row {
padding: 10px;
color: #323743;
}
.archive_row:hover {
background: aliceblue;
}
.bg_blue {
background: #0070ca;
}
.bg_green {
background: #4dca00;
}
.bg_orange {
background: #ca6d00;
}
.archive_list ul li:first-child {
border-top: 1px solid #e2e8f0;
}
.archive_desc {
padding-left: 10px;
position: relative;
width: calc(100% - 100px);
overflow: hidden;
white-space: nowrap;
}
.archive_date span {
color: #323743;
font-size: 14px;
}
.archive_name span {
color: #323743;
font-size: 16px;
font-weight: 500;
}
.archive_name {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
/**************************** archive detail *************************/
.archive_detail .ttl {
font-size: 18px;
font-weight: bold;
}
.archive_detail .item {
margin-bottom: 20px;
}
.archive_detail .archive_detail_desc img {
width: 80px;
height: 80px;
border-radius: 50%;
}
.archive_detail .archive_detail_desc .archive_detail_user_list ul {
padding-left: 0;
overflow-x: scroll;
}
.archive_detail .archive_detail_desc .archive_detail_user_list ul li {
list-style: none;
margin: 0 5px;
}
.archive_detail_desc {
margin: 0 10px;
}
.archive_detail .archive_detail_desc .archive_detail_user_list span,
.archive_detail .archive_detail_desc .archive_detail_sv_user span {
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 90px;
}
@media screen and (max-width: 768px) {
.archive_name {
font-size: 14px;
}
.archive_detail .ttl {
font-size: 16px;
}
.archive_detail_desc span {
font-size: 14px;
}
}
......@@ -388,20 +388,23 @@
</div>
<div class="tab-pane fade" id="pills-archive" role="tabpanel" aria-labelledby="pills-archive-tab">
<div class="inbox_archive">
<div class="heading_srch">
<div class="srch_bar">
<div class="stylish-input-group">
<input id="contactListKeyword" type="text" class="search-bar" placeholder="Search">
<span class="input-group-addon">
<button type="button"> <i class="fa fa-search" aria-hidden="true"></i> </button>
</span>
</div>
</div>
<main id="archive">
<div class="search_form">
<form>
<input type="search" name="search" placeholder="Search">
<span class="src_icon"></span>
<a href="#" class="cancel none" id="archiveCancel">Cancel</a>
</form>
</div>
<div class="archive_list content">
<ul id="archiveListUl">
</ul>
</div>
<div id="archive_list" class="inbox_archive row">
<div class="archive_list">
<ul class="overlay_src_msg">
</ul>
</div>
</div>
</main>
</div>
<div id="archive_detail" class="archive_detail" >
......@@ -757,24 +760,25 @@
</div>
</script>
<script id="archive-template" type="text/template">
<div class="archive_list col-12">
<div class="archive_data">
<div class="archive_img">
<img src={{thumbnailImage}} alt="">
</div>
<div class="archive_ib">
<div class="row">
<div class="archive_date_font col-10">
<span class="archive_date">{{insertDate}}</span>
<li class="d-flex align-items-center">
<div class="w-100 archive_row">
<div class="archive_item d-flex flex-row align-items-center w-100">
<div class="arhive_img">
<div class="img_wrap bg_blue">
<img src={{typeImage}} alt="" />
</div>
<div class="archive_type">
<span class="text-truncate col-2 {{type}}">{{archiveType}}</span>
</div>
<div class="archive_desc">
<div class="archive_name">
<span>{{fileName}}</span>
</div>
<div class="archive_date">
<span>{{insertDate}}</span>
</div>
</div>
<p class="archive_file_name text-truncate">{{fileName}}</p>
</div>
</div>
</div>
</li>
</script>
<script id="archive-detail-template" type="text/template">
<div id="archive_player" class="player">
......
......@@ -892,6 +892,8 @@ CHAT_UI.htmlElementTextInitialize = function(languageCode) {
$("#collaborationAllGroup").text(getLocalizedString("collaborationAllGroup"))
$("#collaborationFavorite").text(getLocalizedString("collaborationFavorite"))
$("#coviewCapture").text(getLocalizedString("coviewCapture"))
$("#archiveCancel").text(getLocalizedString("archiveCancel"))
}
// 画像の読み込みが全て終わったタイミングでコールバック実行
......@@ -1246,7 +1248,7 @@ CHAT_UI.refreshArchiveScreen = function() {
$('.titleRoomName').text(archiveListTitle);
// 初期化
$('#archive_list').html('');
$('#archiveListUl').html('');
$('#pills-archive-tab').tab('show');
// アーカイブの様式を読み込む
......@@ -1258,67 +1260,55 @@ CHAT_UI.refreshArchiveScreen = function() {
// アーカイブ一覧取得&表示
var archiveList = CHAT_DB.getArchiveList();
archiveList.forEach(function(archive) {
var archiveType = '';
var css = '';
var typeImage = "";
switch(archive.archiveType) {
case 0:
archiveType = getLocalizedString("archiveTypeImage");
css = 'type_image';
break;
case 1:
archiveType = getLocalizedString("archiveTypeMovie");
css = 'type_movie';
break;
case 2:
archiveType = getLocalizedString("archiveTypeSound");
css = 'type_sound';
break;
case 3:
// 今回のリリースに文書とその他は含めないため非表示
archiveType = getLocalizedString("archiveTypeDocument");
css = 'type_document';
break;
default:
// 今回のリリースに文書とその他は含めないため非表示
archiveType = getLocalizedString("archiveTypeOther");
css = 'type_other';
case 0: // 画像
typeImage = "./icon/icon_collabo_picture.png";
break;
case 1: // 動画
typeImage = "./icon/icon_collabo_videocam.png";
break;
case 2: // 音声
typeImage = "./icon/icon_collabo_headset.png";
break;
case 3: // 文書
typeImage = "./icon/icon_collabo_document.png";
break;
default: // その他
typeImage = "";
}
let html = Mustache.render(archiveTemplate, {
id: archive.archiveId,
fileName: archive.archiveName,
thumbnailImage: archive.archiveUrl,
insertDate: archive.archiveDate,
archiveType: archiveType,
archiveTypeCSS: css
fileName: archive.archiveName,
insertDate: archive.archiveDate,
typeImage: typeImage
});
let obj = $(jQuery.parseHTML(html)).on('click', function() {
// アーカイブ詳細画面へ遷移
$('#homeButton').hide();
$('.titleRoomName').show();
$('#archive_list').hide();
$('#archive_detail').show();
$('#bottomNav').hide();
$("#backButton").show();
$('#backButton').off().on('click', function() {
// アーカイブ一覧に戻る
$('#homeButton').show();
$("#backButton").hide();
$('.titleRoomName').show();
$('#archive_detail').hide();
$('#archive_list').show();
$('#bottomNav').show();
});
$('#homeButton').hide();
$('.titleRoomName').show();
$('#pills-archive').hide();
$('#archive_detail').show();
$('#bottomNav').hide();
$("#backButton").show();
$('#backButton').off().on('click', function() {
// アーカイブ一覧に戻る
$('#homeButton').show();
$("#backButton").hide();
$('.titleRoomName').show();
$('#archive_detail').hide();
$('#pills-archive').show();
$('#bottomNav').show();
});
// データの受け渡し
CHAT_UI.refreshArchiveDetailScreen(archive.archiveId);
});
$('#archive_list').append(obj);
$('.archive_list').css('border-bottom', '1px solid #c4c4c4');
})
$('#archiveListUl').append(obj);
});
// loadingIndicatorを非表示
CHAT_UI.dismissLoadingIndicator();
......
......@@ -86,5 +86,6 @@ $.lang.en = {
"saveDateTitle":"Save Date",
"roomNameTitle":"ChatRoom Name",
"saveUserTitle":"Save User",
"attendUserTitle":"Attend User"
"attendUserTitle":"Attend User",
"archiveCancel":"Cancel"
}
......@@ -86,5 +86,6 @@ $.lang.ja = {
"saveDateTitle":"保存日",
"roomNameTitle":"チャットルーム名",
"saveUserTitle":"保存ユーザー",
"attendUserTitle":"参加ユーザー"
"attendUserTitle":"参加ユーザー",
"archiveCancel":"キャンセル"
}
......@@ -86,5 +86,6 @@ $.lang.ko = {
"saveDateTitle":"저장 일",
"roomNameTitle":"대화방 이름",
"saveUserTitle":"저장 사용자",
"attendUserTitle":"참여 사용자"
"attendUserTitle":"참여 사용자",
"archiveCancel":"취소"
}
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