wanghui 7 gadi atpakaļ
vecāks
revīzija
578ee26f8d

+ 4 - 12
src/main/webapp/WEB-INF/views/common.html

@@ -57,20 +57,12 @@
                     <li>
                         <a th:href="@{/portal/service/serviceIndex}">科技服务</a>
                         <img th:src="${portalHost+'/img/hot.png'}">
-                       
                     </li>
                     <li>
-                        <a href="#">技术交易</a>
-                        <ol class="subnavigation">
-                            
-                            <li>
-                                <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
-                            </li>
-                            <li>
-                                <a th:href="@{/portal/technologyTrading/demand}">技术需求</a>
-                            </li>
-                          
-                        </ol>
+                        <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
+                    </li>
+                    <li>
+                          <a th:href="@{/portal/technologyTrading/demand}">技术需求</a>
                     </li>
                     <li>
                         <a href="#">智库咨询</a>

+ 16 - 12
src/main/webapp/WEB-INF/views/portal/index.html

@@ -1,16 +1,20 @@
 <!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8" />
-		<link rel="icon" href="../img/ico_logo.ico">
-		<meta name="keywords" content=""/>
-		<meta name="Description" content=""/>
-		<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
-		<meta http-equiv="x-ua-compatible" content="ie=edge">
-		<title>首页</title>
-		
-	<link th:href="${portalHost+'/vendors.css'}" rel="stylesheet"><link th:href="${portalHost+'/index.css'}" rel="stylesheet"></head>	
-	<body>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+<meta charset="utf-8" />
+<link rel="icon" th:href="${portalHost+'/img/ico_logo.ico'}">
+<meta name="keywords" content="" />
+<meta name="Description" content="" />
+<meta name="viewport"
+	content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
+<meta http-equiv="x-ua-compatible" content="ie=edge">
+<title>首页</title>
+<link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
+<link th:href="${portalHost+'/index.css'}" rel="stylesheet">
+</head>
+<body>
 		<header>
 		<div th:replace="common::nav('','')"></div>
 	</header>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


+ 3 - 2
src/main/webapp/WEB-INF/views/portal/service/serviceList.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
-<html lang="en">
-
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

+ 5 - 7
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -1,11 +1,9 @@
 <!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>科技成果</title>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head th:replace="common::header(~{::title},~{::link})">
+<title>科技成果</title>
 <link th:href="${portalHost+ '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost+ '/newMenu/achievement.css'}" rel="stylesheet">
 </head>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementList.html


+ 4 - 6
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -1,10 +1,8 @@
 <!DOCTYPE html>
-<html lang="en">
-
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta http-equiv="X-UA-Compatible" content="ie=edge">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head th:replace="common::header(~{::title},~{::link})">
 <title>科技需求</title>
 <link th:href="${portalHost+ '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/newMenu/demand.css'}" rel="stylesheet">

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandList.html