diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index d6c90ccf4..51259bb5d 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -22,7 +22,6 @@ class AttachmentsController < ApplicationController before_filter :authorize_global, :only => :upload before_filter :login_without_softapplication, only: [:download] - accept_api_auth :show, :download, :upload def show @@ -125,7 +124,7 @@ class AttachmentsController < ApplicationController end respond_to do |format| - format.html { redirect_to_referer_or project_path(@project) } + format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum,@attachment.container) } format.js end end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 116ccd5d7..d9996e739 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -15,9 +15,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class ProjectsController < ApplicationController - # if @project.project_type == 1 - # layout 'base_projects'# by young layout :select_project_layout + menu_item :overview menu_item :roadmap, :only => :roadmap menu_item :settings, :only => :settings @@ -32,18 +31,7 @@ class ProjectsController < ApplicationController menu_item :feedback, :only => :feedback menu_item l(:label_course_file), :only => :index menu_item l(:label_course_news), :only => :index - # end - - # layout 'base_courses'# by young - # menu_item :overview - # menu_item l(:label_homework), :only => :homework - # menu_item :files, :only => :files -# - # layout 'base_courses' - # menu_item l(:label_homework), :only => homework - # menu_item l(:label_course_file), :only => files - # menu_item l(:label_settings), :only => settings before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise] # before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, @@ -52,11 +40,11 @@ class ProjectsController < ApplicationController before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen] before_filter :authorize_global, :only => [:new, :create] before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar] - #by young - # before_filter :member, :file, :statistics, :watcherlist - # modified by fq before_filter :file, :statistics, :watcherlist - # + + # 除非项目内人员,不可查看成员, TODO: 完了写报表里去 + before_filter :memberAccess, only: :member + accept_rss_auth :index accept_api_auth :index, :show, :create, :update, :destroy @@ -89,27 +77,6 @@ class ProjectsController < ApplicationController ### added by william include ActsAsTaggableOn::TagsHelper - # Lists visible projects - # def index - # respond_to do |format| - # format.html { - # scope = Project - # unless params[:closed] - # scope = scope.active - # end - # @projects = scope.visible.order('lft').all - # } - # format.api { - # @offset, @limit = api_offset_and_limit - # @project_count = Project.visible.count - # @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all - # } - # format.atom { - # projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all - # render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}") - # } - # end - # end def enterprise_course session[:enterprise_college] = 2 respond_to do |format| @@ -384,36 +351,6 @@ class ProjectsController < ApplicationController end #gcmend - # def search - # #modified by nie - # project_type = params[:project_type].to_i - # projects_all = (project_type.eql? Project::ProjectType_course) ? Project.course_entities : Project.project_entities - # @projects = projects_all.visible - # @projects = @projects.visible.like(params[:name]) if params[:name].present? - # @offset, @limit = api_offset_and_limit({:limit => 10}) - # @project_count = @projects.visible.count - # @project_pages = Paginator.new @project_count, @limit, params['page'] - # @offset ||= @project_pages.offset - # @projects = @projects.visible.offset(@offset).limit(@limit).all - # respond_to do |format| - # format.html { - # render :layout => 'base' - # scope = Project - # unless params[:closed] - # scope = scope.active - # end - # } - # format.api { - # # @offset, @limit = api_offset_and_limit - # # @project_count = Project.visible.count - # # @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all - # } - # format.atom { - # projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all - # render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}") - # } - # end - # end # added by fq def new_join @@ -861,22 +798,7 @@ class ProjectsController < ApplicationController memberlist end - # def news - # if @project.project_type == 1 - # render :layout => 'base_courses' - # end - # end - def file - # if @project.project_type == 1 - # render :layout => 'base_courses' - # end - # @course_tag = params[:course] - # if @course_tag == '1' - # render :layout => 'base_courses' - # end - - # User.current end def statistics @@ -999,12 +921,8 @@ class ProjectsController < ApplicationController # end before_filter :toggleCourse, only: [:finishcourse, :restartcourse] - # TODO:#finishcourse and #restartcourse 没有设置权限,也就是说,任何人的调用都会关闭or重启课程。 # 最好通过用户与项目的权限解决这种事情。还没写 def finishcourse - #course_prefs = Course.find_by_extra(@project.identifier) - # setup_time = Time.parse(course_prefs.setup_time) - # end_time = Time.parse(course_prefs.endup_time) yesterday = Date.today.prev_day.to_time @course_prefs.endup_time = yesterday @@ -1016,7 +934,6 @@ class ProjectsController < ApplicationController end def restartcourse - #course_prefs = Course.find_by_extra(@project.identifier) day = Time.parse("3000-01-01") @course_prefs.endup_time = day @@ -1030,6 +947,14 @@ class ProjectsController < ApplicationController end private + + def memberAccess + # 是课程,则判断当前用户是否参加了课程 + return 0 if @project.project_type == Project::ProjectType_project + currentUser = User.current + render_403 unless currentUser.member_of?(@project) + end + def toggleCourse @course_prefs = Course.find_by_extra(@project.identifier) unless (@course_prefs.teacher == User.current || User.current.admin?) diff --git a/app/views/bids/_homework_form.html.erb b/app/views/bids/_homework_form.html.erb index 6d9230a91..5aa3462fa 100644 --- a/app/views/bids/_homework_form.html.erb +++ b/app/views/bids/_homework_form.html.erb @@ -37,5 +37,5 @@

<%= hidden_field_tag 'course_id', @project_id %>

<%= l(:label_attachment_plural) %> -

<%= render :partial => 'attachments/form', :locals => {:container => @bid} %>

+
<%= render :partial => 'attachments/form', :locals => {:container => @bid} %>
\ No newline at end of file diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 5c6f24524..99971e0f3 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -66,7 +66,7 @@ <%= link_to(l(:label_user_edit), my_account_path(@user)) if User.current %> <% end %> - + <% messages_count = @user.messages.count %> <% messages_score = messages_count * 0.05%> @@ -158,9 +158,12 @@ <%= l(:label_user_login) %>:<%= format_time(@user.last_login_on) %> + + <% unless @user.user_extensions.nil? %> diff --git a/app/views/mailer/journals_for_message_add.html.erb b/app/views/mailer/journals_for_message_add.html.erb index d6c0bc482..bd2a36440 100644 --- a/app/views/mailer/journals_for_message_add.html.erb +++ b/app/views/mailer/journals_for_message_add.html.erb @@ -1,4 +1,4 @@ -尊敬的用户,<%= @user %>(<%= @user.mail%>)给你留言了: +尊敬的用户,<%= @user %>给你留言了:
<%= @message %>

点击链接查看最新回复<%= link_to(@url, @url) %>

diff --git a/app/views/mailer/journals_for_message_add.text.erb b/app/views/mailer/journals_for_message_add.text.erb index ae405d06d..5eb47ef3b 100644 --- a/app/views/mailer/journals_for_message_add.text.erb +++ b/app/views/mailer/journals_for_message_add.text.erb @@ -1,3 +1,3 @@ -尊敬的用户,<%= @user %>(<%= @user.mail%>)给你留言了: +尊敬的用户,<%= @user %>给你留言了: <%= @message %> 点击链接查看最新回复<%= link_to(@url, @url) %> diff --git a/app/views/users/show_old.html.erb b/app/views/users/show_old.html.erb index 9ce6c160f..d2de97b05 100644 --- a/app/views/users/show_old.html.erb +++ b/app/views/users/show_old.html.erb @@ -6,7 +6,7 @@
- +<%= render partial: 'link_to_another' %> diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 6dd490ff0..48546b006 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -109,7 +109,7 @@
[<%= get_course_term project %>] <%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%> - (<%= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>) + (<%= "#{studentCount(project)}人" %><%#= link_to "#{studentCount(project)}人", project_member_path(project, :role => 2) ,:course =>'1' %>) <% files_count = (project.attachments.count.to_i+Version.joins(:project).where("projects.id=#{project.id}").count.to_i).to_s %> (<%=link_to "#{files_count}份", project_files_path(project) %>资料)
@@ -267,4 +267,5 @@ - \ No newline at end of file + +<%= render partial: 'link_to_another' %> \ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index bb2d6cd36..fcdce62e8 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -149,3 +149,4 @@ +<%= render partial: 'link_to_another' %> \ No newline at end of file diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1a1c1b2ea..8e0a81cf6 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1769,6 +1769,14 @@ p.pagination {margin-top:8px; font-size: 90%} clear:left; } +.tabular .tabDiv{ + margin: 0; + padding: 3px 0 3px 0; + padding-left: 100px; /* width of left column containing the label elements *//*by young*/ + /*min-height: 1.8em;*/ + clear:left; +} + html>body .tabular p {overflow:hidden;} .tabular label{ @@ -1830,7 +1838,7 @@ span.required {color: #bb0000;} .summary {font-style: italic;} #attachments_fields input.description {margin-left:4px; width:100px; } -#attachments_fields span {display:block; white-space:nowrap; font-family:'微软雅黑';} +#attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';} #attachments_fields input.filename {border:0; height:1.8em; width:150px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}/*Modified by young*/ #attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;} #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;} diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css index 4393c1dbc..5ee72add5 100644 --- a/public/stylesheets/welcome.css +++ b/public/stylesheets/welcome.css @@ -3,6 +3,20 @@ */ /************************** 某部分开始 *****************************/ /************************** 某部分结束 *****************************/ + +/************************** 页脚 footer 开始 *****************************/ +.linkother{ + width: 460px; + margin: 70px auto -35px ; +} +.link_other_item{ + width: 150px; + text-align: center; + display: inline-block; + font-size: 14px; +} +/************************** 页脚 footer 结束 *****************************/ + .top_bar{ height: auto; }