landingpage,postproject 页面调整

assets/js/landingpage.js

@@ -166,6 +166,14 @@ $(function() {
 
 
 	});
+	
+	//trigger search by enter
+	$(".landingpage_search").on("keyup",function(event){
+		var e = event || window.event;
+		if(e && e.keyCode==13 && this.value.length>0){ 
+			resentlistAdd($(".landingpage_search").val());
+		}
+	});
 });
 function selectOnchang(obj){ 
 	console.log(obj.selectedIndex)

assets/js/landingpage_photos.json

@@ -1,7 +1,8 @@
 [
 	{
 		"url":"../../assets/img/landingpage/SketchPng677c41a514ce39003ea3ad7eed2f45da074f91790561db2f64b930d36743a708.png",
-		"note":"巴西 Comigo 之家 2021 julian risso Arquitetura"
+		"note":"巴西 Comigo 之家 2021 julian risso Arquitetura",
+		"favourite":true
 	},
 	{
 		"url":"../../assets/img/landingpage/SketchPng27604c75820dea4f34c3641e123e7d0e0686011ab8695b7324e602518faa173e.png",
@@ -13,7 +14,8 @@
 	},
 	{
 		"url":"../../assets/img/landingpage/SketchPng89e9554a3265a9c1f8d56f3f7dd92e7e0af6a15c8c7b8aa9fddfe992757c51a0.png",
-		"note":"Begegnungshaus Jägersbrunn  WSM Architekten"
+		"note":"Begegnungshaus Jägersbrunn  WSM Architekten",
+		"favourite":true
 	},
 	{
 		"url":"../../assets/img/landingpage/SketchPng386937feecf5dc0d6863ea7b0c43461645676e224f9cef09e993539687ea0c83.png",

assets/js/moments.js

@@ -39,7 +39,9 @@ $(function() {
 		
 		window.localStorage.setItem("newestList", JSON.stringify(newestList))
 		
-		$(this).parent().remove()
+		$(this).parent().remove()
+		
+		refreshMoreArrow();
 	})
 	
 	$(".search-item").on("click",'.querybtnli',function(){
@@ -177,6 +179,21 @@ function addlistNewest(name, list) {
 			caret:'<span class="sel-icon glyphicon glyphicon-menu-down"></span>'
 		}
 	});
+	
+	//trigger search by enter
+	$(".landingpage_search").on("keyup",function(event){
+		var e = event || window.event;
+		if(e && e.keyCode==13 && this.value.length>0){ 
+			resentlistAdd($(".landingpage_search").val());
+			refreshMoreArrow();
+		}
+	});
+	
+	$(".newest-list .more-arrow").on("click",function(event){
+		$(".newest-list-pro").prop("scrollLeft",100);
+	});
+	
+	refreshMoreArrow();
 })
 
 function selectOnchang(obj){ 
@@ -197,4 +214,15 @@ function addlistSelect(name, list) {
 
 			$(name).append(btn)
 		})
-	}
+	}
+	
+function refreshMoreArrow(){
+	let $dom=$(".newest-list-pro");
+	console.log($dom[0].scrollWidth,$dom.width());
+	if($dom[0].scrollWidth>$dom.width()){
+		$(".newest-list .more-arrow img").show();
+	}
+	else{
+		$(".newest-list .more-arrow img").hide();
+	}
+}

html/company/postproject.html

@@ -22,6 +22,7 @@
 				$("#head").load("../head.html",function(){
 					$("#common-navbar-head .active").removeClass("active")
 					$("#common-navbar-head .head_li_user").addClass("active")
+					$(".head_li_library").addClass("active")
 				});
 			})
 		</script>
@@ -90,8 +91,8 @@
 							<dl>
 								<dt class="jph2 i18n-text"
 								  style="text-align: center;"
-								 i18n="company_postproject_What are you working on">
-									What are you working on ？
+								 i18n="company_postproject_What Show the world of your createvity">
+									
 
 								</dt>
 								<input id="imagePic" name="imagePic" type="file"
@@ -162,20 +163,7 @@
 										<dd>
 											<input type="text" required name="Discipline" class="i18n-placeholder" i18n="company_postproject_Choose one discipline" placeholder="" />
 										</dd>
-										<dd>
-											<span  class="i18n-text" i18n="company_postproject_Suggested"  >Suggested</span>：
-											<span  class="i18n-text red" i18n="company_postproject_Masterplanning"  >Masterplanning</span> ,
-											<span  class="i18n-text red" i18n="company_postproject_Architecture"  >Architecture</span>  , 
-											<span  class="i18n-text red" i18n="company_postproject_Interiors"  >Interiors</span>  ,
-											 <span  class="i18n-text red" i18n="company_postproject_Lighting"  >Lighting</span>  , 
-											 <span  class="i18n-text red" i18n="company_postproject_Landscape"  >Landscape</span> ,
-											  <span  class="i18n-text red" i18n="company_postproject_AV & Acoustics"  >AV & Acoustics</span>  ,
-											   <span  class="i18n-text red" i18n="company_postproject_MEP"  >MEP</span>  ,
-											   <span  class="i18n-text red" i18n="company_postproject_Art work & Accessories"  >Art work & Accessories</span>   ,
-												<span  class="i18n-text red" i18n="company_postproject_Graphics & Signage"  >Graphics & Signage</span> , 
-												<span  class="i18n-text red" i18n="company_postproject_Branding"  >Branding</span> , 
-												<span  class="i18n-text red" i18n="company_postproject_Furniture"  >Furniture</span> 
-										</dd>
+										
 									</div>
 								</div>
 								<div class="row-fluid">
@@ -216,15 +204,17 @@
 														 
 													</ul>
 												</div> -->
-												<select class="showlistLocation1 form-control" >
+												<!-- <select class="showlistLocation1 form-control" >
 													
-												</select>
+												</select> -->
+												<input type="text"  name="Country" class="i18n-placeholder" i18n="company_postproject_Country" placeholder="Country …" />
 											</div>
 											<div class="span4">
 												
-												<select class="showlistLocation2 form-control"  >
+												<!-- <select class="showlistLocation2 form-control"  >
 													
-												</select>
+												</select> -->
+												<input type="text"  name="Province" class="i18n-placeholder" i18n="company_postproject_Province" placeholder="Province …" />
 											</div>
 											<div class="span4">
 											<!-- 	<div class="btn-group">
@@ -237,12 +227,13 @@
 														
 													</ul>
 												</div> -->
-												<select class="showlistLocation3 form-control"  >
+												<!-- <select class="showlistLocation3 form-control"  >
 													
-												</select>
+												</select> -->
+												<input type="text"  name="City" class="i18n-placeholder" i18n="company_postproject_City" placeholder="City..." />
 											</div>
 										</div>
-										<div class="span5"> <input type="text" required name="Avenue" class="i18n-placeholder" i18n="company_postproject_Avenue" placeholder="Avenue …" />
+										<div class="span5"> <input type="text"  name="Avenue" class="i18n-placeholder" i18n="company_postproject_Avenue" placeholder="Avenue …" />
 										</div>
 										</div>
 									</dd>

html/head.html

@@ -44,7 +44,7 @@
 				<div class="navbar-inner">
 					<div class="container-fluid" style="margin: 25px 0 0 0;">
 
-						<a href="#" class="brand" style="width: 77px;    margin-left: 85px;
+						<a href="/lanhu-bootstrap/html/landingpage/landingpage.html" target="_self" class="brand" style="width: 77px;    margin-left: 85px;
     height: 34px;background: url(../../assets/img/head_logo.png);100% no-repeat;"> </a>
 
 						<div class="nav-collapse collapse navbar-responsive-collapse" style="display: block;">
@@ -80,7 +80,7 @@
 									<a data-toggle="dropdown"   class="dropdown-toggle userName " href="#">userName</a>
 									<ul class="dropdown-menu">
 										
-										<li>
+										<!-- <li>
 											<a href="../company/register.html"  class="head_add" ><img 
 											style="
 											    width: 10px;
@@ -91,7 +91,7 @@
 											
 											src="../../assets/img/head_gopostprojects.png"><span class="i18n-text" i18n="headcommon2">Go post projects</span></a>
 										</li>
-										<li class="divider" style="height: 2px;">&nbsp;</li>
+										<li class="divider" style="height: 2px;">&nbsp;</li> -->
 										
 										
 										

html/landingpage/landingpage.html

@@ -55,9 +55,13 @@
 			   margin:0px 40px 0px 0px;
 			   color:#999;
 			   cursor: pointer;
-			       white-space: nowrap;
+			   white-space: nowrap;
 		   }
 		   
+		   .newest-list .newest-item .query{
+			   font-size:16px;
+			}  
+		   
 		   .search-list .search-item{
 			   margin-right: 10px;
 		   }
@@ -94,6 +98,31 @@
 			.project-box .thumbnail{
 				border:0;
 			}
+			.thumbnail>a{
+				position: relative;
+				width:100%;
+			}
+			.thumbnail>a img{
+				float:left;
+			}
+			.thumbnail>a .glyphicon-heart{
+				position: absolute;
+				top:10px;
+				right: 10px;
+				color:#ffffff;
+				padding:4px;
+				background-color: #ff0000;
+				font-size: 12px;
+			}
+			.thumbnail .caption a{
+				outline: none;
+				font-size: 12px;
+				text-decoration: none;
+				color:#003BB3;
+			}
+			.thumbnail .caption a:hover{
+				text-decoration:underline;
+			}
 			#project-photo-row{
 				-webkit-column-width:242px; /*Safari and Chrome*/
 				-moz-column-width:242px; /*Firefox*/
@@ -128,7 +157,7 @@
 				
 				<div class="search-list" >
 					<div class="search-item">
-						<label class="i18n-text"  i18n="landingpage_Location">Location</label>
+						<label class="i18n-text"  i18n="landingpage_SearchBy"></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>
@@ -137,7 +166,7 @@
 					</div>
 					
 					<div class="search-item">
-						<label>&nbsp;</label>
+						<label class="i18n-text"  i18n="landingpage_Location"></label>
 						<select class="selectpicker selectLocation" multiple>
 						  
 						</select>
@@ -156,7 +185,7 @@
 					
 					<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>
+						 <button type="button" class="btn btn-default i18n-text querybtn2" i18n="head_Submit" style="height: 42px;padding:0px 20px;background-color: #000000;color:#ffffff;border-radius: 8px;">Submit</button>
 					</div>
 					
 					<div style="flex:1;"></div>
@@ -166,8 +195,8 @@
 						
 					
 						<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;">
+						  <input type="text"  class="form-control i18n-placeholder landingpage_search"  data-toggle="dropdown"
+						  i18n="landingpage_search" placeholder="Key words" aria-describedby="basic-addon2" style="height:42px;    width: 220px;">
 						  <span class="input-group-addon" style="
 									padding: 0px;
 								" id="basic-addon2">
@@ -225,18 +254,18 @@
 						    overflow: hidden;
 					}
 					.newest-item-x {
-						display: none;
-						margin-left: 3px;
+						/* display: none; */
+						margin-left: 5px;
 					}
-					.newest-item:hover .newest-item-x{
+					/* .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-item query">All</div> -->
 					
 					<div class="newest-list-pro ">
 					
@@ -280,12 +309,14 @@
 				    <div class="thumbnail">
 				        <a href="javascript:void(0);">
 							<img src="{{photo.url}}" class="img-responsive img-rounded" data-imgname="{{photo.url}}">
+							<span class="glyphicon {{photo.favourite?'glyphicon-heart':''}}"></span>
 				        </a>
 				        <div class="caption">
 				            
 				            <p>
 				                <small>{{photo.note}}</small>
 				            </p>
+							<a href="../company/company_main.html" target="_blank">Company ABC</a>
 				        </div> 
 				    </div>
 				</div>

html/moments/index.html

@@ -40,7 +40,7 @@
 			}
 
 			.tool-box {
-				padding: 25px 50px 20px 50px;
+				padding: 5px 50px 20px 50px;
 				border-bottom: 1px solid #f2f2f2;
 			}
 
@@ -61,6 +61,9 @@
 				cursor: pointer;
 				white-space: nowrap;
 			}
+			.newest-list .newest-item .query {
+			    font-size: 16px;
+			}
 
 			.search-list .search-item {
 				margin-right: 10px;
@@ -141,47 +144,43 @@
 			
 				
 				<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>
-					
-					
+					<style>
+						.newest-list-pro {
+							    display: flex;
+							    overflow: hidden;
+						}
+						.newest-item-x {
+							
+							margin-left: 5px;
+						}
+						.newest-item:hover .newest-item-x{
+							display: inline-flex;
+						}
+					</style>
+					
+					<div class="newest-list" style="flex:1;overflow:hidden;">
+						<div class="newest-item i18n-text" i18n="landingpage_Newest"
+						 style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
+						
+						
+						<div class="newest-list-pro ">
+						
+						</div>
+						
+						
+						<!-- <div style="flex:1;"></div> -->
+						<div class="newest-item more-arrow" style=" margin: 0px 20px;width:20px;text-align: center;">
+							<img src="../../assets/img/landing_right_arrow.png" style="display:none;">
+						</div>
+					</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;">
+						  i18n="landingpage_search" placeholder="" aria-describedby="basic-addon2" style="height:42px;    width: 220px;">
 						  <span class="input-group-addon" style="
 									padding: 0px;
 								" id="basic-addon2">
@@ -233,75 +232,12 @@
 					</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">
 					<div class="span12">
-						<style>
-							.red {
-								color: rgba(248, 61, 90, 1);
-							}
-						</style>
-
-						<dt onclick="window.location='postmoment.html'"
-							style=" text-align: center;height: 208px;border-radius: 8px;border: 1px dashed rgba(151, 151, 151, 1);">
-
-							<p class="jph2 i18n-text" style="      display: block;
-								    overflow-wrap: break-word;
-								    color: rgba(24, 24, 24, 1);
-								    font-size: 22px;
-								    font-family: Avenir-Black;
-								    white-space: nowrap;
-								    line-height: 30px;
-								    text-align: center;
-								    padding-top: 30px;" i18n="moments_Show">Show the world of your createvity
-							</p>
-							<p style="
-								overflow-wrap: break-word;
-								color: rgba(130, 130, 130, 1);
-								font-size: 16px;
-								font-family: Avenir-Roman;
-								white-space: nowrap;
-								line-height: 22px;
-								text-align: center;
-								" class=" i18n-text" i18n="moments_Here">
-
-								Here post your daily designs</p>
-							<img src="../../assets/img/moments_add.png" style="
-								    padding: 20px;
-								">
-
-
-						</dt>
+						
 						<style>
 						.main4{
 							width: 100%;

html/moments/postmoment.html

@@ -25,7 +25,8 @@
 			$(function() {
 				$("#head").load("../head.html",function(){
 					$("#common-navbar-head .active").removeClass("active")
-					 $("#common-navbar-head .head_li_user").addClass("active")
+					$("#common-navbar-head .head_li_user").addClass("active")
+					$(".head_li_Moments").addClass("active")
 				});
 			})
 		</script>
@@ -88,8 +89,8 @@
 							<dl>
 								<dt class="jph2 i18n-text"
 								  style="text-align: center;"
-								 i18n="company_postproject_What are you working on">
-									What are you working on ？
+								 i18n="company_postproject_What Share the things with the others">
+									
 
 								</dt>
 								<input id="imagePic" name="imagePic" type="file"

i18n/strings.properties

@@ -57,11 +57,11 @@ landingpage_Download portoflio=Download portoflio
 
 landingpage_Newest=Newest
 landingpage_Location=Location
-landingpage_search=search...
+landingpage_search=Key words
 landingpage_Disciplines=Disciplines
 landingpage_By project=By project
 landingpage_By company=By company
-
+landingpage_SearchBy=Search By
 
 
 
@@ -114,6 +114,8 @@ signin_Create account=Create account
 
 
 company_postproject_What are you working on=What are you working on ？
+company_postproject_What Share the things with the others=Share the things with the others.
+company_postproject_What Show the world of your createvity=Show the world of your createvity.
 company_postproject_Project name=Project name
 company_postproject_Give me a name=Give me a name
 company_postproject_Discipline=Discipline
@@ -133,8 +135,11 @@ company_postproject_Branding=Branding
 company_postproject_Furniture=Furniture
 company_postproject_Avenue=Avenue …
 company_postproject_Renew=Renew
-company_postproject_Tags=Tags
-company_postproject_Add tags=Add tags…
+company_postproject_Tags=Key words
+company_postproject_Add tags=Add key words…
+company_postproject_Country=Country
+company_postproject_Province=Province
+company_postproject_City=City
 
 company_postproject_Example=Example 
 

i18n/strings_zh.properties

@@ -63,6 +63,7 @@ landingpage_search=搜索。。。
 landingpage_Disciplines=规划
 landingpage_By project=通过项目
 landingpage_By company=通过公司
+landingpage_SearchBy=通过以下搜索
 
 company_register_success=公司信息已经更新成功
 company_register_warning=上传公司logo
@@ -105,6 +106,8 @@ signin_signup4=已有账户？
 signin_Create account=创建帐户
 
 company_postproject_What are you working on=你在做什么？
+company_postproject_What Share the things with the others=和其他人分享.
+company_postproject_What Show the world of your createvity=展示你的创造性作品.
 company_postproject_Project name=项目名称
 company_postproject_Give me a name=给我一个名字
 company_postproject_Discipline=纪律
@@ -124,8 +127,11 @@ company_postproject_Branding=品牌创建
 company_postproject_Furniture=家具
 company_postproject_Avenue=大道 …
 
-company_postproject_Tags=标签
-company_postproject_Add tags=添加标签…
+company_postproject_Tags=关键字
+company_postproject_Add tags=添加关键字…
+company_postproject_Country=国家
+company_postproject_Province=省
+company_postproject_City=市
 
 company_postproject_Example=实例