p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix the bug in homepage.jsp :tow divs in a line

This commit is contained in:
xiaoran 2013-11-06 17:43:26 +08:00
parent 9998992b2d
commit 4206b6ec26
4 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/bench4q/web/security/SessionFilter.java
View File

@ -19,33 +19,25 @@ public class SessionFilter extends OncePerRequestFilter {
// 请求的uri
String uri = request.getRequestURI();
System.out.println("start url filter");
System.out.println(uri);
String user = (String) request.getSession().getAttribute("username");
if (user == null || user.equals("")) {
// uri中包含background时才进行过滤
for (String s : notFilter) {
if (uri.contains(s)) {
filterChain.doFilter(request, response);
System.out.println("end the filter");
return;
}
}
if (uri.equals("/")) {
filterChain.doFilter(request, response);
System.out.println("end the filter");
return;
} else {
System.out.println("redirect to login.jsp");
response.sendRedirect("index.jsp");
System.out.println("end the filter");
return;
}
}
else{
filterChain.doFilter(request, response);
System.out.println("the user is:"+user);
System.out.println("end the filter");
return;
}
}

18
src/main/webapp/bench4q-css/bench4q.css
View File

@ -44,3 +44,21 @@ disply:none;
margin-top : 30px;
margin-left:200px;
}
.message-left{
font-size:20px;
text-align:center;
width:32%;
height:168px;
float:left;
}
.message-right{
padding-left: 8px;
padding-top:8px;
text-align:left;
float: right;
width: 65%;
height:160px;
font-size:13px;
}

46
src/main/webapp/homepage.jsp
View File

@ -20,7 +20,7 @@
<link href='css/opa-icons.css' rel='stylesheet'>
<link rel="shortcut icon" href="img/bench4q-1.ico">
<link href="bench4q-css/bench4q.css" rel="stylesheet" >
</head>
<body>
@ -30,10 +30,9 @@
<div class="container-fluid">
<div class="row-fluid">
<div id="content" class="span10 center">
<div id="content" class="span10 center ">
<!-- content starts -->
<div class="sortable row-fluid">
<div class="sortable row-fluid ui-sortable">
<a data-rel="tooltip" class="well span4 top-block" href="test.jsp">
<span class="icon32 icon-blue icon-plus"></span>
<div>
@ -55,18 +54,20 @@
<div class="row-fluid">
<div class="box span12">
<div class="box-introduction">
<div class="alert1 alert-error"
style="float: left; width: 278px;">
<div class="box-introduction" ">
</div>
<div class="message-left" style="background-color: #eddbe3">
<br />
<fmt:message key="creat" />
<br /> <br />
<fmt:message key="testplan" />
<br /> <br /> <br />
<br /> <br /> <br /></br>
</div>
<div class="alert2 alert-info"
style="float: right; width: 550px;">
<div class="message-right"
style="background-color: #eddbe3">
<fmt:message key="creattestplanhead" />
<br /> <br />
<fmt:message key="creattestplancontent1" />
@ -74,10 +75,9 @@
<fmt:message key="creattestplancontent2" />
<br />
<fmt:message key="creattestplancontent3" />
<br /> <br />
<br /> <br /></br>
</div>
<div style="clear: both;"></div>
</div>
<div class="clearfix"></div>
</div>
<!--/span-->
@ -86,16 +86,15 @@
<div class="row-fluid">
<div class="box span12">
<div class="box-introduction"></div>
<div class="alert1 alert-success"
style="float: left; width: 278px;">
<div class="message-left"
style="background-color:#669533">
<br />
<fmt:message key="script" />
<br /> <br /> <br />
<fmt:message key="management" />
<br /> <br /> <br />
</div>
<div class="alert2 alert-info"
style="float: right; width: 550px;">
<div class="message-right" style="background-color:#669533">
<fmt:message key="scriptmanagementhead" />
<br /> <br />
@ -106,14 +105,16 @@
<fmt:message key="scriptmanagementcontent3" />
<br /> <br /> <br />
</div>
<div class="clearfix"></div>
</div>
<!--/span-->
</div>
<!--/row-->
<div class="row-fluid">
<div class="box span12">
<div class="alert1 alert-heading"
style="float: left; width: 278px;">
<div class="message-left"
style=" background-color: #8bc5e8">
<br />
<fmt:message key="test" />
<br /> <br /> <br />
@ -121,8 +122,8 @@
<br /> <br /> <br />
</div>
<div class="alert2 alert-info"
style="float: right; width: 550px;">
<div class="message-right"
style="background-color: #8bc5e8">
<fmt:message key="testhistoryhead" />
<br /> <br />
@ -133,10 +134,11 @@
</div>
<div class="box-introductiont"></div>
</div>
<div class="clearfix"></div>
<!--/span-->
</div>
<!--/row-->
<div class="clearfix"></div>
<!-- content ends -->
</div>

4
src/main/webapp/index.jsp
View File

@ -50,7 +50,7 @@ body {
<div class="input-prepend" title="Username" data-rel="tooltip">
<span class="add-on"><i class="icon-user"></i></span> <input
autofocus class="input-large span10" name="username"
autofocus class="input-large span6" name="username"
id="username" type="text" onblur="checkName(this.value)" /> <img
id="imgName" src="">
</div>
@ -58,7 +58,7 @@ body {
<div class="input-prepend" title="Password" data-rel="tooltip">
<span class="add-on"><i class="icon-lock"></i></span> <input
class="input-large span10" name="password" id="password"
autofocus class="input-large span6" name="password" id="password"
type="password" onblur="checkPass(this.value)" /> <img
id="imgPass" src="">
</div>