From 13affdc72af6c284b53c76921b4d1e77d7550904 Mon Sep 17 00:00:00 2001 From: ChanMyeong Date: Thu, 20 Dec 2012 10:07:40 +0000 Subject: [PATCH] Member/Communication module. Bootstrap UI applying. ...ing. git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12446 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../skins/default/add_friend.html | 13 +- .../skins/default/add_friend_group.html | 36 +++-- .../skins/default/common_footer.html | 2 +- .../skins/default/common_header.html | 15 +- .../skins/default/css/communication.css | 117 +-------------- .../communication/skins/default/friends.html | 86 ++++++----- .../communication/skins/default/messages.html | 136 +++++++++--------- .../skins/default/new_message.html | 53 +++---- .../skins/default/send_message.html | 8 +- .../member/skins/default/common_footer.html | 2 +- .../member/skins/default/common_header.html | 17 ++- modules/member/skins/default/css/member.css | 127 ++-------------- .../member/skins/default/document_list.html | 94 ++++++------ modules/member/skins/default/member_info.html | 48 +++---- modules/member/skins/default/saved_list.html | 26 ++-- .../member/skins/default/scrapped_list.html | 64 ++++----- modules/member/skins/default/signup_form.html | 1 - 17 files changed, 302 insertions(+), 543 deletions(-) diff --git a/modules/communication/skins/default/add_friend.html b/modules/communication/skins/default/add_friend.html index e3cba924f..3e3b7d208 100644 --- a/modules/communication/skins/default/add_friend.html +++ b/modules/communication/skins/default/add_friend.html @@ -1,11 +1,14 @@ + -

{$lang->cmd_add_friend}

+
+

{$lang->cmd_add_friend}

+

{$XE_VALIDATOR_MESSAGE}

-
+ @@ -21,11 +24,11 @@ - {$lang->cmd_add_friend_group} + {$lang->cmd_add_friend_group} -
- +
+
diff --git a/modules/communication/skins/default/add_friend_group.html b/modules/communication/skins/default/add_friend_group.html index 33cd3833b..60bf593f2 100644 --- a/modules/communication/skins/default/add_friend_group.html +++ b/modules/communication/skins/default/add_friend_group.html @@ -1,30 +1,28 @@ + -

- - {$lang->cmd_rename_friend_group} - - {$lang->cmd_add_friend_group} - -

+
+

+ + {$lang->cmd_rename_friend_group} + + {$lang->cmd_add_friend_group} + +

+

{$XE_VALIDATOR_MESSAGE}

-
+ -
    -
  • -

    {$lang->msg_insert_group_name}

    -

    -
    • -
+
+ +
+
- - - - - + +
diff --git a/modules/communication/skins/default/common_footer.html b/modules/communication/skins/default/common_footer.html index 04f5b8449..5eee65a11 100644 --- a/modules/communication/skins/default/common_footer.html +++ b/modules/communication/skins/default/common_footer.html @@ -1 +1 @@ -
+ diff --git a/modules/communication/skins/default/common_header.html b/modules/communication/skins/default/common_header.html index 2b4d2fbe7..359188647 100644 --- a/modules/communication/skins/default/common_header.html +++ b/modules/communication/skins/default/common_header.html @@ -1,10 +1,9 @@ + -
-
- -
+
+ diff --git a/modules/communication/skins/default/css/communication.css b/modules/communication/skins/default/css/communication.css index 7094ad8bd..0626e5fee 100644 --- a/modules/communication/skins/default/css/communication.css +++ b/modules/communication/skins/default/css/communication.css @@ -1,111 +1,8 @@ @charset "utf-8"; -/* Element Reset */ -.xc, -.xc table, -.xc input, -.xc textarea, -.xc select, -.xc button{font-family:Tahoma,Geneva,sans-serif;font-size:12px;color:#333} -.xc button, -.xc input[type=submit], -.xc input[type=reset], -.xc input[type=button]{cursor:pointer;overflow:visible} -.xc img{border:0} -.xc p{line-height:1.5} -/* Heading */ -.xc .h1, -.xc .h2, -.xc .h3, -.xc .h4{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1} -.xc .h1{border-bottom-width:4px;font-size:24px} -.xc .h2{border-bottom-width:3px;font-size:20px} -.xc .h3{border-bottom-width:2px;font-size:16px} -.xc .h4{border-bottom-width:1px;font-size:12px} -/* Lined Tab Navigation */ -.xc .nav{padding:0;margin:1em 0} -.xc .nav ul{position:relative;margin:0;padding:0;list-style:none;border-bottom:1px solid #ccc;zoom:1} -.xc .nav ul:after{content:"";display:block;clear:both} -.xc .nav li{float:left;margin-bottom:-1px} -.xc .nav li a{position:relative;float:left;text-decoration:none;border:1px solid #eee;border-bottom-color:#ccc;background:#fafafa;color:#333} -.xc .nav li a span{display:inline-block;height:14px;padding:6px 15px 6px 15px;letter-spacing:-1px;cursor:pointer} -.xc .nav li.active a{border:1px solid #ccc;border-bottom:1px solid #fff;margin-top:-1px;background:transparent} -.xc .nav li.active a span{padding-top:7px;font-weight:bold} -/* Form */ -.xc .form{margin:1em 0;padding:0} -.xc .form fieldset{margin:0 0 2em 0;padding:0;border:0} -.xc .form em{font-style:normal;color:#e00} -.xc .form label{margin-right:1em;line-height:1;vertical-align:middle} -.xc .form input[type=checkbox]+label, -.xc .form input[type=radio]+label, -.xc .form input[type=file]{cursor:pointer} -.xc .form ul{position:relative;margin:0;padding:0;list-style:none;border-top:2px solid #ccc;border-bottom:1px solid #ccc;zoom:1} -.xc .form li{list-style:none;border:1px solid #ddd;border-left:0;border-right:0;margin:-1px 0;padding:8px 0;vertical-align:top;zoom:1} -.xc .form li:first-child{border-top:0} -.xc .form li>label:first-child{display:block;font-weight:bold} -.xc .form li label em{font-weight:normal} -.xc .form label.overlap{position:absolute;color:#aaa} -.xc .form input[type=text], -.xc .form input[type=password], -.xc .form input[type=file], -.xc .form textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent} -.xc .form input[type=text], -.xc .form input[type=password], -.xc .form input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px} -.xc .form input[type=checkbox], -.xc .form input[type=radio]{margin:0;padding:0;width:13px;height:13px;vertical-align:middle} -.xc .form input[type=text][disabled=disabled], -.xc .form input[type=password][disabled=disabled], -.xc .form input[type=checkbox][disabled=disabled], -.xc .form input[type=radio][disabled=disabled], -.xc .form input[type=file][disabled=disabled], -.xc .form textarea[disabled=disabled], -.xc .form select[disabled=disabled]{background:#ddd !important;text-shadow:1px 1px 0 #fff} -.xc .form textarea{padding:3px 4px;vertical-align:top} -.xc .form span.desc, -.xc .form em.desc{line-height:22px;vertical-align:middle;margin:0 10px} -.xc .form p.desc{margin:.25em 0;line-height:1.4} -.xc .form .q{font-weight:bold;margin:0 0 5px 0} -.xc .form .a{margin:0 0 5px 0} -.xc .form .tgForm{margin-right:1em} -.xc .form .h1 + ul, -.xc .form .h2 + ul, -.xc .form .h3 + ul, -.xc .form .h4 + ul{border-top:0} -/* Table */ -.xc .table{margin:1em 0} -.xc .table table{width:100%;border:0;border-collapse:collapse;border-top:2px solid #ccc} -.xc .table caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} -.xc .table caption:after{content:"";display:block;clear:both} -.xc .table caption a{font-weight:normal} -.xc .table caption em{float:right;margin-left:1em} -.xc .table caption strong{color:#e00} -.xc .table caption .side{float:right;font-weight:normal;margin-left:1em} -.xc .table th, -.xc .table td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} -.xc .table th{background:#f8f8f8} -.xc .table thead th{border-bottom:1px solid #999} -.xc .table tfoot td{font-weight:bold;background:#f8f8f8} -.xc .table.even tbody tr:nth-of-type(even) td{background-color:#fafafa} -.xc .table td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle} -.xc .table img{vertical-align:middle} -.xc .table em{font-style:normal;font-weight:normal;color:#e00} -.xc .table .title, -.xc .table .text{white-space:normal} -/* Pagination */ -.xc .pagination{margin:1em 0;text-align:center;line-height:normal} -.xc .pagination *{vertical-align:middle} -.xc .pagination a, -.xc .pagination strong{position:relative;display:inline-block;padding:2px 4px;font-weight:bold;text-decoration:none;line-height:normal;color:#333 !important;vertical-align:middle} -.xc .pagination a:hover, -.xc .pagination a:active, -.xc .pagination a:focus{border:1px solid #ddd;margin:0 -1px} -.xc .pagination strong{color:#e00 !important;font-size:20px} -.xc .pagination .direction{font-weight:normal;white-space:nowrap} -.xc .pagination .direction:hover, -.xc .pagination .direction:active, -.xc .pagination .direction:focus{border:0;margin:0;text-decoration:underline} -.xc .pagination input{width:30px;text-align:center} -.xc .pagination button{overflow:visible} -/* Text Button */ -.xc input.text, -.xc button.text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a;background:none;text-decoration:underline} +.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} \ No newline at end of file diff --git a/modules/communication/skins/default/friends.html b/modules/communication/skins/default/friends.html index 8b041e049..b4d936643 100644 --- a/modules/communication/skins/default/friends.html +++ b/modules/communication/skins/default/friends.html @@ -11,64 +11,60 @@
- - + - + - - - {$lang->cmd_add_friend_group} + + + + {$lang->cmd_add_friend_group} +
-
- - - - - - - - - - - - - - - - - - -
Total: {$total_count}
{$lang->friend_group}{$lang->nick_name}{$lang->regdate}
{$val->group_title?$val->group_title:" "}{$val->nick_name}{zdate($val->regdate,"Y-m-d")}
-
+ + + + + + + + + + + + + + + + + + +
Total: {$total_count}
{$lang->friend_group}{$lang->nick_name}{$lang->regdate}
{$val->group_title?$val->group_title:" "}{$val->nick_name}{zdate($val->regdate,"Y-m-d")}
- + - - + + + +
-
diff --git a/modules/member/skins/default/common_header.html b/modules/member/skins/default/common_header.html index 8f68d9fb1..faa087e17 100644 --- a/modules/member/skins/default/common_header.html +++ b/modules/member/skins/default/common_header.html @@ -1,10 +1,9 @@ - + -
-
- -
+ +
+ diff --git a/modules/member/skins/default/css/member.css b/modules/member/skins/default/css/member.css index 027f3da24..cb5374b0c 100644 --- a/modules/member/skins/default/css/member.css +++ b/modules/member/skins/default/css/member.css @@ -1,118 +1,11 @@ @charset "utf-8"; -/* Element Reset */ -.xm, -.xm table, -.xm input, -.xm textarea, -.xm select, -.xm button{font-family:Tahoma,Geneva,sans-serif;font-size:13px;color:#333} -.xm button, -.xm input[type=submit], -.xm input[type=reset], -.xm input[type=button]{cursor:pointer;overflow:visible} -.xm img{border:0} -.xm p{line-height:1.5} -/* Heading */ -.xm .h1, -.xm .h2, -.xm .h3, -.xm .h4{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1} -.xm .h1{border-bottom-width:4px;font-size:24px} -.xm .h2{border-bottom-width:3px;font-size:20px} -.xm .h3{border-bottom-width:2px;font-size:16px} -.xm .h4{border-bottom-width:1px;font-size:12px} -/* Lined Tab Navigation */ -.xm .nav{padding:0;margin:1em 0} -.xm .nav ul{position:relative;margin:0;padding:0;list-style:none;border-bottom:1px solid #ccc;zoom:1} -.xm .nav ul:after{content:"";display:block;clear:both} -.xm .nav li{float:left;margin-bottom:-1px} -.xm .nav li a{position:relative;float:left;text-decoration:none;border:1px solid #eee;border-bottom-color:#ccc;background:#fafafa;color:#333} -.xm .nav li a span{display:inline-block;height:14px;padding:6px 15px 6px 15px;letter-spacing:-1px;cursor:pointer} -.xm .nav li.active a{border:1px solid #ccc;border-bottom:1px solid #fff;margin-top:-1px;background:transparent} -.xm .nav li.active a span{padding-top:7px;font-weight:bold} -/* Form */ -.xm .form{margin:1em 0;padding:0} -.xm fieldset{margin:0 0 2em 0;padding:0;border:0} -.xm em{font-style:normal;color:#e00} -.xm label{margin-right:1em;line-height:1;vertical-align:middle} -.xm input[type=checkbox]+label, -.xm input[type=radio]+label, -.xm input[type=file]{cursor:pointer} -.xm ul{position:relative;margin:0;padding:0;list-style:none;border-top:2px solid #ccc;border-bottom:1px solid #ccc;zoom:1} -.xm li{list-style:none;border:1px solid #ddd;border-left:0;border-right:0;margin:-1px 0;padding:8px 0;vertical-align:top;zoom:1} -.xm li:first-child{border-top:0} -.xm li>label:first-child{display:block;font-weight:bold} -.xm li label em{font-weight:normal} -.xm label.overlap{position:absolute;color:#aaa} -.xm input[type=text], -.xm input[type=email], -.xm input[type=password], -.xm input[type=file], -.xm textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent;*background:transparent url(../../../../../common/img/blank.gif);_background:transparent;} -.xm input[type=text], -.xm input[type=email], -.xm input[type=password], -.xm input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px} -.xm input[type=checkbox], -.xm input[type=radio]{margin:0;padding:0;width:13px;height:13px;vertical-align:middle} -.xm input[type=text][disabled=disabled], -.xm input[type=email][disabled=disabled], -.xm input[type=password][disabled=disabled], -.xm input[type=checkbox][disabled=disabled], -.xm input[type=radio][disabled=disabled], -.xm input[type=file][disabled=disabled], -.xm textarea[disabled=disabled], -.xm select[disabled=disabled]{background:#ddd !important;text-shadow:1px 1px 0 #fff} -.xm textarea{padding:3px 4px;vertical-align:top} -.xm span.desc, -.xm em.desc{line-height:22px;vertical-align:middle;margin:0 10px} -.xm p.desc{margin:.25em 0;line-height:1.4} -.xm .q{font-weight:bold;margin:0 0 5px 0} -.xm .a{margin:0 0 5px 0} -.xm .tgForm{margin-right:1em} -.xm .h1 + ul, -.xm .h2 + ul, -.xm .h3 + ul, -.xm .h4 + ul{border-top:0} -/* Table */ -.xm .table{margin:1em 0} -.xm .table table{width:100%;border:0;border-collapse:collapse;border-top:2px solid #ccc} -.xm .table caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0} -.xm .table caption:after{content:"";display:block;clear:both} -.xm .table caption a{font-weight:normal} -.xm .table caption em{float:right;margin-left:1em} -.xm .table caption strong{color:#e00} -.xm .table caption .side{float:right;font-weight:normal;margin-left:1em} -.xm .table th, -.xm .table td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap} -.xm .table th{background:#f8f8f8} -.xm .table thead th{border-bottom:1px solid #999} -.xm .table tfoot td{font-weight:bold;background:#f8f8f8} -.xm .table.even tbody tr:nth-of-type(even) td{background-color:#fafafa} -.xm .table td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle} -.xm .table img{vertical-align:middle} -.xm .table em{font-style:normal;font-weight:normal;color:#e00} -.xm .table .title, -.xm .table .text{white-space:normal} -/* Pagination */ -.xm .pagination{margin:1em 0;text-align:center;line-height:normal} -.xm .pagination *{vertical-align:middle} -.xm .pagination a, -.xm .pagination strong{position:relative;display:inline-block;padding:2px 4px;font-weight:bold;text-decoration:none;line-height:normal;color:#333 !important;vertical-align:middle} -.xm .pagination a:hover, -.xm .pagination a:active, -.xm .pagination a:focus{border:1px solid #ddd;margin:0 -1px} -.xm .pagination strong{color:#e00 !important;font-size:20px} -.xm .pagination .direction{font-weight:normal;white-space:nowrap} -.xm .pagination .direction:hover, -.xm .pagination .direction:active, -.xm .pagination .direction:focus{border:0;margin:0;text-decoration:underline} -.xm .pagination input{width:30px;text-align:center} -.xm .pagination button{overflow:visible} -/* Text Button */ -.xm input.text, -.xm button.text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a;background:none;text-decoration:underline} -/* Agreement */ -.xm .agreement{margin:1em 0} -.xm .agreement .text{max-height:200px;overflow:auto;margin:1em 0} -.xm .agreement .confirm{margin:1em 0} +.xm em{font-style:normal;color:#f00} +.xm .x_nav a, +.xm .x_btn{text-decoration:none} +.xm .x_dl-horizontal>dd{margin-bottom:10px} +.xm .x_table{border-top:1px solid #ddd;border-bottom:1px solid #ddd} +.xm .x_table>caption{text-align:left;font-weight:bold} +.xm .x_table>caption>.x_pull-right{position:relative;top:-8px} +@media all and (min-width:768px){ +.xm .x_dl-horizontal>dt{margin-bottom:10px} +} \ No newline at end of file diff --git a/modules/member/skins/default/document_list.html b/modules/member/skins/default/document_list.html index 53219bcc1..a32bc7efd 100644 --- a/modules/member/skins/default/document_list.html +++ b/modules/member/skins/default/document_list.html @@ -1,52 +1,48 @@ -

{$member_title = $lang->cmd_view_own_document }

-
- - - - - - - - - - - - - - - - - - - - -
- Total: {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)} - - {$lang->cmd_find_module} - {$lang->cmd_cancel} - -
{$lang->no}{$lang->title}{$lang->date}{$lang->readed_count}{$lang->voted_count}
{$no} - {$oDocument->getTitleText()} - - [{$oDocument->getCommentCount()}] - - - - [{$oDocument->getTrackbackCount()}] - - {$oDocument->getRegdate("Y-m-d")}{$oDocument->get('readed_count')}{$oDocument->get('voted_count')}
-
-