Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/helpers/application_helper.rb

@@ -494,7 +494,7 @@ module ApplicationHelper
   def principals_check_box_tags_ex(name, principals)
     s = ''
     principals.each do |principal|
-      s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h principal.userInfo }</label>\n"
+      s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id)}</label>\n"
     end
     s.html_safe
   end

app/views/courses/_course_form.html.erb

@@ -29,7 +29,7 @@
     <%= l(:label_tags_course_name) %>
     <span class="required">*&nbsp;&nbsp;</span>
   </label>
-  <input id="course_name" type="text" value="<%= @course.name %>" style="width:490px;size:60;" name = "course[name]" maxlength="100">
+  <input id="course_name" type="text" value="<%= @course.name %>" style="width:490px; size:60;" name = "course[name]" maxlength="100">
 </p>
 
 <%= f.fields_for @course do |m| %>
@@ -38,7 +38,7 @@
             <table>
               <tr>
                 <td>
-                  <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px">
+                  <span class="info" align="right" style="width: 90px; font-weight: bold ; margin-left:19px">
                     <%= l(:label_class_period) %>
                     <span class="required"> *&nbsp;&nbsp;</span>
                   </span>
@@ -118,7 +118,7 @@
         </label>
         <input id="course_course_password" type="text" style="width:488px;margin-left: 10px;" value="<%= @course.password %>" size="60" name="course[password]"/>
       </p>
-      <em class="info" style="margin-left:95px;">
+      <em class="info" style="margin-left:95px; padding-left: 5px;">
         <%= l(:text_command) %>
       </em>
 <% end %>

app/views/courses/new.html.erb

@@ -6,7 +6,7 @@
 <%= labelled_form_for @course do |f| %>
     <div class="box tabular">
      <%= render :partial => 'course_form', :locals => { :f => f } %>
-      <span style="padding-left: 60px">
+      <span style="padding-left: 60px; margin-left: 36px">
         <%= submit_tag l(:button_create), :class => "enterprise"%>
       </span>
       <!-- <%#= submit_tag l(:button_create_and_continue), :name => 'course_continue' %> -->

app/views/files/_attachement_list.html.erb

@@ -22,7 +22,7 @@
 </span>
 </div>
 
-<button name="button" class="f_l ml10" onclick="_file.click()" onmouseover="this.focus()" type="button" style="width:80px; height:26px;">上传文件</button>
+<button name="button" class="f_l ml10" onclick="_file.click()" onmouseover="this.focus()" type="button" style="width:20%; height:26%;"><%= l(:label_browse)%></button>
 <%= file_field_tag 'attachments[dummy][file]',
                    :id => '_file',
                    :class => 'file_selector',

app/views/files/_upload_show.html.erb

@@ -1,15 +1,15 @@
 <div id="popbox_upload" style="margin-top: -30px;margin-left: -20px;margin-right: -10px;">
   <div class="upload_con">
-    <h2>上传资源</h2>
+    <h2><%= l(:label_upload_files)%></h2>
     <div class="upload_box">
       <%= error_messages_for 'attachment' %>
-      <div id="network_issue" style="color: red; display: none;">上传出现错误，请您检查您的网络环境，并刷新页面重新上传。</div>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
       <%= form_tag(course_files_path(course), :multipart => true,:remote => true,:method => :post,:name=>"upload_form") do %>
-          <label style="margin-top:3px;">文件浏览：</label>
+          <label style="margin-top:3px;"><%= l(:label_file_upload)%></label>
           <%= render :partial => 'attachement_list',:locals => {:course => course} %>
           <div class="cl"></div>
-          <a id="submit_resource" href="javascript:void(0);" class="upload_btn" onclick="submit_resource();">确&nbsp;&nbsp;认</a>
+          <a id="submit_resource" href="javascript:void(0);" class="upload_btn" onclick="submit_resource();"><%= l(:button_confirm)%></a>
-          <a href="javascript:void(0);" class="upload_btn upload_btn_grey" onclick="closeModal();">取&nbsp;&nbsp;消</a>
+          <a href="javascript:void(0);" class="upload_btn upload_btn_grey" onclick="closeModal();"><%= l(:button_cancel)%></a>
       <% end %>
     </div>
 

app/views/welcome/_search_course.html.erb

@@ -47,7 +47,7 @@ form #search_type{
 <%#完了把上面东西放到 .css 里%>
 </style>
 <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
-<div class="project-search" style="float: right; width: 260px">
+<div class="project-search" style="float: right">
 	<div class='search_widget'>
 		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字',  :size => 27, style: "float:left"  %>
 		<%= select_tag(:search_type, options_for_select(select_option), :style => "float:right" ) %>

app/views/welcome/_search_project.html.erb

@@ -86,7 +86,7 @@ form #search_by
   }
 </script>
 <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
-<div class="project-search" style="float: right; width: 260px">
+<div class="project-search" style="float: right">
 	<div class='search_widget' >
 
 		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', style:"float:left" %>

config/locales/en.yml

@@ -249,7 +249,11 @@ en:
   mail_issue_attachments: "Attachments："
   mail_issue_reply: "Want reply"
   #end
-  
+  # modified by meng 
+  label_file_upload: Resource files
+  label_file_upload_error_messages: "Upload error, please check your network environment, and refresh the page to upload."
+  button_confirm: Confirm
+  # end 
   field_name: Name
   field_description: Description
   field_summary: Summary

config/locales/zh.yml

@@ -264,7 +264,11 @@ zh:
   mail_issue_attachments: "附件："
   mail_issue_reply: "我要回复"
   #end
-  
+  # modified by meng 
+  label_file_upload: 资源文件
+  label_file_upload_error_messages: "上传出现错误，请您检查您的网络环境，并刷新页面重新上传。"
+  button_confirm: 确认
+  # end 
   field_name: 名称
   #added by huang
   field_tea_name: 教师