From aed36229f8b6dd2519808d5445f81407c438b5c4 Mon Sep 17 00:00:00 2001
From: baiyu <whitefeather0126@gmail.com>
Date: Sat, 28 Sep 2013 16:03:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86issues=E9=87=8C?=
 =?UTF-8?q?=E2=80=9C=E9=A1=B6=E2=80=9D=E5=92=8C=E2=80=9C=E8=B8=A9=E2=80=9D?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_list.html.erb          |  17 +++-
 app/views/issues/index.html.erb          |  21 ++--
 app/views/projects/_course_form.html.erb | 116 +++++++++++------------
 config/locales/zh.yml                    |   9 +-
 4 files changed, 91 insertions(+), 72 deletions(-)

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 839940928..4433d29d9 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -69,7 +69,7 @@
 			</tr>
 			<% previous_group = group %>
 			<% end %>
-
+			<div style="float: right">
 			<li id="issue-<%= issue.id %>" class="hascontextmenu-1  <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
 				<% column_content =  ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %>
 
@@ -114,8 +114,11 @@
 						</div>
 					</ul>
 				</ul>
+				
 			</li>
-
+			</div>
+			
+			
 			<% @query.block_columns.each do |column|
 			if (text = column_content(column, issue)) && text.present? -%>
 			<tr class="<%= current_cycle %>">
@@ -127,4 +130,14 @@
 		</tbody>
 	</ul>
 </div>
+<div>
 <% end -%>
+
+</div>
+<div style="float: right; padding-top: 30px">
+	<% other_formats_links do |f| %>
+<%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
+<%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
+<%= f.link_to 'PDF', :url => params %>
+<% end %>
+</div>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 59d43ef56..47cecb863 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -52,16 +52,20 @@
 		</div>
 	</fieldset>
 </div>
-<p class="buttons hide-when-print">
+<div class="buttons hide-when-print">
 
 	<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
 	<%= link_to l(:label_issue_cancel_query), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>	
-</p>
+</div>
 <% end %>
 
+
+
 <%= error_messages_for 'query' %>
 <% if @query.valid? %>
 <% if @issues.empty? %>
+<table>
+	<tr><td>
 <p class="nodata">
 	<%= l(:label_no_data) %>
 </p>
@@ -72,14 +76,15 @@
 	<ul>
 		<%= pagination_links_full @issue_pages, @issue_count %>
 	<ul>
-</div>
+		</div>
 <% end %>
+</td></tr>
+<tr><td>
+
+</td></tr>
+</table>
+
 
-<% other_formats_links do |f| %>
-<%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
-<%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
-<%= f.link_to 'PDF', :url => params %>
-<% end %>
 
 <div id="csv-export-options" style="display:none;">
 	<h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
diff --git a/app/views/projects/_course_form.html.erb b/app/views/projects/_course_form.html.erb
index efc537113..a9030833b 100644
--- a/app/views/projects/_course_form.html.erb
+++ b/app/views/projects/_course_form.html.erb
@@ -1,58 +1,58 @@
-<%= error_messages_for 'project' %>
-<%= error_messages_for 'course' %>
-
-<!--[form:project]-->
-<% unless @project.new_record? %>
-<p><%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %></p>
-<% end %>
-<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p>
-
-<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p><!--by young-->
-<!-- <p><%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
-<% unless @project.identifier_frozen? %>
-  <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
-<% end %></p> -->
-
-
- <%= f.fields_for @course do |m| %>
-
-<!-- added by huang	 -->
-	 <p style="margin-left:-10px;"><%= m.text_field :state, :required => true, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>
-	 <em class="info" style="margin-left:95px;"><%= l(:text_command) %></em>
-	 <p style="margin-left:-10px;"><%= m.text_field :term, :required => true, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>		
-	 <!-- <p style="margin-left:-28px;"><em class="info"><%= l(:label_term) %> <%= select_tag 'term', "<option value = '0'>#{l(:label_spring)}</option><option value = '1'>#{l(:label_summer)}</option><option value = '2'>#{l(:label_autumn)}</option>".html_safe %></em></p> -->
-<% end %>
-<!-- <p style="margin-left:-10px;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></p> -->
-<p style="display:none;"><%= f.text_field :project_type, :value => 1 %></p>
-
-
-<%= wikitoolbar_for 'project_description' %>
-
-<% @project.custom_field_values.each do |value| %>
-  <p><%= custom_field_tag_with_label :project, value %></p>
-<% end %>
-<%= call_hook(:view_projects_form, :project => @project, :form => f) %>
-
-
-
-<!--[eoform:project]-->
-
-<% unless @project.identifier_frozen? %>
-  <% content_for :header_tags do %>
-    <%= javascript_include_tag 'project_identifier' %>
-  <% end %>
-<% end %>
-
-<% if !User.current.admin? && @project.inherit_members? && @project.parent && User.current.member_of?(@project.parent) %>
-  <%= javascript_tag do %>
-    $(document).ready(function() {
-      $("#project_inherit_members").change(function(){
-        if (!$(this).is(':checked')) {
-          if (!confirm("<%= escape_javascript(l(:text_own_membership_delete_confirmation)) %>")) {
-            $("#project_inherit_members").attr("checked", true);
-          }
-        }
-      });
-    });
-  <% end %>
-<% end %>
+<%= error_messages_for 'project' %>
+<%= error_messages_for 'course' %>
+
+<!--[form:project]-->
+<% unless @project.new_record? %>
+<p><%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %></p>
+<% end %>
+<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p>
+
+<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p><!--by young-->
+<!-- <p><%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
+<% unless @project.identifier_frozen? %>
+  <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
+<% end %></p> -->
+
+
+ <%= f.fields_for @course do |m| %>
+
+<!-- added by huang	 -->
+	 <p style="margin-left:-10px;"><%= m.text_field :password, :required => true, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>
+	 <em class="info" style="margin-left:95px;"><%= l(:text_command) %></em>
+	 <p style="margin-left:-10px;"><%= m.text_field :term, :required => true, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>		
+	 <!-- <p style="margin-left:-28px;"><em class="info"><%= l(:label_term) %> <%= select_tag 'term', "<option value = '0'>#{l(:label_spring)}</option><option value = '1'>#{l(:label_summer)}</option><option value = '2'>#{l(:label_autumn)}</option>".html_safe %></em></p> -->
+<% end %>
+<!-- <p style="margin-left:-10px;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></p> -->
+<p style="display:none;"><%= f.text_field :project_type, :value => 1 %></p>
+
+
+<%= wikitoolbar_for 'project_description' %>
+
+<% @project.custom_field_values.each do |value| %>
+  <p><%= custom_field_tag_with_label :project, value %></p>
+<% end %>
+<%= call_hook(:view_projects_form, :project => @project, :form => f) %>
+
+
+
+<!--[eoform:project]-->
+
+<% unless @project.identifier_frozen? %>
+  <% content_for :header_tags do %>
+    <%= javascript_include_tag 'project_identifier' %>
+  <% end %>
+<% end %>
+
+<% if !User.current.admin? && @project.inherit_members? && @project.parent && User.current.member_of?(@project.parent) %>
+  <%= javascript_tag do %>
+    $(document).ready(function() {
+      $("#project_inherit_members").change(function(){
+        if (!$(this).is(':checked')) {
+          if (!confirm("<%= escape_javascript(l(:text_own_membership_delete_confirmation)) %>")) {
+            $("#project_inherit_members").attr("checked", true);
+          }
+        }
+      });
+    });
+  <% end %>
+<% end %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 1955314f2..2cfaeb932 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -522,11 +522,12 @@ zh:
   label_user_login_new: 登录
   label_user_login_tips: 您还没有登录，请登录后留言
   #end
-  #by huang
+  #by huang    # modified by bai
   label_term: 学期
-  label_spring: 春季
-  label_summer: 夏季
-  label_autumn: 秋季
+  label_spring: 春季学期
+  label_summer: 夏季学期
+  label_autumn: 秋季学期
+  label_winter: 冬季学期
   label_followers: 关注
   label_teacher: 教师
   label_limit_time: 截止日期