Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

app/controllers/sub_domains_controller.rb

@@ -1,10 +1,10 @@
 class SubDomainsController < ApplicationController
   layout 'base_org'
-  before_filter :find_org_subfield_and_subdomain, :only => [:show, :index, :new]
+  before_filter :find_org_subfield_and_subdomain, :only => [:show, :index]
 
   def new
     @subdomain = SubDomain.new
-
+    @org_subfield = OrgSubfield.find(params[:org_subfield_id])
   end
 
   def create

app/views/layouts/base_org2.html.erb

@@ -90,7 +90,7 @@
             <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
         <% end %>
         <% if User.current.admin_of_org?(@organization) %>
-            <a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+            <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
         <% end %>
         <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
 

app/views/layouts/base_sub_domain.html.erb

@@ -34,13 +34,13 @@
       $(document).ready(function(){
         $(".nav-element").mouseover(function(){
             $(this).next().show();
-        });
+      });
         $(".sn-grey-opacity").mouseover(function(){
               $(this).show();
         });
         $(".nav-element").mouseout(function(){
             $(this).next().hide();
-        });
+    });
         $(".sn-grey-opacity").mouseout(function(){
               $(this).hide();
         });
@@ -144,7 +144,9 @@
         </ul>
       </div>
       <div class="sn-row">
-        <div class="sn-banner"><img src="/images/sn_banner.jpg" width="1200" height="210" alt="banner image" /></div>
+        <div class="sn-banner"><img src="/images/sn_banner.jpg" width="1200" height="210" alt="banner image" />
+          <a href="#" class="sn-banner-add" title="点击替换图片" ></a>
+        </div>
       </div>
     </div>
   </header>

app/views/organizations/_org_subdomain.html.erb

@@ -3,9 +3,9 @@
       <%= link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => org_subfield_id), :class => "coursesLineGrey hidden", :title => subdomain.name %>
     </li>
 <% end %>
-<% if subdomains.size == 5 %>
-    <li class="homepageLeftMenuMore" id="show_more_org_project">
-      <input type="hidden" value="<%= page %>" id="org_project_page_num">
-      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_project('<%=  more_org_projects_organization_path(org_id) %>');"></a>
-    </li>
-<% end%>
+<%# if subdomains.size == 5 %>
+    <!--<li class="homepageLeftMenuMore" id="show_more_org_project">-->
+      <!--<input type="hidden" value="<%#= page %>" id="org_project_page_num">-->
+      <!--<a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_project('<%#=  more_org_projects_organization_path(org_id) %>');"></a>-->
+    <!--</li>-->
+<%# end%>

app/views/organizations/_subfield_list.html.erb

@@ -98,7 +98,8 @@
             <a href="javascript:void(0);" class="linkGrey fr ml5 mr5" onclick="edit('#subfield_show_<%= field.id %>','#subfield_edit_<%= field.id %>');">编辑</a>
             <span class="fr">|</span>
             <!--escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil)-->
-            <a href="javascript:void(0);" class="linkGrey fr mr5" onclick="org_submain_new('<%= escape_javascript new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field) %>');">添加二级目录</a>
+            <!--<a href="javascript:void(0);" class="linkGrey fr mr5" onclick="org_submain_new('<%#= escape_javascript new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field) %>');">添加二级目录</a>-->
+            <%= link_to("添加二级目录", new_org_subfield_sub_domain_path(:org_subfield_id => field.id, :field => field), :class => "linkGrey fr mr5", :remote => true) %>
           </li>
           <div class="cl"></div>
         </ul>

app/views/sub_document_comments/_show_sub_document_newstyle.html.erb

@@ -1,26 +1,26 @@
-<div class="sn-inner-body">
-  <div class="sn-innner-content">
-    <div class="sn-row sn-bg-white">
-      <div class="sn-content-position"> 您的位置：首页 > 数据资源 > 仿真数据 </div>
-    </div>
-    <div class="sn-inner-newslist">
-      <h2 class="sn-inner-newsh2">最新资讯</h2>
-      <ul>
-        <% documents.each do |document| %>
-            <li>
-              <div class="sn-circle fl"></div><%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain), :class => "sn-newslist-titile fl", :target => "_blank" %>
-              <span class=" txt-grey fr"><%= format_date(document.created_at) %>></span><a href="javascript:void(0)" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0)" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
-              <div class="cl"></div>
-            </li>
-        <% end %>
-      </ul>
-
-      <div>
-        <ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">
-          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>
-          <div class="cl"></div>
-        </ul>
-      </div>
-    </div>
-  </div>
+<div class="sn-inner-body">
+  <div class="sn-innner-content">
+    <div class="sn-row sn-bg-white">
+      <div class="sn-content-position"> 您的位置：首页 > 数据资源 > 仿真数据 </div>
+    </div>
+    <div class="sn-inner-newslist">
+      <h2 class="sn-inner-newsh2">最新资讯</h2>
+      <ul>
+        <% documents.each do |document| %>
+            <li>
+              <div class="sn-circle fl"></div><%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain), :class => "sn-newslist-titile fl", :target => "_blank" %>
+              <span class=" txt-grey fr"><%= format_date(document.created_at) %>></span><a href="javascript:void(0)" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0)" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
+              <div class="cl"></div>
+            </li>
+        <% end %>
+      </ul>
+
+      <div>
+        <ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">
+          <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>
+          <div class="cl"></div>
+        </ul>
+      </div>
+    </div>
+  </div>
 </div>

app/views/sub_domains/_new.html.erb

@@ -1,3 +1,30 @@
-<div class="CodeMirror-cursors">
-  test
-</div>
+<div class="org-popup-wrap sn-w300"> <a href="javascript:void(0);" class="org-popup-close"></a>
+  <div class="f16 fb fontBlue mb10">添加二级目录</div>
+  <%= form_tag url_for(:controller => 'sub_domains', :action => 'create', :org_subfield_id => field.id), :id=> 'add_subfield_form_subdomain',:remote => true do %>
+      <span class="fontGrey3 fb mb5 mr10">二级栏目名称</span>
+      <input type="text" id="subfield_name_subdomain" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
+      <ul class="orgAddRole mb10">
+        <li class="fontGrey3 fb ml24 mr10 fl">栏目类型</li>
+        <li class="fl mr15">
+          <input type="radio" id="orgMng" value="Post" name="field_type" checked="checked"/>
+          <label for="orgMng">帖子</label>
+        </li>
+        <li class="fl mr15">
+          <input type="radio" id="orgMeb" value="Resource" name="field_type" />
+          <label for="orgMeb">资源</label>
+        </li>
+        <li class="cl"></li>
+      </ul>
+      <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="add_org_subfield_subdomain();hideModal()">确定</a></div>
+      <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
+  <% end %>
+  <div class="cl"></div>
+</div>
+
+
+<script type="javascript">
+    function add_org_subfield_subdomain(){
+        if ($("#subfield_name_subdomain").val().trim() != "")
+        $("#add_subfield_form_subdomain").submit();
+    }
+</script>

app/views/sub_domains/new.html.erb

@@ -1,6 +0,0 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'sub_domains/new',:locals => {:course => @course,:course_attachment_type => 1}) %>');
-showModal('ajax-modal', '513px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-$('#ajax-modal').parent().css("top","40%").css("left","50%").css("border","3px solid #269ac9");
-$('#ajax-modal').parent().addClass("popbox_polls");

app/views/sub_domains/new.js.erb

@@ -1 +1,6 @@
-alert("test");
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'sub_domains/new',:locals => {:field => @org_subfield}) %>');
+showModal('ajax-modal', '513px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","40%").css("left","50%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");

public/stylesheets/org2.css

@@ -61,7 +61,8 @@ a.sn-link-select {color:#809df9;}
 .sn-bg-blue {background-color:#24366e;}
 .sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
 .sn-login2 {width:1200px; height:54px; line-height:54px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
-.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;}
+.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;}
+.sn-logo-add{ display:block;  top:10px; left:0px; position:absolute;  width:20px; height:20px;background:url(../images/default_blank/icons-add.png) -0px -3px no-repeat;}
 .sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;}
 a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;}
 .sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1;}
@@ -75,6 +76,8 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:
 .sn-sub-nav li a:hover {border-bottom:3px solid #ffbd18; height:37px;}
 .sn-subnav-slice {margin:12px 5px;}
 .sn-banner {width:1200px; height:210px; margin:0 auto;}
+.sn-logo-add{ display:block;  top:5px; left:0px; position:absolute;  width:20px; height:20px;background:url(../images/default_blank/icons-add.png) 0px -3px no-repeat;}
+.sn-banner-add{ display:block; position:absolute; top:10px; left:10px;width:27px; height:27px; background:url(../images/default_blank/icons-add.png) -32px -0px no-repeat;}
 .sn-content-position {width:1200px; height:50px; line-height:50px; vertical-align:middle; font-size:14px; color:#888; margin:0 auto;}
 /*footer样式*/
 .sn-footer {width:1200px; height:220px; margin:0 auto; text-align:center; font-size:14px; color:#fff; line-height:normal;}