首页调整

assets/js/company-postproject.js

@@ -136,8 +136,8 @@ $(function(){
 	}
 	]
 	
-	var province=["aaa","bbb","ccc"]
-	var city=["aaa1","bbb2","ccc3"]
+	var province=["河南省","安徽省","福建省","甘肃省"]
+	var city=["南阳市","开封市","漯河市","许昌市","新乡市","济源市"]
 	//---------初始化数据部分end-----------
 	//页面初始化
 	contact_number_list.forEach(item=>{

assets/js/company-register.js

@@ -61,8 +61,8 @@ $(function() {
 		name: "Spain"
 	}]
 
-	var province = ["aaa", "bbb", "ccc"]
-	var city = ["aaa1", "bbb2", "ccc3"]
+	var province=["河南省","安徽省","福建省","甘肃省"]
+	var city=["南阳市","开封市","漯河市","许昌市","新乡市","济源市"]
 	//---------初始化数据部分end-----------
 	//页面初始化
 	contact_number_list.forEach(item => {

assets/js/landingpage.js

@@ -1,118 +1,188 @@
-$(function(){
+var selectLocation = ["Canada", "China", "France", "Germany"];
+var selectLocation2 = ["China"];
+
+$(function() {
+
+	var selectDisciplines = [" Masterplanning"," Architecture"," Interiors", "Lighting"," Landscape"," AV & Acoustics"," MEP"," Art work & Accessories"," Graphics & Signage"," Branding"," Furniture, Lighting"];
 	
-	var selectLocation=["Canada","China","France","Germany"];
-	var selectDisciplines=["Architecture","Landscape","AV","Mustard","Landscape"];
+	var newestList = window.localStorage.getItem("newestList")
 	
-	var resentlist=window.localStorage.getItem("resentlist")
-	var trendinglist=[
-		"Interior","Architecture","Masterplanning","Lighting"
-		,"Landscape","Acoustics","MEP","Art work & Accessories",
+	
+	var resentlist = window.localStorage.getItem("resentlist")
+	var trendinglist = [
+		"Interior", "Architecture", "Masterplanning", "Lighting", "Landscape", "Acoustics", "MEP",
+		"Art work & Accessories",
 	]
-	addlistBtn(".trendinglist",trendinglist)
-	if(resentlist){
-		resentlist=JSON.parse(resentlist)
-		addlistBtn(".resentlist",resentlist)
+	if(newestList==null){
+		newestList=[...selectDisciplines]
+		window.localStorage.setItem("newestList", JSON.stringify(newestList))
+		
 	}else{
-		resentlist=[]
+		newestList = JSON.parse(newestList)
 	}
-	$(".search-item").on("click",'.querybtnli',function(){
-		
-		var value=$(this).text()
-		$(".landingpage_search").val(value);
-		$(".querybtn").click()
-	})
-	$(".querybtn").click(function(){
-		
-		resentlistAdd($(".landingpage_search").val())
-	})
-	
 	
-	function resentlistAdd(name){
-		if(!name){
-			var i=resentlist.unshift(name)
-			var num=4
-			if(i>num){
-				resentlist=resentlist.slice(0,num)
-			}
-			window.localStorage.setItem("resentlist",JSON.stringify(resentlist))
-			
-			
-		}
-		
-		addlistBtn(".resentlist",resentlist)
-		$("#project-photo-row").empty();
-		
-		$.getJSON("../../assets/js/landingpage_photos.json", function (data) {
-			data=data.sort(()=>{
-				return Math.random()>0.5?-1:1
-			})
-			const tmphtml=template("flow-photos",{photos:data});
-			
-			$("#project-photo-row").append(tmphtml);
-		});
+	addlistNewest(".newest-list-pro",newestList)
+	
+	addlistBtn(".trendinglist", trendinglist)
+	if (resentlist) {
+		resentlist = JSON.parse(resentlist)
+		addlistBtn(".resentlist", resentlist)
+	} else {
+		resentlist = []
 	}
-	addlistSelect(".selectDisciplines",selectDisciplines)
-	addlistSelect(".selectLocation",selectLocation)
 	
-	function addlistSelect(name,list){
-		$(name).empty()
-		list.forEach(function(item){
-			var btn=$('<option>'+item+'</option>')
-			
-			$(name).append(btn)
-		})
-	}
-	function addlistBtn(name,list){
-		$(name).empty()
-		list.forEach(function(item){
-			var btn=$('<button class="btn btn-lg  querybtnli">'+item+'</button>')
-			
-			$(name).append(btn)
-		})
-	}
-	$(".query").click(function(){
-		resentlistAdd($(this).text())
 	
-	})
-	
-	
-	
-	$('.selectpicker').selectpicker({
-		template:{
-			caret:'<span class="sel-icon glyphicon glyphicon-menu-down"></span>'
-		}
-	});
-	
-	$.getJSON("../../assets/js/landingpage_photos.json", function (data) {
-		const tmphtml=template("flow-photos",{photos:data});
+	$(".newest-list-pro").on("click", '.newest-item-x', function() {
+		var name=$(this).parent().find(".query").text()
 		
-		$("#project-photo-row").append(tmphtml);
-	});
-
-	$("#project-photo-row").on("click",".thumbnail img",function(){
+		var k2=newestList.indexOf(name)
 		
-		var loginUser= window.localStorage.getItem("loginUser");
-		if(!loginUser){
-			window.location.href="../signin/signin.html"
-			 return  
+		if (k2 != -1) {
+			newestList.splice(k2, 1)
 		}
+ 		
+		window.localStorage.setItem("newestList", JSON.stringify(newestList))
 		
-		
-		let imgname=$(this).data('imgname');
-		zeroModal.show({
-			url:'landingpage_details.html?img='+imgname,
-			iframe:true,
-			width:'95%',
-			height:'95%',
-			onClosed:function(){
-				$("body").css('overflow','auto');
-			},
-			onComplete:function(){
-				$("body").css('overflow','hidden');
+		$(this).parent().remove()
+	})
+	$(".search-item").on("click", '.querybtnli', function() {
+
+		var value = $(this).text()
+		$(".landingpage_search").val(value);
+		$(".querybtn").click()
+	})
+	$(".querybtn").click(function() {
+		resentlistAdd($(".landingpage_search").val())
+	})
+	$(".querybtn2").click(function() {	
+		resentlistAdd($(".landingpage_search").val())
+	})
+
+
+	function resentlistAdd(name) {
+
+		if (name) {
+			var k = resentlist.indexOf(name)
+			var k2=newestList.indexOf(name)
+			
+			if (k != -1) {
+				 resentlist.splice(k, 1)
+			}
+			if (k2 != -1) {
+				newestList.splice(k2, 1)
 			}
-		});
+			var i = resentlist.unshift(name)
+			  newestList.unshift(name)
+			
+			var num = 4
+			if (i > num) {
+				resentlist = resentlist.slice(0, num)
+			}
+			window.localStorage.setItem("resentlist", JSON.stringify(resentlist))
+			window.localStorage.setItem("newestList", JSON.stringify(newestList))
+
+		}
+		addlistNewest(".newest-list-pro",newestList)
+		addlistBtn(".resentlist", resentlist)
+		$("#project-photo-row").empty();
+
+		$.getJSON("../../assets/js/landingpage_photos.json", function(data) {
+			data = data.sort(() => {
+				return Math.random() > 0.5 ? -1 : 1
+			})
+			const tmphtml = template("flow-photos", {
+				photos: data
+			});
+
+			$("#project-photo-row").append(tmphtml);
+		});
+	}
+	addlistSelect(".selectDisciplines", selectDisciplines)
+	addlistSelect(".selectLocation", selectLocation)
+
+	
+	function addlistNewest(name, list) {
+		$(name).empty()
+		list.forEach(function(item) {
+				
+			var btn = $('<div class="newest-item "> <span class="query">' + item + '</span><span class="newest-item-x" >x</span></div>')
+	
+			$(name).append(btn)
+		})
+	}
+	function addlistBtn(name, list) {
+		$(name).empty()
+		list.forEach(function(item) {
+			var btn = $('<button class="btn btn-lg  querybtnli">' + item + '</button>')
+
+			$(name).append(btn)
+		})
+	}
+	$(".query").click(function() {
+		
+		resentlistAdd($(this).text())
+
+	})
+	
+
+	
+
+	$('.selectpicker').selectpicker({
+		template: {
+			caret: '<span class="sel-icon glyphicon glyphicon-menu-down"></span>'
+		}
+	});
+
+	$.getJSON("../../assets/js/landingpage_photos.json", function(data) {
+		const tmphtml = template("flow-photos", {
+			photos: data
+		});
+
+		$("#project-photo-row").append(tmphtml);
+	});
+
+	$("#project-photo-row").on("click", ".thumbnail img", function() {
+
+		var loginUser = window.localStorage.getItem("loginUser");
+		if (!loginUser) {
+			window.location.href = "../signin/signin.html"
+			return
+		}
+
+
+		let imgname = $(this).data('imgname');
+		zeroModal.show({
+			url: 'landingpage_details.html?img=' + imgname,
+			iframe: true,
+			width: '95%',
+			height: '95%',
+			onClosed: function() {
+				$("body").css('overflow', 'auto');
+			},
+			onComplete: function() {
+				$("body").css('overflow', 'hidden');
+			}
+		});
+
+
+	});
+});
+function selectOnchang(obj){ 
+	console.log(obj.selectedIndex)
+	if(obj.selectedIndex==1){
+		addlistSelect(".selectpicker.selectLocation", selectLocation2)
 		
+	}else{
+		addlistSelect(".selectpicker.selectLocation", selectLocation)
 		
-	});
-	
-});
+	}
+	$(".selectpicker.selectLocation").selectpicker('refresh');
+}
+function addlistSelect(name, list) {
+		$(name).empty()
+		list.forEach(function(item) {
+			var btn = $('<option>' + item + '</option>')
+
+			$(name).append(btn)
+		})
+	}

assets/js/moments.js

@@ -1,20 +1,47 @@
+	var selectLocation = ["Canada", "China", "France", "Germany"];
+var selectLocation2 = ["China"];
 $(function() {
 
-var selectLocation=["Canada","China","France","Germany"];
-	var selectDisciplines=["Architecture","Landscape","AV","Mustard","Landscape"];
+	var selectDisciplines = [" Masterplanning"," Architecture"," Interiors", "Lighting"," Landscape"," AV & Acoustics"," MEP"," Art work & Accessories"," Graphics & Signage"," Branding"," Furniture, Lighting"];
 	
 	var resentlist=window.localStorage.getItem("resentlist")
 	var trendinglist=[
 		"Interior","Architecture","Masterplanning","Lighting"
 		,"Landscape","Acoustics","MEP","Art work & Accessories",
-	]
+	]
+	var newestList = window.localStorage.getItem("newestList")
+	
 	addlistBtn(".trendinglist",trendinglist)
 	if(resentlist){
 		resentlist=JSON.parse(resentlist)
 		addlistBtn(".resentlist",resentlist)
 	}else{
 		resentlist=[]
-	}
+	}
+	if(newestList==null){
+		newestList=[...selectDisciplines]
+		window.localStorage.setItem("newestList", JSON.stringify(newestList))
+		
+	}else{
+		newestList = JSON.parse(newestList)
+	}
+	
+	addlistNewest(".newest-list-pro",newestList)
+	
+	$(".newest-list-pro").on("click", '.newest-item-x', function() {
+		var name=$(this).parent().find(".query").text()
+		
+		var k2=newestList.indexOf(name)
+		
+		if (k2 != -1) {
+			newestList.splice(k2, 1)
+		}
+		
+		window.localStorage.setItem("newestList", JSON.stringify(newestList))
+		
+		$(this).parent().remove()
+	})
+	
 	$(".search-item").on("click",'.querybtnli',function(){
 		
 		var value=$(this).text()
@@ -27,16 +54,28 @@ var selectLocation=["Canada","China","France","Germany"];
 	
 	
 	function resentlistAdd(name){
-		if(!name){
-			var i=resentlist.unshift(name)
-			var num=4
-			if(i>num){
-				resentlist=resentlist.slice(0,num)
-			}
-			window.localStorage.setItem("resentlist",JSON.stringify(resentlist))
-			
-		}
-	
+		if (name) {
+			var k = resentlist.indexOf(name)
+			var k2=newestList.indexOf(name)
+			
+			if (k != -1) {
+				 resentlist.splice(k, 1)
+			}
+			if (k2 != -1) {
+				newestList.splice(k2, 1)
+			}
+			var i = resentlist.unshift(name)
+			  newestList.unshift(name)
+			
+			var num = 4
+			if (i > num) {
+				resentlist = resentlist.slice(0, num)
+			}
+			window.localStorage.setItem("resentlist", JSON.stringify(resentlist))
+			window.localStorage.setItem("newestList", JSON.stringify(newestList))
+		
+		}
+		addlistNewest(".newest-list-pro",newestList)
 		addlistBtn(".resentlist",resentlist)
 		
 		$(".imguploadlist").empty();
@@ -52,13 +91,14 @@ var selectLocation=["Canada","China","France","Germany"];
 	addlistSelect(".selectDisciplines",selectDisciplines)
 	addlistSelect(".selectLocation",selectLocation)
 	
-	function addlistSelect(name,list){
-		$(name).empty()
-		list.forEach(function(item){
-			var btn=$('<option>'+item+'</option>')
-			
-			$(name).append(btn)
-		})
+function addlistNewest(name, list) {
+		$(name).empty()
+		list.forEach(function(item) {
+				
+			var btn = $('<div class="newest-item "> <span class="query">' + item + '</span><span class="newest-item-x" >x</span></div>')
+	
+			$(name).append(btn)
+		})
 	}
 	function addlistBtn(name,list){
 		$(name).empty()
@@ -138,3 +178,23 @@ var selectLocation=["Canada","China","France","Germany"];
 		}
 	});
 })
+
+function selectOnchang(obj){ 
+	console.log(obj.selectedIndex)
+	if(obj.selectedIndex==1){
+		addlistSelect(".selectpicker.selectLocation", selectLocation2)
+		
+	}else{
+		addlistSelect(".selectpicker.selectLocation", selectLocation)
+		
+	}
+	$(".selectpicker.selectLocation").selectpicker('refresh');
+}
+function addlistSelect(name, list) {
+		$(name).empty()
+		list.forEach(function(item) {
+			var btn = $('<option>' + item + '</option>')
+
+			$(name).append(btn)
+		})
+	}

html/account/account.html

@@ -90,17 +90,17 @@
 		   .project-box .thumbnail{
 		   	border:0;
 		   }
-		   #project-photo-row{
-		   	-webkit-column-width:242px; /*Safari and Chrome*/
-		   	-moz-column-width:242px; /*Firefox*/
-		   	-o-column-width:242px; /*Opera*/
-		   	-ms-column-width:242px; /*IE*/
-		   	column-width:242px;
-		   }
-		   #project-photo-row>div{
-		       width:242px; /*宽度根据实际情况调节，应与上面一致*/
-		       overflow:auto; /*防止内容溢出导致布局错位*/
-		   }
+		 #project-photo-row{
+		 	-webkit-column-width:242px; /*Safari and Chrome*/
+		 	-moz-column-width:242px; /*Firefox*/
+		 	-o-column-width:242px; /*Opera*/
+		 	-ms-column-width:242px; /*IE*/
+		 	column-width:142px;
+		 }
+		 #project-photo-row>div{
+		     width:182px; /*宽度根据实际情况调节，应与上面一致*/
+		     overflow:auto; /*防止内容溢出导致布局错位*/
+		 }
 		   
 		   .follow-box{
 			   display: none;
@@ -164,7 +164,7 @@
 			})
 		</script>
 		<main class="jpmain" style="margin-top:85px;margin-bottom: 0px;">
-		<div class="container-fluid" style="padding:0;">
+		<div class="container-fluid  jpcontainer" style="    max-width: 1300px;">
 			
 			
 			<div class="account-box">
@@ -189,7 +189,8 @@
 				
 			</div>
 			
-			<div class="project-box">
+			<div class="project-box" >
+			
 				<div class="row">
 				    <div class="col-md-12" id="project-photo-row">
 				    <!--图片开始-->

html/landingpage/landingpage.html

@@ -55,6 +55,7 @@
 			   margin:0px 40px 0px 0px;
 			   color:#999;
 			   cursor: pointer;
+			       white-space: nowrap;
 		   }
 		   
 		   .search-list .search-item{
@@ -98,10 +99,10 @@
 				-moz-column-width:242px; /*Firefox*/
 				-o-column-width:242px; /*Opera*/
 				-ms-column-width:242px; /*IE*/
-				column-width:242px;
+				column-width:142px;
 			}
 			#project-photo-row>div{
-			    width:242px; /*宽度根据实际情况调节，应与上面一致*/
+			    width:182px; /*宽度根据实际情况调节，应与上面一致*/
 			    overflow:auto; /*防止内容溢出导致布局错位*/
 			}
 		</style>
@@ -118,31 +119,17 @@
 			})
 		</script>
 		<main class="jpmain">
+		
 		<div class="container-fluid" style="padding:0;">
 		 
 			
 			<div class="tool-box">
-				<div class="newest-list">
-					<div class="newest-item i18n-text" i18n="landingpage_Newest"
-					 style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
-					<div class="newest-item query">All</div>
-					<div class="newest-item query">x &nbsp;Masterplanning</div>
-					<div class="newest-item query">Architecture</div>
-					<div class="newest-item query">Interiors</div>
-					<div class="newest-item query">Lighting</div>
-					<div class="newest-item query">Landscape</div>
-					<div class="newest-item query">AV&nbsp;&amp;&nbsp;Acoustics</div>
-					<div class="newest-item query">MEP</div>
-					<div class="newest-item query">Landscape</div>
-					<div class="newest-item query">Landscape</div>
-					<div style="flex:1;"></div>
-					<div class="newest-item"><img src="../../assets/img/landing_right_arrow.png"></div>
-				</div>
+			
 				
-				<div class="search-list" style="margin-top:30px;">
+				<div class="search-list" >
 					<div class="search-item">
 						<label class="i18n-text"  i18n="landingpage_Location">Location</label>
-						<select class="selectpicker">
+						<select class="selectpicker" onchange="selectOnchang(this)">
 						  <option class="i18n-text"  i18n="landingpage_By project" >By project</option>
 						  <option class="i18n-text"  i18n="landingpage_By company">By company</option>
 						</select>
@@ -169,7 +156,7 @@
 					
 					<div class="search-item">
 						 <label style="display: block;">&nbsp;</label>
-						 <button type="button" class="btn btn-default i18n-text querybtn" i18n="head_Submit" style="height: 42px;padding:0px 20px;background-color: #000000;color:#ffffff;">Submit</button>
+						 <button type="button" class="btn btn-default i18n-text querybtn2" i18n="head_Submit" style="height: 42px;padding:0px 20px;background-color: #000000;color:#ffffff;">Submit</button>
 					</div>
 					
 					<div style="flex:1;"></div>
@@ -214,6 +201,7 @@
 											       color: rgba(130, 130, 130, 1);
 							  }
 							  </style>
+							  
 							  <ul class="dropdown-menu dropdown-menu-right filter-menu filterstyle" aria-labelledby="dropdownMenu1">
 							       <li>
 									    <span  class="i18n-text" i18n="landingpage_Resent searches">Resent searches</span>
@@ -231,12 +219,39 @@
 					</div>
 					
 				</div>
+				<style>
+					.newest-list-pro {
+						    display: flex;
+						    overflow: hidden;
+					}
+					.newest-item-x {
+						display: none;
+						margin-left: 3px;
+					}
+					.newest-item:hover .newest-item-x{
+						display: inline-flex;
+					}
+				</style>
 				
+				<div class="newest-list" style="margin-top:30px;">
+					<div class="newest-item i18n-text" i18n="landingpage_Newest"
+					 style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
+					<div class="newest-item query">All</div>
+					
+					<div class="newest-list-pro ">
+					
+					</div>
+					
+					
+					<div style="flex:1;"></div>
+					<div class="newest-item" style=" margin-left: 30px;">
+						<img src="../../assets/img/landing_right_arrow.png"></div>
+				</div>
 				
 			</div>
 			
 			
-			<div class="project-box">
+			<div class="project-box jpcontainer" style="    max-width: 1300px;" >
 				<div class="row">
 				    <div class="col-md-12" id="project-photo-row">
 				    <!--图片开始-->
@@ -251,6 +266,7 @@
 			</div>
 			
 			
+		
 		</div>
 		<script src="../../js/bootstrap.min.js"></script>
 		<script src="../../assets/plugin/bootstrap-select/js/bootstrap-select.js"></script>

html/moments/index.html

@@ -58,7 +58,8 @@
 			.newest-list .newest-item {
 				margin: 0px 40px 0px 0px;
 				color: #999;
-				cursor: pointer;
+				cursor: pointer;
+				white-space: nowrap;
 			}
 
 			.search-list .search-item {
@@ -135,118 +136,132 @@
 		</script>
 		<main class="jpmain">
 			<div class="container-fluid" style="padding:0;">
-<div class="tool-box">
-				<div class="newest-list">
-					<div class="newest-item i18n-text" i18n="landingpage_Newest"
-					 style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
-					<div class="newest-item query">All</div>
-					<div class="newest-item query">x &nbsp;Masterplanning</div>
-					<div class="newest-item query">Architecture</div>
-					<div class="newest-item query">Interiors</div>
-					<div class="newest-item query">Lighting</div>
-					<div class="newest-item query">Landscape</div>
-					<div class="newest-item query">AV&nbsp;&amp;&nbsp;Acoustics</div>
-					<div class="newest-item query">MEP</div>
-					<div class="newest-item query">Landscape</div>
-					<div class="newest-item query">Landscape</div>
-					<div style="flex:1;"></div>
-					<div class="newest-item"><img src="../../assets/img/landing_right_arrow.png"></div>
-				</div>
-				
-				<div class="search-list" style="margin-top:30px;">
-					<div class="search-item">
-						<label class="i18n-text"  i18n="landingpage_Location">Location</label>
-						<select class="selectpicker">
-						  <option class="i18n-text"  i18n="landingpage_By project" >By project</option>
-						  <option class="i18n-text"  i18n="landingpage_By company">By company</option>
-						</select>
-						
-					</div>
-					
-					<div class="search-item">
-						<label>&nbsp;</label>
-						<select class="selectpicker selectLocation" multiple>
-						  
-						</select>
-						
-					</div>
-					
-					
-					
-					<div class="search-item">
-						<label class="i18n-text"  i18n="landingpage_Disciplines"  >Disciplines</label>
-						<select class="selectpicker my-select selectDisciplines" multiple>
-						 
-						</select>
-					</div>
-					
-					
-					<div class="search-item">
-						 <label style="display: block;">&nbsp;</label>
-						 <button type="button" class="btn btn-default i18n-text querybtn" i18n="head_Submit" style="height: 42px;padding:0px 20px;background-color: #000000;color:#ffffff;">Submit</button>
-					</div>
-					
-					<div style="flex:1;"></div>
-					
-					<div class="search-item">
-						<label style="display: block;">&nbsp;</label>
-						
-					
-						<div class="input-group">
-						  <input type="text" class="form-control i18n-placeholder landingpage_search"  data-toggle="dropdown"
-						  i18n="landingpage_search" placeholder="search..." aria-describedby="basic-addon2" style="height:42px;    width: 300px;">
-						  <span class="input-group-addon" style="
-									padding: 0px;
-								" id="basic-addon2">
-							  <button type="button" class="querybtn" style="    width: 50px;
-									height: 40px; border: 0;">
-								    <i class="glyphicon glyphicon-search query"></i>
-							  </button>
-							
-							  </span>
-							  <style>
-							  .filterstyle{
-								    padding: 20px;
-								      width: 460px;
-									
-							  }
-							  .filterstyle span{
-								    padding: 10px;
-							  		    display: block;
-							  		    overflow-wrap: break-word;
-							  		    color: rgba(24, 24, 24, 1);
-							  		    font-size: 14px;
-							  		    font-family: Avenir-Roman;
-							  		    white-space: nowrap;
-							  		    line-height: 19px;
-							  		    text-align: left;
-							  }
-							  .filterstyle button{
-								    margin: 5px;
-							  		         padding: 5px 16px;
-										       font-size: 14px;
-											       color: rgba(130, 130, 130, 1);
-							  }
-							  </style>
-							  <ul class="dropdown-menu dropdown-menu-right filter-menu filterstyle" aria-labelledby="dropdownMenu1">
-							       <li>
-									    <span  class="i18n-text" i18n="landingpage_Resent searches">Resent searches</span>
-										<div class="resentlist">
- 										</div>
-										
-							  		 </li>
-							      <li>
-							      		 <span class="i18n-text" i18n="landingpage_Trending searches">Trending searches</span>
-							      			<div class="trendinglist">
- 							      			</div>
-							      	</li>
-							  </ul>
-						</div>
-					</div>
-					
-				</div>
-				
-				
+
+			<div class="tool-box">
+			
+				
+				<div class="search-list" >
+					<div class="search-item">
+						<label class="i18n-text"  i18n="landingpage_Location">Location</label>
+						<select class="selectpicker" onchange="selectOnchang(this)">
+						  <option class="i18n-text"  i18n="landingpage_By project" >By project</option>
+						  <option class="i18n-text"  i18n="landingpage_By company">By company</option>
+						</select>
+						
+					</div>
+					
+					<div class="search-item">
+						<label>&nbsp;</label>
+						<select class="selectpicker selectLocation" multiple>
+						  
+						</select>
+						
+					</div>
+					
+					
+					
+					<div class="search-item">
+						<label class="i18n-text"  i18n="landingpage_Disciplines"  >Disciplines</label>
+						<select class="selectpicker my-select selectDisciplines" multiple>
+						 
+						</select>
+					</div>
+					
+					
+					<div class="search-item">
+						 <label style="display: block;">&nbsp;</label>
+						 <button type="button" class="btn btn-default i18n-text querybtn2" i18n="head_Submit" style="height: 42px;padding:0px 20px;background-color: #000000;color:#ffffff;">Submit</button>
+					</div>
+					
+					<div style="flex:1;"></div>
+					
+					<div class="search-item">
+						<label style="display: block;">&nbsp;</label>
+						
+					
+						<div class="input-group">
+						  <input type="text" class="form-control i18n-placeholder landingpage_search"  data-toggle="dropdown"
+						  i18n="landingpage_search" placeholder="search..." aria-describedby="basic-addon2" style="height:42px;    width: 300px;">
+						  <span class="input-group-addon" style="
+									padding: 0px;
+								" id="basic-addon2">
+							  <button type="button" class="querybtn" style="    width: 50px;
+									height: 40px; border: 0;">
+								    <i class="glyphicon glyphicon-search query"></i>
+							  </button>
+							
+							  </span>
+							  <style>
+							  .filterstyle{
+								    padding: 20px;
+								      width: 460px;
+									
+							  }
+							  .filterstyle span{
+								    padding: 10px;
+							  		    display: block;
+							  		    overflow-wrap: break-word;
+							  		    color: rgba(24, 24, 24, 1);
+							  		    font-size: 14px;
+							  		    font-family: Avenir-Roman;
+							  		    white-space: nowrap;
+							  		    line-height: 19px;
+							  		    text-align: left;
+							  }
+							  .filterstyle button{
+								    margin: 5px;
+							  		         padding: 5px 16px;
+										       font-size: 14px;
+											       color: rgba(130, 130, 130, 1);
+							  }
+							  </style>
+							  
+							  <ul class="dropdown-menu dropdown-menu-right filter-menu filterstyle" aria-labelledby="dropdownMenu1">
+							       <li>
+									    <span  class="i18n-text" i18n="landingpage_Resent searches">Resent searches</span>
+										<div class="resentlist">
+ 										</div>
+										
+							  		 </li>
+							      <li>
+							      		 <span class="i18n-text" i18n="landingpage_Trending searches">Trending searches</span>
+							      			<div class="trendinglist">
+ 							      			</div>
+							      	</li>
+							  </ul>
+						</div>
+					</div>
+					
+				</div>
+				<style>
+					.newest-list-pro {
+						    display: flex;
+						    overflow: hidden;
+					}
+					.newest-item-x {
+						display: none;
+						margin-left: 3px;
+					}
+					.newest-item:hover .newest-item-x{
+						display: inline-flex;
+					}
+				</style>
+				
+				<div class="newest-list" style="margin-top:30px;">
+					<div class="newest-item i18n-text" i18n="landingpage_Newest"
+					 style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
+					<div class="newest-item query">All</div>
+					
+					<div class="newest-list-pro ">
+					
+					</div>
+					
+					
+					<div style="flex:1;"></div>
+					<div class="newest-item" style=" margin-left: 30px;">
+						<img src="../../assets/img/landing_right_arrow.png"></div>
+				</div>
+				
 			</div>
 
 				<div class="row-fluid  jpcontainer">
@@ -411,7 +426,7 @@
 				</dd>
 				{{/each}}
 			</script>
-			<script src="../../assets/plugin/bootstrap-select/js/bootstrap-select.min.js"></script>
+			<script src="../../assets/plugin/bootstrap-select/js/bootstrap-select.js"></script>
 			<script src="../../js/viewer-jquery.min.js"></script>
 		</main>
 	</body>