Merge pull request #6 from GiscardBiamby/master

Include some minor fixes from my fork
webadvanced · Feb 7, 2013 · 96ab3a3 · 96ab3a3
2 parents f2f0128 + 178af0c
commit 96ab3a3
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/Controllers/HomeController.cs b/Controllers/HomeController.cs
@@ -83,7 +83,10 @@ public class HomeController : Controller {
                         if (item.LastUpdated.HasValue) {
                             element.Add(new XElement(xmlns + "lastmod", item.LastUpdated.Value.ToString("yyyy-MM-dd")));
                         }
-                        element.Add(new XElement(xmlns + "priority", (item.Priority - 1) / 4.0));
+                        var priority = (item.Priority - 1) / 4.0;
+                        if (priority >= 0.0 && priority <= 1.0) {
+                            element.Add(new XElement(xmlns + "priority", (item.Priority - 1) / 4.0));
+                        }
                         urlset.Add(element);
                     }
                 }

diff --git a/Module.txt b/Module.txt
@@ -9,4 +9,5 @@ Features:
     WebAdvanced.Sitemap:
         Description: Provides a highly configurable XML and HTML sitemap.
 		Name: Advanced Sitemap
-		Category: Navigation
+		Category: Navigation
+        Dependencies: Orchard.jQuery
diff --git a/Scripts/admin.indexsettings.js b/Scripts/admin.indexsettings.js
@@ -2,6 +2,9 @@
     // Add a new route form to the screen
     var url = window.location.toString().replace("Indexing", "");
     $("#addroute").click(function (e) {
+        url = url.replace('indexing/', '');
+        url = url.replace('indexing', '');
+
         $.ajax({
             url: url + "GetCustomRouteForm",
             success: function (data) {

diff --git a/WebAdvanced.Sitemap.csproj b/WebAdvanced.Sitemap.csproj
@@ -63,8 +63,14 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web.Routing" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
@@ -112,17 +118,17 @@
     <Compile Include="ViewModels\DisplaySettingsPageModel.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Views\Admin\Cache.cshtml" />
-    <None Include="Views\Admin\Indexing.cshtml" />
-    <None Include="Views\Admin\DisplaySettings.cshtml" />
-    <None Include="Views\EditorTemplates\CustomRouteModel.cshtml" />
-    <None Include="Views\EditorTemplates\IndexSettingsModel.cshtml" />
-    <None Include="Views\DisplayTemplates\RouteSettingsModel.cshtml" />
-    <None Include="Views\Admin\PartialCustomRouteEditor.cshtml" />
-    <None Include="Views\Sitemap.Column.cshtml" />
-    <None Include="Views\Sitemap.Group.cshtml" />
-    <None Include="Views\Sitemap.Index.cshtml" />
-    <None Include="Views\Sitemap.Node.cshtml" />
+    <Content Include="Views\Admin\Cache.cshtml" />
+    <Content Include="Views\Admin\Indexing.cshtml" />
+    <Content Include="Views\Admin\DisplaySettings.cshtml" />
+    <Content Include="Views\EditorTemplates\CustomRouteModel.cshtml" />
+    <Content Include="Views\EditorTemplates\IndexSettingsModel.cshtml" />
+    <Content Include="Views\DisplayTemplates\RouteSettingsModel.cshtml" />
+    <Content Include="Views\Admin\PartialCustomRouteEditor.cshtml" />
+    <Content Include="Views\Sitemap.Column.cshtml" />
+    <Content Include="Views\Sitemap.Group.cshtml" />
+    <Content Include="Views\Sitemap.Index.cshtml" />
+    <Content Include="Views\Sitemap.Node.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Views\Shared\" />