From 42814feab817abb44ce833e7690bfde1be745223 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 6 May 2016 11:29:30 +0800
Subject: [PATCH] =?UTF-8?q?js=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org2.html.erb | 71 +++++++++++++++-------------
 1 file changed, 38 insertions(+), 33 deletions(-)
diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 6f0a5add9..d5920e3ae 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -34,18 +34,6 @@
   <script>
     $(document).ready(function(){
         scrollPic();
-        $(".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();
-        });
     });
       function scrollPic() {
           var scrollPic = new ScrollPic();
@@ -68,27 +56,6 @@
 </head>
 
 <!--add by huang-->
-<script type="text/javascript">
-    function org_new_files_upload()
-    {
-        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
-        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","36%").css("border","3px solid #269ac9");
-        $('#ajax-modal').parent().addClass("popbox_polls");
-    }
-
-    function org_new_files_banner_upload()
-    {
-        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_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","36%").css("border","3px solid #269ac9");
-        $('#ajax-modal').parent().addClass("popbox_polls");
-    }
-</script>
 <body onload="prettyPrint();">
 <!--内容开始-->
 <header>
@@ -219,3 +186,41 @@
 </body>
 </html>
 
+<script>
+    $(".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();
+    });
+</script>
+
+<!--add by huang-->
+<script type="text/javascript">
+    function org_new_files_upload()
+    {
+        alert("test");
+        $('#ajax-modal').html('');
+        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","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function org_new_files_banner_upload()
+    {
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_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","36%").css("border","3px solid #269ac9");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+</script>
