From 874dcc2b89368ae871592e79a8616b1b3b6e8872 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Fri, 10 Apr 2015 17:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form_course.html.erb | 2 +-
 app/views/welcome/_search_project.html.erb  | 2 +-
 public/javascripts/attachments.js           | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb
index 39c760690..1e81aaf65 100644
--- a/app/views/attachments/_form_course.html.erb
+++ b/app/views/attachments/_form_course.html.erb
@@ -38,7 +38,7 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
 <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+<%= button_tag "#{l(:button_browse)}", :type=>"button", :onclick=>"_file.click()",:class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
 <%= file_field_tag 'attachments[dummy][file]',
       :id => '_file',
       :class => 'file_selector',
diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb
index b1da1f003..4f534ed2f 100644
--- a/app/views/welcome/_search_project.html.erb
+++ b/app/views/welcome/_search_project.html.erb
@@ -90,7 +90,7 @@ form #search_by
 <div class="project-search" style="float: right">
     <%= submit_tag l(:label_search), :class => "enterprise", :name => nil,:style =>"float: right; margin-left:3px;margin-top:2px" %>
 	<div class='search_widget' >
-		<%= text_field_tag :q, nil, :placeholder => l('welcome.search.information'), style:"float:left;" %>
+		<%= text_field_tag :q, nil, :placeholder => l('welcome.search.information'), style:"float:left; width:185px;" %>
         <input type="text" name="search_by_input" style="display: none" id="search_by_input" value="0">
 		<%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();", :style => "float:right" ) %>
         <%= select_tag(:search_by,options_for_select([[l('welcome.search.select.userinfo.nickname'),"0"],[l('welcome.search.select.userinfo.showname'),"1"],[l('welcome.search.select.userinfo.email'),"2"]]), :onchange => "searchByChange();",:style => "float:right" )  %>
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index dc3e0e522..6bfcd05d8 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -37,7 +37,7 @@ function addFile(inputEl, file, eagerUpload) {
         $('<span >'+$(inputEl).data('fieldIsPublic')+':</span>').attr({  'class': 'ispublic-label' }) ,
         $('<input>', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload),
         $('<a>&nbsp</a>').attr({ 'href': "#", 'class': 'remove-upload' }).click(function(){
-            if(confirm('您确定要删除吗？')){
+            if(confirm($(inputEl).data('areYouSure'))){
                 removeFile();
                 if(!eagerUpload){
                     (function(e){
@@ -107,7 +107,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
     //gcm files count and add delete_all link
 
     var count=$('#attachments_fields>span').length;
-    $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+"个文件已上传");
+    $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+$(inputEl).data('fileCount'));
     if(count>=1){
     	var add_attachs=$('.add_attachment');
     	var delete_all=$('.remove_all');	
@@ -141,7 +141,7 @@ function removeFile() {
 
 //gcm delete all file
 function removeAll(){
-	if(confirm("您确定要删除所有文件吗")){
+	if(confirm($(inputEl).data('deleteAllFiles'))){
 		$(".remove-upload").removeAttr("data-confirm");
 		$(".remove-upload").click();
 	}
@@ -196,7 +196,7 @@ function addInputFiles(inputEl) {
         attachmentId = addFile(inputEl, { name: aFilename[ aFilename.length - 1 ] }, false);
         if (attachmentId) {
             $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]'}).hide();
-            $('#upload_file_count').html("已上传"+"<span id=\"count\">"+1+"</span>"+"个文件");
+            $('#upload_file_count').html("<span id=\"count\">"+count+"</span>"+$(inputEl).data('fileCount'));
         }
     }