Am rezolvat eu unele probleme cu JavaScript-ul.

colin-dumitru · Jan 19, 2012 · e36052d · e36052d
1 parent c450cf7
commit e36052d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 595 deletions.
diff --git a/WebServer/Content/jquery-1.4.1.min.js b/WebServer/Content/jquery-1.4.1.min.js
diff --git a/WebServer/Content/timeline.xml b/WebServer/Content/timeline.xml
diff --git a/WebServer/Content/summary.js → WebServer/Scripts/summary.js b/WebServer/Content/summary.js → WebServer/Scripts/summary.js
diff --git a/WebServer/Content/timeline.js → WebServer/Scripts/timeline.js b/WebServer/Content/timeline.js → WebServer/Scripts/timeline.js
@@ -17,7 +17,7 @@ function dateStringToDate(dateString) {
 }
 
 function tryToLoad() {
-    $.get("/Content/timeline.xml", function (xmlFile) {
+    $.get("/Get/Timeline/10", function (xmlFile) {
         var xml = $(xmlFile);
         loaded(xml);
     });

diff --git a/WebServer/Views/Home/Summary.aspx b/WebServer/Views/Home/Summary.aspx
@@ -8,8 +8,12 @@
     Summary
 </asp:Content>
 
+<asp:Content ID="HeadContent" ContentPlaceHolderID="HeadContent" runat="server">
+   <script src="/Scripts/jquery-1.4.1.min.js" type="text/javascript"></script>
+   <script src="/Scripts/summary.js" type="text/javascript"></script>
+</asp:Content>
+
 <asp:Content ID="MainContent" ContentPlaceHolderID="MainContent" runat="server">
-    <script src="/Content/jquery-1.4.1.min.js" type="text/javascript"></script>
-    <script src="/Content/summary.js" type="text/javascript"></script>
+
     <div id="doc"></div>
 </asp:Content>
diff --git a/WebServer/Views/Home/TimeLine.aspx b/WebServer/Views/Home/TimeLine.aspx
@@ -9,8 +9,11 @@
     TimeLine
 </asp:Content>
 
-<asp:Content ID="MainContent" ContentPlaceHolderID="MainContent" runat="server">
-    <script src="/Content/jquery-1.4.1.min.js" type="text/javascript"></script>
-    <script src="/Content/timeline.js" type="text/javascript"></script>
+<asp:Content ID="HeadContent" ContentPlaceHolderID="HeadContent" runat="server">
+    <script src="/Scripts/jquery-1.4.1.min.js" type="text/javascript"></script>
+    <script src="/Scripts/timeline.js" type="text/javascript"></script>
+</asp:Content>
+
+<asp:Content ID="MainContent" ContentPlaceHolderID="MainContent" runat="server">     
     <div id="doc"></div>
 </asp:Content>
diff --git a/WebServer/Views/Shared/Site.Master b/WebServer/Views/Shared/Site.Master
@@ -8,6 +8,9 @@
     <title>
         <asp:ContentPlaceHolder ID="TitleContent" runat="server" />
     </title>
+    <head>
+        <asp:ContentPlaceHolder ID="HeadContent" runat="server" />
+    </head>
     <link href="../../Content/Site.css" rel="stylesheet" type="text/css" />
 </head>
 <body>

diff --git a/WebServer/WebServer.csproj b/WebServer/WebServer.csproj
@@ -101,9 +101,9 @@
     <Content Include="App_Data\WebServerDatabase_log.ldf">
       <DependentUpon>WebServerDatabase.mdf</DependentUpon>
     </Content>
-    <Content Include="Content\jquery-1.4.1.min.js" />
-    <Content Include="Content\summary.js" />
-    <Content Include="Content\timeline.js" />
+    <Content Include="Scripts\jquery-1.4.1.min.js" />
+    <Content Include="Scripts\summary.js" />
+    <Content Include="Scripts\timeline.js" />
     <Content Include="Content\timeline.xml" />
     <Content Include="Global.asax" />
     <Content Include="Models\DocumentDataModel.edmx.sql" />
@@ -119,7 +119,6 @@
     </Content>
     <Content Include="Content\Site.css" />
     <Content Include="Scripts\jquery-1.4.1.js" />
-    <Content Include="Scripts\jquery-1.4.1.min.js" />
     <Content Include="Scripts\jquery-1.4.1-vsdoc.js" />
     <Content Include="Scripts\jquery.validate.js" />
     <Content Include="Scripts\jquery.validate.min.js" />