diff --git a/.metadata/.log b/.metadata/.log
index fbbe00cbe..ea77ea8b9 100644
--- a/.metadata/.log
+++ b/.metadata/.log
@@ -209,16 +209,16 @@ java.lang.UnsupportedOperationException: Not supported yet.
at com.aptana.index.core.IndexRequestJob.indexFileStores(IndexRequestJob.java:205)
at com.aptana.index.core.IndexContainerJob.run(IndexContainerJob.java:114)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
-!SESSION 2015-01-05 10:21:34.093 -----------------------------------------------
+!SESSION 2015-01-17 11:30:30.655 -----------------------------------------------
eclipse.buildId=unknown
java.version=1.6.0_24
java.vendor=Sun Microsystems Inc.
BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=zh_CN
Command-line arguments: -os win32 -ws win32 -arch x86
-!ENTRY org.eclipse.core.resources 4 567 2015-01-05 10:21:56.435
+!ENTRY org.eclipse.core.resources 4 567 2015-01-17 11:30:37.624
!MESSAGE Workspace restored, but some problems occurred.
-!SUBENTRY 1 org.eclipse.core.resources 4 567 2015-01-05 10:21:56.435
+!SUBENTRY 1 org.eclipse.core.resources 4 567 2015-01-17 11:30:37.624
!MESSAGE Could not read metadata for 'demo'.
!STACK 1
org.eclipse.core.internal.resources.ResourceException: The project description file (.project) for 'demo' is missing. This file contains important information about the project. The project will not function properly until this file is restored.
@@ -261,59 +261,8 @@ org.eclipse.core.internal.resources.ResourceException: The project description f
at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:622)
at org.eclipse.equinox.launcher.Main.basicRun(Main.java:577)
at org.eclipse.equinox.launcher.Main.run(Main.java:1410)
-!SUBENTRY 2 org.eclipse.core.resources 4 567 2015-01-05 10:21:56.435
+!SUBENTRY 2 org.eclipse.core.resources 4 567 2015-01-17 11:30:37.626
!MESSAGE The project description file (.project) for 'demo' is missing. This file contains important information about the project. The project will not function properly until this file is restored.
-!ENTRY com.aptana.terminal 1 0 2015-01-05 10:22:03.546
-!MESSAGE Starting terminal process failed.
-!STACK 1
-org.eclipse.core.runtime.CoreException: Shell executable could not be found.
- at com.aptana.core.ShellExecutable.getPath(ShellExecutable.java:113)
- at com.aptana.terminal.internal.configurations.WindowsMingwConfiguration.getCommandLine(WindowsMingwConfiguration.java:40)
- at com.aptana.terminal.internal.ProcessLauncher.launch(ProcessLauncher.java:38)
- at com.aptana.terminal.connector.LocalTerminalConnector.startProcess(LocalTerminalConnector.java:220)
- at com.aptana.terminal.connector.LocalTerminalConnector.access$0(LocalTerminalConnector.java:208)
- at com.aptana.terminal.connector.LocalTerminalConnector$1.run(LocalTerminalConnector.java:102)
-!SUBENTRY 1 com.aptana.core 4 0 2015-01-05 10:22:03.546
-!MESSAGE Shell executable could not be found.
-
-!ENTRY org.eclipse.core.jobs 2 2 2015-01-05 10:27:30.988
-!MESSAGE Job found still running after platform shutdown. Jobs should be canceled by the plugin that scheduled them during shutdown: org.eclipse.tm.internal.terminal.emulator.VT100TerminalControl$1
-
-!ENTRY org.eclipse.core.jobs 2 2 2015-01-05 10:27:30.989
+!ENTRY org.eclipse.core.jobs 2 2 2015-01-17 11:33:58.913
!MESSAGE Job found still running after platform shutdown. Jobs should be canceled by the plugin that scheduled them during shutdown: com.aptana.usage.internal.DefaultAnalyticsEventHandler$1
-!SESSION 2015-01-05 10:27:31.720 -----------------------------------------------
-eclipse.buildId=3.4.2.201308081805
-java.version=1.6.0_24
-java.vendor=Sun Microsystems Inc.
-BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=zh_CN
-Command-line arguments: -os win32 -ws win32 -arch x86
-
-!ENTRY com.aptana.terminal 1 0 2015-01-05 10:27:34.915
-!MESSAGE Starting terminal process failed.
-!STACK 1
-org.eclipse.core.runtime.CoreException: Shell executable could not be found.
- at com.aptana.core.ShellExecutable.getPath(ShellExecutable.java:113)
- at com.aptana.terminal.internal.configurations.WindowsMingwConfiguration.getCommandLine(WindowsMingwConfiguration.java:40)
- at com.aptana.terminal.internal.ProcessLauncher.launch(ProcessLauncher.java:38)
- at com.aptana.terminal.connector.LocalTerminalConnector.startProcess(LocalTerminalConnector.java:220)
- at com.aptana.terminal.connector.LocalTerminalConnector.access$0(LocalTerminalConnector.java:208)
- at com.aptana.terminal.connector.LocalTerminalConnector$1.run(LocalTerminalConnector.java:102)
-!SUBENTRY 1 com.aptana.core 4 0 2015-01-05 10:27:34.915
-!MESSAGE Shell executable could not be found.
-
-!ENTRY com.aptana.terminal 1 0 2015-01-05 10:27:37.984
-!MESSAGE Starting terminal process failed.
-!STACK 1
-org.eclipse.core.runtime.CoreException: Shell executable could not be found.
- at com.aptana.core.ShellExecutable.getPath(ShellExecutable.java:113)
- at com.aptana.terminal.internal.configurations.WindowsMingwConfiguration.getCommandLine(WindowsMingwConfiguration.java:40)
- at com.aptana.terminal.internal.ProcessLauncher.launch(ProcessLauncher.java:38)
- at com.aptana.terminal.connector.LocalTerminalConnector.startProcess(LocalTerminalConnector.java:220)
- at com.aptana.terminal.connector.LocalTerminalConnector.access$0(LocalTerminalConnector.java:208)
- at com.aptana.terminal.connector.LocalTerminalConnector$1.run(LocalTerminalConnector.java:102)
-!SUBENTRY 1 com.aptana.core 4 0 2015-01-05 10:27:37.984
-!MESSAGE Shell executable could not be found.
-
-!ENTRY org.eclipse.core.jobs 2 2 2015-01-05 10:27:55.438
-!MESSAGE Job found still running after platform shutdown. Jobs should be canceled by the plugin that scheduled them during shutdown: org.eclipse.tm.internal.terminal.emulator.VT100TerminalControl$1
diff --git a/.metadata/.plugins/com.aptana.core.io/connections.15 b/.metadata/.plugins/com.aptana.core.io/connections.15
deleted file mode 100644
index 46f15223a..000000000
--- a/.metadata/.plugins/com.aptana.core.io/connections.15
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/.metadata/.plugins/com.aptana.syncing.core/defaultConnection.15 b/.metadata/.plugins/com.aptana.syncing.core/defaultConnection.15
deleted file mode 100644
index 7f1a49fed..000000000
--- a/.metadata/.plugins/com.aptana.syncing.core/defaultConnection.15
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-Default
-file:/C:/Users/Administrator
-
-
\ No newline at end of file
diff --git a/.metadata/.plugins/com.aptana.syncing.core/sites.15 b/.metadata/.plugins/com.aptana.syncing.core/sites.15
deleted file mode 100644
index dc24d7a57..000000000
--- a/.metadata/.plugins/com.aptana.syncing.core/sites.15
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/.metadata/.plugins/com.aptana.webserver.core/webservers.12 b/.metadata/.plugins/com.aptana.webserver.core/webservers.12
deleted file mode 100644
index 2979c56a7..000000000
--- a/.metadata/.plugins/com.aptana.webserver.core/webservers.12
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-demo
-
-
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/demo/6.tree b/.metadata/.plugins/org.eclipse.core.resources/.projects/demo/6.tree
deleted file mode 100644
index 215d06c77..000000000
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/demo/6.tree and /dev/null differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
index 167d2542c..83f5328be 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index and b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
index de5f19a7c..b756a6952 100644
Binary files a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.explorer.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.explorer.prefs
index 752d73cf4..992cdf2bf 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.explorer.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.explorer.prefs
@@ -1,2 +1,2 @@
-activeProject=demo
+activeProject=trustie
eclipse.preferences.version=1
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.prefs
index b13d8f53c..bc6c0d7c7 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.aptana.theme.prefs
@@ -1,7 +1,7 @@
ACTIVE_HYPERLINK_COLOR=84,143,160
ACTIVE_THEME=Aptana Studio
HYPERLINK_COLOR=84,143,160
-THEME_CHANGED=1420424854199
+THEME_CHANGED=1421465443240
eclipse.preferences.version=1
hyperlinkColor=84,143,160
hyperlinkColor.SystemDefault=false
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
index 6624ec57e..310adab05 100644
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
@@ -2,6 +2,6 @@ PROBLEMS_FILTERS_MIGRATE=true
SHOW_COOLBAR=true
SHOW_PERSPECTIVEBAR=true
eclipse.preferences.version=1
-platformState=1420424495377
+platformState=1420528131671
quickStart=false
tipsAndTricks=true
diff --git a/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch b/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch
index 678ced8a0..08a9581b9 100644
--- a/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch
+++ b/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch
@@ -3,7 +3,7 @@
-
+
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
index 3467fd0f7..cd47216f4 100644
--- a/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
+++ b/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
@@ -1,5 +1,5 @@
-
+
@@ -37,7 +37,7 @@
demo
-C:\Users\Administrator
+C:\Users\zh
@@ -46,7 +46,7 @@
Terminal
-C:\Users\Administrator
+C:\Users\nudt
@@ -66,13 +66,19 @@
-
+
+
+
+
+
+
+
-
+
@@ -118,14 +124,19 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
@@ -144,7 +155,7 @@
-
+
@@ -160,15 +171,11 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -182,6 +189,9 @@
+
+
+
diff --git a/app/controllers/applied_project_controller.rb b/app/controllers/applied_project_controller.rb
index 3d061ef74..f5c42f7b4 100644
--- a/app/controllers/applied_project_controller.rb
+++ b/app/controllers/applied_project_controller.rb
@@ -3,7 +3,26 @@ class AppliedProjectController < ApplicationController
#申请加入项目
def applied_join_project
@user_id = params[:user_id]
- @project = Project.find(params[:project_id])
+ @project = Project.find_by_id(params[:project_id])
+ if params[:project_join]
+ if @project
+ @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
+ if @applieds.count == 0
+ appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
+ Mailer.applied_project(appliedproject).deliver
+ @status = 2
+ else
+ @status = 1
+ end
+ else
+ @status = 0
+ end
+ respond_to do |format|
+ format.js
+ end
+ return
+ end
+
@applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
if @applieds.count == 0
appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 4abddaa5e..394c52f13 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,8 +1,8 @@
class PollController < ApplicationController
- before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll,:poll_result]
+ before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll,:poll_result,:close_poll]
before_filter :find_container, :only => [:new,:create, :index]
before_filter :is_member_of_course, :only => [:index,:show,:poll_result]
- before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll]
+ before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll,:close_poll]
include PollHelper
def index
if @course
@@ -47,6 +47,7 @@ class PollController < ApplicationController
:user_id => User.current.id,
:published_at => Time.now,
:closed_at => Time.now,
+ :show_result => 1,
:polls_description => ""
}
@poll = Poll.create option
@@ -69,8 +70,8 @@ class PollController < ApplicationController
end
def update
- @poll.polls_name = params[:polls_name].empty? ? l(:label_poll_title) : params[:polls_name]
- @poll.polls_description = params[:polls_description].empty? ? l(:label_poll_description) : params[:polls_description]
+ @poll.polls_name = params[:polls_name]
+ @poll.polls_description = params[:polls_description]
if @poll.save
respond_to do |format|
format.js
@@ -338,6 +339,17 @@ class PollController < ApplicationController
end
end
+ #关闭问卷
+ def close_poll
+ @poll.polls_status = 3
+ @poll.closed_at = Time.now
+ if @poll.save
+ respond_to do |format|
+ format.js
+ end
+ end
+ end
+
private
def find_poll_and_course
@poll = Poll.find params[:id]
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7efa02503..caf29ba90 100644
--- a/app/helpers/application_helper.rb
+++ b/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 << "\n"
+ s << "\n"
end
s.html_safe
end
diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 60d82c096..3156f1b3a 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -64,13 +64,13 @@ module PollHelper
def options_show pq
case pq
when 1
- "单选题"
+ l(:label_MC)
when 2
- "多选题"
+ l(:label_MCQ)
when 3
- "单行主观题"
+ l(:label_single)
else
- "多行主观题"
+ l(:label_mulit)
end
end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 1760d9004..f42c20acc 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -36,7 +36,7 @@ class Mailer < ActionMailer::Base
@author = forum.creator
recipients = forum.creator.mail
# cc = wiki_content.page.wiki.watcher_recipients - recipients
-
+ @issue_author_url = url_for(user_activities_url(@author))
@forum_url = url_for(:controller => 'forums', :action => 'show', :id => forum.id)
mail :to => recipients,:subject => "[ #{l(:label_forum)} : #{forum.name} #{l(:notice_successful_create)}]"
@@ -47,6 +47,8 @@ class Mailer < ActionMailer::Base
redmine_headers 'Memo' => memo.id
@forum = memo.forum
@author = memo.author
+ @forum_url = url_for(:controller => 'forums', :action => 'show', :id => @forum.id)
+ @issue_author_url = url_for(user_activities_url(@author))
recipients ||= []
mems = memo.self_and_siblings
mems.each do |mem|
@@ -69,7 +71,7 @@ class Mailer < ActionMailer::Base
@mail = journals_for_message.at_user if journals_for_message.at_user
@message = journals_for_message.notes
@title = "#@user #{t(:label_leave_your_message, :locale => 'zh')}"
-
+ @issue_author_url = url_for(user_activities_url(@user))
@url = case journals_for_message.jour.class.to_s.to_sym # 判断留言的对象所属类型
when :Bid
course_for_bid_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
@@ -289,6 +291,7 @@ class Mailer < ActionMailer::Base
redmine_headers 'Project' => document.project.identifier
@author = User.current
@document = document
+ @issue_author_url = url_for(user_activities_url(@author))
@document_url = url_for(:controller => 'documents', :action => 'show', :id => document)
mail :to => document.recipients,
:subject => "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
@@ -304,6 +307,7 @@ class Mailer < ActionMailer::Base
added_to = ''
added_to_url = ''
@author = attachments.first.author
+ @issue_author_url = url_for(user_activities_url(@author))
case container.class.name
when 'Project'
added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container)
@@ -356,6 +360,7 @@ class Mailer < ActionMailer::Base
if news.project
redmine_headers 'Project' => news.project.identifier
@author = news.author
+ @issue_author_url = url_for(user_activities_url(@author))
message_id news
@news = news
@news_url = url_for(:controller => 'news', :action => 'show', :id => news)
@@ -364,6 +369,7 @@ class Mailer < ActionMailer::Base
elsif news.course
redmine_headers 'Course' => news.course.id
@author = news.author
+ @issue_author_url = url_for(user_activities_url(@author))
message_id news
@news = news
recipients = news.course.notified_users.select { |user| user.allowed_to?(:view_files, news.course) }.collect { |u| u.mail }
@@ -383,6 +389,7 @@ class Mailer < ActionMailer::Base
if news.project
redmine_headers 'Project' => news.project.identifier
@author = comment.author
+ @issue_author_url = url_for(user_activities_url(@author))
message_id comment
@news = news
@comment = comment
@@ -393,6 +400,7 @@ class Mailer < ActionMailer::Base
elsif news.course
redmine_headers 'Course' => news.course.id
@author = comment.author
+ @issue_author_url = url_for(user_activities_url(@author))
message_id comment
@news = news
@comment = comment
@@ -414,6 +422,7 @@ class Mailer < ActionMailer::Base
redmine_headers 'Project' => message.project.identifier,
'Topic-Id' => (message.parent_id || message.id)
@author = message.author
+ @issue_author_url = url_for(user_activities_url(@author))
message_id message
references message.parent unless message.parent.nil?
recipients = message.recipients
@@ -427,6 +436,7 @@ class Mailer < ActionMailer::Base
redmine_headers 'Course' => message.course.id,
'Topic-Id' => (message.parent_id || message.id)
@author = message.author
+ @issue_author_url = url_for(user_activities_url(@author))
message_id message
references message.parent unless message.parent.nil?
recipients = message.course.notified_users.select { |user| user.allowed_to?(:view_files, message.course) }.collect { |u| u.mail }
diff --git a/app/views/applied_project/applied_join_project.js.erb b/app/views/applied_project/applied_join_project.js.erb
new file mode 100644
index 000000000..deac2c9ce
--- /dev/null
+++ b/app/views/applied_project/applied_join_project.js.erb
@@ -0,0 +1,9 @@
+<% if @status == 0%>
+ alert("您申请的项目不存在");
+<% elsif @status == 1%>
+ alert("请勿重复申请加入该项目");
+<% elsif @status == 2%>
+ alert("申请成功");
+<%else%>
+ alert("申请失败");
+<%end%>
\ No newline at end of file
diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb
index d293f9ed1..85ca24c1b 100644
--- a/app/views/courses/_course_form.html.erb
+++ b/app/views/courses/_course_form.html.erb
@@ -29,7 +29,7 @@
<%= l(:label_tags_course_name) %>
*
-
+
<%= f.fields_for @course do |m| %>
@@ -38,11 +38,11 @@
-
+
<%= l(:label_class_period) %>
*
-
+
<%= text_field_tag :class_period, @course.class_period, :placeholder => "#{l(:lable_input_class)}", :maxlength => 5 %>
@@ -118,7 +118,7 @@
-
+
<%= l(:text_command) %>
<% end %>
diff --git a/app/views/courses/_set_course_time.html.erb b/app/views/courses/_set_course_time.html.erb
index f1eec891f..0c28b90a7 100644
--- a/app/views/courses/_set_course_time.html.erb
+++ b/app/views/courses/_set_course_time.html.erb
@@ -5,9 +5,9 @@
<% if display #如果课程已结束%>
<% linkPath = course_endTime_timeout?(course) ? restartcourse_course_path(course) : finishcourse_course_path(course, format: :js) %>
- <% desc = course_endTime_timeout?(course) ? '重启' : '关闭' %>
+ <% desc = course_endTime_timeout?(course) ? l(:label_course_reload) : l(:label_course_closed) %>
- <%= link_to "#{desc}", linkPath, :remote => true, :method => :post, :id => id, :confirm => ("确定要#{desc}课程?") %>
+ <%= link_to "#{desc}", linkPath, :remote => true, :method => :post, :id => id, :confirm => l(:label_course_closed_tips, :desc => desc) %>
<% else %>
<% end %>
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 77f041322..b9422ba64 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -6,7 +6,7 @@
<%= labelled_form_for @course do |f| %>
<%= render :partial => 'course_form', :locals => { :f => f } %>
-
+
<%= submit_tag l(:button_create), :class => "enterprise"%>
diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb
index f65ba8d41..85739f7c3 100644
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@@ -22,7 +22,7 @@
-
+
<%= file_field_tag 'attachments[dummy][file]',
:id => '_file',
:class => 'file_selector',
diff --git a/app/views/files/_upload_show.html.erb b/app/views/files/_upload_show.html.erb
index 13bcd043e..65a662f10 100644
--- a/app/views/files/_upload_show.html.erb
+++ b/app/views/files/_upload_show.html.erb
@@ -1,15 +1,15 @@
- 上传资源
+ <%= l(:label_upload_files)%>
<%= error_messages_for 'attachment' %>
- 上传出现错误,请您检查您的网络环境,并刷新页面重新上传。
+ <%= l(:label_file_upload_error_messages)%>
<%= form_tag(course_files_path(course), :multipart => true,:remote => true,:method => :post,:name=>"upload_form") do %>
-
+
<%= render :partial => 'attachement_list',:locals => {:course => course} %>
- 确 认
- 取 消
+ <%= l(:button_confirm)%>
+ <%= l(:button_cancel)%>
<% end %>
diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index f1c829c1f..bf4b12daf 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -135,7 +135,6 @@ function f_submit()
-
意见反馈
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 466e711c2..06626c155 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -305,7 +305,7 @@
.polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
.polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}
.polls_btn a{ float:left;}
- .polls_n{float: left;background: #ff5d31;color: #fff;width: 12px;padding-left: 2px;height: 7px;padding-bottom: 5px;padding-top: 3px;margin-top: -4px;margin-left: 3px; }
+ .polls_n{float: left;background: #ff5d31;color: #fff;width: 32px;padding-left: 2px;height: 7px;padding-bottom: 5px;padding-top: 3px;margin-top: -4px;margin-left: 3px; }
.polls_n p{ margin-top:-4px;}
.cl{ clear:both; overflow:hidden; }
@@ -313,7 +313,7 @@
<%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id)%>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 0d234a69c..d525f65a2 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -102,7 +102,7 @@
- <%= link_to @contest.name, show_contest_contest_path(@contest) %>
+ <%= link_to @contest.name, contest_contestnotifications_path(@contest) %>
|
<% if User.current.login? %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 67e4da0f4..b8cc2ddc9 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -132,8 +132,9 @@
<%=link_to @project.watcher_users.count, :controller=>"projects", :action=>"watcherlist", :id => @project %>
|
+
- <%=link_to "#{@project.issues.count}", project_issues_path(@project) %>
+ <%=link_to "#{@project.issues.where('status_id in (1,2,4,6)').count}", project_issues_path(@project) %>
|
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index abb896b61..c5be3f4fd 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -44,9 +44,7 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
<%= l(:mail_issue_greetings)%>
<%= yield %>
-
-
-
+
|