Skip to content

Commit

Permalink
message center | http get|post
Browse files Browse the repository at this point in the history
  • Loading branch information
wangjeaf committed May 8, 2014
1 parent b52de39 commit cb9b25a
Show file tree
Hide file tree
Showing 20 changed files with 872 additions and 462 deletions.
Binary file added WebContent/WEB-INF/lib/commons-codec-1.6.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/commons-logging-1.1.3.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/fluent-hc-4.3.3.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/httpclient-4.3.3.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/httpcore-4.3.2.jar
Binary file not shown.
Binary file added WebContent/WEB-INF/lib/httpmime-4.3.3.jar
Binary file not shown.
13 changes: 7 additions & 6 deletions WebContent/account/myAccount.vm
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="${staticRoot}/img/favicon.ico">
<title>Manage Account </title>
#includeNewRapStatic
<style type="text/css">
#if ($isEditMode)
\#table {width:530px;}
#else
\#table {width:430px;}
\#table {width:560px;}
#end
</style>
</head>
Expand All @@ -18,7 +19,7 @@
#if($isEditMode)
<form name="formUpdateProfile" action="$accountUrl.doUpdateProfile" method="post" onsubmit="return formOnSubmit(this);">
#end
<table id="table" class="table" cellpadding="4px">
<table id="table" class="table" cellpadding="4px" style="margin: 0 auto; margin-top: 30px;">
<tr>
<td>用户名:</td>
<td>$!curUser.account</td>
Expand Down Expand Up @@ -71,19 +72,19 @@
<td>上次登录:</td>
<td>$!curUser.lastLoginDateStr</td>
</tr>
<tr>
<!--<tr>
<td></td>
<td>
<!--

#if($isEditMode)
<input type="submit" value="更新资料" class="btn btn-primary" />
<input type="button" value="取消" class="btn" onclick="window.location.href='$accountUrl.myAccount'" />
#else
<input type="button" value="修改资料" class="btn" onclick="window.location.href='$accountUrl.updateProfile'" />
#end
-->

</td>
</tr>
</tr>-->
<tr>
<td></td>
<td>
Expand Down
149 changes: 149 additions & 0 deletions WebContent/account/mySetting.vm
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
#parse('/tcom/template.rap.vm')
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="${staticRoot}/img/favicon.ico">
<title>Manage Account</title> #includeNewRapStatic
</head>
<body>
<style>
.ml10 {
margin-left: 10px;
}

.mt30 {
margin-top: 30px;
}

.settings {
width: 580px;
margin: 0 auto;
margin-top: 30px;
}

.settings .nav-tabs {
margin-top: 20px;
}

.settings .nav-tabs li:first-child {
margin-left: 30px;
}

.settings .tab-content .tab-pane {
padding: 30px 20px 0 20px;
min-height: 300px;
}
</style>
#bodyNewStart
<!-- Nav tabs -->
<div class="settings">
<ul class="nav nav-tabs">
<li class="active"><a href="#home" data-toggle="tab">消息提醒设置</a>
</li>
<li><a href="#profile" data-toggle="tab">邮件接收设置</a></li>
<li class='hide'><a href="#settings" data-toggle="tab">其他</a></li>
</ul>

<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane fade in active" id="home">
<form class="form-horizontal" role="form" style="margin: 0 auto;">
<div class="form-group ">
<label class="control-label col-sm-3" for="inputSuccess3">消息提醒效果预览</label>
<div class="col-sm-9">
<img src="${staticRoot}/img/preview-notify.png" width="360" />
</div>
</div>
<div class="form-group ">
<label class="control-label col-sm-3" for="inputSuccess3">是否接收消息提醒</label>
<div class="col-sm-9">
<div class="radio">
<label> <input type="radio" name="optionsRadios"
id="optionsRadios1" value="option1" checked> 接收 </label>
</div>
<div class="radio">
<label> <input type="radio" name="optionsRadios"
id="optionsRadios2" value="option2"> 不接收 </label>
</div>
</div>
</div>

<div class="form-group">
<label class="control-label col-sm-3" for="inputSuccess3">消息提醒类型设置</label>
<div class="col-sm-9">
<div class="checkbox">
<label> <input type="checkbox" name="optionsRadios"
id="optionsRadios1" value="option1" checked>
“我创建的项目” 的变更通知 </label>
</div>
<div class="checkbox">
<label> <input type="checkbox" name="optionsRadios"
id="optionsRadios2" value="option2"> “我参与的项目” 的变更通知 </label>
</div>
</div>
</div>

<div class="form-group mt30">
<div class="col-sm-offset-3 col-sm-9">
<button type="submit" class="btn btn-success">保 存</button>
<button type="reset" class="btn btn-default ml10">重 置</button>
</div>
</div>
</form>
</div>
<div class="tab-pane fade" id="profile">
<form class="form-horizontal" role="form" style="margin: 0 auto;">

<div class="form-group">
<label for="inputEmail3" class="col-sm-3 control-label">您的专属邮件昵称</label>
<div class="col-sm-9">
<input type="text" class="form-control" style="width:44%;"id="inputEmail3" placeholder="默认是花名"
title=" - 不设置,将根据您的花名发送邮件
- 设置了,将根据您设置的名称发送邮件">
</div>
</div>

<div class="form-group ">
<label class="control-label col-sm-3" for="inputSuccess3">是否接收邮件提醒</label>
<div class="col-sm-9">
<div class="radio">
<label> <input type="radio" name="optionsRadios"
id="optionsRadios1" value="option1" checked> 接收 </label>
</div>
<div class="radio">
<label> <input type="radio" name="optionsRadios"
id="optionsRadios2" value="option2"> 不接收 </label>
</div>
</div>
</div>

<div class="form-group">
<label class="control-label col-sm-3" for="inputSuccess3">邮件提醒内容设置</label>
<div class="col-sm-9">
<div class="checkbox">
<label> <input type="checkbox" name="optionsRadios"
id="optionsRadios1" value="option1" checked>
“我创建的项目” 的变更通知 </label>
</div>
<div class="checkbox">
<label> <input type="checkbox" name="optionsRadios"
id="optionsRadios2" value="option2"> “我参与的项目” 的变更通知 </label>
</div>
</div>
</div>

<div class="form-group mt30">
<div class="col-sm-offset-3 col-sm-9">
<button type="submit" class="btn btn-success">保 存</button>
<button type="reset" class="btn btn-default ml10">重 置</button>
</div>
</div>
</form>
</div>
<div class="tab-pane fade hide" id="settings">更多功能,敬请期待~</div>
</div>
</div>
#bodyEnd
</body>
</html>
84 changes: 77 additions & 7 deletions WebContent/stat/css/rap.template.css
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ label {
position: absolute;
right: 0;
}

.div-p-control {
padding-left: 2px;
}
Expand Down Expand Up @@ -200,14 +201,14 @@ div#tipDiv {
src: url('http://at.alicdn.com/t/font_1390195988_9420388.eot');
/* IE9*/
src: url('http://at.alicdn.com/t/font_1390195988_9420388.eot?#iefix')
format('embedded-opentype'), /* IE6-IE8 */
url('http://at.alicdn.com/t/font_1390195989_0386753.woff')
format('woff'), /* chrome、firefox */
url('http://at.alicdn.com/t/font_1390195988_7969282.ttf')
format('embedded-opentype'), /* IE6-IE8 */
url('http://at.alicdn.com/t/font_1390195989_0386753.woff')
format('woff'), /* chrome、firefox */
url('http://at.alicdn.com/t/font_1390195988_7969282.ttf')
format('truetype'),
/* chrome、firefox、opera、Safari, Android, iOS 4.2+*/
/* chrome、firefox、opera、Safari, Android, iOS 4.2+*/

url('http://at.alicdn.com/t/font_1390195989_0668917.svg#svgFontName')
url('http://at.alicdn.com/t/font_1390195989_0668917.svg#svgFontName')
format('svg'); /* iOS 4.1- */
}

Expand Down Expand Up @@ -341,21 +342,90 @@ div#tipDiv {
bottom: 0;
cursor: pointer;
}

.helper-tip.anim {
-webkit-transition: all .5s;
transition: all .5s;
}

.helper-tip.part {
right: -23px;
bottom: -33px;
}
.helper-tip:hover, .helper-tip.part:hover {

.helper-tip:hover,.helper-tip.part:hover {
right: 0;
bottom: 0;
}

.helper-tip .mask {
display: none;
}

.helper-tip:hover .mask {
display: block;
}

.messages-trigger .label {
display: none;
border-radius: 10px;
position: absolute;
top: 9px;
right: 2px;
padding: 2px;
width: 18px;
}

.messages-container .msgs {
}

.messages-container .close {
margin-right: 2px;
outline: none;
margin-top: -2px;
}

.messages-dropdown {
min-width: 360px;
padding-bottom: 60px;
}

.messages-container ul {
list-style: none;
}

.messages-container ul li {
padding: 10px;
cursor: pointer;
border-bottom: 1px solid #EEE;
}

.messages-container ul li:last-child {
border-bottom: none;
}

.messages-container ul li:hover {
background-color: #FAFAFA;
}

.messages-container .btns {
border-top: 1px solid #CCC;
margin-top: 10px;
padding-top: 10px;
padding-bottom: 8px;
text-align: center;
background-color: #F2F2F2;
position: absolute;
width: 100%;
bottom: 0;
border-radius: 0 0 4px 4px;
}

.messages-container .btns .btn {
padding-left: 25px;
padding-right: 25px;
outline: none;
}
.messages-container .btns .close-btn, .messages-container .btns .clear-btn {
margin-left: 10px;
}
Binary file added WebContent/stat/img/preview-notify.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 50 additions & 1 deletion WebContent/stat/js/base.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions WebContent/tcom/const.inc.vm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"register":"$projectContext/account/register.action",
"doRegister":"$projectContext/account/doRegister.action",
"myAccount":"$projectContext/account/myAccount.action",
"mySetting":"$projectContext/account/mySetting.action",
"updateProfile":"$projectContext/account/updateProfile.action",
"doUpdateProfile":"$projectContext/account/doUpdateProfile.action",
"doChangeProfile":"$projectContext/account/doChangeProfile.action",
Expand Down
Loading

0 comments on commit cb9b25a

Please sign in to comment.