diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index f117acd7f..db174f30e 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -99,7 +99,7 @@ // } }); -
+
<%= topic.content.html_safe %> @@ -165,7 +165,7 @@
<%= link_to User.current.member_of_course?(@board.course) ? "#{message.author.show_name}(#{message.author.login})" : "#{message.author}", user_path(message.author),:class => 'fl c_orange f14 ' %>
-
+
<%= textAreailizable message,:content,:attachments => message.attachments %>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index bc69e2666..3cfd4ae72 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -92,7 +92,7 @@
-
+
<%= topic.content.html_safe %> @@ -150,7 +150,7 @@
<%= link_to_user_header message.author,false,:class => 'fl c_orange f14 ' %>
-
+
<%= textAreailizable message,:content,:attachments => message.attachments %>
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 6eb722981..eceb29f34 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -7,7 +7,7 @@ <%= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %> -
+
<%= link_to_user_header(activity.user,false,:class => 'problem_name c_orange fl') %>   <%= activity.course_act_type == "Course" ? "创建了课程" : l(:label_new_activity) %>： diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index 2e680d6ea..4bf3d1781 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -37,7 +37,7 @@ $(function(){if($("#bid_description_<%= homework.id%>_content").height()>360){$("#bid_show_more_des_button<%= homework.id%>").show();}});
-
+
<%= homework.description.html_safe %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 01cbea1c1..41605a826 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg' %>

<%= l(:label_issue_edit) %>

@@ -22,25 +22,25 @@

由<%= @issue.author %> <%# if @issue.created_on != @issue.updated_on %> - 添加于 <%= format_time(@issue.created_on).html_safe %> + 添加于 <%= format_time(@issue.created_on).html_safe %> <%# else %> - <%#= format_time(@issue.updated_on).html_safe %> + <%#= format_time(@issue.updated_on).html_safe %> <%# end %>

'action_menu' %>
-
+
<% if @issue.description? || @issue.attachments.any? -%> <% if @issue.description? %> <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> <%= textAreailizable @issue, :description, :attachments => @issue.attachments %> <% end %> -
-
- - - <%= link_to_attachment_project @issue, :thumbnails => true %>
+
+
+ + + <%= link_to_attachment_project @issue, :thumbnails => true %>
<% end -%> <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
@@ -48,51 +48,61 @@
<%= issue_fields_rows do |rows| %> -
    -

  •  状态  : 

    <%= @issue.status.name %>

    -
    • -
    - <% unless @issue.disabled_core_fields.include?('assigned_to_id') %> -

  •  指派给  : 

    <%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %> -
    • - <% end %> -
    -
-
    -

  •  优先级  : 

    <%= @issue.priority.name %> -
    • -
    - <% unless @issue.disabled_core_fields.include?('done_ratio') %> -

  •  % 完成  : 

    <%= @issue.done_ratio %>% -
    • - <% end %> -
    -
+
    +

  •  状态  : 

    -
      +

      <%= @issue.status.name %>

      + +
      + <% unless @issue.disabled_core_fields.include?('assigned_to_id') %> +

    •  指派给  : 

      + <%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %> +
      • + <% end %> +
      +
    +
      +

    •  优先级  : 

      + <%= @issue.priority.name %> +
      • +
      + <% unless @issue.disabled_core_fields.include?('done_ratio') %> +

    •  % 完成  : 

      + <%= @issue.done_ratio %>% +
      • + <% end %> +
      +
    + +
      <% unless @issue.disabled_core_fields.include?('start_date') %> -

    •  开始  : 

      <%= format_date(@issue.start_date) %>

      -
      • +

    •  开始  : 

      + +

      <%= format_date(@issue.start_date) %>

      +
      • <% end %> -
      +
      <% unless @issue.disabled_core_fields.include?('estimated_hours') %> -

    •  周期  : 

      <%= l_hours(@issue.estimated_hours) %> -
      • +

    •  周期  : 

      + <%= l_hours(@issue.estimated_hours) %> +
      • <% end %> -
      -
    -
      - <% unless @issue.disabled_core_fields.include?('due_date') %> -

    •  计划完成  : 

      <%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %> -
      • +
      +
    +
      + <% unless @issue.disabled_core_fields.include?('due_date') %> +

    •  计划完成  : 

      + <%= format_date(@issue.due_date) ? format_date(@issue.due_date) : "--" %> +
      • <% end %> -
      +
      <% unless @issue.disabled_core_fields.include?('fixed_version_id') %> -

    •  目标版本  : 

      <%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %> -
      • +

    •  目标版本  : 

      + <%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %> +
      • <% end %> -
      -
    +
    +
<% end %> <%#= render_custom_fields_rows(@issue) %> <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> @@ -111,7 +121,7 @@

- + <%= l(:button_submit) %> diff --git a/app/views/news/_course_news_list.html.erb b/app/views/news/_course_news_list.html.erb index da963b3cd..74a70e33d 100644 --- a/app/views/news/_course_news_list.html.erb +++ b/app/views/news/_course_news_list.html.erb @@ -7,7 +7,7 @@ <% newss.each do |news| %>
<%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %> -
+
<%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %> <%= l(:label_release_news) %>： diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb index 9ae951779..2d8dae59d 100644 --- a/app/views/news/_course_show.html.erb +++ b/app/views/news/_course_show.html.erb @@ -4,7 +4,7 @@
<%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %> -
+

<%=h @news.title %>

@@ -51,7 +51,7 @@
<%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author), :class => "problem_pic fl"%>
-
+
<%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %> <%= format_time(comment.created_on) %> diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb index 0cd26382b..efbb74e46 100644 --- a/app/views/news/_project_news.html.erb +++ b/app/views/news/_project_news.html.erb @@ -31,7 +31,7 @@ <% @newss.each do |news| %>
<%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %> -
+
<%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %> <%= l(:label_add_news) %>：<%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %> <%=link_to "#{news.comments.all.count}".html_safe, news_path(news.id), :class => "pro_mes_w_news" %>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb index 6e94f0947..463b0f489 100644 --- a/app/views/news/_project_show.html.erb +++ b/app/views/news/_project_show.html.erb @@ -14,7 +14,7 @@
<%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %> -
+

<%=h @news.title %>

<%#= watcher_link(@news, User.current) %> <%= link_to(l(:button_edit), diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index f1b3d9b7b..971794699 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -24,7 +24,7 @@ <% if e.forge_act_type == "Issue" %>
<%= image_tag(url_to_avatar(act.author), :width => "42", :height => "42") %> -
+
<%= h(e.project) if @project.nil? || @project.id != e.project_id %> <%= link_to act.author, user_path(act.author), :class => "problem_name c_orange fl" %> <%= l(:label_new_activity) %> ： @@ -60,7 +60,7 @@ <% elsif e.forge_act_type == "Message" %>
<%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %> -
+
<%= h(e.project) if @project.nil? || @project.id != e.project_id %> <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %> <%= l(:label_new_activity) %> ： @@ -79,7 +79,7 @@ <% elsif e.forge_act_type == "News" %>
<%= image_tag(url_to_avatar(e.user), :width => "42", :height => "42") %> -
+
<%= h(e.project) if @project.nil? || @project.id != e.project_id %> <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %> <%= l(:label_new_activity) %> ： diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index 6bc03e33d..cd596e22b 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -41,7 +41,7 @@ <%= l(:label_end_time)%>：<%= homework_common.end_time%>
-
+
<%= homework_common.description.html_safe %>
diff --git a/db/schema.rb b/db/schema.rb index 1c6760345..767208f9e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -476,13 +476,6 @@ ActiveRecord::Schema.define(:version => 20150918134804) do add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" - create_table "discuss_demos", :force => true do |t| - t.string "title" - t.text "body" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "documents", :force => true do |t| t.integer "project_id", :default => 0, :null => false t.integer "category_id", :default => 0, :null => false @@ -916,6 +909,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do t.datetime "created_on" t.integer "comments_count", :default => 0, :null => false t.integer "course_id" + t.datetime "updated_on" end add_index "news", ["author_id"], :name => "index_news_on_author_id" diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 7c1e590db..39c0c6eb0 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -262,6 +262,8 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;} .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;} /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/ +.list_style ol li{list-style-type: decimal;margin-left: 40px;} +.list_style ul li{list-style-type: disc;margin-left: 40px;} /* 创建作品 work */ .Newwork{ width:668px; height:418px;} @@ -637,7 +639,7 @@ a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px sol a:hover.Reply_pic{border:1px solid #64bdd9;} .Msg_txt{ float:left; width:540px; margin-left:10px;} .Msg_txt p{ } -.talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;} +.talkWrapMsg > ul > li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;} .talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; } .Replybox{ float:left; width:495px; margin-left:5px;} .talk_nextpage{ border:none; width:410px; margin:0 auto;} diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index ebb290597..f6bf63f2c 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -120,7 +120,8 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_distop span{ float:left;} .ping_distop p{ color:#5f5f5f;min-height: 24px;} .ping_disfoot a{ float:right; color:#15bccf; margin-left:5px;} - +.list_style ol li{list-style-type: decimal;margin-left: 40px;} +.list_style ul li{list-style-type: disc;margin-left: 40px;} .ping_distop span a{ float:right; /*width:20px;*/ height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 46ef4a760..1c361c3f9 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1149,3 +1149,6 @@ a:hover.tijiao{ background:#0f99a9;} a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; } a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} + +.list_style ol li{list-style-type: decimal;margin-left: 40px;} +.list_style ul li{list-style-type: disc;margin-left: 40px;} \ No newline at end of file diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index bee965a90..875f01ba0 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -328,6 +328,8 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;} .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;} /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/ +.list_style ol li{list-style-type: decimal;margin-left: 40px;} +.list_style ul li{list-style-type: disc;margin-left: 40px;} /*上传资源弹出框样式*/ .popbox_polls{position:fixed !important;} @@ -862,7 +864,7 @@ a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px sol a:hover.Reply_pic{border:1px solid #64bdd9;} .Msg_txt{ float:left; width:540px; margin-left:10px;} .Msg_txt p{ } -.talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;} +.talkWrapMsg > ul > li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;} .talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; } .Replybox{ float:left; width:495px; margin-left:5px;} .talk_nextpage{ border:none; width:410px; margin:0 auto;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 34bb71898..8ab9a373f 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -945,3 +945,6 @@ a.resourcesBlack:hover {font-size:12px; color:#000000;} .Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px; border: none;} .AgreementTxt{text-indent:2em; margin-bottom:15px;} .AgreementImg{ margin:0px auto;} + +.list_style ol li{list-style-type: decimal;margin-left: 40px;} +.list_style ul li{list-style-type: disc;margin-left: 40px;} \ No newline at end of file