diff --git a/src/main/java/org/ccpit/base/controller/UploadFileController.java b/src/main/java/org/ccpit/base/controller/UploadFileController.java
index 36f782a..91c4671 100644
--- a/src/main/java/org/ccpit/base/controller/UploadFileController.java
+++ b/src/main/java/org/ccpit/base/controller/UploadFileController.java
@@ -169,7 +169,6 @@ public class UploadFileController extends BaseController {
}
} catch (FileUploadException e) {
e.printStackTrace();
- return "上传文件过大，不要超过1M";
} catch (IOException e) {
e.printStackTrace();
} catch (Exception e) {
diff --git a/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp b/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp
index 43d5745..ac1f9d4 100644
--- a/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/business/registerInfoListPage.jsp
@@ -122,7 +122,7 @@
</table>
<!-- datagrid工具栏 -->
<div id="toolbar">
- <security:url uri="/admin/business/registerManage/add"><a class="easyui-linkbutton" iconCls="icon-edit_add" plain="true" onclick="openAddWin()"><span >新增</span></a></security:url>
+<%-- <security:url uri="/admin/business/registerManage/add"><a class="easyui-linkbutton" iconCls="icon-edit_add" plain="true" onclick="openAddWin()"><span >新增</span></a></security:url>--%>
<security:url uri="/admin/business/registerManage/update"><a class="easyui-linkbutton" iconCls="icon-pencil" plain="true" onclick="openEditWin()"><span >修改</span></a></security:url>
<security:url uri="/admin/business/registerManage/delete"><a class="easyui-linkbutton" iconCls="icon-remove" plain="true" onclick="deleteNews()"><span >删除</span></a></security:url>
<security:url uri="/admin/business/registerManage/export"><a class="easyui-linkbutton" iconCls="icon-export" plain="true" onclick="openExportWin()"><span >导出</span></a></security:url>
@@ -813,12 +813,6 @@
<td align="left" >
<textarea id="remarkId" name="remark" rows="7"></textarea>
</td>
- <td align="right"><span>证书照:</span></td>
- <td align="left" >
- <img id="img_1" class="certificatePhoto" style="width:130px;height:100px">
- <img id="img_2" class="certificatePhoto" style="width:130px;height:100px">
- <img id="img_3" class="certificatePhoto" style="width:130px;height:100px">
- </td>
</tr>
<tr>
<td colspan="4"> </td>
diff --git a/src/main/webapp/WEB-INF/jsp/front/login.jsp b/src/main/webapp/WEB-INF/jsp/front/login.jsp
index 71b191f..7f105e8 100644
--- a/src/main/webapp/WEB-INF/jsp/front/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/front/login.jsp
@@ -57,7 +57,7 @@
<div style="float:left; width:157px"> </div><div style="font-weight:bold;color:red;" class="message"></div>
</td></tr>
<tr><td></td><td colspan="1" align="left"><div > </div>
- <input type="button" class="index_login fl button" id="submit" name=btnLogin onclick="javascript:;" value="登陆"/>
+ <input type="button" class="index_login fl button" id="submit" name=btnLogin onclick="javascript:;" value="登录"/>
<input type="button" onclick="javascript:location.href='/training/regp'" class="index_login fl button" id=btnReg name=btnReg value="注册" />
</td></tr>
</table>
diff --git a/src/main/webapp/WEB-INF/jsp/front/reg.jsp b/src/main/webapp/WEB-INF/jsp/front/reg.jsp
index 57acc27..2ff35af 100644
--- a/src/main/webapp/WEB-INF/jsp/front/reg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/front/reg.jsp
@@ -20,7 +20,7 @@
<div class="pp"></div>
<table width="100%" align="center" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td background="/resource/front/img/borderc_04.gif"></td>
+<%-- <td background="/resource/front/img/borderc_04.gif"></td>--%>
<td>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
diff --git a/src/main/webapp/resource/business/phase.js b/src/main/webapp/resource/business/phase.js
index 091078a..cf84160 100644
--- a/src/main/webapp/resource/business/phase.js
+++ b/src/main/webapp/resource/business/phase.js
@@ -41,8 +41,8 @@ $(function() {
bodyWidth = document.body.clientWidth;
bodyHeight = document.documentElement.clientHeight;
- addWinWidth = (bodyWidth/100)*80;
- addWinHeight = (addWinWidth/16)*9;
+ addWinWidth = (bodyWidth/5)*4;
+ addWinHeight = addWinWidth;
$("#addNewsWinId").window('close');
$("#exportWindow").window('close');
@@ -101,6 +101,7 @@ function initDataTable(){
striped : true,
pagination : true,
rownumbers : true,
+ singleSelect : true,
pageList : [15,20,30,40,50],
autoRowHeight : false,
fitColumns : true,
@@ -181,13 +182,13 @@ function openAddWin(){
$('#newsForm')[0].reset();
operation = "add";
- $("#main_area").height(addWinHeight);
+ $("#main_area").height(addWinHeight/8);
$("#addNewsWinId").window({
title : '新增期数信息',
width : addWinWidth/2,
- height : addWinHeight/3,
- left : (dataGridWidth - addWinWidth)/2,
- top : (bodyHeight - addWinHeight)/2,
+ height : addWinHeight/5,
+ left : (dataGridWidth - addWinWidth/2)/2,
+ top : (bodyHeight - addWinHeight/5)/2,
closable : true, // 否显示关闭按钮
collapsible : false, // 是否显示折叠按钮
minimizable : false, // 是否显示最小化按钮
@@ -237,14 +238,14 @@ function openEditWin(){
$("#newsForm").form('load', data);
//$('#eventDateId').datebox('setValue',timestampformat(data.eventDate));
formatDateField("#date1",data.time);
- $("#main_area").height((bodyHeight/5)*4);
+ $("#main_area").height(addWinHeight/8);
});
$("#addNewsWinId").window({
title : '修改报名信息',
width : addWinWidth/2,
- height : addWinHeight/3,
- left : (dataGridWidth - addWinWidth)/2,
- top : (bodyHeight - addWinHeight)/2,
+ height : addWinHeight/5,
+ left : (dataGridWidth - addWinWidth/2)/2,
+ top : (bodyHeight - addWinHeight/5)/2,
closable : true, // 否显示关闭按钮
collapsible : false, // 是否显示折叠按钮
minimizable : false, // 是否显示最小化按钮
diff --git a/src/main/webapp/resource/business/registration.js b/src/main/webapp/resource/business/registration.js
index 6cda990..b5775ba 100644
--- a/src/main/webapp/resource/business/registration.js
+++ b/src/main/webapp/resource/business/registration.js
@@ -85,8 +85,15 @@ $(function() {
initInputWidth();
initExportWindow();
initShowPhoto();
- $("#showPhotoWinId").window('close');
-
+
+
+ $("#showPhotoWinId").window({
+ onBeforeClose:function (){
+ $("#showPhotoId").attr('src','');
+ }
+ })
+ $("#showPhotoWinId").window('close');
+
// $.each(subjectArray,function(n,v){
// var href = "/admin/business/registerManage/exporgExcel2?&phase="+activePhase+"&bigger=1&subject="+n+
// "&fields=submitTime,city,name,gender,birthday,telphone,mobileTel,email,company,address,invoiceTitle,invoiceType,dcNumber,title,dateOfBirth,gender_en,name_en,name_en_last,company_en,address_en,country,phone,email,,city_en,subject";
@@ -99,6 +106,7 @@ $(function() {
* 初始化查看图片窗口
*/
function initShowPhoto(){
+
$("#showPhotoWinId").window({
title : '查看图片',
width : addWinWidth/1.5,
diff --git a/src/main/webapp/resource/front/js/photoUpload.js b/src/main/webapp/resource/front/js/photoUpload.js
index 64a8f70..c2c647b 100644
--- a/src/main/webapp/resource/front/js/photoUpload.js
+++ b/src/main/webapp/resource/front/js/photoUpload.js
@@ -25,11 +25,11 @@ function ajaxFileUpload(target) {
data = data.substring(data.indexOf(">") + 1, data.lastIndexOf("<"));
data = eval("(" + data + ")");
- if (status) {
+ if (null != data.fileSavePath) {
imagePath = data.fileSavePath;
$("img[data-target='"+target+"']").attr("src", '/base/upload/show?path=' + imagePath);
} else {
- alert("图片上传失败，请重新上传！");
+ alert("图片大小超过1M，请重新上传！");
}
}
},
diff --git a/src/main/webapp/resource/home/css/default.css b/src/main/webapp/resource/home/css/default.css
index aef59af..8378116 100644
--- a/src/main/webapp/resource/home/css/default.css
+++ b/src/main/webapp/resource/home/css/default.css
@@ -1,11 +1,11 @@
-*{font-size:12px; font-family:Tahoma,Verdana,���ź�,������}
+*{font-size:12px; font-family:Tahoma,Verdana,���ź�,������}
body{background:#D2E0F2; }
a{ color:Black; text-decoration:none;}
a:hover{ color:Red; text-decoration:underline;}
-.textbox03 {border: #878787 1px solid;padding: 4px 3px;font:Verdana, Geneva, sans-serif,����;line-height: 14px; background-color: #fff; height: auto; font-size: 14px; font-weight: bold; width: 190px; }
+.textbox03 {border: #878787 1px solid;padding: 4px 3px;font:Verdana, Geneva, sans-serif,����;line-height: 14px; background-color: #fff; height: auto; font-size: 14px; font-weight: bold; width: 190px; }
-.txt01{font:Verdana, Geneva, sans-serif,����;padding:3px 2px 2px 2px; border-width:1px; border-color:#ddd; color:#000;}
-.txt {border: #878787 1px solid;padding: 4px 3px;font:Verdana, Geneva, sans-serif,����;line-height: 14px; background-color: #fff; height: auto; font-size: 14px;}
+.txt01{font:Verdana, Geneva, sans-serif,����;padding:3px 2px 2px 2px; border-width:1px; border-color:#ddd; color:#000;}
+.txt {border: #878787 1px solid;padding: 4px 3px;font:Verdana, Geneva, sans-serif,����;line-height: 14px; background-color: #fff; height: auto; font-size: 14px;}
.footer{text-align:center;color:#15428B; margin:0px; padding:0px;line-height:23px; font-weight:bold;}
.head a{color:White;text-decoration:underline;}
@@ -40,7 +40,7 @@ a:hover{ color:Red; text-decoration:underline;}
.icon-collapse{ background:url('/images/coll3.gif') no-repeat;}
.icon-class{background-position:-200px -40px;)}
.icon-page{background-position:0 -60px;)}
-#topHurdleID{background: url("/project/resource/home/images/layout-browser-hd-bg.gif") #7f99be repeat-x center 50%;overflow: hidden; height: 30px; line-height: 20px; color: #fff; font-family: Verdana, ���ź�, ����}
+#topHurdleID{background: url("/resource/home/images/layout-browser-hd-bg.gif") #7f99be repeat-x center 50%;overflow: hidden; height: 30px; line-height: 20px; color: #fff; font-family: Verdana, ���ź�, ����}
.button_area_absolute {
position: absolute;
diff --git a/src/main/webapp/resource/themes-1.3.1/css/default.css b/src/main/webapp/resource/themes-1.3.1/css/default.css
index 3d24378..268ba2b 100644
--- a/src/main/webapp/resource/themes-1.3.1/css/default.css
+++ b/src/main/webapp/resource/themes-1.3.1/css/default.css
@@ -2,10 +2,10 @@
body{background:#D2E0F2; margin:0;height:100%}
a{ color:Black; text-decoration:none;}
a:hover{ color:Red; text-decoration:underline;}
-.textbox03 {border: #878787 1px solid;padding: 4px 3px;font:Verdana, Geneva, sans-serif,����;line-height: 14px; background-color: #fff; height: auto; font-size: 14px; font-weight: bold; width: 190px; }
+.textbox03 {border: #878787 1px solid;padding: 4px 3px;font:Verdana, Geneva, sans-serif,����;line-height: 14px; background-color: #fff; height: auto; font-size: 14px; font-weight: bold; width: 190px; }
-.txt01{font:Verdana, Geneva, sans-serif,����;padding:3px 2px 2px 2px; border-width:1px; border-color:#ddd; color:#000;}
-.txt {border: #878787 1px solid;padding: 4px 3px;font:Verdana, Geneva, sans-serif,����;line-height: 14px; background-color: #fff; height: auto; font-size: 14px;}
+.txt01{font:Verdana, Geneva, sans-serif,����;padding:3px 2px 2px 2px; border-width:1px; border-color:#ddd; color:#000;}
+.txt {border: #878787 1px solid;padding: 4px 3px;font:Verdana, Geneva, sans-serif,����;line-height: 14px; background-color: #fff; height: auto; font-size: 14px;}
.footer{text-align:center;color:#15428B; margin:0px; padding:0px;line-height:23px; font-weight:bold;}
.head a{color:White;text-decoration:underline;}
@@ -21,7 +21,7 @@ a:hover{ color:Red; text-decoration:underline;}
/**
-* ������ظı���ͼƬ�����ƶ����Ҳ����ظı���ͼ�������ƶ���ÿ���ƶ���λ��'+'��'-'20
+* ������ظı���ͼƬ�����ƶ����Ҳ����ظı���ͼ�������ƶ���ÿ���ƶ���λ��'+'��'-'20
*/
.icon{ background:url(../../home/images/tabicons.png) no-repeat;width:18px; line-height:18px; display:inline-block;}
.icon-sys{ background-position:0px -200px;}
@@ -44,7 +44,7 @@ a:hover{ color:Red; text-decoration:underline;}
.icon-collapse{ background:url('/images/coll3.gif') no-repeat;}
.icon-class{background-position:-200px -40px;)}
.icon-page{background-position:0 -60px;)}
-#topHurdleID{background: url("/project/resource/home/images/layout-browser-hd-bg.gif") #7f99be repeat-x center 50%;overflow: hidden; height: 30px; line-height: 20px; color: #fff; font-family: Verdana, 微软雅黑, 黑体}
+#topHurdleID{background: url("/resource/home/images/layout-browser-hd-bg.gif") #7f99be repeat-x center 50%;overflow: hidden; height: 30px; line-height: 20px; color: #fff; font-family: Verdana, 微软雅黑, 黑体}
.mult-selections{
diff --git a/src/main/webapp/resource/themes/css/default.css b/src/main/webapp/resource/themes/css/default.css
index 2cc3d5d..301dfeb 100644
--- a/src/main/webapp/resource/themes/css/default.css
+++ b/src/main/webapp/resource/themes/css/default.css
@@ -40,4 +40,4 @@ a:hover{ color:Red; text-decoration:underline;}
.icon-collapse{ background:url('/images/coll3.gif') no-repeat;}
.icon-class{background-position:-200px -40px;)}
.icon-page{background-position:0 -60px;)}
-#topHurdleID{background: url("/project/resource/home/images/layout-browser-hd-bg.gif") #7f99be repeat-x center 50%;overflow: hidden; height: 30px; line-height: 20px; color: #fff; font-family: Verdana, 微软雅黑, 黑体}
+#topHurdleID{background: url("/resource/home/images/layout-browser-hd-bg.gif") #7f99be repeat-x center 50%;overflow: hidden; height: 30px; line-height: 20px; color: #fff; font-family: Verdana, 微软雅黑, 黑体}