wanghui лет назад: 8
Родитель
Сommit
857a7abc44

+ 1 - 1
src/main/java/com/goafanti/common/dao/NewsMapper.java

@@ -26,7 +26,7 @@ public interface NewsMapper {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
-	List<NewsPortalList> findPortalList(Map<String, Object> params);
+	List<NewsPortalList> findNewsList(Map<String, Object> params);
 
 	List<NewsSummary> findIndexNewsList(Map<String, Object> params);
 	

+ 47 - 2
src/main/java/com/goafanti/common/mapper/NewsMapper.xml

@@ -217,6 +217,51 @@
       province_id = #{provinceId,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
-  
-  
+  <select id="portalNewsList" resultType="com.goafanti.news.bo.NewsPortalList">
+		select
+			a.id,
+			a.create_time as createTime,
+			a.title,
+			a.title_img as titleImg,
+			a.type,
+			a.hot,
+			a.summary,
+			a.source,
+			a.content
+		from news a
+		where 1 =1
+		<if test="provinceId != null">
+			and a.province_id = #{provinceId,jdbcType=INTEGER}
+		</if>
+		<!-- 
+		<if test="type != null and type != 0" >
+			and a.type = #{type,jdbcType=INTEGER}
+		</if>
+		<if test="hot != null">
+			and a.hot = #{hot,jdbcType=INTEGER}
+		</if>
+		 -->
+		order by create_time desc
+		<if test="page_sql != null">
+			${page_sql}
+		</if>
+	</select>
+	
+	<select id="portalNewsCount" resultType="java.lang.Integer">
+		select 
+			count(0)
+		from news a
+		where 1 =1
+		<if test="provinceId != null">
+			and a.province_id = #{provinceId,jdbcType=INTEGER}
+		</if>
+		<!-- 
+		<if test="type != null and type != 0" >
+			and a.type = #{type,jdbcType=INTEGER}
+		</if>	
+		<if test="hot != null">
+			and a.hot = #{hot,jdbcType=INTEGER}
+		</if>
+		-->
+	</select>
 </mapper>

+ 2 - 28
src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml

@@ -126,33 +126,7 @@
 			#{item}
 	</foreach>
   </delete>
-  
-  <select id="findPortalList" resultType="com.goafanti.news.bo.NewsPortalList">
-		select
-			a.id,
-			a.create_time as createTime,
-			a.title,
-			a.title_img as titleImg,
-			a.type,
-			a.hot,
-			a.summary,
-			a.source,
-			a.content
-		from news a
-		join branch_office_info b
-		on a.province_id = b.province_id
-		where 1 =1
-		<if test="type != null and type != 0" >
-			and a.type = #{type,jdbcType=INTEGER}
-		</if>
-		<if test="website != null">
-			and b.website = #{website,jdbcType=VARCHAR}
-		</if>
-		order by create_time desc
-		limit #{pageNo,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER}
-	</select>
-	
-	<select id="findJmrhNewsList" parameterType="String" resultMap="SummaryResultMap">
+  <select id="findJmrhNewsList" parameterType="String" resultMap="SummaryResultMap">
 		select 
 			id,title,create_time 
 		from 
@@ -162,5 +136,5 @@
 		order by 
 			create_time desc
 		limit 3;
-	</select>
+  </select>
 </mapper>

+ 0 - 9
src/main/java/com/goafanti/news/bo/NewsPortalList.java

@@ -1,18 +1,9 @@
 package com.goafanti.news.bo;
 
 public class NewsPortalList extends NewsSummary {
-	private String	source;
 
 	private String	content;
 
-	public String getSource() {
-		return source;
-	}
-
-	public void setSource(String source) {
-		this.source = source;
-	}
-
 	public String getContent() {
 		return content;
 	}

+ 8 - 23
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -74,15 +74,16 @@ public class NewsController extends BaseController {
 	 */
 	@RequestMapping(value = "/portal/news/list", method = RequestMethod.GET)
 	@ResponseBody
-	public Result portalNewsList(Integer type, String pageSize, String pageNo, String noCache,HttpServletRequest request) {
+	public Result portalNewsList(Integer type, String pageSize, String pageNo, Integer hot,Integer provinceId) {
 		Result res = new Result();
-		if (StringUtils.equals(noCache, "clear")) {
-			newsService.cleanPortalList();
+		Integer pNo = 1,pSize = 4;
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
 		}
-		String domainName = request.getServerName();
-		Integer pN = getPageNo(pageNo);
-		Integer pS = getPageSize(pageSize);
-		res.setData(newsService.findPortalList(pS, (pN - 1) * pS, type,domainName));
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		res.setData(newsService.portalNewsList(pSize,pNo, type,hot,provinceId));
 		return res;
 	}
 
@@ -113,21 +114,5 @@ public class NewsController extends BaseController {
 			modelview.addObject("banners", banners);
 		}
 	}
-	
-	private Integer getPageNo(String pageNo){
-		if (StringUtils.isNumeric(pageNo)) {
-			Integer pn = Integer.parseInt(pageNo);
-			return pn < 1 ? 1 : pn;
-		}
-		return 1;
-	}
-	
-	private Integer getPageSize(String pageSize){
-		if (StringUtils.isNumeric(pageSize)) {
-			Integer ps = Integer.parseInt(pageSize);
-			return ps > 50 ? 50 : (ps < 5 ? 5 : ps);
-		}
-		return 10;
-	}
 
 }

+ 18 - 7
src/main/java/com/goafanti/news/service/NewsService.java

@@ -141,14 +141,25 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 		return newsMapper.batchDeleteByPrimaryKey(id);
 	}
 	
-	@Cacheable(value = "NewsPortalListCache", key = "'NewsPortalList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize+'domainName:'+#domainName")
-	public List<NewsPortalList> findPortalList(Integer pSize, Integer pNo, Integer type,String domainName) {
+	@SuppressWarnings("unchecked")
+	public Pagination<NewsPortalList> portalNewsList(Integer pSize, Integer pNo, Integer type,Integer hot,Integer provinceId) {
 		Map<String, Object> params = new HashMap<String, Object>();
-		params.put("type", type);
-		params.put("pageSize", pSize);
-		params.put("pageNo", pNo);
-		params.put("website", domainName);
-		return newsMapper.findPortalList(params);
+		if (null != hot){
+			params.put("hot", hot);
+		}
+		if(null != type){
+			params.put("type", type);
+		}
+		if(null != provinceId){
+			params.put("provinceId", provinceId);
+		}
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		return (Pagination<NewsPortalList>) findPage("portalNewsList","portalNewsCount",params,pNo,pSize);
 	}
 	
 	@CacheEvict(value = "NewsPortalListCache", allEntries = true)

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html

@@ -4,7 +4,7 @@
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>技术交易</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-	<link th:href="${portalHost + '/Technologytrading.css'}" rel="stylesheet">
+	<link th:href="${portalHost + '/technologyTrading.css'}" rel="stylesheet">
 </head>
 
 <body>
@@ -192,7 +192,7 @@
 	</footer>
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript" th:src="${portalHost + '/Technologytrading.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/technologyTrading.js'}"></script>
 	</div>
 </body>
 

+ 67 - 215
src/main/webapp/WEB-INF/views/portal/thinkTank/index.html

@@ -74,132 +74,71 @@
 			</div>
 		</div>
 		<!--智者列表-->
-
 		<div class="wiseman_list">
-			<ul>
-				<li><img th:href="${portalHost + '/img/think_09.jpg'}" alt="" />
-					<div class="list_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-					</div>
-					<div class="shadow_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-						<img th:href="${portalHost + '/img/search_txt.png'}" alt="" />
-					</div></li>
-				<li><img th:href="${portalHost + '/img/think_09.jpg'}" alt="" />
-					<div class="list_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-					</div>
-					<div class="shadow_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-						<img th:href="${portalHost + '/img/search_txt.png'}" alt="" />
-					</div></li>
-				<li><img th:href="${portalHost + '/img/think_09.jpg'}" alt="" />
-					<div class="list_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-					</div>
-					<div class="shadow_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-						<img th:href="${portalHost + '/img/search_txt.png'}" alt="" />
-					</div></li>
-				<li><img th:href="${portalHost + '/img/think_09.jpg'}" alt="" />
-					<div class="list_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-					</div>
-					<div class="shadow_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-						<img th:href="${portalHost + '/img/search_txt.png'}" alt="" />
-					</div></li>
-				<li><img th:href="${portalHost + '/img/think_09.jpg'}" alt="" />
-					<div class="list_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-					</div>
-					<div class="shadow_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-						<img th:href="${portalHost + '/img/search_txt.png'}" alt="" />
-					</div></li>
-				<li><img th:href="${portalHost + '/img/think_09.jpg'}" alt="" />
-					<div class="list_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-					</div>
-					<div class="shadow_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-						<img th:href="${portalHost + '/img/search_txt.png'}" alt="" />
-					</div></li>
-				<li><img th:href="${portalHost + '/img/think_09.jpg'}" alt="" />
-					<div class="list_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-					</div>
-					<div class="shadow_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-						<img th:href="${portalHost + '/img/search_txt.png'}" alt="" />
-					</div></li>
-				<li><img th:href="${portalHost + '/img/think_09.jpg'}" alt="" />
-					<div class="list_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-					</div>
-					<div class="shadow_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-						<img th:href="${portalHost + '/img/search_txt.png'}" alt="" />
-					</div></li>
-				<li><img th:href="${portalHost + '/img/think_09.jpg'}" alt="" />
-					<div class="list_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-					</div>
-					<div class="shadow_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-						<img th:href="${portalHost + '/img/search_txt.png'}" alt="" />
-					</div></li>
-				<li><img th:href="${portalHost + '/img/think_09.jpg'}" alt="" />
-					<div class="list_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
+			<div class="wrap active ">
+				<div class="portal-body">
+					<div class="portal-content">
+						<div class="search-criteria row">
+							<div class="search-title col-md-2">
+								<span>行业分类</span>
+							</div>
+							<div class="search-select col-md-10">
+								<ul id="industryList" class="clearfix"></ul>
+							</div>
+						</div>
+						<ul class='detail_interest_sub clearfix' id="subscriberList">
+							<li class="org-detail clearfix">
+								<div class="logo">
+									<i class="user_portrait_img"></i>
+								</div>
+								<div class="detail-right">
+									<div class="name">
+										<span>柏连阳</span>
+									</div>
+									<div class="text">
+										<span>省医学会检验专业委员会</span>
+									</div>
+									<div class="text">
+										<span>省医学会检验专业委员会副主任委员</span>
+									</div>
+									<div class="text">
+										<span title="生物与新医药/医疗仪器、设备与医学专用软件/医学影像诊断技术">生物与新医药/医疗仪器、设备与医学专用软件/医学影像诊断技术</span>
+									</div>
+									<div class="detail-text">
+										<div class="text">
+											<span class="letter_Spacing">需</span> <span>求: </span> <span
+												class="text-Number">123</span> <span class="text-unit">
+												条</span>
+										</div>
+										<div class="text">
+											<span>技术成果: </span> <span class="text-Number">456 </span> <span
+												class="text-unit"> 条</span>
+										</div>
+										<div class="text">
+											<span class="letter_Spacing">粉</span> <span>丝: </span> <span
+												class="text-Number">789</span> <span class="text-unit">
+												位</span>
+										</div>
+									</div>
+								</div>
+							</li>
+						</ul>
 					</div>
-					<div class="shadow_text">
-						<p class="bulr">邓志国</p>
-						<p class="orange">DNA研究会会长</p>
-						<p class="text_on">怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后怒吼道胡非常胡海峰回复u和丢货牛的很和丢弃化合物哈迪斯粗后</p>
-						<img th:href="${portalHost + '/img/search_txt.png'}" alt="" />
-					</div></li>
-			</ul>
-			<div class="found">
-				<a href="#">发现更多智者</a>
+				</div>
+			</div>
+			<div class="container pagination_box">
+				<nav aria-label="Page navigation" class="clearfix">
+					<ul class="pagination">
+						<li class="pagePre"><a href="#" aria-label="Previous"> <span
+								aria-hidden="true">&laquo;</span>
+						</a></li>
+						<li class="pageNumber"><a href="#" value="1">1</a></li>
+						<li class="pageNext"><a href="#" aria-label="Next"> <span
+								aria-hidden="true">&raquo;</span>
+						</a></li>
+					</ul>
+					<span class="totalCount">共0条数据</span>
+				</nav>
 			</div>
 		</div>
 		<!--智政详情-->
@@ -209,38 +148,6 @@
 				<div class="main_zizone">
 					<span class="zizone_left">&laquo;</span>
 					<ul>
-						<li><img th:href="${portalHost + '/img/think_31.png'}" alt="" />
-							<div class="zizone_text">
-								<h4>
-									<a href="">高新是什家纺的的大学城赴会而</a>
-									</h3>
-									<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-									<a href="#">MORE+</a>
-							</div></li>
-						<li><img th:href="${portalHost + '/img/think_31.png'}" alt="" />
-							<div class="zizone_text">
-								<h4>
-									<a href="">高新是什家纺的的大学城赴会而</a>
-									</h3>
-									<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-									<a href="#">MORE+</a>
-							</div></li>
-						<li><img th:href="${portalHost + '/img/think_31.png'}" alt="" />
-							<div class="zizone_text">
-								<h4>
-									<a href="">高新是什家纺的的大学城赴会而</a>
-									</h3>
-									<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-									<a href="#">MORE+</a>
-							</div></li>
-						<li><img th:href="${portalHost + '/img/think_31.png'}" alt="" />
-							<div class="zizone_text">
-								<h4>
-									<a href="">高新是什家纺的的大学城赴会而</a>
-									</h3>
-									<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-									<a href="#">MORE+</a>
-							</div></li>
 					</ul>
 					<span class="zizone_right">&raquo;</span>
 				</div>
@@ -257,72 +164,17 @@
 	 					<li value="5">四川</li>	 					
 	 				</ul>
 	 				<div class="more_city">
-	 					<input type="text" name="" readonly="readonly" value="更多省份 +"/>
+	 					<div value="更多省份 +" class="inp"/>更多省份 +</div>
 	 					<div class="list_city">	 						 						
 	 					</div>
 	 				</div>
 	 			</div>
 				<div class="policy">
-					<ul>
-						<li>
-							<div class="policy_time">
-								<p>30</p>
-								<time>2017-09</time>
-							</div>
-							<div class="policy_details">
-								<h4>
-									<a href="">高新是什家纺的的大学城赴会而费尽覅么?</a>
-									</h3>
-									<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-									<a href="#">MORE+</a>
-							</div>
-						</li>
-						<li>
-							<div class="policy_time">
-								<p>30</p>
-								<time>2017-09</time>
-							</div>
-							<div class="policy_details">
-								<h4>
-									<a href="">高新是什家纺的的大学城赴会而费尽覅么?</a>
-									</h3>
-									<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-									<a href="#">MORE+</a>
-							</div>
-						</li>
-						<li>
-							<div class="policy_time">
-								<p>30</p>
-								<time>2017-09</time>
-							</div>
-							<div class="policy_details">
-								<h4>
-									<a href="">高新是什家纺的的大学城赴会而费尽覅么?</a>
-									</h3>
-									<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-									<a href="#">MORE+</a>
-							</div>
-						</li>
-						<li>
-							<div class="policy_time">
-								<p>30</p>
-								<time>2017-09</time>
-							</div>
-							<div class="policy_details">
-								<h4>
-									<a href="">高新是什家纺的的大学城赴会而费尽覅么?</a>
-									</h3>
-									<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-									<a href="#">MORE+</a>
-							</div>
-						</li>
-					</ul>
+					<ul></ul>
 					<ol>
 						<li class="active_of"></li>
 						<li></li>
 						<li></li>
-						<li></li>
-						<li></li>
 					</ol>
 				</div>
 			</div>
@@ -330,11 +182,11 @@
 	</div>
 	<footer>
 		<div th:replace="common::copyright"></div>
-		<div th:replace="common::login"></div>
+		<div th:replace="common::login"></div>	
 	</footer>
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript" th:src="${portalHost + '/thinkTank.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/thinktank.js'}"></script>
 	</div>
 </body>
 </html>