Jelajahi Sumber

Merge branch 'master' of http://47.92.161.104:10080/zkx/lanhu-bootstrap

chenwen 3 tahun lalu
induk
melakukan
27d78e7ee3

TEMPAT SAMPAH
assets/img/SketchPngff4baa52e24274f171eff0ccc6e01f1890b55b11bafffb477ce1f23bc465c249.png


TEMPAT SAMPAH
assets/img/head_gopostprojects.png


TEMPAT SAMPAH
assets/img/moments_add.png


+ 61 - 12
assets/js/company-postproject.js

@@ -3,9 +3,6 @@ $(function(){
  	  $(document).ready(function () {
 		
 		
-		
-		
-	
 		  $(".btnUpload").height($(".btnUpload").width()) 
 		  	var getspan=$(".imguploadspan").html();
 			$(".imguploadspan").append(getspan)
@@ -72,15 +69,18 @@ $(function(){
 				$("#imagePic").val("")
 	          }
 	        } else {
-	          alert('仅支持不超过10M的图片');
- 	       
+				jpalert($(".head_10M").val(),null,"alert");
+	     
+ 	       	$("#imagePic").val("")
 	          // btnUploadText = '上传'
 	          // $("#uploadButton").text(btnUploadText)
 	          return false;
 	        }
 	      } else {
-	        alert('仅限bmp,jpg,png,jpeg图片格式');
-	      
+	       
+			jpalert($(".head_jpgpng").val(),null,"alert");
+			
+			 	$("#imagePic").val("")
 	        // btnUploadText = '上传'
 	        // $("#uploadButton").text(btnUploadText)
 	        return false;
@@ -124,9 +124,6 @@ $(function(){
 		$(".showlistLocation3").append(li)
 	})
 	
- 
-	
-		
 		$.validator.setDefaults({
 		    submitHandler: function() {
 				var bl=true;
@@ -136,9 +133,61 @@ $(function(){
 						return
 					}
 				});
+				
+				var success = $(".head_success").val();
+				var warning = $(".head_warning").val();
+				var success1 = $(".signin_success").val();
+				var warning1 = $(".signin_warning").val()
+				
+				
 		       if(bl){
-		            alert("请上传一张照片")
-		       }
+					zeroModal.alert({
+						unique: '1',
+						opacity: 0.8,
+						content: warning,
+						contentDetail: warning1,
+						width: '300px',
+						height: '260px',
+						cancel:true,
+						ok: false,
+						onClosed: function() {
+							; //location.href='../signin/signin.html'
+						},
+						onComplete: function(evn) {
+							console.log('onComplete')
+							setTimeout(function() {
+					
+								zeroModal.close('1');
+							}, 3000);
+						}
+					})
+		       }else{
+				  zeroModal.success({
+				  	unique: '1',
+				  	opacity: 0.8,
+				  	content: success,
+				  	contentDetail: success1,
+				  	width: '300px',
+				  	height: '280px',
+				  	//okTitle: headcommon2,
+				    ok:false,
+				  	okFn: function() {
+				  
+				  		window.location.href = '../lanhu/index.html'
+				  	},
+				  	onClosed: function() {
+				  		; //location.href='../signin/signin.html'
+				  	},
+				  	onComplete: function(evn) {
+				  		//submitCompany()
+				  		console.log('onComplete')
+				  		setTimeout(function(){
+				  		window.location.href = '../lanhu/index.html'
+				  			zeroModal.close('1');
+				  		},3000);
+				  	}
+				  })
+			   }
 		    }
 		});
 		$("#form").validate()

+ 339 - 139
assets/js/company-register.js

@@ -1,144 +1,344 @@
-$(function(){
-	
- 	  $(document).ready(function () {
-	     
-		 
-	    $('#uploadButton').click(function () {
-	      $('#imagePic').click();
-	    });
-	    $("#imagePic").on("change", function (e) {
-	      var file = e.target.files[0]; //获取图片资源
-	      var fileTypes = ["bmp", "jpg", "png", "jpeg"];
-	      var bTypeMatch = false
-	      for (var i = 0; i < fileTypes.length; i++) {
-	        var start = file.name.lastIndexOf(".");
-	        var fileType = file.name.substring(start + 1);
-	        if (fileType.toLowerCase() == fileTypes[i]) {
-	          bTypeMatch = true;
-	          break;
-	        }
-	      }
-	      if (bTypeMatch) {
-	        if (file.size <= 1024 * 1024 * 10) {
-	          var reader = new FileReader();
-	          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')
-			 
-	          }
-	        } else {
-	          alert('仅支持不超过10M的图片');
- 	       
-	          // btnUploadText = '上传'
-	          // $("#uploadButton").text(btnUploadText)
-	          return false;
-	        }
-	      } else {
-	        alert('仅限bmp,jpg,png,jpeg图片格式');
-	      
-	        // btnUploadText = '上传'
-	        // $("#uploadButton").text(btnUploadText)
-	        return false;
-	      }
-	    });
-	  })
-	//---------初始化数据部分-----------
-	var  contact_number_list=["+86","+87","+88"]
-	var  location=[{
-		icon:"🇨🇳",
-		name:"China"
-	},{
-		icon:"🇺🇸",
-		name:"USA"
-	},{
-		icon:"🇪🇸",
-		name:"Spain"
-	}
-	]
-	
-	var province=["aaa","bbb","ccc"]
-	var city=["aaa1","bbb2","ccc3"]
-	//---------初始化数据部分end-----------
-	//页面初始化
-	contact_number_list.forEach(item=>{
-		var li=$("<option>"+item+"</option>")
-		$(".showqulist").append(li)
-	})
-	location.forEach(item=>{
-		var li=$("<option>"+item.icon+' '+item.name+"</li>")
-		$(".showlistLocation1").append(li)
-	})
-	province.forEach(item=>{
-		//var li=$("<li class='contact_location2_li' txt="+item+"><a >"+item+"</a></li>")
-		var li=$("<option>"+item+"</option>")
-		$(".showlistLocation2").append(li)
-	})
-	city.forEach(item=>{
-		//var li=$("<li class='contact_location3_li' txt="+item+"><a >"+item+"</a></li>")
-		var li=$("<option>"+item+"</option>")
-		$(".showlistLocation3").append(li)
-	})
-	
-	
-	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)
-		
+$(function() {
+
+	$(document).ready(function() {
+
+
+		$('#uploadButton').click(function() {
+			$('#imagePic').click();
+		});
+		$("#imagePic").on("change", function(e) {
+			var file = e.target.files[0]; //获取图片资源
+			var fileTypes = ["bmp", "jpg", "png", "jpeg"];
+			var bTypeMatch = false
+			for (var i = 0; i < fileTypes.length; i++) {
+				var start = file.name.lastIndexOf(".");
+				var fileType = file.name.substring(start + 1);
+				if (fileType.toLowerCase() == fileTypes[i]) {
+					bTypeMatch = true;
+					break;
+				}
+			}
+			if (bTypeMatch) {
+				if (file.size <= 1024 * 1024 * 10) {
+					var reader = new FileReader();
+					reader.readAsDataURL(file); // 读取文件
+					// 渲染文件
+					reader.onload = function(arg) {
+						onloadresult(arg.target.result)
+
+
+					}
+				} else {
+					jpalert($(".head_10M").val(),null,"alert");
+				$("#imagePic").val("")
+					// btnUploadText = '上传'
+					// $("#uploadButton").text(btnUploadText)
+					return false;
+				}
+			} else {
+			
+					jpalert($(".head_jpgpng").val(),null,"alert");
+				$("#imagePic").val("")
+				// btnUploadText = '上传'
+				// $("#uploadButton").text(btnUploadText)
+				return false;
+			}
+		});
+	})
+
+
+
+	//---------初始化数据部分-----------
+	var contact_number_list = ["+86", "+87", "+88"]
+	var location = [{
+		icon: "🇨🇳",
+		name: "China"
+	}, {
+		icon: "🇺🇸",
+		name: "USA"
+	}, {
+		icon: "🇪🇸",
+		name: "Spain"
+	}]
+
+	var province = ["aaa", "bbb", "ccc"]
+	var city = ["aaa1", "bbb2", "ccc3"]
+	//---------初始化数据部分end-----------
+	//页面初始化
+	contact_number_list.forEach(item => {
+		var li = $("<option>" + item + "</option>")
+		$(".showqulist").append(li)
+	})
+	location.forEach(item => {
+		var li = $("<option>" + item.icon + ' ' + item.name + "</li>")
+		$(".showlistLocation1").append(li)
+	})
+	province.forEach(item => {
+		//var li=$("<li class='contact_location2_li' txt="+item+"><a >"+item+"</a></li>")
+		var li = $("<option>" + item + "</option>")
+		$(".showlistLocation2").append(li)
+	})
+	city.forEach(item => {
+		//var li=$("<li class='contact_location3_li' txt="+item+"><a >"+item+"</a></li>")
+		var li = $("<option>" + item + "</option>")
+		$(".showlistLocation3").append(li)
+	})
+
+
+
+
+	$("#contact_number_add").click(function() {
+		
+		$("#contact_number").append(html_contact_number)
+
 		$("#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)
-		
+		inithtml()
+	})
+	$("#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)
+
 		$("#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)
-		
+		inithtml()
+	})
+	$("#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)
+
 		$("#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()
-		 }
-	})
-	
- 
-	
+		inithtml()
+	})
+	$("#contact_location_remove").click(function() {
+		$("#contact_location .row-fluid").eq(-1).remove();
+		if ($("#contact_location .row-fluid").length == 1) {
+			$("#contact_location_remove").hide()
+		}
+	})
+
+
+
+
+	$.validator.setDefaults({
+		submitHandler: function() {
+			var submitlogo = $("#uploadButtonInput").val();
+			var success = $(".head_success").val();
+			var warning = $(".head_warning").val();
+			var success1 = $(".signin_success").val();
+			var warning1 = $(".signin_warning").val()
+			var headcommon2 = $(".signin_headcommon2").val()
+
+
+
+			if (!submitlogo) {
+				zeroModal.alert({
+					unique: '1',
+					opacity: 0.8,
+					content: warning,
+					contentDetail: warning1,
+					width: '300px',
+					height: '260px',
+					cancel:true,
+					ok: false,
+					onClosed: function() {
+						; //location.href='../signin/signin.html'
+					},
+					onComplete: function(evn) {
+						console.log('onComplete')
+						setTimeout(function() {
+
+							zeroModal.close('1');
+						}, 3000);
+					}
+				})
+			} else {
+
+				zeroModal.success({
+					unique: '1',
+					opacity: 0.8,
+					content: success,
+					contentDetail: success1,
+					width: '300px',
+					height: '280px',
+					okTitle: headcommon2,
+					//ok:false,
+					okFn: function() {
+
+						window.location.href = './postproject.html'
+					},
+					onClosed: function() {
+						; //location.href='../signin/signin.html'
+					},
+					onComplete: function(evn) {
+						submitCompany()
+						console.log('onComplete')
+						// setTimeout(function(){
+						// 	location.href='../lanhu/index.html'
+						// 	zeroModal.close('1');
+						// },3000);
+					}
+				})
+			}
+		}
+	});
+	$("#form").validate()
+
+	function submitCompany() {
+
+		var obj = {
+
+		}
+		obj.logo = $("#uploadButtonInput").val();
+		obj.introduction = $(".introduction").val()
+
+		$("#form input[type='text']").each(function() {
+			var key = $(this).attr("name")
+			obj[key] = $(this).val()
+		})
+		var i = 0;
+		var sz1 = [];
+		$(".showlistLocation1").each(function() {
+			var ob = {}
+			ob.location1 = $(this).val()
+			ob.location2 = $(".showlistLocation2").eq(i).val()
+			ob.location3 = $(".showlistLocation3").eq(i).val()
+			ob.avenue = $("input[name=Avenue]").eq(i).val()
+			sz1.push(ob)
+			i++;
+		})
+		obj.locationList = sz1;
+
+
+		i = 0;
+		var sz2 = [];
+		$(".showqulist").each(function() {
+			var ob = {}
+			ob.qu = $(this).val()
+			ob.contactNumber = $("input[name=contactNumber]").eq(i).val()
+			sz2.push(ob)
+			i++;
+		})
+		obj.showqulist = sz2;
+
+		i = 0;
+		var sz3 = [];
+		$("input[name=contactEmail]").each(function() {
+			var ob = {}
+			ob.contactEmail = $(this).val()
+			sz3.push(ob)
+			i++;
+		})
+		obj.contactEmailList = sz3;
+
+		window.localStorage.setItem("loginCompany", JSON.stringify(obj));
+	}
+
+
+	$("#registerupload2").click(function(){
+		submitCompany()
+	})
+
+	//页面初始化end
+})
+var html_contact_number = $("#contact_number").html();
+var		html_contact_email = $("#contact_email").html();
+var		html_contact_location = $("#contact_location").html();
+
+function getItemloginCompany() {
+	 html_contact_number = $("#contact_number").html();
+			html_contact_email = $("#contact_email").html();
+			html_contact_location = $("#contact_location").html();
+	
+	var loginCompany = window.localStorage.getItem("loginCompany");
+	if (loginCompany) {
+		loginCompany = JSON.parse(loginCompany);
+		
+		onloadresult(loginCompany.logo)
+		
+		$("#form input[type='text']").each(function() {
+			var key = $(this).attr("name")
+			console.log(key)
+			if(key&&loginCompany[key]){
+				$(this).val(loginCompany[key])
+			}
+		})
+		var i = 0;
+		loginCompany.locationList.forEach(function(){
+			
+			if(i==1){
+				$("#contact_location_remove").show()
+			}
+			var ob=loginCompany.locationList[i]
+			 $(".showlistLocation1").eq(i).val(ob.location1 )
+			 $(".showlistLocation2").eq(i).val(ob.location2 )
+			 $(".showlistLocation3").eq(i).val(ob.location3 )
+			$("input[name=Avenue]").eq(i).val(ob.avenue )
+			i++;
+			$("#contact_location").append(html_contact_location)
+			
+		})
+		i = 0;
+		loginCompany.showqulist.forEach(function(){
+			if(i==1){
+				$("#contact_number_remove").show()
+			}
+			var ob=loginCompany.showqulist[i]
+			 $(".showqulist").eq(i).val(ob.qu )
+			 $("input[name=contactNumber]").eq(i).val(ob.contactNumber )
 		
-		$.validator.setDefaults({
-		    submitHandler: function() {
-				var submitlogo=$("#uploadButtonInput").val();
-		       if(!submitlogo){
-		            				  alert("请上传公司logo")
-		            }
-		    }
-		});
-		$("#form").validate()
-	
+			i++;
+			$("#contact_number").append(html_contact_number)
+			
+		})
+		i = 0;
+		loginCompany.contactEmailList.forEach(function(){
+			
+			if(i==1){
+				$("#contact_email_remove").show()
+			}
+			var ob=loginCompany.contactEmailList[i]
+			 $("input[name=contactEmail]").eq(i).val(ob.contactEmail )
+			
+			i++;
+			$("#contact_email").append(html_contact_email)
+			
+		})
+		$("#contact_location .row-fluid").eq(-1).remove();
+		$("#contact_number .row-fluid").eq(-1).remove();
+		$("#contact_email input").eq(-1).remove();
 		
-	//页面初始化end
-})
+		 $(".introduction").val(loginCompany.introduction)
+		
+	}
+	
+}
+
+function onloadresult(result) {
+	$("#uploadButtonInput").val(result);
+	$("#uploadButton").css("background", "url(" + result + ") no-repeat center")
+	$("#uploadButton").css("border", '1px solid #b8b9ba')
+	$("#uploadButton").css("border-radius", '10px')
+	$("#uploadButton").css("background-size", '100% 100%')
+}
+
+function inithtml() {
+	try{
+			relanguage()
+	}catch(e){
+		console.log(e)
+	}
+}

+ 63 - 3
assets/js/head.js

@@ -1,8 +1,68 @@
 $(function () {
-       $(".dropdown").mouseover(function () {
+	$(".head_li_library").click(function(){
+		window.location.href="../lanhu/index.html"
+	})
+	$(".head_li_Moments").click(function(){
+		window.location.href="../moments/index.html"
+	})
+       $(".navbar .dropdown").mouseover(function () {
            $(this).addClass("open");
        });
-       $(".dropdown").mouseleave(function(){
+       $(".navbar .dropdown").mouseleave(function(){
            $(this).removeClass("open");
        })
-    })
+	   $(".headSignout").click(function(){
+		   window.localStorage.removeItem("loginUser");
+		   window.localStorage.removeItem("loginCompany");
+			$(".loginUserNo").show()
+			 $(".loginUser").hide()
+	   })
+	  var loginUser= window.localStorage.getItem("loginUser");
+	  if(loginUser){
+		  $(".loginUserNo").hide()
+		   $(".loginUser").show()
+		   $(".userName").text(loginUser)
+		   var loginCompany= window.localStorage.getItem("loginCompany");
+		     if(loginCompany){
+				 $(".head_add").attr("href","../company/postproject.html")
+			 }else{
+				  $(".head_add").attr("href","../company/register.html")
+			 }
+		   
+	  }
+    })
+	
+function jpalert(text,url,type){
+	var success = $(".head_success").val();
+	
+	if(type==null){
+		type="success"
+	}
+	if(type=="alert"){
+		success= $(".head_warning").val();
+	}
+	zeroModal[type]({
+		unique: '1',
+		opacity: 0.8,
+		content: success,
+		contentDetail: text,
+		width: '300px',
+		height: '280px',
+		ok:false,
+		cancel:true,
+		onClosed: function() {
+			; //location.href='../signin/signin.html'
+		},
+		onComplete: function(evn) {
+			
+			console.log('onComplete')
+			setTimeout(function(){
+				if(url){
+						window.location.href=url
+				}
+				zeroModal.close('1');
+			},3000);
+		}
+	})
+}
+

+ 20 - 13
assets/js/language.js

@@ -1,17 +1,21 @@
+var sz = ["en", "zh", "ot"]
+var szname = ["English", "Chinese", "Other"]
 $(function() {
 	var default_value = "en";
-	$("#language").on("change", function() {
-		loadProperties($(this).val());
-	})
+
 	var value = window.localStorage.getItem("i18n_default_value");
-	var sz = ["en", "zh", "ot"]
-	var szname = ["English", "Chinese", "Other"]
+	
 	if (value) {
 		default_value = value;
 	}
 	loadProperties(default_value);
 
-	function loadProperties(val) {
+	
+
+ 
+})
+
+function loadProperties(val) {
 		$("#languagelist").empty()
 		window.localStorage.setItem("i18n_default_value", val);
 		for (var i in sz) {
@@ -40,6 +44,11 @@ $(function() {
 					var prop = $(this).attr('i18n')
 					var value = $.i18n.prop(prop)
 					$(this).text(value);
+				});
+				$('.i18n-input').each(function() {
+					var prop = $(this).attr('i18n')
+					var value = $.i18n.prop(prop)
+					$(this).val(value);
 				});
 				$('.i18n-placeholder').each(function() {
 					var prop = $(this).attr('i18n')
@@ -49,10 +58,8 @@ $(function() {
 
 			}
 		});
-	}
-
-
-
-
-
-})
+	}
+function relanguage(){
+	var value = window.localStorage.getItem("i18n_default_value");
+		loadProperties(value);
+}

+ 189 - 0
assets/js/moments-postmoment.js

@@ -0,0 +1,189 @@
+$(function(){
+	
+ 	  $(document).ready(function () {
+		
+		
+		  $(".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 obj=window.localStorage.getItem("postmoment")
+			if(obj){
+				obj=JSON.parse(obj)
+				$("[name=Project_title]").val(obj.title)
+				$(".Projectdescriptiontxt").val(obj.txt)
+				for(var i in obj.list){
+					var input=$(".btnUpload").eq(i)
+					onloadimg(input,obj.list[i])
+				}
+				$(".Publish").hide()
+				$(".Renew").show()
+				
+				//onloadimg
+			}
+			
+			
+		   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
+	      for (var i = 0; i < fileTypes.length; i++) {
+	        var start = file.name.lastIndexOf(".");
+	        var fileType = file.name.substring(start + 1);
+	        if (fileType.toLowerCase() == fileTypes[i]) {
+	          bTypeMatch = true;
+	          break;
+	        }
+	      }
+	      if (bTypeMatch) {
+	        if (file.size <= 1024 * 1024 * 10) {
+	          var reader = new FileReader();
+	          reader.readAsDataURL(file); // 读取文件
+	          // 渲染文件
+	          reader.onload = function (arg) {
+				 onloadimg(btnUpload,arg.target.result)
+	          $("#imagePic").val("")
+	          }
+	        } else {
+				jpalert($(".head_10M").val(),null,"alert");
+	     
+ 	       	$("#imagePic").val("")
+	          // btnUploadText = '上传'
+	          // $("#uploadButton").text(btnUploadText)
+	          return false;
+	        }
+	      } else {
+	       
+			jpalert($(".head_jpgpng").val(),null,"alert");
+			
+			 	$("#imagePic").val("")
+	        // btnUploadText = '上传'
+	        // $("#uploadButton").text(btnUploadText)
+	        return false;
+	      }
+	    });
+	  })
+	//---------初始化数据部分-----------
+	
+	//---------初始化数据部分end-----------
+	//页面初始化
+	function onloadimg(btn,img){
+		$(btn).css("background", "url("+img+")   no-repeat center")
+		$(btn).css("background-size", "100% 100%")
+		
+		$(btn).css("border", '1px solid #b8b9ba')
+		$(btn).css("border-radius",'10px')
+		$(btn).attr("disabled","disabled")
+		$(btn).find(".imgdel").show()
+		$(btn).find(".imginput").val(img)
+		
+	}
+	
+		$.validator.setDefaults({
+		    submitHandler: function() {
+				var bl=true;
+				$(".imginput").each(function(){
+					if($(this).val()!=''){
+						bl=false;
+						return
+					}
+				});
+				
+				var success = $(".head_success").val();
+				var warning = $(".head_warning").val();
+				var success1 = $(".signin_success").val();
+				var warning1 = $(".signin_warning").val()
+				
+				
+		       if(bl){
+				   jpalert(warning1,null,"alert");
+				   
+				
+		       }else{
+				  zeroModal.success({
+				  	unique: '1',
+				  	opacity: 0.8,
+				  	content: success,
+				  	contentDetail: success1,
+				  	width: '300px',
+				  	height: '280px',
+				  	//okTitle: headcommon2,
+				    ok:false,
+				  	okFn: function() {
+				  
+				  		window.location.href = '../moments/index.html'
+				  	},
+				  	onClosed: function() {
+				  		; //location.href='../signin/signin.html'
+				  	},
+				  	onComplete: function(evn) {
+				  		submitCompany()
+				  		console.log('onComplete')
+				  		setTimeout(function(){
+				  		window.location.href = '../moments/index.html'
+				  			zeroModal.close('1');
+				  		},3000);
+				  	}
+				  })
+			   }
+		    }
+		});
+		$("#form").validate()
+		function submitCompany(){
+			debugger
+			var company=window.localStorage.getItem("loginCompany")
+			company=JSON.parse(company)
+			
+			var time=(1900+new Date().getYear())+"."+(new Date().getMonth()+1)+"."+new Date().getDate()
+			var postmoment={
+				title:$("[name=Project_title]").val(),
+				txt:$(".Projectdescriptiontxt").val(),
+				date:time,
+				list:[],
+				name:company.companyName,
+				logo:company.logo,
+			}
+			$(".imginput").each(function(){
+				var value=$(this).val()
+				if(value){
+					postmoment.list.push(value)
+				}
+			})
+			window.localStorage.setItem("postmoment",JSON.stringify(postmoment))
+			
+		}
+	
+		
+		
+	//页面初始化end
+})

+ 67 - 0
assets/js/moments.js

@@ -0,0 +1,67 @@
+$(function() {
+
+	var data = [
+		{
+		logo: "/lanhu-bootstrap/assets/img/SketchPngff4baa52e24274f171eff0ccc6e01f1890b55b11bafffb477ce1f23bc465c249.png",
+		name: "Helen studio CHINA | interior",
+		isfollow: false,
+		title: "Title for the post",
+		data: "2021.09.11  17:23",
+		txt: "	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).",
+		list: [
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png",
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png",
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng677c41a514ce39003ea3ad7eed2f45da074f91790561db2f64b930d36743a708.png",
+			
+		]
+	},{
+		logo: "/lanhu-bootstrap/assets/img/moments_add.png",
+		name: "Helen studio CHINA2 | interior2",
+		isfollow: true,
+		title: "Title for the post22",
+		data: "2022.09.11  17:23",
+		txt: "	222It 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).",
+		list: [
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png",
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng09b8d1f99fd42b318c6bc00cfecbc1aebaf6950c531649da656adbf849d84188.png",
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng11f2551c8c79f2a1f49994d7331b917307433c1dfc9bb864ab7941f9e98dacfd.png",
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng51f6302e0405645a754c13a5832916e57e46357a62248bba0c66a45fb3cf7e34.png",
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng89e9554a3265a9c1f8d56f3f7dd92e7e0af6a15c8c7b8aa9fddfe992757c51a0.png",
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng90c84aeaabbe84af30410a95aa5645e88733bd80ac3f5fa3f01f88542155891b.png",
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng92fd1d5f74f2e41c540e2262f216f9fb69b010979d402fadb516bca3fe317bc2.png",
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng321a6596588e6a2a48470c19b29e6164b134792adc609d7f631c7548339e50fe.png",
+			"/lanhu-bootstrap/assets/img/landingpage/SketchPng631eafd3e8e1a7ffdc4c6e213f31b0af54b76cc064bf269f4c39fceac1e788b8.png",
+			
+			
+			
+			
+		]
+	},
+	
+	]
+	var obj=window.localStorage.getItem("postmoment")
+	if(obj){
+		obj=JSON.parse(obj)
+		data=[
+			obj,
+			...data
+		]
+	}
+	const tmphtml = template("flow-photos", {
+		objs: data
+	});
+	
+	$(".imguploadlist").append(tmphtml);
+	$('.imguploadspan').viewer({
+		url: 'data-original',
+	});
+	$(".Follow").click(function(){
+		$(this).parent().find(".Follow").show()
+		$(this).hide()
+	})
+	$('.selectpicker').selectpicker({
+		template:{
+			caret:'<span class="sel-icon glyphicon glyphicon-menu-down"></span>'
+		}
+	});
+})

+ 55 - 20
assets/js/signin.js

@@ -2,28 +2,63 @@ $(function(){
 	$(".signin-form").validate({
 			
 			 submitHandler:(form) => {
-				zeroModal.success({
-					unique:'1',
-					opacity:0.8,
-					content:'success',
-					contentDetail:'Signin success',
-					width:'300px',
-					height:'260px',
-					ok:false,
-					onClosed:function(){
-						;//location.href='../signin/signin.html'
-					},
-					onComplete:function(evn){
-						console.log('onComplete')
-						setTimeout(function(){
-							zeroModal.close('1');
-						},3000);
-					}
-					
-				})  
+				 var success=$(".head_success").val();
+				  var warning=$(".head_warning").val();
+				   var success1=$(".signin_success").val();
+				    var warning1=$(".signin_warning").val()
+					 
+				if($(".agreeme")[0].checked) {
+					zeroModal.success({
+						unique:'1',
+						opacity:0.8,
+						content:success,
+						contentDetail:success1,
+						width:'300px',
+						height:'260px',
+						ok:false,
+						onClosed:function(){
+							;//location.href='../signin/signin.html'
+						},
+						onComplete:function(evn){
+							login()
+							console.log('onComplete')
+							setTimeout(function(){
+								location.href='../lanhu/index.html'
+								zeroModal.close('1');
+							},3000);
+						}
+					}) 
+				}else{
+					zeroModal.alert({
+						unique:'1',
+						opacity:0.8,
+						content:warning,
+						contentDetail:warning1,
+						width:'300px',
+						height:'260px',
+						ok:false,
+						onClosed:function(){
+							;//location.href='../signin/signin.html'
+						},
+						onComplete:function(evn){
+							
+							console.log('onComplete')
+							setTimeout(function(){
+								
+								zeroModal.close('1');
+							},3000);
+						}
+					}) 
+				}
+				 
+				 
 			 }
 	});
-	
+	function login(){
+		
+		window.localStorage.setItem("loginUser",$("#email").val())
+		console.log($("#email").val())
+	}
 	$(".form-control").on("input",function(evn){
 		//console.log('input');
 		let $icon=$(this).siblings('.input-tool-icon');

+ 58 - 27
assets/js/signup.js

@@ -7,34 +7,65 @@ $(function(){
 	}); */
 	
 	 $(".signup-form").validate({
-		 /* errorPlacement:(error, element)=>{
-			 console.log(error);
-			 alert(error.text());
-		 }, */
-		
-		 submitHandler:(form) => {
-			$(".agree-chkbox").prop('checked',true);
-			zeroModal.success({
-				unique:'1',
-				opacity:0.8,
-				content:'success',
-				contentDetail:'You have successfully registered',
-				width:'300px',
-				height:'260px',
-				ok:false,
-				onClosed:function(){
-					location.href='../signin/signin.html'
-				},
-				onComplete:function(evn){
-					console.log('onComplete')
-					setTimeout(function(){
-						zeroModal.close('1');
-					},3000);
+	
+			 submitHandler:(form) => {
+				 var success=$(".head_success").val();
+				  var warning=$(".head_warning").val();
+				   var success1=$(".signin_success").val();
+				    var warning1=$(".signin_warning").val()
+					 
+				if($(".agreeme")[0].checked) {
+					zeroModal.success({
+						unique:'1',
+						opacity:0.8,
+						content:success,
+						contentDetail:success1,
+						width:'300px',
+						height:'260px',
+						ok:false,
+						onClosed:function(){
+							;//location.href='../signin/signin.html'
+						},
+						onComplete:function(evn){
+							login()
+							console.log('onComplete')
+							setTimeout(function(){
+								location.href='../lanhu/index.html'
+								zeroModal.close('1');
+							},3000);
+						}
+					}) 
+				}else{
+					zeroModal.alert({
+						unique:'1',
+						opacity:0.8,
+						content:warning,
+						contentDetail:warning1,
+						width:'300px',
+						height:'260px',
+						ok:false,
+						onClosed:function(){
+							;//location.href='../signin/signin.html'
+						},
+						onComplete:function(evn){
+							
+							console.log('onComplete')
+							setTimeout(function(){
+								
+								zeroModal.close('1');
+							},3000);
+						}
+					}) 
 				}
-				
-			})  
-		 }
-	 });
+				 
+				 
+			 }
+	});
+	function login(){
+		
+		window.localStorage.setItem("loginUser",$("#email").val())
+		console.log($("#email").val())
+	}
 	
 	$(".form-control").on("input",function(evn){
 		//console.log('input');

+ 7 - 6
assets/plugin/zeroModal/css/zeroModal.css

@@ -88,7 +88,7 @@
     white-space: nowrap;
     padding: 6px 8px;
     line-height: 20px;
-    border-radius: 1px;
+    border-radius: 5px;
     min-width: 80px;
     box-shadow: 0 1px 4px rgba(0, 0, 0, .32);
     -webkit-transition: all;
@@ -103,7 +103,7 @@
 
 .zeromodal-btn-primary {
     color: #fff;
-    background-color: #2196f3;
+    background-color: #e54e5e;
     border: none;
 }
 
@@ -192,14 +192,14 @@
 }
 
 .zeromodal-btn-container {
-    text-align: right;
-    padding-right: 15px;
+    text-align: center;
+  /*  padding-right: 15px; */
 }
 
 .zeromodal-icon {
     width: 80px;
     height: 80px;
-    border: 4px solid #808080;
+ border: 4px solid #808080;
     border-radius: 50%;
     margin: 16px auto 16px;
     margin-top: 16px;
@@ -264,7 +264,8 @@
 }
 
 .zeromodal-icon.zeromodal-success {
-    border-color: #a5dc86;
+    border: 0px;
+	background: url(zeromodal_success.png) no-repeat center;
 }
 
 .zeromodal-icon.zeromodal-success::before {

TEMPAT SAMPAH
assets/plugin/zeroModal/css/zeromodal_success.png


+ 23 - 9
assets/plugin/zeroModal/js/zeroModal.js

@@ -40,10 +40,10 @@
         resize: false, // 是否允许调整大小
         resizeAfterFn: undefined, // 调整大小后触发的事件
         ok: false, //是否启用“ok”按钮,默认false
-        okTitle: '确定', //“ok”按钮的显示值,默认为“确定”
+        okTitle: "", //“ok”按钮的显示值,默认为“确定”
         okFn: false, //点击“ok”按钮触发的事件
         cancel: false, //是否启用“cancel”按钮,默认false
-        cancelTitle: '关闭', //“cancel”按钮的显示值,默认为“取消”
+        cancelTitle: "", //“cancel”按钮的显示值,默认为“取消”
         cancelFn: true, //点击“cancel”按钮触发的事件
         buttonTopLine: true,
         buttons: [], //自定义的按钮,使用了自定义按钮ok与cancel按钮将不会生效;格式:[{ className: 'zeromodal-btn zeromodal-btn-primary', name: '开始导出' }]
@@ -82,7 +82,7 @@
                 _resize(params);
             }
         });
-
+ 		
         return params.unique;
     };
 
@@ -335,7 +335,7 @@
      */
     zeroModal.success = function(content) {
         var params = {
-            iconDisplay: '<div class="show-zero2 zeromodal-icon zeromodal-success"><span class="line tip"></span><span class="line long"></span><div class="placeholder"></div></div>'
+            iconDisplay: '<div class="show-zero2 zeromodal-icon zeromodal-success"></div>'
         };
 
         if (typeof content === 'object') {
@@ -390,9 +390,11 @@
     // 渲染
     function _render(opt) {
         if (typeof opt.onOpen === 'function') { opt.onOpen(); }
-
+		
         _buildOverlay(opt);
         _buildModal(opt);
+		$(".zeromodal-overlay").height($("html").height())
+		
     }
 
     // 关闭
@@ -526,7 +528,9 @@
             $('[zero-unique-body="' + opt.unique + '"]').addClass('zeromodal-overflow-y');
 
             _body.html(opt.content);
-            if (typeof opt.onComplete === 'function') { opt.onComplete(); }
+            if (typeof opt.onComplete === 'function') { 
+				opt.onComplete(); 
+				}
         } else {
             _body.html('<div class="zeromodal-loading1"></div>');
             // 如果iframe为true,则通过iframe的方式加载需要显示的内容
@@ -535,7 +539,8 @@
                 _body.append(_iframe);
                 _iframe.load(function() {
                     $('.zeromodal-loading1').remove();
-                    if (typeof opt.onComplete === 'function') { opt.onComplete(); }
+                    if (typeof opt.onComplete === 'function') { 
+						opt.onComplete(); }
                 });
             } else {
                 // 如果是div方式,则设置overflow-y属性,同时通过ajax获取内容
@@ -547,7 +552,9 @@
                     success: function(data) {
                         _body.append(data);
                         $('.zeromodal-loading1').remove();
-                        if (typeof opt.onComplete === 'function') { opt.onComplete(); }
+                        if (typeof opt.onComplete === 'function') {
+							
+							opt.onComplete(); }
                     }
                 });
             }
@@ -592,9 +599,14 @@
             } else {
                 // 显示默认提供的按钮
                 if (opt.ok) {
+					if(opt.okTitle==""){
+							opt.okTitle=$(".head_okTitle").val();
+					}
+									
                     var _ok = $('<button zeromodal-btn-ok="' + opt.unique + '" class="zeromodal-btn zeromodal-btn-primary">' + opt.okTitle + '</button>');
                     $('[zeromodal-btn-container="' + opt.unique + '"]').append(_ok);
                     _ok.click(function() {
+						
                         if (typeof opt.okFn === 'function') {
                             var _r = opt.okFn();
                             if (typeof _r === 'undefined' || _r) {
@@ -606,6 +618,7 @@
                     });
                 }
                 if (opt.cancel) {
+					 
                     var _cancel = $('<button zeromodal-btn-cancel="' + opt.unique + '" class="zeromodal-btn zeromodal-btn-default">' + opt.cancelTitle + '</button>');
                     $('[zeromodal-btn-container="' + opt.unique + '"]').append(_cancel);
                     _cancel.click(function() {
@@ -629,7 +642,8 @@
     function _buildAlertInfo(opt) {
         // 初始化
         if (typeof opt === 'undefined' || typeof opt.cancelTitle === 'undefined') {
-            opt.cancelTitle = '取消';
+            //opt.cancelTitle = '取消';
+			opt.cancelTitle=$(".head_cancelTitle").val();
         }
 
         var params = _initParams(opt);

+ 2 - 4
css/head.css

@@ -877,9 +877,7 @@ ol ul {
 	margin-bottom: 0;
 }
 
-li {
-	line-height: 20px;
-}
+
 
 ul.unstyled,
 ol.unstyled {
@@ -4287,7 +4285,7 @@ input[type="submit"].btn.btn-mini {
 	overflow-wrap: break-word;
 	color: rgba(24, 24, 24, 1);
 	font-size: 16px;
-	text-transform: uppercase;
+	/* text-transform: uppercase; */
 	font-family: Avenir-Black;
 	white-space: nowrap;
 	line-height: 22px;

File diff ditekan karena terlalu besar
+ 8 - 0
css/viewer.min.css


+ 15 - 2
html/company/postproject.html

@@ -11,6 +11,8 @@
 
 		<link rel="stylesheet" href="/lanhu-bootstrap/css/head.css">
 		<script src="/lanhu-bootstrap/assets/js/company-postproject.js"></script>
+<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/zeroModal.css">
+		<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/normalize.css" />
 
 	</head>
 	<body>
@@ -23,7 +25,13 @@
 				});
 			})
 		</script>
-		<main class="jpmain">
+		<main class="jpmain">
+			<input type="hidden" class="head_success i18n-input"  i18n="head_success" />
+			<input type="hidden" class="head_warning i18n-input"  i18n="head_warning" />
+			<input type="hidden" class="signin_success i18n-input"  i18n="company_postproject_success" />
+			<input type="hidden" class="signin_warning i18n-input"  i18n="company_postproject_warning" />
+ 			
+			
 			<form id="form">
 
 				<div class=" jpcontainer" >
@@ -288,6 +296,11 @@
 								</div>
 						</div>
 			</form>
-		</main>
+		</main>
+		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+			<script src="../../js/ie10-viewport-bug-workaround.js"></script>
+			
+			<script src="../../assets/plugin/zeroModal/js/zeroModal.js"></script>
+		
 	</body>
 </html>

+ 35 - 36
html/company/register.html

@@ -5,6 +5,7 @@
 		<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>
@@ -12,12 +13,26 @@
 		<link rel="stylesheet" href="/lanhu-bootstrap/css/head.css">
 		<script src="/lanhu-bootstrap/assets/js/company-register.js"></script>
 
+	<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/zeroModal.css">
+		<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/normalize.css" />
+
 	</head>
 	<body>
+		<input type="hidden" class="head_success i18n-input"  i18n="head_success" />
+		<input type="hidden" class="head_warning i18n-input"  i18n="head_warning" />
+		<input type="hidden" class="signin_success i18n-input"  i18n="company_register_success" />
+		<input type="hidden" class="signin_warning i18n-input"  i18n="company_register_warning" />
+		<input type="hidden" class="signin_headcommon2 i18n-input"  i18n="headcommon2" />
+		
+		
+		
 		<div id="head"></div>
 		<script>
 			$(function() {
-				$("#head").load("../head.html");
+				$("#head").load("../head.html",function(){
+					getItemloginCompany()
+				});
+				
 			})
 		</script>
 		<main class="jpmain">
@@ -84,7 +99,7 @@
 								Company logo
 							</dt>
 							<dd>
-								<input id="uploadButtonInput" class="i18n-placeholder" i18n="company_register_enter Company logo" placeholder="enter Company logo" type="hidden" />
+								<input id="uploadButtonInput"   type="hidden" />
 								<button id="uploadButton" type="button" class="btnUpload" style="
 									width: 85px;
 								    height: 85px;
@@ -145,13 +160,7 @@
 									<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" >
-													
-												</ul>
-											</div> -->
+											 
 											<select class="showqulist form-control" >
 												
 											</select>
@@ -165,7 +174,7 @@
 								<dd>
 									
 									
-									<button 
+									<button  type="button"
 									id="contact_number_add"
 									style="
 										width: 50px;
@@ -173,7 +182,7 @@
 									    border: 0px;
 									background: url(/lanhu-bootstrap/assets/img/company_add_icon.png);"></button>
 									
-									<button
+									<button  type="button"
 									id="contact_number_remove"
 									style="
 										display: none;
@@ -195,7 +204,7 @@
 									<input required	  name="contactEmail"	type="email" class="i18n-placeholder" i18n="company_register_enter email" placeholder="enter email" style="    margin-bottom: 4px;" />
 								</dd>
 								<dd>
-									<button 
+									<button   type="button"
 										id="contact_email_add"
 									style="
 										width: 50px;
@@ -203,7 +212,7 @@
 									    border: 0px;
 									background: url(/lanhu-bootstrap/assets/img/company_add_icon.png);"></button>
 									
-									<button
+									<button  type="button"
 									id="contact_email_remove"
 									style="
 									background: url(/lanhu-bootstrap/assets/img/company_remove_icon.png);
@@ -227,14 +236,7 @@
 						
 						<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>
@@ -246,16 +248,7 @@
 								</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>
@@ -266,7 +259,7 @@
 						</div>
 					</dd>
 					<dd>
-						<button 
+						<button   type="button"
 						id="contact_location_add"
 						style="
 						  
@@ -276,7 +269,7 @@
 						background: url(/lanhu-bootstrap/assets/img/company_add_icon.png);"></button>
 						
 						
-						<button
+						<button  type="button"
 						id="contact_location_remove"
 						style="
 							display: none;
@@ -302,7 +295,7 @@
 						</dt>
 						<dd>
 							<div class="input-group" style="  width: 100%;">
-								<input type="text" class="form-control"  placeholder="" />
+								<input type="text" class="form-control" name="people"  placeholder="" />
 								<span  i18n="company_register_people" class="i18n-text input-group-addon" style="width: 80px;"> people</span>
 							</div>
 							
@@ -315,7 +308,7 @@
 							Disciplines
 						</dt>
 						<dd>
-								<input required type="text"  placeholder="" />
+								<input required type="text"  name="Disciplines"  placeholder="" />
 						</dd>
 					</div>
 				</div>
@@ -325,16 +318,22 @@
 							Company  introduction
 						</dt>
 						<dd>
-							<textarea  required  maxlength="500" 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 introduction" i18n="company_register_introduction" placeholder="A  short company introduction…"></textarea>
 						</dd>
 					</div>
 
 				</div>
 				<div class="row-fluid">
+<!-- 					<button   type="button" id="registerupload2" style="  float: right; ">aaa</button>
+ -->					
 					<button   type="submit" id="registerupload" class="hbutton i18n-text" i18n="company_register_upload" style="  float: right; ">upload</button>
 				</div>
 			</div>
 			</form>
 		</main>
+		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+		<script src="../../js/ie10-viewport-bug-workaround.js"></script>
+	
+		<script src="../../assets/plugin/zeroModal/js/zeroModal.js"></script>
 	</body>
 </html>

+ 1 - 0
html/favorites/index.html

@@ -0,0 +1 @@
+我的关注

+ 61 - 20
html/head.html

@@ -1,5 +1,5 @@
-<script src="/lanhu-bootstrap/js/jquery-1.9.1.min.js"></script>
-<script src="/lanhu-bootstrap/js/bootstrap.min.js"></script>
+<!-- <script src="/lanhu-bootstrap/js/jquery-1.9.1.min.js"></script>
+ <script src="/lanhu-bootstrap/js/bootstrap.min.js"></script>-->
 <script src="/lanhu-bootstrap/js/less.min.js"></script>
 <script src="/lanhu-bootstrap/js/jquery.i18n.properties.js"></script>
  
@@ -8,7 +8,12 @@
 
 <link rel="stylesheet" href="/lanhu-bootstrap/css/head.css">
 <link rel="stylesheet" href="/lanhu-bootstrap/css/bootstrap.min.css"
-	integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
+	integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
+	
+<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/zeroModal.css">
+<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/normalize.css" />
+
+	
 <style>
 #common-navbar-head .dropdown-menu{
 	top:80%;
@@ -18,7 +23,17 @@
 }
 
 </style>
-
+	<input type="hidden" class="head_success i18n-input"  i18n="head_success" />
+			<input type="hidden" class="head_warning i18n-input"  i18n="head_warning" />
+		
+		
+<input type="hidden" class="head_okTitle i18n-input"  i18n="head_okTitle" />
+		<input type="hidden" class="head_cancelTitle i18n-input"  i18n="head_cancelTitle" />
+<input type="hidden" class="head_10M i18n-input"  i18n="head_10M" />
+		<input type="hidden" class="head_jpgpng i18n-input"  i18n="head_jpgpng" />
+		
+		
+		
 <div class="container-fluid" id="common-navbar-head" style="
     padding: 0px;
     margin: 0px;
@@ -57,40 +72,61 @@
 
 
 								</li>
-
-								<li class="dropdown head_li_user">
-									<a data-toggle="dropdown"  class="dropdown-toggle" href="#">userName</a>
+								<li class="dropdown loginUserNo">
+										<a   href="../signin/signin.html" class="i18n-text" i18n="headcommon1">Sign up /Sign in</a>
+										
+								</li>
+								<li class="dropdown head_li_user loginUser" style="display: none;">
+									
+									<a data-toggle="dropdown"   class="dropdown-toggle userName " href="#">userName</a>
 									<ul class="dropdown-menu">
 										
+										<li>
+											<a href="../company/register.html"  class="head_add" ><img 
+											style="
+											    width: 10px;
+											    height: 14px;
+											    margin-right: 5px;
+											  
+											"
+											
+											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>
-											<a href="../company/register.html">上传公司信息</a>
+											<a href="../lanhu/index.html" class="i18n-text" i18n="headcommon3">My posts</a>
 										</li>
 										<li>
-											<a href="../company/postproject.html">发布项目</a>
+											<a href="../moments/index.html" class="i18n-text" i18n="headcommon4">My moments</a>
 										</li>
 										<li>
-											<a href="../moments/postmoment.html">发布时刻</a>
+											<a href="../favorites/index.html" class="i18n-text" i18n="headcommon5">My Favorites</a>
 										</li>
+										<li>
+											<a href="../company/register.html" class="i18n-text" i18n="headcommon6">Edit profile</a>
+										</li>
+										
+										
 										<li class="divider" style="height: 2px;">&nbsp;</li>
 										
 										<li>
-											<a href="#">退出</a>
+											<a href="../login/password.html" class="i18n-text" i18n="headcommon7">Password</a>
 										</li>
 										<li>
-											<a href="#">我的</a>
-										</li>
-										<li class="divider" style="height: 2px;">&nbsp;</li>
-										<li>
-											<a href="#">修改密码</a>
+											<a href="#" class="headSignout" class="i18n-text" i18n="headcommon8">Sign out</a>
 										</li>
+										
 									</ul>
 								</li>
 
-								<li>
-									<a href="#" style="
-    margin-top: -8px;
-"> <img class="img1" referrerpolicy="no-referrer"
+								<li  style="display: none;" class="loginUser" >
+									
+									<a href="#"  class="head_add" style="
+										margin-top: -8px;
+									"> <img class="img1" referrerpolicy="no-referrer"
 											src="/lanhu-bootstrap/assets/img/head_add.png">
 									</a>
 								</li>
@@ -104,3 +140,8 @@
 		</div>
 	</div>
 </div>
+	<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+			<script src="../../js/ie10-viewport-bug-workaround.js"></script>
+			
+			<script src="../../assets/plugin/zeroModal/js/zeroModal.js"></script>
+		

+ 12 - 21
html/landingpage/landingpage.html

@@ -108,28 +108,18 @@
 	</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">
 		<div class="container-fluid" style="padding:0;">
-			<div class="top">
-				<div class="top-item">
-					<img  src="../../assets/img/head_logo.png"/>
-				</div>
-				<div class="top-item top-item-active">
-					<span>LIBRARY</span>
-				</div>
-				<div class="top-item">
-					<span>MOMENTS</span>
-				</div>
-				<div class="top-item" style="flex:1;"></div>
-				<div class="top-item">
-					<img src="../../assets/img/head_icon_language.png"><span>&nbsp;&nbsp;English</span>
-				</div>
-				<div class="top-item us-name-item">
-					<span>Sign in / Sign up</span>
-				</div>
-				<div class="top-item">
-					<img  src="../../assets/img/head_add.png" style="height: 40px;">
-				</div>
-			</div>
+		 
 			
 			<div class="tool-box">
 				<div class="newest-list">
@@ -232,5 +222,6 @@
 				</div>
 			{{ /each }}
 		</script>
+		</main>
 	</body>
 </html>

+ 4 - 28
html/lanhu/index.html

@@ -1,28 +1,4 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title></title>
-		 			<script src="/lanhu-bootstrap/js/jquery-1.9.1.min.js"></script>
-
-	</head>
-
-	<body>
-		<div id="head"></div>
-		<script>
-		$(function(){
-			$("#head").load("../head.html");
-		})
-		</script>
-		<main style="margin-top: 100px;">
-			<h1>1111</h1>
-			
-			<div>
-				<span   class="i18n-text" i18n="signOut">signOut</span>
-			    <input type="search"  selectname="searchPlaceholder" selectattr="placeholder">
-			</div>
-		
-		</main>
-		
-	</body>
-</html>
+<script>
+//首页
+window.location.href="../landingpage/landingpage.html"
+</script>

+ 0 - 9
html/login/index.html

@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title></title>
-	</head>
-	<body>
-	</body>
-</html>

+ 1 - 0
html/login/password.html

@@ -0,0 +1 @@
+找回密码

+ 369 - 0
html/moments/index.html

@@ -0,0 +1,369 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title></title>
+		<script src="../../js/jquery-1.9.1.min.js"></script>
+		<script src="../../js/jquery.i18n.properties.js"></script>
+		<script src="../../assets/js/language.js"></script>
+		<link rel="stylesheet" type="text/css" href="../../css/viewer.min.css" rel="stylesheet">
+		<link rel="stylesheet" type="text/css" href="../../css/bootstrap.min.css" rel="stylesheet">
+
+		<link rel="stylesheet" type="text/css" href="../../assets/plugin/bootstrap-select/css/bootstrap-select.css" />
+		<style>
+			.top {
+				padding: 10px 50px 0px 50px;
+				border-bottom: 1px solid #e8e8e8;
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: space-between;
+				align-items: center;
+				height: 80px;
+				box-sizing: border-box;
+				font-family: Avenir-Black;
+			}
+
+			.top-item {
+				padding: 0px 20px;
+				line-height: 70px;
+				font-weight: bold;
+				cursor: pointer;
+			}
+
+			.top-item-active {
+				border-bottom: 3px solid #f83d5a;
+				color: #f83d5a;
+			}
+
+			.us-name-item {
+				width: 160px;
+			}
+
+			.tool-box {
+				padding: 25px 50px 20px 50px;
+				border-bottom: 1px solid #f2f2f2;
+			}
+
+			.newest-list,
+			.search-list {
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: flex-start;
+				align-items: center;
+				/* height: 40px; */
+				box-sizing: border-box;
+				font-family: Arial;
+			}
+
+			.newest-list .newest-item {
+				margin: 0px 40px 0px 0px;
+				color: #999;
+				cursor: pointer;
+			}
+
+			.search-list .search-item {
+				margin-right: 10px;
+			}
+
+			.search-list .search-item label {
+				display: block;
+			}
+
+			.dropdown button {
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: flex-start;
+				align-items: center;
+			}
+
+			.project-box {
+				padding: 25px 35px 20px 35px;
+			}
+
+			.bootstrap-select>.dropdown-toggle {
+				padding-top: 10px;
+				padding-bottom: 10px;
+				padding-right: 32px;
+			}
+
+			.sel-icon {
+				position: absolute;
+				top: 50%;
+				right: 10px;
+				margin-top: -7px;
+				vertical-align: middle;
+			}
+
+			.my-select {
+				width: 280px !important;
+			}
+
+			.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;
+				/*防止内容溢出导致布局错位*/
+			}
+		</style>
+	</head>
+
+	<body>
+		<div id="head"></div>
+		<script>
+			$(function() {
+				$("#head").load("../head.html", function() {
+					$("#common-navbar-head .active").removeClass("active")
+					$("#common-navbar-head .head_li_Moments").addClass("active")
+				});
+			})
+		</script>
+		<main class="jpmain">
+			<div class="container-fluid" style="padding:0;">
+
+
+				<div class="tool-box">
+					<div class="newest-list">
+						<div class="newest-item" style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
+						<div class="newest-item">All</div>
+						<div class="newest-item">x &nbsp;Masterplanning</div>
+						<div class="newest-item">Architecture</div>
+						<div class="newest-item">Interiors</div>
+						<div class="newest-item">Lighting</div>
+						<div class="newest-item">Landscape</div>
+						<div class="newest-item">AV&nbsp;&amp;&nbsp;Acoustics</div>
+						<div class="newest-item">MEP</div>
+						<div class="newest-item">Landscape</div>
+						<div class="newest-item">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>Location</label>
+							<select class="selectpicker">
+								<option>By project</option>
+								<option>By company</option>
+							</select>
+
+						</div>
+
+						<div class="search-item">
+							<label>&nbsp;</label>
+							<select class="selectpicker" multiple>
+								<option>Canada</option>
+								<option>China</option>
+								<option>France</option>
+								<option>Germany</option>
+							</select>
+
+						</div>
+
+
+
+						<div class="search-item">
+							<label>Disciplines</label>
+							<select class="selectpicker my-select" multiple>
+								<option>Architecture</option>
+								<option>Landscape</option>
+								<option>AV</option>
+								<option>Mustard</option>
+								<option>Landscape</option>
+							</select>
+						</div>
+
+
+						<div class="search-item">
+							<label style="display: block;">&nbsp;</label>
+							<button type="button" class="btn btn-default"
+								style="height: 42px;background-color: #000000;color: #fff;padding:0px 20px;">Submit</button>
+						</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="/lanhu-bootstrap/assets/img/moments_add.png" style="
+								    padding: 20px;
+								">
+
+
+						</dt>
+						<style>
+						.main4{
+							width: 100%;
+							    height: 8px;
+							    background-color: rgba(239, 241, 244, 1);
+							    margin-top: 51px;
+						}
+							.imguploadspan img {
+								width: 33%;
+								max-width: 270px;
+								max-height: 270px;
+								border: 0px;
+								border-radius: 5px;
+								margin-top: 3px;
+								min-width: 50px;
+							}
+
+							.Follow {
+								margin-top: 25px;
+								float: right;
+								border: 0px;
+								height: 48px;
+								border-radius: 8px;
+								background-color: rgba(239, 241, 244, 1);
+								width: 90px;
+								overflow-wrap: break-word;
+								color: rgba(24, 24, 24, 1);
+								;
+								font-size: 16px;
+								font-family: Avenir-Medium;
+								white-space: nowrap;
+								line-height: 22px;
+								text-align: center;
+							}
+
+							.Following {
+								background-color: rgba(248, 61, 90, 1);
+								color: rgba(255, 255, 255, 1);
+							}
+							.title{
+								
+								    overflow-wrap: break-word;
+								    color: rgba(24, 24, 24, 1);
+								    font-size: 28px;
+								    font-family: Avenir-Black;
+								    white-space: nowrap;
+								    line-height: 28px;
+								    text-align: left;
+							}
+							.date{
+								    overflow-wrap: break-word;
+								    color: rgba(130, 130, 130, 1);
+								    font-size: 16px;
+								    font-family: Avenir-Medium;
+								    white-space: nowrap;
+								    line-height: 22px;
+								    text-align: left;
+							}
+							.txt{
+								    overflow-wrap: break-word;
+								    color: rgba(24, 24, 24, 1);
+								    font-size: 16px;
+								    font-family: Avenir-Roman;
+								    line-height: 22px;
+								    text-align: left;
+								    overflow: hidden;
+								    text-overflow: ellipsis;
+							}
+						</style>
+						<div class="imguploadlist">
+							
+						</div>
+						
+						
+					</div>
+					
+				</div>
+
+
+			</div>
+			<script src="../../js/bootstrap.min.js"></script>
+			<script src="/lanhu-bootstrap/assets/js/moments.js"></script>
+			<script src="../../assets/plugin/template-web.js"></script>
+			<script id="flow-photos" type="text/html" >
+			{{each  objs  obj index}}
+			<dd >
+				
+				
+			
+			<div class="span12 " style="margin: 30px 0;     overflow-wrap: break-word;
+					color: rgba(24, 24, 24, 1);
+					font-size: 18px;
+					font-family: PingFangSC-Medium;
+					white-space: nowrap;">
+				<img src="{{obj.logo}}" style="width: 60px;height: 60px;" >
+				
+				{{obj.name}}
+				
+				<button type="button" style=" {{obj.isfollow?'display: none;':''}}" i18n="head_Following" class="Follow Following i18n-text">Following</button>
+				<button type="button"  style=" {{!obj.isfollow?'display: none;':''}}"  i18n="head_Follow" class="Follow Following2 i18n-text">Follow</button>
+			</div>
+			<div class="span12 title" style="margin: 10px 0; ">
+				{{obj.title}}
+			</div>
+			<div class="span12 date" style="margin: 10px 0;">
+				{{obj.date}}
+			</div>
+			<div class="span12 txt " style="margin: 10px 0;">
+			{{obj.txt}}
+			</div>
+			
+			<div class="span12 imguploadspan" style="margin: 20px 0;">
+				{{each    obj.list ob index2}}
+				<img data-original="{{ob}}"
+					src="{{ob}}">
+				{{/each}}
+			</div>
+			<div class="span12 "  style="margin: 0;">
+			
+			<div class="main4 "></div>
+				</div>
+				</dd>
+				{{/each}}
+			</script>
+			<script src="../../assets/plugin/bootstrap-select/js/bootstrap-select.min.js"></script>
+			<script src="../../js/viewer-jquery.min.js"></script>
+		</main>
+	</body>
+</html>

+ 16 - 6
html/moments/postmoment.html

@@ -10,16 +10,22 @@
 		<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>
+		<script src="/lanhu-bootstrap/assets/js/moments-postmoment.js"></script>
 
 	</head>
-	<body>
+	<body>
+		<input type="hidden" class="head_success i18n-input"  i18n="head_success" />
+		<input type="hidden" class="head_warning i18n-input"  i18n="head_warning" />
+		<input type="hidden" class="signin_success i18n-input"  i18n="company_postproject_success" />
+		<input type="hidden" class="signin_warning i18n-input"  i18n="company_postproject_warning" />
+		
+		
 		<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")
+					 $("#common-navbar-head .head_li_user").addClass("active")
 				});
 			})
 		</script>
@@ -170,7 +176,7 @@
 											
 										</dt>
 										<dd>
-											<textarea style="height: 90px;" rows="3" class="i18n-placeholder"
+											<textarea style="height: 90px;" rows="3" class="i18n-placeholder Projectdescriptiontxt"
 												 maxlength="500"
 												i18n="company_postproject_Projectdescriptiontxt"
 												placeholder=""></textarea>
@@ -179,9 +185,13 @@
 
 								</div>
 								<div class="row-fluid">
-									<button type="submit" id="registerupload" class="hbutton i18n-text"
+									<button type="submit"   class="Publish hbutton i18n-text"
 									style="background-color: #e64e5e; float: right;"
-										i18n="company_postproject_Publish now"  >upload</button>
+										i18n="company_postproject_Publish now"  >upload</button>
+										
+										<button type="submit"   class="Renew hbutton i18n-text"
+										style="background-color: #e64e5e; float: right;display: none;"
+											i18n="company_postproject_Renew"  >upload</button>
 								</div>
 						</div>
 			</form>

+ 27 - 15
html/signin/signin.html

@@ -111,30 +111,36 @@
 		</style>
 	</head>
 	<body>
+		<input type="hidden" class="head_success i18n-input"  i18n="head_success" />
+		<input type="hidden" class="head_warning i18n-input"  i18n="head_warning" />
+		<input type="hidden" class="signin_success i18n-input"  i18n="signin_success" />
+		<input type="hidden" class="signin_warning i18n-input"  i18n="signin_warning" />
+		
+		
 		<div class="container">
 			<div class="row">
 			      <div class="col-md-7" style="height:100vh;box-sizing: border-box;padding: 20px 0px;">
 					  <div class="left-box">
-						  <p style="font-size: 36px;">Explore</p>
-						  <p style="font-size: 36px;">all creativety</p>
-						  <p style="color:#d2d2d2;">There are many variations of passages of Lorem lpsum available,</p>
-						  <p style="color:#d2d2d2;">but the majority have suffered alteration in some form,by injected humour.</p>
+						  <p style="font-size: 36px;" class="i18n-text"  i18n="signin_Explore" >Explore</p>
+						  <p style="font-size: 36px;" class="i18n-text"  i18n="signin_Explore1">all creativety</p>
+						  <p style="color:#d2d2d2;" class="i18n-text"  i18n="signin_Explore2">There are many variations of passages of Lorem lpsum available,</p>
+						  <p style="color:#d2d2d2;" class="i18n-text"  i18n="signin_Explore3">but the majority have suffered alteration in some form,by injected humour.</p>
 					  </div>
 				  </div>
 			      <div class="col-md-4 col-md-offset-1" style="height:100vh;display: flex;flex-flow: column nowrap;justify-content: center;">
-					<h3 class="login-tit">Sign in</h3>
+					<h3 class="login-tit i18n-text"  i18n="signin_Sign in" >Sign in</h3>
 							
 					<form class="signin-form">
 						<div class="form-group form-group-custom">
-						  <label for="email">Email</label>
-						  <input type="email" class="form-control" id="email" name="email" placeholder="Enter your email" required>
+						  <label for="email"  class="i18n-text"  i18n="signin_Email">Email</label>
+						  <input type="email" class="form-control i18n-placeholder" i18n="signin_Email1" id="email" name="email" placeholder="Enter your email" required>
 						  <span class="input-tool-icon glyphicon glyphicon-remove"></span>
 						</div>
 						
 						<div class="form-group form-group-custom">
-						  <label for="pwd">Password</label>
-						  <label class="tip-txt-input">forgot password ?</label>
-						  <input type="password" class="form-control" id="pwd" name="pwd" placeholder="Enter your password" required>
+						  <label for="pwd"  class="i18n-text"  i18n="signin_Password">Password</label>
+						  <label class="tip-txt-input i18n-text" i18n="signin_Password1">forgot password ?</label>
+						  <input type="password" class="form-control i18n-placeholder"  i18n="signin_Password2"  id="pwd" name="pwd" placeholder="Enter your password" required>
 						  <span class="input-tool-icon glyphicon glyphicon-eye-open"></span>
 						</div>
 						
@@ -143,18 +149,24 @@
 								        
 						<div class="checkbox-box">
 						 
-							<input type="checkbox" value="agree-me"> 
-							<span class="tip-txt-grey">Sign in means you’re okay with our Terms of <span class="tip-txt-link">Services, Privacy policy ,</span> and our default <span class="tip-txt-link">Notification settings.</span></span>
+							<input type="checkbox" class="agreeme" value="agree-me" > 
+							<span class="tip-txt-grey">
+							<span class="i18n-text" i18n="signin_agree">Sign in means you’re okay with our Terms of </span>
+							<span class="tip-txt-link i18n-text" i18n="signin_agree1">Services, Privacy policy ,</span> 
+							<span class="i18n-text" i18n="signin_agree2">and our default </span>
+							<span class="tip-txt-link i18n-text" i18n="signin_agree3">Notification settings.</span></span>
 						 
 						</div>  
 							
 							
 						
 						
-						<button class="btn btn-lg btn-danger btn-block" type="submit">Sign in</button>
+						<button class="btn btn-lg btn-danger btn-block i18n-text" i18n="signin_Sign in" type="submit">Sign in</button>
 					</form>
 					
-					<div style="margin-top:40px;text-align: center;"><span class="tip-txt-grey">Not a member ? </span><span class="tip-txt-link" data-forward="../signup/signup.html">Sign up now</span></div>  
+					<div style="margin-top:40px;text-align: center;">
+						<span class="tip-txt-grey i18n-text" i18n="signin_signup2">Not a member ? </span>
+						<span class="tip-txt-link i18n-text" i18n="signin_signup" data-forward="../signup/signup.html">Sign up now</span></div>  
 				  </div>      
 			</div>
 			
@@ -163,7 +175,7 @@
 		
 		
 		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-		<script src="https://fastly.jsdelivr.net/npm/@bootcss/v3.bootcss.com@1.0.35/assets/js/ie10-viewport-bug-workaround.js"></script>
+		<script src="../../js/ie10-viewport-bug-workaround.js"></script>
 		<script src="../../assets/js/signin.js"></script>
 		<script src="../../assets/plugin/zeroModal/js/zeroModal.js"></script>
 	</body>

+ 36 - 21
html/signup/signup.html

@@ -119,55 +119,70 @@
 		</style>
 	</head>
 	<body>
+		<input type="hidden" class="head_success i18n-input"  i18n="head_success" />
+		<input type="hidden" class="head_warning i18n-input"  i18n="head_warning" />
+		<input type="hidden" class="signin_success i18n-input"  i18n="signup_success" />
+		<input type="hidden" class="signin_warning i18n-input"  i18n="signin_warning" />
+		
 		<div class="container">
 			<div class="row">
 			      <div class="col-md-7" style="height:100vh;box-sizing: border-box;padding: 20px 0px;">
-					  <div class="left-box">
-						  <p style="font-size: 36px;">Explore</p>
-						  <p style="font-size: 36px;">all creativety</p>
-						  <p style="color:#d2d2d2;">There are many variations of passages of Lorem lpsum available,</p>
-						  <p style="color:#d2d2d2;">but the majority have suffered alteration in some form,by injected humour.</p>
-					  </div>
+					 <div class="left-box">
+					 						  <p style="font-size: 36px;" class="i18n-text"  i18n="signin_Explore" >Explore</p>
+					 						  <p style="font-size: 36px;" class="i18n-text"  i18n="signin_Explore1">all creativety</p>
+					 						  <p style="color:#d2d2d2;" class="i18n-text"  i18n="signin_Explore2">There are many variations of passages of Lorem lpsum available,</p>
+					 						  <p style="color:#d2d2d2;" class="i18n-text"  i18n="signin_Explore3">but the majority have suffered alteration in some form,by injected humour.</p>
+					 </div>
 				  </div>
 			      <div class="col-md-4 col-md-offset-1" style="height:100vh;display: flex;flex-flow: column nowrap;justify-content: center;">
-					<h3 class="login-tit">Sign up</h3>
+					<h3 class="login-tit i18n-text"  i18n="signin_Sign up" >Sign up</h3>
 							
 					<form class="signup-form">
 						<div class="form-group form-group-custom">
-						  <label for="email">Email</label>
-						  <input type="email" class="form-control" id="email" placeholder="Enter your email" required>
+						  <label for="email"  class="i18n-text"  i18n="signin_Email">Email</label>
+						  <input type="email" class="form-control i18n-placeholder" i18n="signin_Email1" id="email" name="email" placeholder="Enter your email" required>
 						  <span class="input-tool-icon glyphicon glyphicon-remove"></span>
 						</div>
 						
 						<div class="form-group form-group-custom">
-						  <label for="pwd">Password</label>
-						  <input type="password" class="form-control" id="pwd" name="pwd" placeholder="Enter your password" required>
+						  <label for="pwd"  class="i18n-text"  i18n="signin_Password">Password</label>
+						
+						  <input type="password" class="form-control i18n-placeholder"  i18n="signin_Password2"  id="pwd" name="pwd" placeholder="Enter your password" required>
 						  <span class="input-tool-icon glyphicon glyphicon-eye-open"></span>
 						</div>
 						
 						<div class="form-group form-group-custom">
-						  <label for="pwd">Confirm password</label>
-						  <input type="password" class="form-control" id="pwdagain" name="pwdagain" placeholder="Enter your password again" required equalTo="#pwd">
+						  <label for="pwd"  class="i18n-text"  i18n="signin_Password3">Confirm password</label>
+						 
+							<input type="password" class="form-control i18n-placeholder"  i18n="signin_Password4"  id="pwdagain" name="pwdagain" placeholder="Enter your password again" required equalTo="#pwd">
+						
 						  <span class="input-tool-icon glyphicon glyphicon-eye-open"></span>
 						</div>
 						
+						
 								        
 						<div class="checkbox-box">
 						 
-							<input type="checkbox" value="agree-me" class="agree-chkbox"> 
-							<span class="tip-txt-grey">Creating a account means you’re okay with our Terms of <span class="tip-txt-link">Services, Privacy policy ,</span> and our default <span class="tip-txt-link">Notification settings.</span></span>
-						 
+							<input type="checkbox" value="agree-me" class="agree-chkbox agreeme"> 
+						<span class="tip-txt-grey">
+						<span class="i18n-text" i18n="signin_agree4">Sign in means you’re okay with our Terms of </span>
+						<span class="tip-txt-link i18n-text" i18n="signin_agree1">Services, Privacy policy ,</span> 
+						<span class="i18n-text" i18n="signin_agree2">and our default </span>
+						<span class="tip-txt-link i18n-text" i18n="signin_agree3">Notification settings.</span></span>
+												 
 						</div>  
 							
 							
+						<button class="btn btn-lg btn-danger btn-block create-btn i18n-text" i18n="signin_Create account" type="submit">Sign in</button>
 						
 						
-						<button class="btn btn-lg btn-danger btn-block create-btn" type="submit">Create account</button>
-					</form>
+ 					</form>
 					
-
-					<div style="margin-top:40px;text-align: center;"><span class="tip-txt-grey">Already a member ? </span><span class="tip-txt-link" data-forward="../signin/signin.html">Sign in now</span></div>  
+<div style="margin-top:40px;text-align: center;">
+						<span class="tip-txt-grey i18n-text" i18n="signin_signup4">Not a member ? </span>
+						<span class="tip-txt-link i18n-text" i18n="signin_signup3" data-forward="../signin/signin.html">Sign up now</span></div>  
 				  </div>      
+ 				  </div>      
 			</div>
 			
 		
@@ -175,7 +190,7 @@
 		
 		
 		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-		<script src="https://fastly.jsdelivr.net/npm/@bootcss/v3.bootcss.com@1.0.35/assets/js/ie10-viewport-bug-workaround.js"></script>
+		<script src="../../js/ie10-viewport-bug-workaround.js"></script>
 		<script src="../../assets/js/signup.js"></script>
 		<script src="../../assets/plugin/zeroModal/js/zeroModal.js"></script>
 	</body>

+ 65 - 3
i18n/strings.properties

@@ -1,8 +1,70 @@
-head_Library=Library
-head_Moments=Moments
+head_Library=LIBRARY
+head_Moments=MOMENTS
+head_success=success
+head_warning=warning
+head_okTitle=OK
+head_cancelTitle=cancel
+
+head_10M=only pictures up to 10m are supported
+head_jpgpng=BMP, JPG, PNG, JPEG picture format only
+head_Follow=Follow
+head_Following=Following
+
+headcommon1=Sign up /Sign in
+headcommon2=Go post projects
+headcommon3=My posts
+headcommon4=My moments
+headcommon5=My Favorites
+headcommon6=Edit profile
+headcommon7=Password
+headcommon8=Sign out
+
+moments_Show=Show the world of your createvity
+moments_Here=Here post your daily designs
+
+
+company_register_success=The company information has been uploaded successfully
+company_register_warning=Please upload the company logo
+
+company_postproject_success=Share success
+company_postproject_warning=At least one picture last time
+
 
 signOut=Login Out
 
+signup_success=Your have successfully registered
+
+signin_success=Login successful
+signin_warning=Please tick
+
+signin_Explore=Explore
+signin_Explore1=all creativety
+signin_Explore2=There are many variations of passages of Lorem lpsum available,
+signin_Explore3=but the majority have suffered alteration in some form,by injected humour.
+
+signin_Sign in=Sign in
+signin_Sign up=Sign up
+signin_Email=Email
+signin_Email1=Enter your email
+signin_Password=Password
+signin_Password1=forgot password ?
+signin_Password2=Enter your password
+signin_Password3=Confirm password
+signin_Password4=Enter your password again
+
+signin_agree=Sign in means you’re okay with our Terms of 
+signin_agree1=Services, Privacy policy ,
+signin_agree2=and our default 
+signin_agree3=Notification settings.
+signin_agree4=Creating a account means you’re okay with our Terms of 
+
+
+signin_signup=Sign up now
+signin_signup2=Not a member ?
+signin_signup3=Sign up now
+signin_signup4=Already a member  ?
+signin_Create account=Create account
+
 
 company_postproject_What are you working on=What are you working on ?
 company_postproject_Project name=Project name
@@ -23,7 +85,7 @@ company_postproject_Graphics & Signage=Graphics & Signage
 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…
 

+ 63 - 2
i18n/strings_zh.properties

@@ -1,8 +1,69 @@
 signOut=退出
 head_Library=图书馆
 head_Moments=时刻
-
-
+head_success=操作成功
+head_warning=警告
+head_Follow=关注
+head_Following=关注中
+head_okTitle=确定
+head_cancelTitle=关闭
+head_10M=仅支持不超过10M的图片
+head_jpgpng=仅限bmp,jpg,png,jpeg图片格式
+
+headcommon1=注册/登录
+headcommon2=发布项目
+headcommon3=我的帖子
+headcommon4=我的时刻
+headcommon5=我的最爱
+headcommon6=编辑配置文件
+headcommon7=密码
+headcommon8=注销
+
+
+moments_Show=展示你创造力的世界
+moments_Here=在这里发布你的日常设计
+
+
+
+company_register_success=公司信息已经更新成功
+company_register_warning=上传公司logo
+
+company_postproject_Renew=更新
+company_postproject_success=分享成功
+company_postproject_warning=至少选择一张图片上传
+
+
+signin_success=登陆成功
+signup_success=您的帐户已成功注册
+signin_warning=请勾选
+
+signin_Explore=勘探
+signin_Explore1=创意十足
+signin_Explore2=Lorem lpsum的段落有很多变体,
+signin_Explore3=但大多数人都因注入幽默而经历了某种形式的改变。
+
+signin_Sign in=登录
+signin_Sign up=注册
+signin_Email=电子邮件
+signin_Email1=输入你的电子邮件
+signin_Password=密码
+signin_Password1=忘记密码了?
+signin_Password2=输入密码
+signin_Password3=确认密码
+signin_Password4=再次输入密码
+
+signin_agree=登录表示您同意我们的服务条款
+signin_agree1=服务、隐私政策、
+signin_agree2=我们的违约
+signin_agree3=通知设置。
+signin_agree4=创建一个账户意味着你同意我们的条款
+
+
+signin_signup=马上注册
+signin_signup2=没有账户?
+signin_signup3=马上登陆
+signin_signup4=已有账户?
+signin_Create account=创建帐户
 
 company_postproject_What are you working on=你在做什么?
 company_postproject_Project name=项目名称

+ 23 - 0
js/ie10-viewport-bug-workaround.js

@@ -0,0 +1,23 @@
+/*!
+ * IE10 viewport hack for Surface/desktop Windows 8 bug
+ * Copyright 2014-2019 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/v3-dev/LICENSE)
+ */
+
+// See the Getting Started docs for more information:
+// https://getbootstrap.com/docs/3.4/getting-started/#support-ie10-width
+
+(function () {
+  'use strict';
+
+  if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
+    var msViewportStyle = document.createElement('style')
+    msViewportStyle.appendChild(
+      document.createTextNode(
+        '@-ms-viewport{width:auto!important}'
+      )
+    )
+    document.querySelector('head').appendChild(msViewportStyle)
+  }
+
+})();

+ 4 - 1
js/jquery.i18n.properties.js

@@ -267,7 +267,10 @@
                 $.i18n.map[key] = arr;
             }
         }
-
+		if(value==null){
+			console.log("errorerrorerror:"+key)
+		}
+	
         if (value.length === 0) {
             return "";
         }

File diff ditekan karena terlalu besar
+ 0 - 3
js/jquery.validate.min.js


File diff ditekan karena terlalu besar
+ 9 - 0
js/viewer-jquery.min.js


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini