diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 88acb59f6..ef65bf8b2 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -1,93 +1,93 @@ -<% @nav_dispaly_project_label = 1 - @nav_dispaly_forum_label = 1 %> -<%#@nav_dispaly_project_label = 1 %> - - - - - <%= h html_title %> - - - <%= csrf_meta_tag %> - <%= favicon %> - <%= javascript_heads %> - <%= heads_for_theme %> - <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> - <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%> - - <%= call_hook :view_layouts_base_html_head %> - - <%= yield :header_tags -%> - - - - - -
- <% if User.current.logged? %> - <%= render :partial => 'layouts/logined_header' %> - <% else %> - <%= render :partial => 'layouts/unlogin_header' %> - <% end %> -
-
-
-
-
-
- - - - -
组织id：<%= @organization.id %>
- 配置 - -
-
- <%= link_to '文章', organization_org_document_comments_path(@organization) %> (  - <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> -  ) | 成员 ( <%= @organization.org_members.count %>  ) -
-
-
-
动态
-
项目
-
- -
-
-
-
- <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
-
-
-
- - -
- <%= render :partial => 'layouts/footer' %> -
- - - +<% @nav_dispaly_project_label = 1 + @nav_dispaly_forum_label = 1 %> +<%#@nav_dispaly_project_label = 1 %> + + + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %> + <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%> + + <%= call_hook :view_layouts_base_html_head %> + + <%= yield :header_tags -%> + + + + + +
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else %> + <%= render :partial => 'layouts/unlogin_header' %> + <% end %> +
+
+
+
+
+
+ + + + +
组织id：<%= @organization.id %>
+ 配置 + +
+
+ <%= link_to '文章', organization_org_document_comments_path(@organization) %> (  + <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %> +  ) | 成员 ( <%= @organization.org_members.count %>  ) +
+
+
+
动态
+
项目
+
+ +
+
+
+
+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
+
+
+
+ + +
+ <%= render :partial => 'layouts/footer' %> +
+ + + diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb index f47048bf9..91bcad2a9 100644 --- a/app/views/org_document_comments/_new.html.erb +++ b/app/views/org_document_comments/_new.html.erb @@ -1,40 +1,41 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> - -<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> -
-
- -
-
- -
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%> + +<%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %> +
+
+ +
+
+
+ +
<% end %> \ No newline at end of file diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb index 6641ae23d..72b7e00dc 100644 --- a/app/views/organizations/_show_org_document.html.erb +++ b/app/views/organizations/_show_org_document.html.erb @@ -6,7 +6,7 @@
<%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %> - TO  <%= link_to document.organization.name, organization_path(document.organization) %> | 组织 + TO  <%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %> | 组织
<%= document.title %>
@@ -40,7 +40,8 @@
<% comments_for_doc = document.children.reorder("created_at desc") %> <% count = document.children.count() %> -
+ +
回复（<%= count %>）
<% if count > 3 %> @@ -72,7 +73,7 @@ <% end %>
-
+
<%=link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>