albertshaw 8 years ago
parent
commit
de21b5c824
22 changed files with 156 additions and 121 deletions
  1. 10 4
      src/main/java/com/goafanti/common/controller/PortalController.java
  2. 94 78
      src/main/webapp/WEB-INF/views/common.html
  3. 1 1
      src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html
  4. 2 1
      src/main/webapp/WEB-INF/views/portal/activity/details.html
  5. 2 1
      src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html
  6. 16 20
      src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html
  7. 2 1
      src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html
  8. 2 1
      src/main/webapp/WEB-INF/views/portal/highTech/authentication.html
  9. 2 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/basicInfo.html
  10. 2 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/evaluate.html
  11. 2 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/financeInfo.html
  12. 2 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/iprInfo.html
  13. 2 1
      src/main/webapp/WEB-INF/views/portal/highTech/evaluate/rdManage.html
  14. 1 1
      src/main/webapp/WEB-INF/views/portal/index.html
  15. 2 1
      src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html
  16. 2 1
      src/main/webapp/WEB-INF/views/portal/ipr/apply.html
  17. 2 1
      src/main/webapp/WEB-INF/views/portal/ipr/service.html
  18. 2 1
      src/main/webapp/WEB-INF/views/portal/news.html
  19. 2 1
      src/main/webapp/WEB-INF/views/portal/patent.html
  20. 2 1
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html
  21. 2 1
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html
  22. 2 1
      src/main/webapp/WEB-INF/views/portal/scienceTechnology/star.html

+ 10 - 4
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -4,12 +4,14 @@ import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
 
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.enums.AchievementMaturity;
@@ -43,13 +45,17 @@ public class PortalController extends BaseController {
 	private static final String		UNCERTIFY			= "未认证";
 
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
-	public String index(ModelAndView modelview) {
-		return "/index";
+	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
+		return home(request, modelview);
 	}
 
 	@RequestMapping(value = "/", method = RequestMethod.GET)
-	public String home(ModelAndView modelview) {
-		return "/index";
+	public ModelAndView home(HttpServletRequest request, ModelAndView modelview) {
+		RedirectView rv = new RedirectView();
+		rv.setUrl(request.getContextPath() + "/portal/index");
+		rv.setExposeModelAttributes(false);
+		modelview.setView(rv);
+		return modelview;
 	}
 
 	/**

File diff suppressed because it is too large
+ 94 - 78
src/main/webapp/WEB-INF/views/common.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/activity/details.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html


+ 16 - 20
src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html

@@ -11,20 +11,20 @@
 </head>
 
 <body>
-	<th:block th:fragment="{topNav}">
-		<div class="container">
-			<div class="lt">欢迎进入科技认知计算交易平台!</div>
-			<div class="rt" th:if="${!isLogin}">
-				<a th:href="${basePath + '/user/login.html'}">登录</a> <a
-					th:href="${basePath + '/user/signIn.html'}">注册</a>
-			</div>
-			<div class="rt" th:if="${isLogin}">
-				<span>欢迎光临,</span> <a class="login"
-					th:href="${basePath + '/user/account/index.html'}"
-					th:text="${userName}">个人中心</a> <a href="/user/logout">退出</a>
-			</div>
+	<header>
+		<div th:replace="common::{topNav}">
+			<div class="container">
+				<div class="lt">欢迎进入科技认知计算交易平台!</div>
+	               <div class="rt">
+					<a href="/user/login.html" class="login">登录</a>
+	                   <a href="/user/signIn.html">注册</a>
+					<a href="#">导航</a>
+					<a href="#">关于我们</a>
+					<a href="#">联系我们</a>
+				</div>
+			</div>		
 		</div>
-	</th:block>
+	</header>
 	<div class="container header_nav_detail">
 		<div class="row clearfix">
 			<div class="col-md-3 logo">
@@ -183,16 +183,12 @@
 			</div>
 		</div>
 	</div>
-	
 	<footer>
-		<div class="container">
-			<a href="#">联系我们</a> <a href="#">联系我们</a> <a href="#">联系我们</a> <a
-				href="#">联系我们</a> <a href="#">联系我们</a> <a href="#">联系我们</a>
-		</div>
+		<div th:replace="common::copyright"></div>
 	</footer>
-	<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+	<div th:replace="common::footer(~{::script})"><script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 	<script type="text/javascript"
-		th:src="${portalHost + '/highTech/detail/demandDetail.js'}"></script>
+		th:src="${portalHost + '/highTech/detail/demandDetail.js'}"></script></div>
 </body>
 
 </html>

File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/entrepreneurship/entrepreneurshipIndex.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/highTech/authentication.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/basicInfo.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/evaluate.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/financeInfo.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/iprInfo.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/rdManage.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/ipr/apply.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/ipr/service.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/news.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/patent.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html


File diff suppressed because it is too large
+ 2 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/star.html