diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 4fc08d41f..171b2b764 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -56,7 +56,9 @@

- <%= l(:lable_hot_projects)%> + + <%= l(:lable_hot_projects)%> +

<% if User.current.logged? %> @@ -83,14 +85,16 @@
<% unless project.is_public %> - <%= l(:label_private) %> + + <%= l(:label_private) %> + <% end %> <%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%> - (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) + (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>)
-
+
- <%=project.description.truncate(100, omission: '...')%> + <%=project.description.truncate(90, omission: '...')%>
@@ -109,33 +113,37 @@
    -

    <%= l(:lable_user_active)%>

    - <%= link_to l(:label_more), { :controller => 'users', :action => 'index'}, :target => "_blank" %> +

    + + <%= l(:lable_user_active)%> + +

    + + <%= link_to l(:label_more), { :controller => 'users', :action => 'index'}, :target => "_blank" %> +
    <%activities = find_all_activities%> <% activities.each do |event| %> -
  • <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
    -
    <%= link_to event.event_author, (user_path(event.event_author) if event.event_author), :style => "color:green;", :target => "_blank" %> <%= show_user_content event %> -

    - - <%= l(:field_updated_on) %> - <%= time_tag_welcome event.event_datetime %>前 - -       - - <%= show_event_reply event %> - -

    +

    + + <%= l(:field_updated_on) %> + <%= time_tag_welcome event.event_datetime %>前 + +       + + <%= show_event_reply event %> + +

  • <% end %> @@ -148,14 +156,18 @@

    - <%= l(:lable_bar_active)%> + + <%= l(:lable_bar_active)%> + <%= link_to l(:label_my_question) , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> <%= link_to l(:label_my_feedback) , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>

    - <%= link_to l(:label_more), forums_path %> + + <%= link_to l(:label_more), forums_path %> +
    - <% topics = find_new_forum_topics(7) %> + <% topics = find_new_forum_topics(6) %> <% topics.includes(:forum, :last_reply, :author).each do |topic|%>