fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Communication module bootstrap UI fix.

Browse source 
Module selector popup UI fixed.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12577 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2013-01-21 10:06:40 +00:00
parent c9edd9eb33
commit f6a00de24c
14 changed files with 168 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/communication/skins/default/add_friend.html
View file

@ -3,7 +3,7 @@
<load target="../../../../common/css/bootstrap-responsive.min.css" />
<load target="css/communication.css" />
<load target="js/communication.js" />
<div class="x_page-header">
<div class="page-header">
<h1>{$lang->cmd_add_friend}</h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
@ -13,7 +13,7 @@
<input type="hidden" name="module" value="communication" />
<input type="hidden" name="act" value="procCommunicationAddFriend" />
<input type="hidden" name="target_srl" value="{$target_info->member_srl}" />
<table class="x_table x_table-striped x_table-hover">
<table class="table table-striped table-hover">
<tr>
<th scope="row">{$lang->nick_name}</th>
<td>{$target_info->nick_name}</td>
@ -25,11 +25,11 @@
<option value="">{$lang->default_friend_group}</option>
<option loop="$friend_group_list => $key,$val" value="{$val->friend_group_srl}">{$val->title}</option>
</select>
<a href="{getUrl('act','dispCommunicationAddFriendGroup')}" class="x_btn" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
<a href="{getUrl('act','dispCommunicationAddFriendGroup')}" class="btn" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
</td>
</tr>
</table>
<div class="btnArea" style="border-top:0;padding:0">
<input type="submit" value="{$lang->cmd_add_friend}" class="x_btn x_btn-inverse" />
<input type="submit" value="{$lang->cmd_add_friend}" class="btn btn-inverse" />
</div>
</form>

14
modules/communication/skins/default/add_friend_group.html
View file

@ -2,7 +2,7 @@
<load target="../../../../common/css/bootstrap-responsive.min.css" />
<load target="css/communication.css" />
<load target="js/communication.js" />
<div class="x_page-header">
<div class="page-header">
<h1>
<!--@if($friend_group->friend_group_srl)-->
{$lang->cmd_rename_friend_group}
@ -14,16 +14,16 @@
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="addFriendGroup" action="./" method="post" class="x_form-horizontal xc">
<form ruleset="addFriendGroup" action="./" method="post" class="form-horizontal xc">
<input type="hidden" name="module" value="communication" />
<input type="hidden" name="act" value="procCommunicationAddFriendGroup" />
<input type="hidden" name="friend_group_srl" value="{$friend_group->friend_group_srl}" />
<div class="x_control-group">
<label for="title" class="x_control-label">{$lang->msg_insert_group_name}</label>
<div class="x_controls"><input name="title" id="title" type="text" value="{htmlspecialchars($friend_group->title)}"/></div>
<div class="control-group">
<label for="title" class="control-label">{$lang->msg_insert_group_name}</label>
<div class="controls"><input name="title" id="title" type="text" value="{htmlspecialchars($friend_group->title)}"/></div>
</div>
<div class="btnArea">
<input cond="$friend_group->friend_group_srl" type="submit" value="{$lang->cmd_modify}" class="x_btn x_btn-inverse" />
<input cond="!$friend_group->friend_group_srl" type="submit" value="{$lang->cmd_insert}" class="x_btn x_btn-inverse" />
<input cond="$friend_group->friend_group_srl" type="submit" value="{$lang->cmd_modify}" class="btn btn-inverse" />
<input cond="!$friend_group->friend_group_srl" type="submit" value="{$lang->cmd_insert}" class="btn btn-inverse" />
</div>
</form>

4
modules/communication/skins/default/common_header.html
View file

@ -3,8 +3,8 @@
<load target="css/communication.css" />
<load target="js/communication.js" />
<section class="xc">
<ul class="x_nav x_nav-tabs" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
<li loop="$logged_info->menu_list => $key,$val" class="x_active"|cond="$key==$act">
<ul class="nav nav-tabs" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
<li loop="$logged_info->menu_list => $key,$val" class="active"|cond="$key==$act">
<a href="{getUrl('act',$key)}">{Context::getLang($val)}</a>
</li>
</ul>

14
modules/communication/skins/default/css/communication.css
View file

@ -1,8 +1,8 @@
@charset "utf-8";
.xc .x_nav a,
.xc .x_btn{text-decoration:none}
.xc .x_table{border-top:1px solid #ddd;border-bottom:1px solid #ddd}
.xc .x_table>caption{text-align:left;font-weight:bold}
.xc .x_table>caption>.x_pull-right{position:relative;top:-8px}
.xc .x_control-group:first-child,
.xc .x_control-group:first-of-type{border-top:0}
.xc .nav a,
.xc .btn{text-decoration:none}
.xc .table{border-top:1px solid #ddd;border-bottom:1px solid #ddd}
.xc .table>caption{text-align:left;font-weight:bold}
.xc .table>caption>.pull-right{position:relative;top:-8px}
.xc .control-group:first-child,
.xc .control-group:first-of-type{border-top:0}

22
modules/communication/skins/default/friends.html
View file

@ -17,19 +17,19 @@
<option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
<!--@end-->
</select>
<button type="button" class="x_btn" onclick="doJumpFriendGroup()">{$lang->cmd_move}</button>
<button type="button" class="btn" onclick="doJumpFriendGroup()">{$lang->cmd_move}</button>
</span>
<select name="friend_group_list" id="friend_group_list" style="margin:0">
<option loop="$friend_group_list => $key,$val" value="{$val->friend_group_srl}" selected="selected"|cond="$val->friend_group_srl == $friend_group_srl">{$val->title}</option>
</select>
<span class="x_btn-group">
<button type="button" class="x_btn" onclick="doRenameFriendGroup();return false;">{$lang->cmd_modify}</button>
<button type="button" class="x_btn" onclick="doDeleteFriendGroup();return false;">{$lang->cmd_delete}</button>
<a href="{getUrl('','module','communication','act','dispCommunicationAddFriendGroup')}" class="x_btn" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
<span class="btn-group">
<button type="button" class="btn" onclick="doRenameFriendGroup();return false;">{$lang->cmd_modify}</button>
<button type="button" class="btn" onclick="doDeleteFriendGroup();return false;">{$lang->cmd_delete}</button>
<a href="{getUrl('','module','communication','act','dispCommunicationAddFriendGroup')}" class="btn" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
</span>
</div>
<table class="x_table x_table-striped x_table-hover">
<table class="table table-striped table-hover">
<caption>Total: {$total_count}</caption>
<thead>
<tr>
@ -52,16 +52,16 @@
<select name="target_friend_group_srl" style="margin:0">
<option loop="$friend_group_list => $key,$val" value="{$val->friend_group_srl}">{$val->title}</option>
</select>
<span class="x_btn-group">
<button type="submit" name="act" class="x_btn" value="procCommunicationMoveFriend">{$lang->cmd_move}</button>
<button type="submit" name="act" class="x_btn" value="procCommunicationDeleteFriend">{$lang->cmd_delete}</button>
<span class="btn-group">
<button type="submit" name="act" class="btn" value="procCommunicationMoveFriend">{$lang->cmd_move}</button>
<button type="submit" name="act" class="btn" value="procCommunicationDeleteFriend">{$lang->cmd_delete}</button>
</span>
</div>
<div class="x_pagination x_pagination-centered">
<div class="pagination pagination-centered">
<ul>
<li><a href="{getUrl('page','','document_srl','')}" class="direction">&laquo; {$lang->first_page}</a></li>
<!--@while($page_no = $page_navigation->getNextPage())-->
<li class="x_active"|cond="$page == $page_no"><a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a></li>
<li class="active"|cond="$page == $page_no"><a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a></li>
<!--@end-->
<li><a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="direction">{$lang->last_page} &raquo;</a></li>
</ul>

22
modules/communication/skins/default/messages.html
View file

@ -6,7 +6,7 @@
<select name="message_box" style="margin:0">
<option loop="$lang->message_box => $key,$val" selected="selected"|cond="$key==$message_type" value="{$key}" >{$val}</option>
</select>
<input type="submit" value="{$lang->cmd_select}" class="x_btn" />
<input type="submit" value="{$lang->cmd_select}" class="btn" />
</form>
<form action="./" method="POST" class="setupMessage">
<input type="hidden" name="module" value="communication" />
@ -15,10 +15,10 @@
<select name="allow_message" style="margin:0">
<option loop="$lang->allow_message_type => $key,$val" value="{$key}" selected="selected"|cond="$logged_info->allow_message==$key">{$val}</option>
</select>
<input type="submit" value="{$lang->cmd_save}" class="x_btn">
<input type="submit" value="{$lang->cmd_save}" class="btn">
</form>
</div>
<table class="x_table x_table-striped x_table-hover" cond="$message">
<table class="table table-striped table-hover" cond="$message">
<tr>
<th>{$message->title}</th>
</tr>
@ -34,17 +34,17 @@
</td>
</tr>
</table>
<div class="btnArea x_btn-group" cond="$message" style="margin-bottom:20px">
<button class="x_btn" cond="$message->message_type != 'S' && $message->member_srl != $logged_info->member_srl" type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');">{$lang->cmd_reply_message}</button>
<button class="x_btn" cond="$message->message_type == 'R'" type="button" onclick="doStoreMessage('{$message->message_srl}');">{$lang->cmd_store}</button>
<button class="x_btn" type="button" onclick="doDeleteMessage('{$message->message_srl}');">{$lang->cmd_delete}</button>
<div class="btnArea btn-group" cond="$message" style="margin-bottom:20px">
<button class="btn" cond="$message->message_type != 'S' && $message->member_srl != $logged_info->member_srl" type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');">{$lang->cmd_reply_message}</button>
<button class="btn" cond="$message->message_type == 'R'" type="button" onclick="doStoreMessage('{$message->message_srl}');">{$lang->cmd_store}</button>
<button class="btn" type="button" onclick="doDeleteMessage('{$message->message_srl}');">{$lang->cmd_delete}</button>
</div>
<form action="./" method="get" id="fo_message_list">
<input type="hidden" name="module" value="communication" />
<input type="hidden" name="act" value="procCommunicationDeleteMessages" />
<input type="hidden" name="message_type" value="{$message_type}" />
<table class="x_table x_table-striped x_table-hover">
<table class="table table-striped table-hover">
<thead>
<tr>
<th scope="col" class="title">{$lang->title}</th>
@ -78,14 +78,14 @@
</tbody>
</table>
<div class="btnArea">
<input type="submit" class="x_btn" value="{$lang->cmd_delete}" />
<input type="submit" class="btn" value="{$lang->cmd_delete}" />
</div>
</form>
<div class="x_pagination x_pagination-centered">
<div class="pagination pagination-centered">
<ul>
<li><a href="{getUrl('page','','document_srl','')}" class="direction">&laquo; {$lang->first_page}</a></li>
<!--@while($page_no = $page_navigation->getNextPage())-->
<li class="x_active"|cond="$page == $page_no"><a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a></li>
<li class="active"|cond="$page == $page_no"><a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a></li>
<!--@end-->
<li><a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="direction">{$lang->last_page} &raquo;</a></li>
</ul>

14
modules/communication/skins/default/new_message.html
View file

@ -2,10 +2,10 @@
<load target="../../../../common/css/bootstrap-responsive.min.css" />
<load target="js/communication.js" />
<div class="xe" cond="$message">
<div class="x_page-header">
<div class="page-header">
<h1>{$lang->message_received}</h1>
</div>
<table class="x_table x_table-striped x_table-hover">
<table class="table table-striped table-hover">
<!--@if($message->member_srl != $logged_info->member_srl)-->
<tr>
<th scope="row">{$lang->sender}</th>
@ -21,11 +21,11 @@
</tr>
</table>
<div class="btnArea">
<span class="etc"><button type="button" class="x_btn" onclick="location.href=location.href;return false;">{$lang->cmd_next}</button></span>
<span class="x_btn-group">
<button cond="$message->member_srl != $logged_info->member_srl" class="x_btn" type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;">{$lang->cmd_reply_message}</button>
<button type="button" class="x_btn" onclick="doStoreMessage('{$message->message_srl}');return false;">{$lang->cmd_store}</button>
<button type="button" class="x_btn" onclick="doDeleteMessage('{$message->message_srl}');return false;">{$lang->cmd_delete}</button>
<span class="etc"><button type="button" class="btn" onclick="location.href=location.href;return false;">{$lang->cmd_next}</button></span>
<span class="btn-group">
<button cond="$message->member_srl != $logged_info->member_srl" class="btn" type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;">{$lang->cmd_reply_message}</button>
<button type="button" class="btn" onclick="doStoreMessage('{$message->message_srl}');return false;">{$lang->cmd_store}</button>
<button type="button" class="btn" onclick="doDeleteMessage('{$message->message_srl}');return false;">{$lang->cmd_delete}</button>
</span>
</div>
</div>

8
modules/communication/skins/default/send_message.html
View file

@ -1,10 +1,10 @@
<load target="../../../../common/css/bootstrap.min.css" />
<load target="../../../../common/css/bootstrap-responsive.min.css" />
<load target="js/communication.js" />
<div class="x_page-header">
<div class="page-header">
<h1>{$lang->cmd_send_message}</h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE" class="x_alert x_alert-{$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE" class="alert alert-{$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="sendMessage" action="./" method="post">
@ -12,7 +12,7 @@
<input type="hidden" name="act" value="procCommunicationSendMessage" />
<input type="hidden" name="content" value="{htmlspecialchars($source_message->content)}" />
<input type="hidden" name="receiver_srl" value="{$receiver_info->member_srl}" />
<table class="x_table x_table-striped x_table-hover">
<table class="table table-striped table-hover">
<tr>
<th scope="row"><label for="textfield1">{$lang->receiver}</label></th>
<td>{$receiver_info->nick_name}</td>
@ -28,6 +28,6 @@
</table>
{$editor}
<div class="btnArea">
<input type="submit" value="{$lang->cmd_send_message}" class="x_btn x_btn-inverse" />
<input type="submit" value="{$lang->cmd_send_message}" class="btn btn-inverse" />
</div>
</form>