diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb index 1c2939071..60653b301 100644 --- a/app/views/layouts/base_org_newstyle.html.erb +++ b/app/views/layouts/base_org_newstyle.html.erb @@ -28,23 +28,7 @@ }); - @@ -54,91 +38,7 @@
<%# 登录 %> - <% if User.current.logged? %> - - - <%#= link_to image_tag(url_to_avatar(User.current)), user_url_in_org(User.current.id), :alt => '用户头像', :target => '_blank', :class => "fr user-img" %> - <%#= link_to User.current, user_url_in_org(User.current.id),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %> - <%#= link_to "退出",logout_url_without_domain, :class =>"menuGrey", :method => 'post', :rel => "nofollow" %> - - - <% else %> -
    • -
    • - <% end %> - -
    -
    - - -
    -
    - <% @subfield_content.each do |field| %> - <% if is_default_field?(field) %> - <% case field.name %> - <% when 'activity' %> - <%= link_to "首页", organization_path(@organization), :class => "fl navact" %> - <% when 'course' %> - 课程动态 - <% when 'project' %> - 项目动态 - <% end %> - <% else %> - <% if field.field_type == "Post" && field.hide == 0 %> - <%= field.name %> - <% elsif field.field_type == "Resource" && field.hide == 0%> - <%= field.name %> - <% end %> - <% end %> - <% end %> -
    -
    - - - - - - - -
    -
    - <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %> - <% if User.current.logged? %> - - - <% else %> -
    • -
    • - <% end %> + <%= render :partial => 'organizations/org_logined_header' %>
    @@ -164,52 +64,13 @@ <% end %> <% end %> -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    <%= @organization.name %>

    -

    course activities

    -

    - More -

    -
    -
    -
    -
    -

    <%= @organization.name %>

    -

    open laboratory of simulation and testing

    -

    - More -

    -
    -
    + -
    -
    -

    <%= @organization.name %>

    -

    open laboratory of simulation and testing

    -

    - More -

    -
    -
    -
    -
    - ? ? -
    -
    @@ -246,7 +107,7 @@ <% @course_acts_message.each do |act| %> <% if act.container_type == 'Course' %> <% case act.org_act_type.to_s %> - <% when 'HomeworkCommon' %> + <% when 'HomeworkCommon' %> <%= render :partial => 'org_new_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %> <% when 'News' %> <%= render :partial => 'org_new_course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %> @@ -360,7 +221,7 @@

    <%=link_to message.title %>

    - <%= format_time(message.updated_at) %> + <%= format_date(message.updated_at) %>
    <%= message.content.html_safe %>
     diff --git a/app/views/organizations/_org_logined_header.html.erb b/app/views/organizations/_org_logined_header.html.erb new file mode 100644 index 000000000..d2cf5d753 --- /dev/null +++ b/app/views/organizations/_org_logined_header.html.erb @@ -0,0 +1,46 @@ +<% if User.current.logged? %> + +<% else %> +
    • +
    • +<% end %> + + \ No newline at end of file diff --git a/app/views/organizations/_org_new_course_create.html.erb b/app/views/organizations/_org_new_course_create.html.erb index 29882a027..fb953d10f 100644 --- a/app/views/organizations/_org_new_course_create.html.erb +++ b/app/views/organizations/_org_new_course_create.html.erb @@ -1,5 +1,5 @@ - <%= format_time(activity.updated_at) %> + <%= format_date(activity.updated_at) %>

    <%= activity.title %>

    <%= activity.description %>
     \ No newline at end of file diff --git a/app/views/organizations/_org_new_course_homework.html.erb b/app/views/organizations/_org_new_course_homework.html.erb index 3f93300ed..ef1a73fa7 100644 --- a/app/views/organizations/_org_new_course_homework.html.erb +++ b/app/views/organizations/_org_new_course_homework.html.erb @@ -1,5 +1,5 @@ - <%= format_time activity.updated_at %> + <%= format_date activity.updated_at %>

    <%= activity.name %>

    <%= activity.description.html_safe %>
     \ No newline at end of file diff --git a/app/views/organizations/_org_new_course_message.html.erb b/app/views/organizations/_org_new_course_message.html.erb index fb2ddf197..134dc4961 100644 --- a/app/views/organizations/_org_new_course_message.html.erb +++ b/app/views/organizations/_org_new_course_message.html.erb @@ -1,5 +1,5 @@ - <%= format_time activity.updated_on %> + <%= format_date activity.updated_on %>

    <% if activity.parent_id.nil? %> <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :class=> "postGrey" %> diff --git a/app/views/organizations/_org_new_course_news.html.erb b/app/views/organizations/_org_new_course_news.html.erb index fe6c4507f..eb2ee08f7 100644 --- a/app/views/organizations/_org_new_course_news.html.erb +++ b/app/views/organizations/_org_new_course_news.html.erb @@ -1,5 +1,5 @@ - <%= format_time activity.updated_at %> + <%= format_date activity.updated_at %>

    首届卫星导航仿真与测试专题研讨会在...首届卫星导航仿真与测试专题研讨会在...

    10月15日，由卫星导航仿真与测试开放实验室联盟主办的首次专题研讨会在西安国家民用航天产业基地隆重召开...
     \ No newline at end of file diff --git a/app/views/organizations/_org_new_course_poll.html.erb b/app/views/organizations/_org_new_course_poll.html.erb index fe6c4507f..eb2ee08f7 100644 --- a/app/views/organizations/_org_new_course_poll.html.erb +++ b/app/views/organizations/_org_new_course_poll.html.erb @@ -1,5 +1,5 @@ - <%= format_time activity.updated_at %> + <%= format_date activity.updated_at %>

    首届卫星导航仿真与测试专题研讨会在...首届卫星导航仿真与测试专题研讨会在...

    10月15日，由卫星导航仿真与测试开放实验室联盟主办的首次专题研讨会在西安国家民用航天产业基地隆重召开...
     \ No newline at end of file diff --git a/app/views/organizations/_org_new_project_issues.html.erb b/app/views/organizations/_org_new_project_issues.html.erb index dd438a1f4..00075d9e6 100644 --- a/app/views/organizations/_org_new_project_issues.html.erb +++ b/app/views/organizations/_org_new_project_issues.html.erb @@ -1,4 +1,4 @@ -

    <%= format_time(activity.updated_on) %>项目社区 +

    <%= format_date(activity.updated_on) %>项目社区 <%= link_to activity.subject.to_s, issue_url_in_org(activity.id) %>

    <%= activity.description.html_safe %>

    \ No newline at end of file diff --git a/app/views/organizations/_org_new_project_message.html.erb b/app/views/organizations/_org_new_project_message.html.erb index 08338aca8..207c6cbd4 100644 --- a/app/views/organizations/_org_new_project_message.html.erb +++ b/app/views/organizations/_org_new_project_message.html.erb @@ -1,4 +1,4 @@ -

    <%= format_time(activity.updated_on) %>项目社区 +

    <%= format_date(activity.updated_on) %>项目社区 <% if activity.parent_id.nil? %> <%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board.id,activity.id) %> <% else %> diff --git a/app/views/organizations/_org_new_resource.html.erb b/app/views/organizations/_org_new_resource.html.erb index 08d1f8b78..8ae583722 100644 --- a/app/views/organizations/_org_new_resource.html.erb +++ b/app/views/organizations/_org_new_resource.html.erb @@ -6,7 +6,7 @@ <%= link_to truncate(attach.filename,length: 35, omission: '...'), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename+"\n"+attach.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :class => "fl ziyuan-title" %> -

    上传时间：<%= format_time attach.created_on %>类型：软件 上传者：尹刚 下载次数：40

    +

    上传时间：<%= format_date attach.created_on %>类型：软件 上传者：尹刚 下载次数：40

    下载
    diff --git a/public/stylesheets/org_new_style.css b/public/stylesheets/org_new_style.css index e23d3f28d..c7c3c81a8 100644 --- a/public/stylesheets/org_new_style.css +++ b/public/stylesheets/org_new_style.css @@ -93,7 +93,7 @@ ul.callbacks_tabs.callbacks1_tabs {position:absolute;bottom: 7.3%;z-index: 999;l /** 开源 **/ .box2{ height:569px; padding:70px 0; width:100%; background:url(../images/org_new_style/bg.jpg) no-repeat; } .row-box3{ width:370px;} -.row-title3{ width:290px; font-size:18px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; font-weight:bold; } +.row-title3{ width:288px; font-size:18px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; font-weight:bold; } .box3{height:540px; width:100%; padding:70px 0; background:url(../images/org_new_style/bg2.jpg) no-repeat; } .box-title-p3{font-size:14px; color:#999999;} .row-img2{ margin-bottom:10px; width:380px; height:310px; display:block;}