Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

Conflicts: app/views/organizations/_show_org_document.html.erb
10 years ago · 7dc02d2c4f
parent 21275e8b7b 7751dc9081
commit 7dc02d2c4f
3 changed files with 137 additions and 135 deletions
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@ -23,7 +23,7 @@
 </head>
 <!--add by huang-->
 <body onload="prettyPrint();">
-    <div class="navContainer mb10">
+    <div class="navContainer">
      <% if User.current.logged? %>
          <%= render :partial => 'layouts/logined_header' %>
      <% else %>
@ -51,7 +51,7 @@
            <% end%>
          </div>
          <div class="orgName fl mb5 f14">组织id：<%= @organization.id %></div>
-          <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a"><span class="pr_setting"></span>配置</a>
+          <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>

          <div class="cl"></div>
          <div class="f12 fontGrey3">
--- a/app/views/org_document_comments/_new.html.erb
+++ b/app/views/org_document_comments/_new.html.erb
@ -15,11 +15,12 @@
 <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
    <div class="resources">
      <div>
-        <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" placeholder="请输入文章标题"></input>
+        <input class="postDetailInput fl" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" placeholder="请输入文章标题" />
      </div>
      <div id="doc_title_hint"></div>
-      <div id="org_document_editor" class="mt15" style="display: none">
-        <div class="mt10">
+      <div class="cl"></div>
+      <div id="org_document_editor" class="mt10" style="display: none">
+        <div>
          <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
        </div>
        <div class="cl"></div>
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@ -6,7 +6,7 @@
  <div class="homepagePostDes">
    <div class="homepagePostTo">
      <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
-      TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization) %> | 组织
+      TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue"  %> | 组织
    </div>
    <div class="homepagePostTitle postGrey"><%= document.title %></div>
    <div class="homepagePostDate">
@ -40,7 +40,8 @@
 </div>
 <% comments_for_doc = document.children.reorder("created_at desc") %>
 <% count = document.children.count() %>
-<div class="homepagePostReply" style="background-color: #f1f1f1;" id="<%= document.id %>">
+
+<div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
  <div class="homepagePostReplyBanner" style="display:<%= count == 0?'none':'block' %>">
    <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
    <% if count > 3 %>
@ -72,7 +73,7 @@
        <% end %>
      </ul>
    </div>
-    <div class="homepagePostReplyContainer">
+    <div class="homepagePostReplyContainer borderBottomNone minHeight48">
      <div class="homepagePostReplyPortrait mr15">
        <%=link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
      </div>