Merge remote-tracking branch 'remotes/origin/master'

assets/js/company-postproject.js

@@ -1,12 +1,48 @@
 $(function(){
 	
  	  $(document).ready(function () {
-	     
-		 
-	    $('#uploadButton').click(function () {
-	      $('#imagePic').click();
+		
+		
+		
+		
+	
+		  $(".btnUpload").height($(".btnUpload").width()) 
+		  	var getspan=$(".imguploadspan").html();
+			$(".imguploadspan").append(getspan)
+			$(".imguploadspan").append(getspan)
+			
+			var list=$(".imguploadlist").html();
+			$(".imguploadlist").append(list);
+			$(".imguploadlist").append(list);
+			
+			
+			
+		   var btnUpload=null;
+	    $('.btnUpload').click(function () {
+			if(bl){
+				$('#imagePic').click();
+				btnUpload=$(this);
+			}else{
+				bl=true
+			}
+	    
 	    });
+		var bl=true;
+		$('.imgdel').click(function () {
+			bl=false
+			$(this).parent().css("background", "url(/lanhu-bootstrap/assets/img/img_add.png) no-repeat center")
+			$(this).parent().css("border", '0')
+			$(this).parent().css("background-size", "100% 100%")
+			
+			$(this).hide()
+			$(this).parent().removeAttr("disabled")
+			
+			$(this).parent().find(".imginput").val("")
+			
+		});
+		
 	    $("#imagePic").on("change", function (e) {
+			
 	      var file = e.target.files[0]; //获取图片资源
 	      var fileTypes = ["bmp", "jpg", "png", "jpeg"];
 	      var bTypeMatch = false
@@ -24,11 +60,16 @@ $(function(){
 	          reader.readAsDataURL(file); // 读取文件
 	          // 渲染文件
 	          reader.onload = function (arg) {
-				$("#uploadButtonInput").val(arg.target.result);
-	            $("#uploadButton").css("background", "url("+arg.target.result+") no-repeat center")
-				$("#uploadButton").css("border", '1px solid #b8b9ba')
-				$("#uploadButton").css("border-radius",'10px')
-			 
+				 
+	            $(btnUpload).css("background", "url("+arg.target.result+")   no-repeat center")
+				$(btnUpload).css("background-size", "100% 100%")
+				
+				$(btnUpload).css("border", '1px solid #b8b9ba')
+				$(btnUpload).css("border-radius",'10px')
+				$(btnUpload).attr("disabled","disabled")
+				$(btnUpload).find(".imgdel").show()
+				$(btnUpload).find(".imginput").val(arg.target.result)
+				$("#imagePic").val("")
 	          }
 	        } else {
 	          alert('仅支持不超过10M的图片');
@@ -83,72 +124,21 @@ $(function(){
 		$(".showlistLocation3").append(li)
 	})
 	
-	li_click()
-	var html_contact_number=$("#contact_number").html();
-	var html_contact_email=$("#contact_email").html();
-	var html_contact_location=$("#contact_location").html();
-	
-	
-	$("#contact_number_add").click(function(){
-		$("#contact_number").append(html_contact_number)
-		li_click()
-		$("#contact_number_remove").show()
-	})
-	$("#contact_number_remove").click(function(){
-		 $("#contact_number .row-fluid").eq(-1).remove();
-		 if($("#contact_number .row-fluid").length==1){
-			 $("#contact_number_remove").hide()
-		 }
-	})
-	
-	$("#contact_email_add").click(function(){
-		$("#contact_email").append(html_contact_email)
-		li_click()
-		$("#contact_email_remove").show()
-	})
-	$("#contact_email_remove").click(function(){
-		 $("#contact_email input").eq(-1).remove();
-		 if($("#contact_email input").length==1){
-			 $("#contact_email_remove").hide()
-		 }
-	})
-	
-	
-	$("#contact_location_add").click(function(){
-		$("#contact_location").append(html_contact_location)
-		li_click()
-		$("#contact_location_remove").show()
-	})
-	$("#contact_location_remove").click(function(){
-		 $("#contact_location .row-fluid").eq(-1).remove();
-		 if($("#contact_location .row-fluid").length==1){
-			 $("#contact_location_remove").hide()
-		 }
-	})
-	
-	function li_click(){
-		// $(".contact_number_li").on("click",function(){
-		// 	$(this).parent().parent().find(".showqu").text($(this).attr("txt"))
-		// })
-		// $(".contact_location1_li").on("click",function(){
-		// 	$(this).parent().parent().find(".showqu1").text($(this).attr("txt"))
-		// })
-		// $(".contact_location2_li").on("click",function(){
-		// 	$(this).parent().parent().find(".showqu2").text($(this).attr("txt"))
-		// })
-		// $(".contact_location3_li").on("click",function(){
-			
-		// 	$(this).parent().parent().find(".showqu3").text($(this).attr("txt"))
-		// })
-	}
+ 
 	
 		
 		$.validator.setDefaults({
 		    submitHandler: function() {
-				var submitlogo=$("#uploadButtonInput").val();
-		       if(!submitlogo){
-		            				  alert("请上传公司logo")
-		            }
+				var bl=true;
+				$(".imginput").each(function(){
+					if($(this).val()!=''){
+						bl=false;
+						return
+					}
+				});
+		       if(bl){
+		            alert("请上传一张照片")
+		       }
 		    }
 		});
 		$("#form").validate()

assets/js/company-register.js

@@ -83,7 +83,7 @@ $(function(){
 		$(".showlistLocation3").append(li)
 	})
 	
-	li_click()
+	
 	var html_contact_number=$("#contact_number").html();
 	var html_contact_email=$("#contact_email").html();
 	var html_contact_location=$("#contact_location").html();
@@ -91,7 +91,7 @@ $(function(){
 	
 	$("#contact_number_add").click(function(){
 		$("#contact_number").append(html_contact_number)
-		li_click()
+		
 		$("#contact_number_remove").show()
 	})
 	$("#contact_number_remove").click(function(){
@@ -103,7 +103,7 @@ $(function(){
 	
 	$("#contact_email_add").click(function(){
 		$("#contact_email").append(html_contact_email)
-		li_click()
+		
 		$("#contact_email_remove").show()
 	})
 	$("#contact_email_remove").click(function(){
@@ -116,7 +116,7 @@ $(function(){
 	
 	$("#contact_location_add").click(function(){
 		$("#contact_location").append(html_contact_location)
-		li_click()
+		
 		$("#contact_location_remove").show()
 	})
 	$("#contact_location_remove").click(function(){
@@ -126,21 +126,7 @@ $(function(){
 		 }
 	})
 	
-	function li_click(){
-		// $(".contact_number_li").on("click",function(){
-		// 	$(this).parent().parent().find(".showqu").text($(this).attr("txt"))
-		// })
-		// $(".contact_location1_li").on("click",function(){
-		// 	$(this).parent().parent().find(".showqu1").text($(this).attr("txt"))
-		// })
-		// $(".contact_location2_li").on("click",function(){
-		// 	$(this).parent().parent().find(".showqu2").text($(this).attr("txt"))
-		// })
-		// $(".contact_location3_li").on("click",function(){
-			
-		// 	$(this).parent().parent().find(".showqu3").text($(this).attr("txt"))
-		// })
-	}
+ 
 	
 		
 		$.validator.setDefaults({

assets/js/language_validator.js

@@ -42,7 +42,7 @@ $(function() {
 				
 				var sz=["maxlength","minlength","rangelength","range","max","min"]
 				for(var i  in valiobj){
-					console.log(i)
+					
 					var key= $.i18n.prop("validator_"+i);
 					if(sz.indexOf(i)>-1){
 						valiobj[i]= $.validator.format(key)
@@ -51,7 +51,7 @@ $(function() {
 					}
 					
 				}
-				console.log(valiobj)
+				//console.log(valiobj)
 				$.extend($.validator.messages,valiobj);
 				
 

css/head.css

@@ -9,9 +9,11 @@
  */
 .jpcontainer {
 	padding-top: 50px;
-	padding: 0 300px;
+	margin: 0 auto;
+	max-width:800px 
 
 }
+
 .error{
 	color: red;
 }

html/company/postproject.html

@@ -1,340 +1,293 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title></title>
-		<script src="/lanhu-bootstrap/js/jquery-1.9.1.min.js"></script>
-		<script src="/lanhu-bootstrap/js/jquery.validate.min.js"></script>
- 		<script src="/lanhu-bootstrap/assets/js/language_validator.js"></script>
- 		
-		<script src="/lanhu-bootstrap/js/jquery.i18n.properties.js"></script>
- 	
-		<link rel="stylesheet" href="/lanhu-bootstrap/css/head.css">
-		<script src="/lanhu-bootstrap/assets/js/company-register.js"></script>
-
-	</head>
-	<body>
-		<div id="head"></div>
-		<script>
-			$(function() {
-				$("#head").load("../head.html");
-			})
-		</script>
-		<main class="jpmain">
-			<form  id="form" >
-
-			<div class=" jpcontainer">
-				<style>
-					
-					dt {
-						margin-top: 20px;
-					}
-
-					dd {
-						margin-top: 20px;
-						margin-bottom: 20px;
-					}
-					
-					input,
-					textarea,.form-control,.input-group-addon {
-						border-width: 0;
-						height: 48px;
-						border-radius: 8px;
-						background-color: rgba(239, 241, 244, 1);
-						width: 100%;
-						
-					}
-					
-					input,
-					textarea {
-						border-width: 0;
-						height: 48px;
-						border-radius: 8px;
-						background-color: rgba(239, 241, 244, 1);
-						width: 100%;
-						padding-left: 20px;
-					}
-
-					.btn-group {
-						width: 100%;
-						height: 48px;
-					}
-
-					.btn-group>.btn {
-						width: 80%;
-						height: 48px;
-					}
-
-					.btn-group>.dropdown-toggle {
-						width: 20%;
-						height: 48px;
-					}
-				</style>
-				<div class="row-fluid">
-					<div class="span12">
-						<dl>
-							<dt class="jph2 i18n-text" i18n="company_register_Company_profile">
-								Company profile
-
-							</dt>
-							<dd class="i18n-text" i18n="company_register_Company_profile_text">
-								This information will be displayed on the company homepage
-							</dd>
-							<dt class="jph3 i18n-text" i18n="company_register_Company logo">
-								Company logo
-							</dt>
-							<dd>
-								<input id="uploadButtonInput" class="i18n-placeholder" i18n="company_register_enter Company logo" placeholder="enter Company logo" type="hidden" />
-								<button id="uploadButton" type="button" class="btnUpload" style="
-									width: 85px;
-								    height: 85px;
-								    border: 0px;
-								background: url(/lanhu-bootstrap/assets/img/company_add_logo.png);"></button>
-
-
-								<input id="imagePic" name="imagePic" type="file"
-									accept=".bmp,.jpg,.png,.jpeg,image/bmp,image/jpg,image/png,image/jpeg"
-									style="display:none" />
-
-
-								<!-- <img style="vertical-align: bottom;"
-									src="/lanhu-bootstrap/assets/img/company_add_logo.png"> -->
-								<span style="
-    position: relative;
-    bottom: -30px;
-">（png，jpg，gif）</span>
-							</dd>
-
-							<dt class="jph3 i18n-text" i18n="company_register_Company name">
-								Company name
-							</dt>
-							<dd>
-								<input  required type="text" name="companyName" class="i18n-placeholder" i18n="company_register_Enter company name" placeholder="Enter company name" />
-							</dd>
-
-						</dl>
-
-					</div>
-				</div>
-				<div class="row-fluid">
-					<div class="span6">
-						<dt class="jph3  i18n-text" i18n="company_register_Contact person name">
-							Contact person name
-						</dt>
-						<dd>
-							<input required type="text" name="personName" class="i18n-placeholder" i18n="company_register_your name" placeholder="your name" />
-						</dd>
-					</div>
-					<div class="span6">
-						<dt class="jph3 i18n-text" i18n="company_register_Title region">
-							Title region
-						</dt>
-						<dd>
-							<input required name="region" type="text" class="i18n-placeholder" i18n="company_register_title region" placeholder="title region" />
-						</dd>
-					</div>
-				</div>
-				<div class="row-fluid">
-					<div class="span12">
-						<div class="row-fluid">
-							<div class="span6">
-								<dt class="jph3 i18n-text" i18n="company_register_Contact number">
-									Contact number
-								</dt>
-								<dd id="contact_number" >
-									<div class="row-fluid" style="    margin-top: 4px;" >
-
-										<div class="span4">
-											<!-- <div class="btn-group">
-												<button class="btn "><span class="showqu"></span></button> <button data-toggle="dropdown"
-													class="btn dropdown-toggle"><span class="caret"></span></button>
-												<ul class="dropdown-menu showqulist" >
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title></title>
+		<script src="/lanhu-bootstrap/js/jquery-1.9.1.min.js"></script>
+		<script src="/lanhu-bootstrap/js/jquery.validate.min.js"></script>
+		<script src="/lanhu-bootstrap/assets/js/language_validator.js"></script>
+
+		<script src="/lanhu-bootstrap/js/jquery.i18n.properties.js"></script>
+
+		<link rel="stylesheet" href="/lanhu-bootstrap/css/head.css">
+		<script src="/lanhu-bootstrap/assets/js/company-postproject.js"></script>
+
+	</head>
+	<body>
+		<div id="head"></div>
+		<script>
+			$(function() {
+				$("#head").load("../head.html",function(){
+					$("#common-navbar-head .active").removeClass("active")
+					$("#common-navbar-head .head_li_user").addClass("active")
+				});
+			})
+		</script>
+		<main class="jpmain">
+			<form id="form">
+
+				<div class=" jpcontainer" >
+					<style>
+						.red{
+							color:rgba(248, 61, 90, 1) ;
+						}
+						dt {
+							margin-top: 20px;
+						}
+
+						dd {
+							margin-top: 20px;
+							margin-bottom: 20px;
+						}
+
+						input,
+						textarea,
+						.form-control,
+						.input-group-addon {
+							border-width: 0;
+							height: 48px;
+							border-radius: 8px;
+							background-color: rgba(239, 241, 244, 1);
+							width: 100%;
+
+						}
+
+						input,
+						textarea {
+							border-width: 0;
+							height: 48px;
+							border-radius: 8px;
+							background-color: rgba(239, 241, 244, 1);
+							width: 100%;
+							padding-left: 20px;
+						}
+
+						.btn-group {
+							width: 100%;
+							height: 48px;
+						}
+
+						.btn-group>.btn {
+							width: 80%;
+							height: 48px;
+						}
+
+						.btn-group>.dropdown-toggle {
+							width: 20%;
+							height: 48px;
+						}
+					</style>
+					<div class="row-fluid">
+						<div class="span12">
+							<dl>
+								<dt class="jph2 i18n-text"
+								  style="text-align: center;"
+								 i18n="company_postproject_What are you working on">
+									What are you working on ？
+
+								</dt>
+								<input id="imagePic" name="imagePic" type="file"
+									accept=".bmp,.jpg,.png,.jpeg,image/bmp,image/jpg,image/png,image/jpeg"
+									style="display:none" />
+								<style>
+									.imgdel {
+										opacity: 0.5;
+										background-color: #e5e8ec;
+										top: -40%;
+										left: 40%;
+										position: relative;
+									}
+								</style>
+								<dd class="imguploadlist">
+
+									<div class="span12 imguploadspan" style="margin-left: 0;">
+
+										<button type="button" class="btnUpload" style="
+											width: 32%;
+											max-width: 260px;
+											max-height: 170px;
+										    border: 0px;
+											
+										background: url(/lanhu-bootstrap/assets/img/img_add.png) no-repeat;
+										  background-size: 100% 100%;
+											min-width: 50px;
+										">
+
+											<span class="imgdel " style="display: none;" aria-hidden="true">
+												<img style="width: 20px;height: 20px;"
+													src="/lanhu-bootstrap/assets/img/img_del.png">
+											</span>
+
+
+											<input type="hidden" class="imginput" />
+										</button>
+
+
+									</div>
+
+
+								</dd>
+
+								<div class="row-fluid">
+
+									<div class="span12">
+										<dt class="jph3 i18n-text" i18n="company_postproject_Project name">
+											Project name
+										</dt>
+										<dd>
+											<input type="text" required  name="Project_name" class="i18n-placeholder" i18n="company_postproject_Give me a name" placeholder="" />
+										</dd>
+									</div>
+								</div>
+								<div class="row-fluid">
+								
+									<div class="span12">
+										<dt class="jph3 i18n-text" i18n="company_postproject_Discipline">
+											Disciplines
+										</dt>
+										<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">
+								
+									<div class="span12">
+										<dt class="jph3 i18n-text" i18n="company_postproject_Tags">
+											Tags
+										</dt>
+										<dd>
+											<input type="text" required name="Tags" class="i18n-placeholder" i18n="company_postproject_Add tags" placeholder="" />
+										</dd>
+										<dd>
+											<span  class="i18n-text" i18n="company_postproject_Example"  >Example</span> ：
+											 <span  class="i18n-text red" i18n="company_postproject_Sofa"  >Sofa</span> , 
+											<span  class="i18n-text red" i18n="company_postproject_Bar"  >Bar</span>  , 
+											<span  class="i18n-text red" i18n="company_postproject_living room"  >living room </span>  ,
+											 <span  class="i18n-text red" i18n="company_postproject_bedroom"  >bedroom </span>  , 
+											 <span  class="i18n-text red" i18n="company_postproject_Chair"  >Chair</span> ,
+											  <span  class="i18n-text red" i18n="company_postproject_table"  >table</span>...
+										</dd>
+									</div>
+								</div>
+								
+								<div class="row-fluid">
+									<dt class="jph3">
+										<span class="i18n-text" i18n="company_postproject_Project location">Project location</span> 
+									</dt>
+									<dd id="contact_location">
+										<div class="row-fluid" style="    margin-top: 4px;" >
+										
+										<div class="span7">
+											<div class="span4">
+												<!-- <div class="btn-group">
+													<button class="btn"><span class="showqu1">🇨🇳  China</span></button> <button data-toggle="dropdown"
+														class="btn dropdown-toggle"><span class="caret"></span></button>
+													<ul class="dropdown-menu showlistLocation1" >
+														 
+														 
+													</ul>
+												</div> -->
+												<select class="showlistLocation1 form-control" >
 													
-												</ul>
-											</div> -->
-											<select class="showqulist form-control" >
+												</select>
+											</div>
+											<div class="span4">
 												
-											</select>
+												<select class="showlistLocation2 form-control"  >
+													
+												</select>
+											</div>
+											<div class="span4">
+											<!-- 	<div class="btn-group">
+								
+													<button class="btn" style="width: 80%;"><span class="showqu3">city</span></button> <button style="width: 20%;"
+														data-toggle="dropdown" class="btn dropdown-toggle"><span
+															class="caret"></span></button>
+													<ul class="dropdown-menu showlistLocation3">
+													 
+														
+													</ul>
+												</div> -->
+												<select class="showlistLocation3 form-control"  >
+													
+												</select>
+											</div>
 										</div>
-										<div class="span8">
-											<input  required	 name="contactNumber" number="true" type="text" class="i18n-placeholder" i18n="company_register_enter Contact number"  placeholder="enter Contact number" />
+										<div class="span5"> <input type="text" required name="Avenue" class="i18n-placeholder" i18n="company_postproject_Avenue" placeholder="Avenue …" />
 										</div>
-										
-									</div>
-								</dd>
-								<dd>
-									
-									
-									<button 
-									id="contact_number_add"
-									style="
-										width: 50px;
-									    height: 50px;
-									    border: 0px;
-									background: url(/lanhu-bootstrap/assets/img/company_add_icon.png);"></button>
-									
-									<button
-									id="contact_number_remove"
-									style="
-										display: none;
-										width: 50px;
-										background: url(/lanhu-bootstrap/assets/img/company_remove_icon.png);
-										
-									    height: 50px;
-									    border: 0px;"
-										
-									></button>
-
-								</dd>
-							</div>
-							<div class="span6">
-								<dt class="jph3 i18n-text" i18n="company_register_Contact Email">
-									Contact Email
-								</dt>
-								<dd id="contact_email">
-									<input required	  name="contactEmail"	type="email" class="i18n-placeholder" i18n="company_register_enter email" placeholder="enter email" style="    margin-bottom: 4px;" />
-								</dd>
-								<dd>
-									<button 
-										id="contact_email_add"
-									style="
-										width: 50px;
-									    height: 50px;
-									    border: 0px;
-									background: url(/lanhu-bootstrap/assets/img/company_add_icon.png);"></button>
-									
-									<button
-									id="contact_email_remove"
-									style="
-									background: url(/lanhu-bootstrap/assets/img/company_remove_icon.png);
-									
-										display: none;
-										width: 50px;
-									    height: 50px;
-									    border: 0px;"
-									></button>
-								</dd>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="row-fluid">
-					<dt class="jph3">
-						<span class="i18n-text" i18n="company_register_Company location">Company location</span> <img src="/lanhu-bootstrap/assets/img/SketchPng74b7bc7fc1dbb6dacaa89a92f2f5423720791305c5c272f7d4a347338c12c37f.png">
-					</dt>
-					<dd id="contact_location">
-						<div class="row-fluid" style="    margin-top: 4px;" >
-						
-						<div class="span7">
-							<div class="span4">
-								<!-- <div class="btn-group">
-									<button class="btn"><span class="showqu1">🇨🇳  China</span></button> <button data-toggle="dropdown"
-										class="btn dropdown-toggle"><span class="caret"></span></button>
-									<ul class="dropdown-menu showlistLocation1" >
-										 
-										 
-									</ul>
-								</div> -->
-								<select class="showlistLocation1 form-control" >
-									
-								</select>
-							</div>
-							<div class="span4">
+										</div>
+									</dd>
 								
-								<select class="showlistLocation2 form-control"  >
-									
-								</select>
-							</div>
-							<div class="span4">
-							<!-- 	<div class="btn-group">
-
-									<button class="btn" style="width: 80%;"><span class="showqu3">city</span></button> <button style="width: 20%;"
-										data-toggle="dropdown" class="btn dropdown-toggle"><span
-											class="caret"></span></button>
-									<ul class="dropdown-menu showlistLocation3">
-									 
+								</div>
+								<div class="row-fluid">
+									<div class="span6">
+										<dt class="jph3">
+											<span class="i18n-text" i18n="company_postproject_Project completion date">
+												Project completion date
+												
+											</span>
+											
+											
+										</dt>
+										<dd>
+											<input  required name="completion" type="date" class="form-control"  placeholder="" />
+											
+											
+										</dd>
+									</div>
+									<div class="span6">
+										<dt class="jph3 i18n-text" i18n="company_postproject_Affiliates name">
+											Affiliates name
+										</dt>
+										<dd>
+												<input  required name="Affiliates"  type="text"  placeholder="" />
+										</dd>
+									</div>
+								</div>
+								
+								<div class="row-fluid">
+									<div class="span12">
+										<dt class="jph3 ">
 										
-									</ul>
-								</div> -->
-								<select class="showlistLocation3 form-control"  >
-									
-								</select>
-							</div>
-						</div>
-						<div class="span5"> <input type="text" required class="i18n-placeholder" i18n="company_register_Avenue …" placeholder="Avenue …" />
-						</div>
-						</div>
-					</dd>
-					<dd>
-						<button 
-						id="contact_location_add"
-						style="
-						  
-							width: 50px;
-						    height: 50px;
-						    border: 0px;
-						background: url(/lanhu-bootstrap/assets/img/company_add_icon.png);"></button>
-						
-						
-						<button
-						id="contact_location_remove"
-						style="
-							display: none;
-							background: url(/lanhu-bootstrap/assets/img/company_remove_icon.png);
-							
-							width: 50px;
-						    height: 50px;
-						    border: 0px;"
-						></button>
-					</dd>
-				</div>
-				<div class="row-fluid">
-					<div class="span6">
-						<dt class="jph3">
-							<span class="i18n-text" i18n="company_register_Number of employees">
-								Number of employees
-								
-							</span>
-							
-							 <span   class="i18n-text" i18n="company_register_optional"
-							style="    color: rgb(69 69 69 / 75%);
-							font-size: 12px;">（ optional ）</span>
-						</dt>
-						<dd>
-							<div class="input-group" style="  width: 100%;">
-								<input type="text" class="form-control"  placeholder="" />
-								<span  i18n="company_register_people" class="i18n-text input-group-addon" style="width: 80px;"> people</span>
-							</div>
-							
-							
-							
-						</dd>
-					</div>
-					<div class="span6">
-						<dt class="jph3 i18n-text" i18n="company_register_Disciplines">
-							Disciplines
-						</dt>
-						<dd>
-								<input type="text"  placeholder="" />
-						</dd>
-					</div>
-				</div>
-				<div class="row-fluid">
-					<div class="span12">
-						<dt class="jph3 i18n-text" i18n="company_register_Company  introduction">	
-							Company  introduction
-						</dt>
-						<dd>
-							<textarea style="height: 90px;" rows="3" class="i18n-placeholder" i18n="company_register_introduction" placeholder="A  short company introduction…"></textarea>
-						</dd>
-					</div>
-
-				</div>
-				<div class="row-fluid">
-					<button   type="submit" id="registerupload" class="hbutton i18n-text" i18n="company_register_upload" style="  float: right; ">upload</button>
-				</div>
-			</div>
-			</form>
-		</main>
-	</body>
+											<span class="i18n-text" i18n="company_postproject_Project description">
+												Project description
+												
+											</span>
+											<span   class="i18n-text" i18n="company_postproject_optional"
+											style="    color: rgb(69 69 69 / 75%);
+											font-size: 12px;">（ optional ）</span>
+										</dt>
+										<dd>
+											<textarea style="height: 90px;" rows="3" class="i18n-placeholder"
+												 maxlength="500"
+												i18n="company_postproject_A  short  introduction"
+												placeholder="A  short company introduction…"></textarea>
+										</dd>
+									</div>
+
+								</div>
+								<div class="row-fluid">
+									<button type="submit" id="registerupload" class="hbutton i18n-text"
+									style="background-color: #e64e5e; float: right;"
+										i18n="company_postproject_Publish now"  >upload</button>
+								</div>
+						</div>
+			</form>
+		</main>
+	</body>
 </html>

html/company/register.html

@@ -261,7 +261,7 @@
 								</select>
 							</div>
 						</div>
-						<div class="span5"> <input type="text" required class="i18n-placeholder" i18n="company_register_Avenue …" placeholder="Avenue …" />
+						<div class="span5"> <input type="text"  name="Avenue" required class="i18n-placeholder" i18n="company_register_Avenue …" placeholder="Avenue …" />
 						</div>
 						</div>
 					</dd>
@@ -315,7 +315,7 @@
 							Disciplines
 						</dt>
 						<dd>
-								<input type="text"  placeholder="" />
+								<input required type="text"  placeholder="" />
 						</dd>
 					</div>
 				</div>
@@ -325,7 +325,7 @@
 							Company  introduction
 						</dt>
 						<dd>
-							<textarea style="height: 90px;" rows="3" class="i18n-placeholder" i18n="company_register_introduction" placeholder="A  short company introduction…"></textarea>
+							<textarea  required  maxlength="500" style="height: 90px;" rows="3" class="i18n-placeholder" i18n="company_register_introduction" placeholder="A  short company introduction…"></textarea>
 						</dd>
 					</div>
 

html/head.html

@@ -35,17 +35,17 @@
 
 						<div class="nav-collapse collapse navbar-responsive-collapse" style="display: block;">
 							<ul class="nav">
-								<li class="active" style="margin-left: 30px;">
+								<li class="active  head_li_library" style="margin-left: 30px;">
 									<a href="#" class="i18n-text" i18n="head_Library">Library</a>
 								</li>
-								<li style="margin-left: 25px;">
+								<li style="margin-left: 25px;" class="head_li_Moments">
 									<a href="#" class="i18n-text" i18n="head_Moments">Moments</a>
 								</li>
 
 							</ul>
 							<ul class="nav pull-right">
 
-								<li class="dropdown">
+								<li class="dropdown head_li_language">
 
 									<a data-toggle="dropdown"
 										style="background: url(/lanhu-bootstrap/assets/img/head_icon_language.png) no-repeat;"
@@ -58,7 +58,7 @@
 
 								</li>
 
-								<li class="dropdown">
+								<li class="dropdown head_li_user">
 									<a data-toggle="dropdown"  class="dropdown-toggle" href="#">userName</a>
 									<ul class="dropdown-menu">
 										
@@ -69,6 +69,9 @@
 										<li>
 											<a href="../company/postproject.html">发布项目</a>
 										</li>
+										<li>
+											<a href="../moments/postmoment.html">发布时刻</a>
+										</li>
 										<li class="divider" style="height: 2px;">&nbsp;</li>
 										
 										<li>

html/moments/postmoment.html

@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title></title>
+		<script src="/lanhu-bootstrap/js/jquery-1.9.1.min.js"></script>
+		<script src="/lanhu-bootstrap/js/jquery.validate.min.js"></script>
+		<script src="/lanhu-bootstrap/assets/js/language_validator.js"></script>
+
+		<script src="/lanhu-bootstrap/js/jquery.i18n.properties.js"></script>
+
+		<link rel="stylesheet" href="/lanhu-bootstrap/css/head.css">
+		<script src="/lanhu-bootstrap/assets/js/company-postproject.js"></script>
+
+	</head>
+	<body>
+		<div id="head"></div>
+		<script>
+			$(function() {
+				$("#head").load("../head.html",function(){
+					$("#common-navbar-head .active").removeClass("active")
+					//$("#common-navbar-head .head_li_user").addClass("active")
+				});
+			})
+		</script>
+		<main class="jpmain">
+			<form id="form">
+
+				<div class=" jpcontainer" >
+					<style>
+						.red{
+							color:rgba(248, 61, 90, 1) ;
+						}
+						dt {
+							margin-top: 20px;
+						}
+
+						dd {
+							margin-top: 20px;
+							margin-bottom: 20px;
+						}
+
+						input,
+						textarea,
+						.form-control,
+						.input-group-addon {
+							border-width: 0;
+							height: 48px;
+							border-radius: 8px;
+							background-color: rgba(239, 241, 244, 1);
+							width: 100%;
+
+						}
+
+						input,
+						textarea {
+							border-width: 0;
+							height: 48px;
+							border-radius: 8px;
+							background-color: rgba(239, 241, 244, 1);
+							width: 100%;
+							padding-left: 20px;
+						}
+
+						.btn-group {
+							width: 100%;
+							height: 48px;
+						}
+
+						.btn-group>.btn {
+							width: 80%;
+							height: 48px;
+						}
+
+						.btn-group>.dropdown-toggle {
+							width: 20%;
+							height: 48px;
+						}
+					</style>
+					<div class="row-fluid">
+						<div class="span12">
+							<dl>
+								<dt class="jph2 i18n-text"
+								  style="text-align: center;"
+								 i18n="company_postproject_What are you working on">
+									What are you working on ？
+
+								</dt>
+								<input id="imagePic" name="imagePic" type="file"
+									accept=".bmp,.jpg,.png,.jpeg,image/bmp,image/jpg,image/png,image/jpeg"
+									style="display:none" />
+								<style>
+									.imgdel {
+										opacity: 0.5;
+										background-color: #e5e8ec;
+										top: -40%;
+										left: 40%;
+										position: relative;
+									}
+								</style>
+								<dd class="imguploadlist">
+
+									<div class="span12 imguploadspan" style="margin-left: 0;">
+
+										<button type="button" class="btnUpload" style="
+											width: 32%;
+											max-width: 260px;
+											max-height: 170px;
+										    border: 0px;
+											
+										background: url(/lanhu-bootstrap/assets/img/img_add.png) no-repeat;
+										  background-size: 100% 100%;
+											min-width: 50px;
+										">
+
+											<span class="imgdel " style="display: none;" aria-hidden="true">
+												<img style="width: 20px;height: 20px;"
+													src="/lanhu-bootstrap/assets/img/img_del.png">
+											</span>
+
+
+											<input type="hidden" class="imginput" />
+										</button>
+
+
+									</div>
+										
+								</dd>
+								<style>
+									.ddul{
+									
+										    overflow-wrap: break-word;
+										    color: rgba(130, 130, 130, 1);
+										    font-size: 14px;
+										    font-family: Avenir-Roman;
+										
+										    line-height: 19px;
+										    text-align: left;
+									}
+								</style>
+								<dd>
+									<ul class="ddul">
+										<li class="i18n-text" i18n="company_postproject_Only upload media you ownthe rights to"></li>
+										<li class="i18n-text" i18n="company_postproject_high resolution images（png，jpg，gif）"></li>
+										<li class="i18n-text" i18n="company_postproject_1600X1200 or higher recommended. Max 10MB each"></li>
+										
+									</ul>
+								</dd>
+								<div class="row-fluid">
+
+									<div class="span12">
+										<dt class="jph3 i18n-text" i18n="company_postproject_Project title">
+											Project title
+										</dt>
+										<dd>
+											<input type="text" required  name="Project_title" class="i18n-placeholder" i18n="company_postproject_A  short  introduction" placeholder="" />
+										</dd>
+									</div>
+								</div>
+							
+								
+								<div class="row-fluid">
+									<div class="span12">
+										<dt class="jph3 ">
+										
+											<span class="i18n-text" i18n="company_postproject_Project description">
+												Project description
+												
+											</span>
+											
+										</dt>
+										<dd>
+											<textarea style="height: 90px;" rows="3" class="i18n-placeholder"
+												 maxlength="500"
+												i18n="company_postproject_Projectdescriptiontxt"
+												placeholder=""></textarea>
+										</dd>
+									</div>
+
+								</div>
+								<div class="row-fluid">
+									<button type="submit" id="registerupload" class="hbutton i18n-text"
+									style="background-color: #e64e5e; float: right;"
+										i18n="company_postproject_Publish now"  >upload</button>
+								</div>
+						</div>
+			</form>
+		</main>
+	</body>
+</html>

i18n/strings.properties

@@ -3,6 +3,56 @@ head_Moments=Moments
 
 signOut=Login Out
 
+
+company_postproject_What are you working on=What are you working on ？
+company_postproject_Project name=Project name
+company_postproject_Give me a name=Give me a name
+company_postproject_Discipline=Discipline
+company_postproject_Choose one discipline=Choose one discipline
+company_postproject_Suggested=Suggested
+
+company_postproject_Masterplanning=Masterplanning
+company_postproject_Architecture=Architecture
+company_postproject_Interiors=Interiors
+company_postproject_Lighting=Lighting
+company_postproject_Landscape=Landscape
+company_postproject_AV & Acoustics=AV & Acoustics 
+company_postproject_MEP=MEP
+company_postproject_Art work & Accessories=Art work & Accessories 
+company_postproject_Graphics & Signage=Graphics & Signage
+company_postproject_Branding=Branding
+company_postproject_Furniture=Furniture
+company_postproject_Avenue=Avenue …
+
+company_postproject_Tags=Tags
+company_postproject_Add tags=Add tags…
+
+company_postproject_Example=Example 
+
+company_postproject_Sofa=Sofa
+company_postproject_Bar=Bar
+company_postproject_living room=living room 
+company_postproject_bedroom=bedroom
+company_postproject_Chair=Chair 
+company_postproject_table=table 
+company_postproject_Project location=Project location
+company_postproject_Project completion date=Project completion date
+company_postproject_Affiliates name=Affiliates name
+
+company_postproject_Project description =Project description 
+company_postproject_optional=（ optional ）
+company_postproject_A  short  introduction=A  short  introduction…
+company_postproject_Publish now=Publish now
+
+company_postproject_Project title=Project title
+company_postproject_Projectdescriptiontxt=It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English.
+ Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).
+
+company_postproject_Only upload media you ownthe rights to=Only upload media you ownthe rights to
+company_postproject_high resolution images（png，jpg，gif）=high resolution images（png，jpg，gif）
+company_postproject_1600X1200 or higher recommended. Max 10MB each=1600X1200 or higher recommended. Max 10MB each
+
+
 company_register_Company_profile=Company profile
 company_register_Company_profile_text=This information will be displayed on the company homepage
 company_register_Company logo=Company logo
@@ -14,7 +64,7 @@ company_register_Contact number=Contact number
 company_register_Contact Email=Contact Email
 company_register_Company location=Company location
 company_register_Number of employees=Number of employees
-company_register_optional=optional
+company_register_optional=（ optional ）
 company_register_Disciplines=Disciplines
 company_register_Company  introduction=Company  introduction
 company_register_people=people

i18n/strings_zh.properties

@@ -4,6 +4,56 @@ head_Moments=时刻
 
 
 
+company_postproject_What are you working on=你在做什么？
+company_postproject_Project name=项目名称
+company_postproject_Give me a name=给我一个名字
+company_postproject_Discipline=纪律
+company_postproject_Choose one discipline=选择一门学科
+company_postproject_Suggested=建议
+
+company_postproject_Masterplanning=总体规划
+company_postproject_Architecture=建筑学
+company_postproject_Interiors=内部
+company_postproject_Lighting=照明
+company_postproject_Landscape=景观
+company_postproject_AV & Acoustics=视听与声学 
+company_postproject_MEP=欧洲议会
+company_postproject_Art work & Accessories=艺术作品与配饰
+company_postproject_Graphics & Signage=图形和标识
+company_postproject_Branding=品牌创建
+company_postproject_Furniture=家具
+company_postproject_Avenue=大道 …
+
+company_postproject_Tags=标签
+company_postproject_Add tags=添加标签…
+
+company_postproject_Example=实例 
+
+company_postproject_Sofa=沙发
+company_postproject_Bar=酒吧
+company_postproject_living room=客厅
+company_postproject_bedroom=卧室
+company_postproject_Chair=椅子 
+company_postproject_table=桌子 
+company_postproject_Project location=项目地点
+company_postproject_Project completion date=工程完成日期
+company_postproject_Affiliates name=附属公司名称
+
+company_postproject_Project description =项目描述 
+company_postproject_optional=（ 可选 ）
+company_postproject_A  short  introduction=简短的介绍…
+company_postproject_Publish now=立即发布
+
+company_postproject_Project title=项目名称
+company_postproject_Projectdescriptiontxt=读者在查看页面布局时，会被页面的可读内容分散注意力，这是一个由来已久的事实。使用Lorem Ipsum的意义在于，它的字母分布或多或少是正态的，而不是使用“此处内容，此处内容”，使其看起来像可读的语句。
+
+
+company_postproject_Only upload media you ownthe rights to=仅上传您拥有的权限的媒体
+company_postproject_high resolution images（png，jpg，gif）=高分辨率图像（png，jpg，gif）
+company_postproject_1600X1200 or higher recommended. Max 10MB each=1600X1200或更高。每个最大10MB
+
+
+
 company_register_Company_profile=公司简介
 company_register_Company_profile_text=此信息将显示在公司主页上
 company_register_Company logo=公司标志

js/jquery.i18n.properties.js

@@ -128,7 +128,7 @@
      * Eg, jQuery.i18n.prop('com.company.bundles.menu_add')
      */
     $.i18n.prop = function (key /* Add parameters as function arguments as necessary  */) {
-
+		
         var args = [].slice.call(arguments);
 
         var phvList, namespace;