java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devs' of https://gitlab.com/big.imcloud/badyfeed/bf into devs

Browse Source
dev_bert
jonghwan76 3 years ago
parent f583b86f8b 1ef5f3ada1
commit 6e3c31f24e
13 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl
Unescape View File

@ -13,7 +13,7 @@
<input type="hidden" id="email" name="email" value="${model['email']!}"> <input type="hidden" id="email" name="email" value="${model['email']!}">
<div id="search_id" class="search_id"> <div id="search_id" class="search_id">
<div class="search_phone"> <div>
<h3>비밀번호 재설정</h3> <h3>비밀번호 재설정</h3>
<div style="padding-bottom: 15px" class="input_search_phone"> <div style="padding-bottom: 15px" class="input_search_phone">
<input type="password" maxlength="15" id="password_1" name="password_1" value="" class="input_box" placeholder="영문/숫자/특수문자2조합 9~15자 이내로 작성해주세요." /> <input type="password" maxlength="15" id="password_1" name="password_1" value="" class="input_box" placeholder="영문/숫자/특수문자2조합 9~15자 이내로 작성해주세요." />

2
src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_01.ftl
Unescape View File

@ -13,7 +13,7 @@
<!-- search_id --> <!-- search_id -->
<div id="search_id" class="search_id"> <div id="search_id" class="search_id">
<div class="search_phone"> <div>
<p>전화번호</p> <p>전화번호</p>
<div class="input_search_phone"> <div class="input_search_phone">
<input type="text" maxlength="15" onkeyup="this.value = phone_mask(this.value)" id="phone" name="phone" value="" placeholder="가입 시 사용한 전화번호를 입력하세요.(숫자만 가능)" class="input_box" /> <input type="text" maxlength="15" onkeyup="this.value = phone_mask(this.value)" id="phone" name="phone" value="" placeholder="가입 시 사용한 전화번호를 입력하세요.(숫자만 가능)" class="input_box" />

2
src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl
Unescape View File

@ -14,7 +14,7 @@
<!-- search_id --> <!-- search_id -->
<div id="search_id" class="search_id"> <div id="search_id" class="search_id">
<div class="search_phone"> <div>
<h3>전화번호</h3> <h3>전화번호</h3>
<div class="input_search_phone"> <div class="input_search_phone">
<input readonly type="number" id="phone" name="phone" value="${model['phone_num']}" class="input_box" /> <input readonly type="number" id="phone" name="phone" value="${model['phone_num']}" class="input_box" />

2
src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_result.ftl
Unescape View File

@ -13,7 +13,7 @@
<!-- search_id --> <!-- search_id -->
<div id="search_id" class="search_id"> <div id="search_id" class="search_id">
<div class="search_phone"> <div>
<p>가입하신 아이디입니다.</p> <p>가입하신 아이디입니다.</p>
<div class="input_search_phone"> <div class="input_search_phone">
<input readonly type="text" id="email" name="email" value="${model['email']}" class="input_box" /> <input readonly type="text" id="email" name="email" value="${model['email']}" class="input_box" />

2
src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_02.ftl
Unescape View File

@ -10,7 +10,7 @@
</header> </header>
<div id="search_id" class="search_id"> <div id="search_id" class="search_id">
<div class="search_phone"> <div>
<h3>이메일</h3> <h3>이메일</h3>
<div class="input_search_phone"> <div class="input_search_phone">
<input readonly type="text" id="email" name="email" value="${model['email']}" class="input_box" /> <input readonly type="text" id="email" name="email" value="${model['email']}" class="input_box" />

2
src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl
Unescape View File

@ -14,7 +14,7 @@
<!-- search_id --> <!-- search_id -->
<div id="search_id" class="search_id"> <div id="search_id" class="search_id">
<div class="search_phone"> <div>
<h3>전화번호</h3> <h3>전화번호</h3>
<div class="input_search_phone"> <div class="input_search_phone">
<input readonly type="number" id="phone" name="phone" value="${model['phone_num']}" class="input_box" /> <input readonly type="number" id="phone" name="phone" value="${model['phone_num']}" class="input_box" />

2
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl
Unescape View File

@ -9,7 +9,7 @@
</header> </header>
<form name="frmMember" id="frmMember" method="post"> <form name="frmMember" id="frmMember" method="post">
<div id="search_id" class="search_id"> <div id="search_id" class="search_id">
<div class="search_phone"> <div>
<h3>현재 설정된 닉네임</h3> <h3>현재 설정된 닉네임</h3>
<div class="input_search_phone"> <div class="input_search_phone">
<input readonly type="text" id="nickname_now" name="nickname_now" value="<#if Session.rm_member?has_content>${Session.rm_member['nickname']!}</#if>" class="input_box" /> <input readonly type="text" id="nickname_now" name="nickname_now" value="<#if Session.rm_member?has_content>${Session.rm_member['nickname']!}</#if>" class="input_box" />

2
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_02.ftl
Unescape View File

@ -13,7 +13,7 @@
<!-- search_id --> <!-- search_id -->
<div id="search_id" class="search_id"> <div id="search_id" class="search_id">
<div class="search_phone"> <div>
<h3>전화번호</h3> <h3>전화번호</h3>
<div class="input_search_phone"> <div class="input_search_phone">
<input readonly type="number" id="phone" name="phone" value="${model['phone']}" class="input_box" /> <input readonly type="number" id="phone" name="phone" value="${model['phone']}" class="input_box" />

2
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl
Unescape View File

@ -14,7 +14,7 @@
<div id="search_id" class="search_id"> <div id="search_id" class="search_id">
<input type="hidden" id="s_no" value="${model['s_no']}"> <input type="hidden" id="s_no" value="${model['s_no']}">
<div class="search_phone"> <div>
<h3>전화번호</h3> <h3>전화번호</h3>
<div class="input_search_phone"> <div class="input_search_phone">
<input readonly type="number" id="phone" name="phone" value="${model['phone_num']}" class="input_box" /> <input readonly type="number" id="phone" name="phone" value="${model['phone_num']}" class="input_box" />

2
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl
Unescape View File

@ -10,7 +10,7 @@
<form name="frmMember" id="frmMember" method="post"> <form name="frmMember" id="frmMember" method="post">
<div id="search_id" class="search_id"> <div id="search_id" class="search_id">
<div class="search_phone"> <div>
<h3>현재 비밀번호</h3> <h3>현재 비밀번호</h3>
<div class="input_search_phone"> <div class="input_search_phone">
<input type="password" id="password_now" name="password_now" value="" maxlength="15" placeholder="현재 비밀번호를 입력해 주세요." class="input_box" /> <input type="password" id="password_now" name="password_now" value="" maxlength="15" placeholder="현재 비밀번호를 입력해 주세요." class="input_box" />

4
src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
Unescape View File

@ -23,7 +23,7 @@
<#list model['music_list'] as item> <#list model['music_list'] as item>
<div name="list_item" class="item_order flex_box"> <div name="list_item" class="item_order flex_box">
<input type="hidden" name="music_list" value="/bf/upload/${item['music_file_path']!}"> <input type="hidden" name="music_list" value="/bf/upload/${item['music_file_path']!}">
<div>${item['music_name']!}</div> <div class="select_music">${item['music_name']!}</div>
<#if item['base_yn'] == 'N'> <#if item['base_yn'] == 'N'>
<div class='btn_cont'> <div class='btn_cont'>
@ -188,7 +188,7 @@
$(".list").append( $(".list").append(
"<div name='list_item' class='item_order flex_box'>" + "<div name='list_item' class='item_order flex_box'>" +
" <div><input type='file' accept='audio/*' onchange='fn_M_my_fileSave(this);' name='file'></div>" + " <div class='select_music'><input type='file' accept='audio/*' onchange='fn_M_my_fileSave(this);' name='file'></div>" +
" <div>" + " <div>" +
" <div class='btn' onclick='fncRemove(this);'>삭제</div>" + " <div class='btn' onclick='fncRemove(this);'>삭제</div>" +
" </div>" + " </div>" +

16
src/main/webapp/m/css/style.css
Unescape View File

@ -4694,7 +4694,10 @@ main {
} }
.item_order .select_music { .item_order .select_music {
width: 15rem; flex: 1;
border: 1px solid;
overflow: hidden;
text-overflow: ellipsis;
} }
.item_add { .item_add {
@ -14589,11 +14592,13 @@ main.sona_cont_measurement {
height: 30px; height: 30px;
color: #fff; color: #fff;
background: #C3C3C3; background: #C3C3C3;
font-size: 14px; font-size: 0.7rem;
line-height: 30px; line-height: 0.8rem;
padding:0 15px; padding:0 0.3rem;
border-radius: 20px; border-radius: 20px;
margin-bottom: 10px; margin-bottom: 10px;
display: flex;
align-items: center;
} }
.snack_input .flex{ .snack_input .flex{
@ -15255,6 +15260,9 @@ main.sona_cont_measurement {
margin-bottom: 5px; margin-bottom: 5px;
} }
/* 8-14.설정하기-음악설정 */
{}
/* 8-15.설정하기-카테고리수정 */ /* 8-15.설정하기-카테고리수정 */
.m_set_recode_order { .m_set_recode_order {
padding: 15px 15px 0; padding: 15px 15px 0;

10
src/main/webapp/m/html/setting/8-14.설정하기-음악설정.html
Unescape View File

@ -29,27 +29,27 @@
<div id="word_list"> <div id="word_list">
<div class="set_list_wrap list"> <div class="set_list_wrap list">
<div name="list_item" class="item_order flex_box"> <div name="list_item" class="item_order flex_box">
<div>기본음악 1</div> <div class="select_music">기본음악 1 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</div>
<input type="hidden" name="record_list" value="${item['cd_no']!}"> <input type="hidden" name="record_list" value="${item['cd_no']!}">
<div class="btn" onclick="">음소거</div> <div class="btn" onclick="">음소거</div>
</div> </div>
<div name="list_item" class="item_order flex_box"> <div name="list_item" class="item_order flex_box">
<div>기본음악 2</div> <div class="select_music">기본음악 2 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</div>
<input type="hidden" name="record_list" value="${item['cd_no']!}"> <input type="hidden" name="record_list" value="${item['cd_no']!}">
<div class="btn" onclick="">음소거</div> <div class="btn" onclick="">음소거</div>
</div> </div>
<div name="list_item" class="item_order flex_box"> <div name="list_item" class="item_order flex_box">
<div>기본음악 3</div> <div class="select_music">기본음악 3 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</div>
<input type="hidden" name="record_list" value="${item['cd_no']!}"> <input type="hidden" name="record_list" value="${item['cd_no']!}">
<div class="btn" onclick="">음소거</div> <div class="btn" onclick="">음소거</div>
</div> </div>
<div name="list_item" class="item_order flex_box"> <div name="list_item" class="item_order flex_box">
<div>기본음악 4</div> <div class="select_music">기본음악 4 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</div>
<input type="hidden" name="record_list" value="${item['cd_no']!}"> <input type="hidden" name="record_list" value="${item['cd_no']!}">
<div class="btn" onclick="">음소거</div> <div class="btn" onclick="">음소거</div>
</div> </div>
<div name="list_item" class="item_order flex_box"> <div name="list_item" class="item_order flex_box">
<div>기본음악 5</div> <div class="select_music">Waves Crashing on Rock Beach.mp3</div>
<input type="hidden" name="record_list" value="${item['cd_no']!}"> <input type="hidden" name="record_list" value="${item['cd_no']!}">
<div class="btn" onclick="">음소거</div> <div class="btn" onclick="">음소거</div>
</div> </div>

Write Preview
Loading…
Cancel
Save