Skip to content
Browse files

updated packages

  • Loading branch information...
1 parent 8731ead commit d2e88d2e4c58a9ceb2566b3113395101d90e9069 @dlebedynskyi dlebedynskyi committed May 8, 2012
Showing with 82,848 additions and 45,215 deletions.
  1. +2 −0 CityTravel.Domain/.gitignore
  2. +14 −0 CityTravel.Domain/App.config
  3. +10 −6 CityTravel.Domain/CityTravel.Domain.csproj
  4. +0 −243 CityTravel.Domain/Resources.resx
  5. +0 −240 CityTravel.Domain/Resources.ru.resx
  6. +1 −1 CityTravel.Domain/packages.config
  7. +73 −0 CityTravel.Web.UI/App_Start/NinjectWebCommon.cs
  8. +36 −32 CityTravel.Web.UI/CityTravel.Web.UI.csproj
  9. BIN CityTravel.Web.UI/Content/images/glyphicons-halflings-white.png
  10. BIN CityTravel.Web.UI/Content/images/glyphicons-halflings.png
  11. +33 −26 CityTravel.Web.UI/Global.asax.cs
  12. +351 −245 CityTravel.Web.UI/Scripts/Bootstrap/bootstrap.js
  13. +6 −1 CityTravel.Web.UI/Scripts/Bootstrap/bootstrap.min.js
  14. +1 −2 CityTravel.Web.UI/Scripts/My/ControlsNew.js
  15. +1 −4 CityTravel.Web.UI/Scripts/My/Main.js
  16. +1 −2 CityTravel.Web.UI/Scripts/My/MakeRouteViewModel.js
  17. +1 −1 CityTravel.Web.UI/Scripts/My/engine.js
  18. +0 −7,153 CityTravel.Web.UI/Scripts/jQuery/jquery-1.7.1-vsdoc.js
  19. +0 −4 CityTravel.Web.UI/Scripts/jQuery/jquery-1.7.1.min.js
  20. +7,223 −0 CityTravel.Web.UI/Scripts/jQuery/jquery-1.7.2-vsdoc.js
  21. +654 −516 CityTravel.Web.UI/Scripts/jQuery/{jquery-1.7.1.js → jquery-1.7.2.js}
  22. +4 −0 CityTravel.Web.UI/Scripts/jQuery/jquery-1.7.2.min.js
  23. +1 −2 CityTravel.Web.UI/Scripts/jQuery/jquery.unobtrusive-ajax.js
  24. +1 −3 CityTravel.Web.UI/Scripts/jQuery/jquery.validate.unobtrusive.js
  25. 0 ....0/Content/Scripts/knockout-2.0.0.debug.js → CityTravel.Web.UI/Scripts/knockout/knockout.debug.js
  26. 0 ...ockoutjs.2.0.0/Content/Scripts/knockout-2.0.0.js → CityTravel.Web.UI/Scripts/knockout/knockout.js
  27. +31 −33 CityTravel.Web.UI/Views/AddRoute/AddRoute.cshtml
  28. +4 −10 CityTravel.Web.UI/Views/AddRoute/AddStop.cshtml
  29. +1 −3 CityTravel.Web.UI/Views/MakeRoute/AboutUs.cshtml
  30. +122 −119 CityTravel.Web.UI/Views/MakeRoute/Index.cshtml
  31. +32 −31 CityTravel.Web.UI/Views/Shared/_Layout.cshtml
  32. +6 −15 CityTravel.Web.UI/Views/Web.config
  33. +80 −63 CityTravel.Web.UI/Web.config
  34. +15 −15 CityTravel.Web.UI/packages.config
  35. +2 −2 CityTravel.Web.UI/robots.txt
  36. +0 −12 CityTravel.sln
  37. BIN packages/AjaxMin.4.13.4076.28499/AjaxMin.4.13.4076.28499.nupkg
  38. BIN packages/AjaxMin.4.13.4076.28499/lib/AjaxMin.dll
  39. BIN packages/AjaxMin.4.51.4507.18296/AjaxMin.4.51.4507.18296.nupkg
  40. BIN packages/AjaxMin.4.51.4507.18296/lib/net20/AjaxMin.dll
  41. BIN packages/AjaxMin.4.51.4507.18296/lib/net20/AjaxMin.pdb
  42. BIN packages/EntityFramework.4.3.0-beta1/EntityFramework.4.3.0-beta1.nupkg
  43. BIN packages/EntityFramework.4.3.0-beta1/lib/net40/EntityFramework.dll
  44. BIN packages/EntityFramework.4.3.0-beta1/tools/EntityFramework.PowerShell.dll
  45. BIN packages/EntityFramework.4.3.0-beta1/tools/Update-Database.exe
  46. +0 −1 packages/{EntityFramework.4.3.0-beta1 → EntityFramework.4.3.1}/Content/App.config.transform
  47. +0 −1 packages/{EntityFramework.4.3.0-beta1 → EntityFramework.4.3.1}/Content/Web.config.transform
  48. BIN packages/EntityFramework.4.3.1/EntityFramework.4.3.1.nupkg
  49. BIN packages/EntityFramework.4.3.1/lib/net40/EntityFramework.dll
  50. +9,553 −9,471 packages/{EntityFramework.4.3.0-beta1 → EntityFramework.4.3.1}/lib/net40/EntityFramework.xml
  51. +52 −0 packages/EntityFramework.4.3.1/tools/EF4.3on.NET4.5Readme.txt
  52. BIN packages/EntityFramework.4.3.1/tools/EntityFramework.PowerShell.dll
  53. 0 packages/{EntityFramework.4.3.0-beta1 → EntityFramework.4.3.1}/tools/EntityFramework.psd1
  54. +102 −44 packages/{EntityFramework.4.3.0-beta1 → EntityFramework.4.3.1}/tools/EntityFramework.psm1
  55. 0 packages/{EntityFramework.4.3.0-beta1 → EntityFramework.4.3.1}/tools/init.ps1
  56. +36 −0 packages/EntityFramework.4.3.1/tools/install.ps1
  57. BIN packages/EntityFramework.4.3.1/tools/migrate.exe
  58. BIN packages/Jurassic.2.1.1/Jurassic.2.1.1.nupkg
  59. BIN packages/Jurassic.2.1.1/lib/Jurassic.dll
  60. BIN packages/Newtonsoft.Json.4.0.7/Newtonsoft.Json.4.0.7.nupkg
  61. BIN packages/Newtonsoft.Json.4.0.7/lib/net20/Newtonsoft.Json.dll
  62. BIN packages/Newtonsoft.Json.4.0.7/lib/net20/Newtonsoft.Json.pdb
  63. BIN packages/Newtonsoft.Json.4.0.7/lib/net35/Newtonsoft.Json.dll
  64. BIN packages/Newtonsoft.Json.4.0.7/lib/net35/Newtonsoft.Json.pdb
  65. BIN packages/Newtonsoft.Json.4.0.7/lib/net40/Newtonsoft.Json.dll
  66. BIN packages/Newtonsoft.Json.4.0.7/lib/net40/Newtonsoft.Json.pdb
  67. BIN packages/Newtonsoft.Json.4.0.7/lib/sl3-wp/Newtonsoft.Json.dll
  68. BIN packages/Newtonsoft.Json.4.0.7/lib/sl3-wp/Newtonsoft.Json.pdb
  69. BIN packages/Newtonsoft.Json.4.0.7/lib/sl4/Newtonsoft.Json.dll
  70. BIN packages/Newtonsoft.Json.4.0.7/lib/sl4/Newtonsoft.Json.pdb
  71. BIN packages/Newtonsoft.Json.4.5.5/Newtonsoft.Json.4.5.5.nupkg
  72. BIN packages/Newtonsoft.Json.4.5.5/lib/net20/Newtonsoft.Json.dll
  73. +8,181 −0 packages/Newtonsoft.Json.4.5.5/lib/net20/Newtonsoft.Json.xml
  74. BIN packages/Newtonsoft.Json.4.5.5/lib/net35/Newtonsoft.Json.dll
  75. +990 −634 packages/{Newtonsoft.Json.4.0.7/lib/net40 → Newtonsoft.Json.4.5.5/lib/net35}/Newtonsoft.Json.xml
  76. BIN packages/Newtonsoft.Json.4.5.5/lib/net40/Newtonsoft.Json.dll
  77. +1,293 −1,412 packages/{Newtonsoft.Json.4.0.7/lib/net20 → Newtonsoft.Json.4.5.5/lib/net40}/Newtonsoft.Json.xml
  78. BIN packages/Newtonsoft.Json.4.5.5/lib/sl3-wp/Newtonsoft.Json.dll
  79. +2,840 −2,782 packages/{Newtonsoft.Json.4.0.7/lib/net35 → Newtonsoft.Json.4.5.5/lib/sl3-wp}/Newtonsoft.Json.xml
  80. BIN packages/Newtonsoft.Json.4.5.5/lib/sl4-windowsphone71/Newtonsoft.Json.dll
  81. +639 −173 ...tonsoft.Json.4.0.7/lib/sl3-wp → Newtonsoft.Json.4.5.5/lib/sl4-windowsphone71}/Newtonsoft.Json.xml
  82. BIN packages/Newtonsoft.Json.4.5.5/lib/sl4/Newtonsoft.Json.dll
  83. +634 −176 packages/{Newtonsoft.Json.4.0.7 → Newtonsoft.Json.4.5.5}/lib/sl4/Newtonsoft.Json.xml
  84. BIN packages/Newtonsoft.Json.4.5.5/lib/winrt45/Newtonsoft.Json.dll
  85. +7,103 −0 packages/Newtonsoft.Json.4.5.5/lib/winrt45/Newtonsoft.Json.xml
  86. BIN packages/Ninject.2.2.1.4/Ninject.2.2.1.4.nupkg
  87. BIN packages/Ninject.2.2.1.4/lib/net35-Client/Ninject.dll
  88. BIN packages/Ninject.2.2.1.4/lib/net35-Client/Ninject.pdb
  89. BIN packages/Ninject.2.2.1.4/lib/net35-Full/Ninject.dll
  90. BIN packages/Ninject.2.2.1.4/lib/net35-Full/Ninject.pdb
  91. BIN packages/Ninject.2.2.1.4/lib/net40-Client/Ninject.dll
  92. BIN packages/Ninject.2.2.1.4/lib/net40-Client/Ninject.pdb
  93. BIN packages/Ninject.2.2.1.4/lib/net40-Full/Ninject.dll
  94. BIN packages/Ninject.2.2.1.4/lib/net40-Full/Ninject.pdb
  95. BIN packages/Ninject.2.2.1.4/lib/sl2/Ninject.dll
  96. BIN packages/Ninject.2.2.1.4/lib/sl2/Ninject.pdb
  97. +0 −4,477 packages/Ninject.2.2.1.4/lib/sl2/Ninject.xml
  98. BIN packages/Ninject.2.2.1.4/lib/sl3-wp/Ninject.dll
  99. BIN packages/Ninject.2.2.1.4/lib/sl3-wp/Ninject.pdb
  100. +0 −4,439 packages/Ninject.2.2.1.4/lib/sl3-wp/Ninject.xml
  101. BIN packages/Ninject.2.2.1.4/lib/sl3/Ninject.dll
  102. BIN packages/Ninject.2.2.1.4/lib/sl3/Ninject.pdb
  103. +0 −4,477 packages/Ninject.2.2.1.4/lib/sl3/Ninject.xml
  104. BIN packages/Ninject.2.2.1.4/lib/sl4/Ninject.dll
  105. BIN packages/Ninject.2.2.1.4/lib/sl4/Ninject.pdb
  106. +0 −4,477 packages/Ninject.2.2.1.4/lib/sl4/Ninject.xml
  107. BIN packages/Ninject.3.0.0.15/Ninject.3.0.0.15.nupkg
  108. BIN packages/Ninject.3.0.0.15/lib/net35/Ninject.dll
  109. BIN packages/Ninject.3.0.0.15/lib/net35/Ninject.pdb
  110. +6,186 −0 packages/Ninject.3.0.0.15/lib/net35/Ninject.xml
  111. BIN packages/Ninject.3.0.0.15/lib/net40/Ninject.dll
  112. BIN packages/Ninject.3.0.0.15/lib/net40/Ninject.pdb
  113. +1,722 −279 packages/{Ninject.2.2.1.4/lib/net35-Full → Ninject.3.0.0.15/lib/net40}/Ninject.xml
  114. BIN packages/Ninject.3.0.0.15/lib/net45-full/Ninject.dll
  115. BIN packages/Ninject.3.0.0.15/lib/net45-full/Ninject.pdb
  116. +1,721 −273 packages/{Ninject.2.2.1.4/lib/net40-Full → Ninject.3.0.0.15/lib/net45-full}/Ninject.xml
  117. BIN packages/Ninject.3.0.0.15/lib/sl2/Ninject.dll
  118. BIN packages/Ninject.3.0.0.15/lib/sl2/Ninject.pdb
  119. +6,097 −0 packages/Ninject.3.0.0.15/lib/sl2/Ninject.xml
  120. BIN packages/Ninject.3.0.0.15/lib/sl3-wp/Ninject.dll
  121. BIN packages/Ninject.3.0.0.15/lib/sl3-wp/Ninject.pdb
  122. +6,048 −0 packages/Ninject.3.0.0.15/lib/sl3-wp/Ninject.xml
  123. BIN packages/Ninject.3.0.0.15/lib/sl3/Ninject.dll
  124. BIN packages/Ninject.3.0.0.15/lib/sl3/Ninject.pdb
  125. +6,097 −0 packages/Ninject.3.0.0.15/lib/sl3/Ninject.xml
  126. BIN packages/Ninject.3.0.0.15/lib/sl4-windowsphone71/Ninject.dll
  127. BIN packages/Ninject.3.0.0.15/lib/sl4-windowsphone71/Ninject.pdb
  128. +1,775 −425 packages/{Ninject.2.2.1.4/lib/net35-Client → Ninject.3.0.0.15/lib/sl4-windowsphone71}/Ninject.xml
  129. BIN packages/Ninject.3.0.0.15/lib/sl4/Ninject.dll
  130. BIN packages/Ninject.3.0.0.15/lib/sl4/Ninject.pdb
  131. +1,786 −382 packages/{Ninject.2.2.1.4/lib/net40-Client → Ninject.3.0.0.15/lib/sl4}/Ninject.xml
  132. BIN packages/Ninject.3.0.0.15/lib/sl5/Ninject.dll
  133. BIN packages/Ninject.3.0.0.15/lib/sl5/Ninject.pdb
  134. +6,045 −0 packages/Ninject.3.0.0.15/lib/sl5/Ninject.xml
  135. BIN packages/Ninject.MVC3.2.2.2.0/Ninject.MVC3.2.2.2.0.nupkg
  136. BIN packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.dll
  137. BIN packages/Ninject.MVC3.2.2.2.0/lib/net40-Full/Ninject.Web.Mvc.pdb
  138. BIN packages/Ninject.MVC3.3.0.0.6/Ninject.MVC3.3.0.0.6.nupkg
  139. BIN packages/Ninject.MVC3.3.0.0.6/lib/net40-full/Ninject.Web.Mvc.dll
  140. BIN packages/Ninject.MVC3.3.0.0.6/lib/net40-full/Ninject.Web.Mvc.pdb
  141. +101 −107 ...s/{Ninject.MVC3.2.2.2.0/lib/net40-Full → Ninject.MVC3.3.0.0.6/lib/net40-full}/Ninject.Web.Mvc.xml
  142. BIN packages/Ninject.MVC3.3.0.0.6/lib/net45-full/Ninject.Web.Mvc.dll
  143. BIN packages/Ninject.MVC3.3.0.0.6/lib/net45-full/Ninject.Web.Mvc.pdb
  144. +934 −0 packages/Ninject.MVC3.3.0.0.6/lib/net45-full/Ninject.Web.Mvc.xml
  145. +13 −7 ...pp_Start/NinjectMVC3.cs.pp → Ninject.Web.Common.3.0.0.7/Content/App_Start/NinjectWebCommon.cs.pp}
  146. BIN packages/Ninject.Web.Common.3.0.0.7/Ninject.Web.Common.3.0.0.7.nupkg
  147. BIN packages/Ninject.Web.Common.3.0.0.7/lib/net35-full/Ninject.Web.Common.dll
  148. BIN packages/Ninject.Web.Common.3.0.0.7/lib/net35-full/Ninject.Web.Common.pdb
  149. +227 −0 packages/Ninject.Web.Common.3.0.0.7/lib/net35-full/Ninject.Web.Common.xml
  150. BIN packages/Ninject.Web.Common.3.0.0.7/lib/net40-full/Ninject.Web.Common.dll
  151. BIN packages/Ninject.Web.Common.3.0.0.7/lib/net40-full/Ninject.Web.Common.pdb
  152. +227 −0 packages/Ninject.Web.Common.3.0.0.7/lib/net40-full/Ninject.Web.Common.xml
  153. BIN packages/Ninject.Web.Common.3.0.0.7/lib/net45-full/Ninject.Web.Common.dll
  154. BIN packages/Ninject.Web.Common.3.0.0.7/lib/net45-full/Ninject.Web.Common.pdb
  155. +227 −0 packages/Ninject.Web.Common.3.0.0.7/lib/net45-full/Ninject.Web.Common.xml
  156. BIN packages/SquishIt.0.7.1/SquishIt.0.7.1.nupkg
  157. BIN packages/SquishIt.0.7.1/lib/SquishIt.Framework.dll
  158. BIN packages/SquishIt.0.7.1/optional/SquishIt.Mvc.dll
  159. BIN packages/SquishIt.0.8.6/SquishIt.0.8.6.nupkg
  160. BIN packages/SquishIt.0.8.6/lib/SquishIt.Framework.dll
  161. BIN packages/SquishIt.Contrib.Mvc.0.1.3/SquishIt.Contrib.Mvc.0.1.3.nupkg
  162. +0 −44 packages/SquishIt.Contrib.Mvc.0.1.3/content/SquishIt.Contrib.MvcReadMe.txt
  163. BIN packages/SquishIt.Contrib.Mvc.0.1.3/lib/net40/SquishIt.Contrib.Mvc.dll
  164. +0 −38 packages/SquishIt.Contrib.Mvc.0.1.3/lib/net40/SquishIt.Contrib.Mvc.dll.CodeAnalysisLog.xml
  165. BIN packages/SquishIt.Mvc.0.8.6/SquishIt.Mvc.0.8.6.nupkg
  166. BIN packages/SquishIt.Mvc.0.8.6/lib/SquishIt.Mvc.dll
  167. BIN packages/Twitter.Bootstrap.2.0.1/Twitter.Bootstrap.2.0.1.nupkg
  168. +0 −581 packages/Twitter.Bootstrap.2.0.1/content/Content/bootstrap-responsive.css
  169. +0 −4 packages/Twitter.Bootstrap.2.0.1/content/Content/bootstrap-responsive.min.css
  170. +0 −632 packages/Twitter.Bootstrap.2.0.1/content/Content/bootstrap.min.css
  171. BIN packages/Twitter.Bootstrap.2.0.1/content/Content/images/glyphicons-halflings-white.png
  172. BIN packages/Twitter.Bootstrap.2.0.1/content/Content/images/glyphicons-halflings.png
  173. +0 −1 packages/Twitter.Bootstrap.2.0.1/content/Scripts/bootstrap.min.js
  174. BIN packages/Twitter.Bootstrap.2.0.3/Twitter.Bootstrap.2.0.3.nupkg
  175. +808 −0 packages/Twitter.Bootstrap.2.0.3/content/Content/bootstrap-responsive.css
  176. +9 −0 packages/Twitter.Bootstrap.2.0.3/content/Content/bootstrap-responsive.min.css
  177. +2,313 −849 packages/{Twitter.Bootstrap.2.0.1 → Twitter.Bootstrap.2.0.3}/content/Content/bootstrap.css
  178. +9 −0 packages/Twitter.Bootstrap.2.0.3/content/Content/bootstrap.min.css
  179. BIN packages/Twitter.Bootstrap.2.0.3/content/Content/images/glyphicons-halflings-white.png
  180. BIN packages/Twitter.Bootstrap.2.0.3/content/Content/images/glyphicons-halflings.png
  181. +351 −245 packages/{Twitter.Bootstrap.2.0.1 → Twitter.Bootstrap.2.0.3}/content/Scripts/bootstrap.js
  182. +6 −0 packages/Twitter.Bootstrap.2.0.3/content/Scripts/bootstrap.min.js
  183. BIN packages/WebActivator.1.4.4/WebActivator.1.4.4.nupkg
  184. BIN packages/WebActivator.1.4.4/lib/net40/WebActivator.dll
  185. BIN packages/WebActivator.1.5/WebActivator.1.5.nupkg
  186. BIN packages/WebActivator.1.5/lib/net40/WebActivator.dll
  187. BIN packages/YUICompressor.NET.1.5.0.0/YUICompressor.NET.1.5.0.0.nupkg
  188. BIN packages/YUICompressor.NET.1.5.0.0/lib/NET20/EcmaScript.NET.modified.dll
  189. BIN packages/YUICompressor.NET.1.5.0.0/lib/NET20/Iesi.Collections.dll
  190. BIN packages/YUICompressor.NET.1.5.0.0/lib/NET20/Yahoo.Yui.Compressor.NET20.dll
  191. BIN packages/YUICompressor.NET.1.5.0.0/lib/NET35/EcmaScript.NET.modified.dll
  192. BIN packages/YUICompressor.NET.1.5.0.0/lib/NET35/Yahoo.Yui.Compressor.dll
  193. BIN packages/YUICompressor.NET.1.7.1.0/YUICompressor.NET.1.7.1.0.nupkg
  194. BIN packages/YUICompressor.NET.1.7.1.0/lib/net35/EcmaScript.NET.modified.dll
  195. BIN packages/YUICompressor.NET.1.7.1.0/lib/net35/Yahoo.Yui.Compressor.dll
  196. BIN packages/dotless.1.1.0/Tools/dotless.Compiler.exe
  197. BIN packages/dotless.1.1.0/dotless.1.1.0.nupkg
  198. BIN packages/dotless.1.1.0/lib/dotless.Core.dll
  199. 0 packages/{dotless.1.1.0 → dotless.1.3.0.3}/acknowledgements.txt
  200. +17 −0 packages/dotless.1.3.0.3/content/web.config.transform
  201. BIN packages/dotless.1.3.0.3/dotless.1.3.0.3.nupkg
  202. BIN packages/dotless.1.3.0.3/lib/dotless.Core.dll
  203. 0 packages/{dotless.1.1.0 → dotless.1.3.0.3}/license.txt
  204. BIN packages/dotless.1.3.0.3/tool/dotless.compiler.exe
Sorry, we could not display the entire diff because it was too big.
View
2 CityTravel.Domain/.gitignore
@@ -0,0 +1,2 @@
+
+*.user
View
14 CityTravel.Domain/App.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <configSections>
+ <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+ <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ </configSections>
+ <entityFramework>
+ <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework">
+ <parameters>
+ <parameter value="Data Source=.\SQLEXPRESS; Integrated Security=True; MultipleActiveResultSets=True" />
+ </parameters>
+ </defaultConnectionFactory>
+ </entityFramework>
+</configuration>
View
16 CityTravel.Domain/CityTravel.Domain.csproj
@@ -49,22 +49,23 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
- <Reference Include="EntityFramework, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\EntityFramework.4.3.0-beta1\lib\net40\EntityFramework.dll</HintPath>
+ <Reference Include="EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+ <HintPath>..\packages\EntityFramework.4.3.1\lib\net40\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.SqlServer.Types, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Program Files (x86)\Microsoft SQL Server\100\SDK\Assemblies\Microsoft.SqlServer.Types.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=4.0.7.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.4.0.7\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Newtonsoft.Json.4.5.5\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
+ <Reference Include="System.Data.Entity" />
<Reference Include="System.Web" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
@@ -157,7 +158,10 @@
<Name>CityTravel.Resources</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <None Include="App.config" />
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
View
243 CityTravel.Domain/Resources.resx
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="AboutUs" xml:space="preserve">
- <value>AboutUs</value>
- </data>
- <data name="AboutUsText" xml:space="preserve">
- <value>AboutUsText</value>
- </data>
- <data name="AdressError" xml:space="preserve">
- <value>AdressError</value>
- </data>
- <data name="Cancel" xml:space="preserve">
- <value>Cancel</value>
- </data>
- <data name="ChooseCategory" xml:space="preserve">
- <value>ChooseCategory</value>
- </data>
- <data name="ChooseCategoryError" xml:space="preserve">
- <value>ChooseCategoryError</value>
- </data>
- <data name="Complaint" xml:space="preserve">
- <value>Сomplaint</value>
- </data>
- <data name="CooperationPurpose" xml:space="preserve">
- <value>CooperationPurpose</value>
- </data>
- <data name="EnterLocation" xml:space="preserve">
- <value>EnterLocation</value>
- </data>
- <data name="Error" xml:space="preserve">
- <value>Error</value>
- </data>
- <data name="Feedback" xml:space="preserve">
- <value>Feedback</value>
- </data>
- <data name="FindRoute" xml:space="preserve">
- <value>FindRoute</value>
- </data>
- <data name="MakeRoute" xml:space="preserve">
- <value>MakeRoute</value>
- </data>
- <data name="Metro" xml:space="preserve">
- <value>Metro</value>
- </data>
- <data name="ModelEmail" xml:space="preserve">
- <value>ModelEmail</value>
- </data>
- <data name="ModelMessage" xml:space="preserve">
- <value>ModelMessage</value>
- </data>
- <data name="ModelName" xml:space="preserve">
- <value>ModelName</value>
- </data>
- <data name="OnStop" xml:space="preserve">
- <value>at the stop called</value>
- </data>
- <data name="Opinion" xml:space="preserve">
- <value>Opinion</value>
- </data>
- <data name="Partnership" xml:space="preserve">
- <value>Partnership</value>
- </data>
- <data name="PrintRoute" xml:space="preserve">
- <value>PrintRoute</value>
- </data>
- <data name="ProcessingError" xml:space="preserve">
- <value>ProcessingError</value>
- </data>
- <data name="Purpose" xml:space="preserve">
- <value>Purpose</value>
- </data>
- <data name="RequiredFields" xml:space="preserve">
- <value>RequiredFields</value>
- </data>
- <data name="RideUntil" xml:space="preserve">
- <value>Ride on the shuttle until bus stop called</value>
- </data>
- <data name="RoutesListCaption" xml:space="preserve">
- <value>RoutesListCaption</value>
- </data>
- <data name="SbSInstruction" xml:space="preserve">
- <value>SbSInstruction</value>
- </data>
- <data name="ShuttleTransport" xml:space="preserve">
- <value>ShuttleTransport</value>
- </data>
- <data name="Sit" xml:space="preserve">
- <value>Sit on</value>
- </data>
- <data name="Submit" xml:space="preserve">
- <value>Submit</value>
- </data>
- <data name="temp" xml:space="preserve">
- <value>temp</value>
- </data>
- <data name="TextVersion" xml:space="preserve">
- <value>TextVersion</value>
- </data>
- <data name="Tramvay" xml:space="preserve">
- <value>Tramvay</value>
- </data>
- <data name="TransportList" xml:space="preserve">
- <value>TransportList</value>
- </data>
- <data name="TroleyBus" xml:space="preserve">
- <value>TroleyBus</value>
- </data>
- <data name="YouEnterWrongAdress" xml:space="preserve">
- <value>YouEnterWrongAdress</value>
- </data>
- <data name="YouMustEnterMessage" xml:space="preserve">
- <value>YouMustEnterMessage</value>
- </data>
- <data name="YouMustEnterName" xml:space="preserve">
- <value>YouMustEnterName</value>
- </data>
- <data name="ShuttleTransportLabel" xml:space="preserve">
- <value>ShuttleTransportLabel</value>
- </data>
- <data name="Currency" xml:space="preserve">
- <value>Hrn</value>
- </data>
- <data name="FieldsRequired" xml:space="preserve">
- <value>[en]FieldsRequired</value>
- </data>
-</root>
View
240 CityTravel.Domain/Resources.ru.resx
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="AboutUs" xml:space="preserve">
- <value>О нас</value>
- </data>
- <data name="AboutUsText" xml:space="preserve">
- <value>Че-то хорошее про нас(можно с картинками) :)</value>
- </data>
- <data name="AdressError" xml:space="preserve">
- <value>Ошибка ввода адреса</value>
- </data>
- <data name="Cancel" xml:space="preserve">
- <value>Отмена</value>
- </data>
- <data name="ChooseCategory" xml:space="preserve">
- <value>Выберите категорию:</value>
- </data>
- <data name="ChooseCategoryError" xml:space="preserve">
- <value>Выберете категорию, к которой относится ваше сообщение</value>
- </data>
- <data name="Complaint" xml:space="preserve">
- <value>Жалоба</value>
- </data>
- <data name="CooperationPurpose" xml:space="preserve">
- <value>Предложение о сотрудничестве</value>
- </data>
- <data name="Currency" xml:space="preserve">
- <value> грн</value>
- </data>
- <data name="EnterLocation" xml:space="preserve">
- <value>Введите адрес</value>
- </data>
- <data name="Error" xml:space="preserve">
- <value>Ошибка</value>
- </data>
- <data name="Feedback" xml:space="preserve">
- <value>Обратная связь</value>
- </data>
- <data name="FieldsRequired" xml:space="preserve">
- <value>* - поля, обязательные к заполнению</value>
- </data>
- <data name="FindRoute" xml:space="preserve">
- <value>Поиск</value>
- </data>
- <data name="MakeRoute" xml:space="preserve">
- <value>Найти</value>
- </data>
- <data name="Metro" xml:space="preserve">
- <value>Метро</value>
- </data>
- <data name="ModelEmail" xml:space="preserve">
- <value>E-mail:</value>
- </data>
- <data name="ModelMessage" xml:space="preserve">
- <value>Сообщение:</value>
- </data>
- <data name="ModelName" xml:space="preserve">
- <value>Имя:</value>
- </data>
- <data name="OnStop" xml:space="preserve">
- <value>на остановке</value>
- </data>
- <data name="Opinion" xml:space="preserve">
- <value>Мнение</value>
- </data>
- <data name="Partnership" xml:space="preserve">
- <value>Партнерство</value>
- </data>
- <data name="PrintRoute" xml:space="preserve">
- <value>Распечатать</value>
- </data>
- <data name="ProcessingError" xml:space="preserve">
- <value>Произошла ошибка при обработке вашего запроса.</value>
- </data>
- <data name="Purpose" xml:space="preserve">
- <value>Пожелание</value>
- </data>
- <data name="RequiredFields" xml:space="preserve">
- <value>* - поля, обязательные к заполнению</value>
- </data>
- <data name="RideUntil" xml:space="preserve">
- <value>Едьте до остановки</value>
- </data>
- <data name="RoutesListCaption" xml:space="preserve">
- <value>Список маршрутов</value>
- </data>
- <data name="SbSInstruction" xml:space="preserve">
- <value>Пошаговая инструкция</value>
- </data>
- <data name="ShuttleTransport" xml:space="preserve">
- <value>Маршрутка</value>
- </data>
- <data name="ShuttleTransportLabel" xml:space="preserve">
- <value>Маршрутку</value>
- </data>
- <data name="Sit" xml:space="preserve">
- <value>Сядьте на </value>
- </data>
- <data name="Submit" xml:space="preserve">
- <value>Отправить</value>
- </data>
- <data name="TextVersion" xml:space="preserve">
- <value>Текстовая версия</value>
- </data>
- <data name="Tramvay" xml:space="preserve">
- <value>Трамвай</value>
- </data>
- <data name="TransportList" xml:space="preserve">
- <value>Транспорт</value>
- </data>
- <data name="TroleyBus" xml:space="preserve">
- <value>Тролейбус</value>
- </data>
- <data name="YouEnterWrongAdress" xml:space="preserve">
- <value>Неправильный формат почты</value>
- </data>
- <data name="YouMustEnterMessage" xml:space="preserve">
- <value>Вы должны ввести сообщение</value>
- </data>
- <data name="YouMustEnterName" xml:space="preserve">
- <value>Вы должны ввести имя</value>
- </data>
-</root>
View
2 CityTravel.Domain/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="EntityFramework" version="4.2.0.0" />
+ <package id="EntityFramework" version="4.3.1" />
</packages>
View
73 CityTravel.Web.UI/App_Start/NinjectWebCommon.cs
@@ -0,0 +1,73 @@
+[assembly: WebActivator.PreApplicationStartMethod(typeof(CityTravel.Web.UI.App_Start.NinjectWebCommon), "Start")]
+[assembly: WebActivator.ApplicationShutdownMethodAttribute(typeof(CityTravel.Web.UI.App_Start.NinjectWebCommon), "Stop")]
+
+namespace CityTravel.Web.UI.App_Start
+{
+ using System;
+ using System.Web;
+ using CityTravel.Domain.DomainModel.Abstract;
+ using CityTravel.Domain.DomainModel.Concrete;
+ using CityTravel.Domain.Repository.Abstract;
+ using CityTravel.Domain.Repository.Concrete;
+ using CityTravel.Domain.Services.AuthenticationProvider.Abstract;
+ using CityTravel.Domain.Services.AuthenticationProvider.Concrete;
+ using CityTravel.Domain.Services.Autocomplete.Abstract;
+ using CityTravel.Domain.Services.Autocomplete.Concrete;
+ using CityTravel.Domain.Services.Segment.Abstract;
+ using CityTravel.Domain.Services.Segment.Concrete;
+ using Microsoft.Web.Infrastructure.DynamicModuleHelper;
+ using Ninject;
+ using Ninject.Web.Common;
+
+ public static class NinjectWebCommon
+ {
+ private static readonly Bootstrapper bootstrapper = new Bootstrapper();
+
+ /// <summary>
+ /// Starts the application
+ /// </summary>
+ public static void Start()
+ {
+ DynamicModuleUtility.RegisterModule(typeof(OnePerRequestHttpModule));
+ DynamicModuleUtility.RegisterModule(typeof(NinjectHttpModule));
+ bootstrapper.Initialize(CreateKernel);
+ }
+
+ /// <summary>
+ /// Stops the application.
+ /// </summary>
+ public static void Stop()
+ {
+ bootstrapper.ShutDown();
+ }
+
+ /// <summary>
+ /// Creates the kernel that will manage your application.
+ /// </summary>
+ /// <returns>The created kernel.</returns>
+ private static IKernel CreateKernel()
+ {
+ var kernel = new StandardKernel();
+
+ kernel.Bind<Func<IKernel>>().ToMethod(ctx => () => new Bootstrapper().Kernel);
+ kernel.Bind<IHttpModule>().To<HttpApplicationInitializationHttpModule>();
+
+ RegisterServices(kernel);
+ return kernel;
+ }
+
+ /// <summary>
+ /// Load your modules or register your services here!
+ /// </summary>
+ /// <param name="kernel">The kernel.</param>
+ private static void RegisterServices(IKernel kernel)
+ {
+ kernel.Bind(typeof(IProvider<>)).To(typeof(GenericRepository<>));
+ kernel.Bind<IAutocomplete>().To<CacheAutoComplete>().InThreadScope();
+ kernel.Bind<IRouteSeach>().To<RouteSeach>();
+ kernel.Bind<IDataBaseContext>().To<DataBaseContext>().InThreadScope();
+ kernel.Bind<IAuthenticationProvider>().To<FormsAuthenticationProvider>().InThreadScope();
+
+ }
+ }
+}
View
68 CityTravel.Web.UI/CityTravel.Web.UI.csproj
@@ -34,15 +34,19 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AjaxMin">
- <HintPath>..\packages\AjaxMin.4.13.4076.28499\lib\AjaxMin.dll</HintPath>
- </Reference>
- <Reference Include="dotless.Core">
- <HintPath>..\packages\dotless.1.1.0\lib\dotless.Core.dll</HintPath>
+ <Reference Include="AjaxMin, Version=4.51.4507.18296, Culture=neutral, PublicKeyToken=21ef50ce11b5d80f, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\AjaxMin.4.51.4507.18296\lib\net20\AjaxMin.dll</HintPath>
</Reference>
- <Reference Include="EntityFramework, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+ <Reference Include="dotless.Core, Version=1.3.0.3, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\EntityFramework.4.3.0-beta1\lib\net40\EntityFramework.dll</HintPath>
+ <HintPath>..\packages\dotless.1.3.0.3\lib\dotless.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+ <HintPath>..\packages\EntityFramework.4.3.1\lib\net40\EntityFramework.dll</HintPath>
+ </Reference>
+ <Reference Include="Jurassic, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Jurassic.2.1.1\lib\Jurassic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.SqlServer.Types, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -51,23 +55,28 @@
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>..\packages\Newtonsoft.Json.4.0.7\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.4.5.5\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
- <Reference Include="Ninject">
- <HintPath>..\packages\Ninject.2.2.1.4\lib\net40-Full\Ninject.dll</HintPath>
+ <Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Ninject.3.0.0.15\lib\net40\Ninject.dll</HintPath>
+ </Reference>
+ <Reference Include="Ninject.Web.Common">
+ <HintPath>..\packages\Ninject.Web.Common.3.0.0.7\lib\net40-full\Ninject.Web.Common.dll</HintPath>
</Reference>
- <Reference Include="Ninject.Web.Mvc">
- <HintPath>..\packages\Ninject.MVC3.2.2.2.0\lib\net40-Full\Ninject.Web.Mvc.dll</HintPath>
+ <Reference Include="Ninject.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Ninject.MVC3.3.0.0.6\lib\net40-full\Ninject.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="SQLSpatialTools">
<HintPath>..\packages\SQLSpatialTools.dll</HintPath>
</Reference>
- <Reference Include="SquishIt.Contrib.Mvc">
- <HintPath>..\packages\SquishIt.Contrib.Mvc.0.1.3\lib\net40\SquishIt.Contrib.Mvc.dll</HintPath>
- </Reference>
<Reference Include="SquishIt.Framework">
- <HintPath>..\packages\SquishIt.0.7.1\lib\SquishIt.Framework.dll</HintPath>
+ <HintPath>..\packages\SquishIt.0.8.6\lib\SquishIt.Framework.dll</HintPath>
+ </Reference>
+ <Reference Include="SquishIt.Mvc">
+ <HintPath>..\packages\SquishIt.Mvc.0.8.6\lib\SquishIt.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Data.Entity" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -89,14 +98,17 @@
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
- <Reference Include="WebActivator">
- <HintPath>..\packages\WebActivator.1.4.4\lib\net40\WebActivator.dll</HintPath>
+ <Reference Include="WebActivator, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\WebActivator.1.5\lib\net40\WebActivator.dll</HintPath>
</Reference>
- <Reference Include="Yahoo.Yui.Compressor">
- <HintPath>..\packages\YUICompressor.NET.1.5.0.0\lib\NET35\Yahoo.Yui.Compressor.dll</HintPath>
+ <Reference Include="Yahoo.Yui.Compressor, Version=1.7.1.0, Culture=neutral, PublicKeyToken=f8b4b81ec75097e2, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\YUICompressor.NET.1.7.1.0\lib\net35\Yahoo.Yui.Compressor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
+ <Compile Include="App_Start\NinjectWebCommon.cs" />
<Compile Include="Controllers\AccountController.cs" />
<Compile Include="Controllers\AddRouteController.cs" />
<Compile Include="Controllers\AutocompleteController.cs" />
@@ -186,29 +198,23 @@
<Content Include="Global.asax" />
<Content Include="humans.txt" />
<Content Include="robots.txt" />
+ <Content Include="Scripts\Bootstrap\bootstrap.min.js" />
+ <Content Include="Scripts\jQuery\jquery-1.7.2.min.js" />
<Content Include="Scripts\jQuery\jquery.cookie.js" />
<Content Include="Scripts\jQuery\jquery.toastmessage.js" />
+ <Content Include="Scripts\knockout\knockout.js" />
<Content Include="Scripts\My\AutocompleteNew.js" />
<Content Include="Scripts\Bootstrap\bootstrap-button.js" />
<Content Include="Scripts\Bootstrap\bootstrap-popover.js" />
<Content Include="Scripts\Bootstrap\bootstrap-tooltip.js" />
<Content Include="Scripts\Bootstrap\bootstrap-typeahead.js" />
- <Content Include="Scripts\Bootstrap\bootstrap.js" />
- <Content Include="Scripts\Bootstrap\bootstrap.min.js" />
<Content Include="Scripts\My\ControlsNew.js" />
<Content Include="Scripts\My\engine.js" />
<Content Include="Scripts\My\Feedback.js" />
<Content Include="Scripts\My\Helpers.js" />
- <Content Include="Scripts\jQuery\jquery-1.7.1-vsdoc.js" />
- <Content Include="Scripts\jQuery\jquery-1.7.1.js" />
- <Content Include="Scripts\jQuery\jquery-1.7.1.min.js" />
<Content Include="Scripts\jQuery\jquery.easing.1.3.js" />
- <Content Include="Scripts\jQuery\jquery.validate-vsdoc.js" />
- <Content Include="Scripts\jQuery\jquery.validate.js" />
<Content Include="Scripts\jQuery\jquery.validate.min.js" />
<Content Include="Scripts\json2.js" />
- <Content Include="Scripts\Knouckout\knockout-2.0.0.debug.js" />
- <Content Include="Scripts\Knouckout\knockout-2.0.0.js" />
<Content Include="Scripts\My\Legend.js" />
<Content Include="Scripts\My\MakeRouteViewModel.js" />
<Content Include="Scripts\My\Map.js" />
@@ -228,9 +234,7 @@
<DependentUpon>Web.config</DependentUpon>
<SubType>Designer</SubType>
</Content>
- <Content Include="Scripts\jQuery\jquery.unobtrusive-ajax.js" />
<Content Include="Scripts\jQuery\jquery.unobtrusive-ajax.min.js" />
- <Content Include="Scripts\jQuery\jquery.validate.unobtrusive.js" />
<Content Include="Scripts\jQuery\jquery.validate.unobtrusive.min.js" />
<Content Include="Views\Web.config">
<SubType>Designer</SubType>
View
BIN CityTravel.Web.UI/Content/images/glyphicons-halflings-white.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN CityTravel.Web.UI/Content/images/glyphicons-halflings.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
59 CityTravel.Web.UI/Global.asax.cs
@@ -4,7 +4,6 @@
using System.Web.Routing;
using CityTravel.Web.UI.Helpers;
using Ninject;
-using Ninject.Web.Mvc;
namespace CityTravel.Web.UI
{
@@ -22,7 +21,7 @@ namespace CityTravel.Web.UI
/// <summary>
/// The mvc application.
/// </summary>
- public class MvcApplication : NinjectHttpApplication
+ public class MvcApplication : HttpApplication
{
#region Public Methods and Operators
@@ -102,36 +101,44 @@ public override string GetVaryByCustomString(HttpContext context, string arg)
#region Methods
- /// <summary>
- /// The create kernel.
- /// </summary>
- /// <returns>
- /// ninject kernel
- /// </returns>
- protected override IKernel CreateKernel()
- {
- var kernel = new StandardKernel();
- kernel.Load(Assembly.GetExecutingAssembly());
- kernel.Bind(typeof(IProvider<>)).To(typeof(GenericRepository<>));
- kernel.Bind<IAutocomplete>().To<CacheAutoComplete>().InThreadScope();
- kernel.Bind<IRouteSeach>().To<RouteSeach>();
- kernel.Bind<IDataBaseContext>().To<DataBaseContext>().InThreadScope();
- kernel.Bind<IAuthenticationProvider>().To<FormsAuthenticationProvider>().InThreadScope();
-
- return kernel;
- }
-
- /// <summary>
- /// The on application started.
- /// </summary>
- protected override void OnApplicationStarted()
+ ///// <summary>
+ ///// The create kernel.
+ ///// </summary>
+ ///// <returns>
+ ///// ninject kernel
+ ///// </returns>
+ //protected override IKernel CreateKernel()
+ //{
+ // var kernel = new StandardKernel();
+ // kernel.Load(Assembly.GetExecutingAssembly());
+ // kernel.Bind(typeof(IProvider<>)).To(typeof(GenericRepository<>));
+ // kernel.Bind<IAutocomplete>().To<CacheAutoComplete>().InThreadScope();
+ // kernel.Bind<IRouteSeach>().To<RouteSeach>();
+ // kernel.Bind<IDataBaseContext>().To<DataBaseContext>().InThreadScope();
+ // kernel.Bind<IAuthenticationProvider>().To<FormsAuthenticationProvider>().InThreadScope();
+
+ // return kernel;
+ //}
+
+ ///// <summary>
+ ///// The on application started.
+ ///// </summary>
+ //protected override void OnApplicationStarted()
+ //{
+ // base.OnApplicationStarted();
+ // AreaRegistration.RegisterAllAreas();
+ // RegisterGlobalFilters(GlobalFilters.Filters);
+ // RegisterRoutes(RouteTable.Routes);
+ //}
+
+ public void Application_Start()
{
- base.OnApplicationStarted();
AreaRegistration.RegisterAllAreas();
RegisterGlobalFilters(GlobalFilters.Filters);
RegisterRoutes(RouteTable.Routes);
}
+
#endregion
}
View
596 CityTravel.Web.UI/Scripts/Bootstrap/bootstrap.js
@@ -1,5 +1,5 @@
/* ===================================================
- * bootstrap-transition.js v2.0.1
+ * bootstrap-transition.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
@@ -17,39 +17,49 @@
* limitations under the License.
* ========================================================== */
-!function( $ ) {
+
+!function ($) {
$(function () {
- "use strict"
+ "use strict"; // jshint ;_;
+
- /* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
+ /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
* ======================================================= */
$.support.transition = (function () {
- var thisBody = document.body || document.documentElement
- , thisStyle = thisBody.style
- , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined
-
- return support && {
- end: (function () {
- var transitionEnd = "TransitionEnd"
- if ( $.browser.webkit ) {
- transitionEnd = "webkitTransitionEnd"
- } else if ( $.browser.mozilla ) {
- transitionEnd = "transitionend"
- } else if ( $.browser.opera ) {
- transitionEnd = "oTransitionEnd"
+
+ var transitionEnd = (function () {
+
+ var el = document.createElement('bootstrap')
+ , transEndEventNames = {
+ 'WebkitTransition' : 'webkitTransitionEnd'
+ , 'MozTransition' : 'transitionend'
+ , 'OTransition' : 'oTransitionEnd'
+ , 'msTransition' : 'MSTransitionEnd'
+ , 'transition' : 'transitionend'
+ }
+ , name
+
+ for (name in transEndEventNames){
+ if (el.style[name] !== undefined) {
+ return transEndEventNames[name]
}
- return transitionEnd
- }())
+ }
+
+ }())
+
+ return transitionEnd && {
+ end: transitionEnd
}
+
})()
})
-}( window.jQuery );/* ==========================================================
- * bootstrap-alert.js v2.0.1
+}(window.jQuery);/* ==========================================================
+ * bootstrap-alert.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -68,61 +78,57 @@
* ========================================================== */
-!function( $ ){
+!function ($) {
+
+ "use strict"; // jshint ;_;
- "use strict"
/* ALERT CLASS DEFINITION
* ====================== */
var dismiss = '[data-dismiss="alert"]'
- , Alert = function ( el ) {
+ , Alert = function (el) {
$(el).on('click', dismiss, this.close)
}
- Alert.prototype = {
-
- constructor: Alert
+ Alert.prototype.close = function (e) {
+ var $this = $(this)
+ , selector = $this.attr('data-target')
+ , $parent
- , close: function ( e ) {
- var $this = $(this)
- , selector = $this.attr('data-target')
- , $parent
+ if (!selector) {
+ selector = $this.attr('href')
+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+ }
- if (!selector) {
- selector = $this.attr('href')
- selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
- }
+ $parent = $(selector)
- $parent = $(selector)
- $parent.trigger('close')
+ e && e.preventDefault()
- e && e.preventDefault()
+ $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
- $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+ $parent.trigger(e = $.Event('close'))
- $parent
- .trigger('close')
- .removeClass('in')
+ if (e.isDefaultPrevented()) return
- function removeElement() {
- $parent
- .trigger('closed')
- .remove()
- }
+ $parent.removeClass('in')
- $.support.transition && $parent.hasClass('fade') ?
- $parent.on($.support.transition.end, removeElement) :
- removeElement()
+ function removeElement() {
+ $parent
+ .trigger('closed')
+ .remove()
}
+ $.support.transition && $parent.hasClass('fade') ?
+ $parent.on($.support.transition.end, removeElement) :
+ removeElement()
}
/* ALERT PLUGIN DEFINITION
* ======================= */
- $.fn.alert = function ( option ) {
+ $.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('alert')
@@ -141,8 +147,8 @@
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
})
-}( window.jQuery );/* ============================================================
- * bootstrap-button.js v2.0.1
+}(window.jQuery);/* ============================================================
+ * bootstrap-button.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -160,58 +166,54 @@
* limitations under the License.
* ============================================================ */
-!function( $ ){
- "use strict"
+!function ($) {
+
+ "use strict"; // jshint ;_;
+
/* BUTTON PUBLIC CLASS DEFINITION
* ============================== */
- var Button = function ( element, options ) {
+ var Button = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, $.fn.button.defaults, options)
}
- Button.prototype = {
-
- constructor: Button
-
- , setState: function ( state ) {
- var d = 'disabled'
- , $el = this.$element
- , data = $el.data()
- , val = $el.is('input') ? 'val' : 'html'
+ Button.prototype.setState = function (state) {
+ var d = 'disabled'
+ , $el = this.$element
+ , data = $el.data()
+ , val = $el.is('input') ? 'val' : 'html'
- state = state + 'Text'
- data.resetText || $el.data('resetText', $el[val]())
+ state = state + 'Text'
+ data.resetText || $el.data('resetText', $el[val]())
- $el[val](data[state] || this.options[state])
+ $el[val](data[state] || this.options[state])
- // push to event loop to allow forms to submit
- setTimeout(function () {
- state == 'loadingText' ?
- $el.addClass(d).attr(d, d) :
- $el.removeClass(d).removeAttr(d)
- }, 0)
- }
-
- , toggle: function () {
- var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
+ // push to event loop to allow forms to submit
+ setTimeout(function () {
+ state == 'loadingText' ?
+ $el.addClass(d).attr(d, d) :
+ $el.removeClass(d).removeAttr(d)
+ }, 0)
+ }
- $parent && $parent
- .find('.active')
- .removeClass('active')
+ Button.prototype.toggle = function () {
+ var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
- this.$element.toggleClass('active')
- }
+ $parent && $parent
+ .find('.active')
+ .removeClass('active')
+ this.$element.toggleClass('active')
}
/* BUTTON PLUGIN DEFINITION
* ======================== */
- $.fn.button = function ( option ) {
+ $.fn.button = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('button')
@@ -234,12 +236,14 @@
$(function () {
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
- $(e.currentTarget).button('toggle')
+ var $btn = $(e.target)
+ if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+ $btn.button('toggle')
})
})
-}( window.jQuery );/* ==========================================================
- * bootstrap-carousel.js v2.0.1
+}(window.jQuery);/* ==========================================================
+ * bootstrap-carousel.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -258,23 +262,30 @@
* ========================================================== */
-!function( $ ){
+!function ($) {
+
+ "use strict"; // jshint ;_;
- "use strict"
/* CAROUSEL CLASS DEFINITION
* ========================= */
var Carousel = function (element, options) {
this.$element = $(element)
- this.options = $.extend({}, $.fn.carousel.defaults, options)
+ this.options = options
this.options.slide && this.slide(this.options.slide)
+ this.options.pause == 'hover' && this.$element
+ .on('mouseenter', $.proxy(this.pause, this))
+ .on('mouseleave', $.proxy(this.cycle, this))
}
Carousel.prototype = {
- cycle: function () {
- this.interval = setInterval($.proxy(this.next, this), this.options.interval)
+ cycle: function (e) {
+ if (!e) this.paused = false
+ this.options.interval
+ && !this.paused
+ && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
return this
}
@@ -299,7 +310,8 @@
return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
}
- , pause: function () {
+ , pause: function (e) {
+ if (!e) this.paused = true
clearInterval(this.interval)
this.interval = null
return this
@@ -322,33 +334,36 @@
, direction = type == 'next' ? 'left' : 'right'
, fallback = type == 'next' ? 'first' : 'last'
, that = this
-
- if (!$next.length) return
+ , e = $.Event('slide')
this.sliding = true
isCycling && this.pause()
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
- if (!$.support.transition && this.$element.hasClass('slide')) {
- this.$element.trigger('slide')
- $active.removeClass('active')
- $next.addClass('active')
- this.sliding = false
- this.$element.trigger('slid')
- } else {
+ if ($next.hasClass('active')) return
+
+ if ($.support.transition && this.$element.hasClass('slide')) {
+ this.$element.trigger(e)
+ if (e.isDefaultPrevented()) return
$next.addClass(type)
$next[0].offsetWidth // force reflow
$active.addClass(direction)
$next.addClass(direction)
- this.$element.trigger('slide')
this.$element.one($.support.transition.end, function () {
$next.removeClass([type, direction].join(' ')).addClass('active')
$active.removeClass(['active', direction].join(' '))
that.sliding = false
setTimeout(function () { that.$element.trigger('slid') }, 0)
})
+ } else {
+ this.$element.trigger(e)
+ if (e.isDefaultPrevented()) return
+ $active.removeClass('active')
+ $next.addClass('active')
+ this.sliding = false
+ this.$element.trigger('slid')
}
isCycling && this.cycle()
@@ -362,20 +377,21 @@
/* CAROUSEL PLUGIN DEFINITION
* ========================== */
- $.fn.carousel = function ( option ) {
+ $.fn.carousel = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('carousel')
- , options = typeof option == 'object' && option
+ , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
if (!data) $this.data('carousel', (data = new Carousel(this, options)))
if (typeof option == 'number') data.to(option)
else if (typeof option == 'string' || (option = options.slide)) data[option]()
- else data.cycle()
+ else if (options.interval) data.cycle()
})
}
$.fn.carousel.defaults = {
interval: 5000
+ , pause: 'hover'
}
$.fn.carousel.Constructor = Carousel
@@ -394,8 +410,8 @@
})
})
-}( window.jQuery );/* =============================================================
- * bootstrap-collapse.js v2.0.1
+}(window.jQuery);/* =============================================================
+ * bootstrap-collapse.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -413,16 +429,21 @@
* limitations under the License.
* ============================================================ */
-!function( $ ){
- "use strict"
+!function ($) {
- var Collapse = function ( element, options ) {
- this.$element = $(element)
+ "use strict"; // jshint ;_;
+
+
+ /* COLLAPSE PUBLIC CLASS DEFINITION
+ * ================================ */
+
+ var Collapse = function (element, options) {
+ this.$element = $(element)
this.options = $.extend({}, $.fn.collapse.defaults, options)
- if (this.options["parent"]) {
- this.$parent = $(this.options["parent"])
+ if (this.options.parent) {
+ this.$parent = $(this.options.parent)
}
this.options.toggle && this.toggle()
@@ -438,67 +459,83 @@
}
, show: function () {
- var dimension = this.dimension()
- , scroll = $.camelCase(['scroll', dimension].join('-'))
- , actives = this.$parent && this.$parent.find('.in')
+ var dimension
+ , scroll
+ , actives
, hasData
+ if (this.transitioning) return
+
+ dimension = this.dimension()
+ scroll = $.camelCase(['scroll', dimension].join('-'))
+ actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+
if (actives && actives.length) {
hasData = actives.data('collapse')
+ if (hasData && hasData.transitioning) return
actives.collapse('hide')
hasData || actives.data('collapse', null)
}
this.$element[dimension](0)
- this.transition('addClass', 'show', 'shown')
+ this.transition('addClass', $.Event('show'), 'shown')
this.$element[dimension](this.$element[0][scroll])
-
}
, hide: function () {
- var dimension = this.dimension()
+ var dimension
+ if (this.transitioning) return
+ dimension = this.dimension()
this.reset(this.$element[dimension]())
- this.transition('removeClass', 'hide', 'hidden')
+ this.transition('removeClass', $.Event('hide'), 'hidden')
this.$element[dimension](0)
}
- , reset: function ( size ) {
+ , reset: function (size) {
var dimension = this.dimension()
this.$element
.removeClass('collapse')
[dimension](size || 'auto')
[0].offsetWidth
- this.$element.addClass('collapse')
+ this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+
+ return this
}
- , transition: function ( method, startEvent, completeEvent ) {
+ , transition: function (method, startEvent, completeEvent) {
var that = this
, complete = function () {
- if (startEvent == 'show') that.reset()
+ if (startEvent.type == 'show') that.reset()
+ that.transitioning = 0
that.$element.trigger(completeEvent)
}
- this.$element
- .trigger(startEvent)
- [method]('in')
+ this.$element.trigger(startEvent)
+
+ if (startEvent.isDefaultPrevented()) return
+
+ this.transitioning = 1
+
+ this.$element[method]('in')
$.support.transition && this.$element.hasClass('collapse') ?
this.$element.one($.support.transition.end, complete) :
complete()
- }
+ }
, toggle: function () {
this[this.$element.hasClass('in') ? 'hide' : 'show']()
- }
+ }
}
- /* COLLAPSIBLE PLUGIN DEFINITION
+
+ /* COLLAPSIBLE PLUGIN DEFINITION
* ============================== */
- $.fn.collapse = function ( option ) {
+ $.fn.collapse = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('collapse')
@@ -529,8 +566,8 @@
})
})
-}( window.jQuery );/* ============================================================
- * bootstrap-dropdown.js v2.0.1
+}(window.jQuery);/* ============================================================
+ * bootstrap-dropdown.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -549,15 +586,16 @@
* ============================================================ */
-!function( $ ){
+!function ($) {
+
+ "use strict"; // jshint ;_;
- "use strict"
/* DROPDOWN CLASS DEFINITION
* ========================= */
var toggle = '[data-toggle="dropdown"]'
- , Dropdown = function ( element ) {
+ , Dropdown = function (element) {
var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () {
$el.parent().removeClass('open')
@@ -568,12 +606,16 @@
constructor: Dropdown
- , toggle: function ( e ) {
+ , toggle: function (e) {
var $this = $(this)
- , selector = $this.attr('data-target')
, $parent
+ , selector
, isActive
+ if ($this.is('.disabled, :disabled')) return
+
+ selector = $this.attr('data-target')
+
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
@@ -585,7 +627,8 @@
isActive = $parent.hasClass('open')
clearMenus()
- !isActive && $parent.toggleClass('open')
+
+ if (!isActive) $parent.toggleClass('open')
return false
}
@@ -600,7 +643,7 @@
/* DROPDOWN PLUGIN DEFINITION
* ========================== */
- $.fn.dropdown = function ( option ) {
+ $.fn.dropdown = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('dropdown')
@@ -617,11 +660,13 @@
$(function () {
$('html').on('click.dropdown.data-api', clearMenus)
- $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+ $('body')
+ .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
+ .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
})
-}( window.jQuery );/* =========================================================
- * bootstrap-modal.js v2.0.1
+}(window.jQuery);/* =========================================================
+ * bootstrap-modal.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
@@ -640,14 +685,15 @@
* ========================================================= */
-!function( $ ){
+!function ($) {
+
+ "use strict"; // jshint ;_;
- "use strict"
/* MODAL CLASS DEFINITION
* ====================== */
- var Modal = function ( content, options ) {
+ var Modal = function (content, options) {
this.options = options
this.$element = $(content)
.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
@@ -663,19 +709,23 @@
, show: function () {
var that = this
+ , e = $.Event('show')
- if (this.isShown) return
+ this.$element.trigger(e)
+
+ if (this.isShown || e.isDefaultPrevented()) return
$('body').addClass('modal-open')
this.isShown = true
- this.$element.trigger('show')
escape.call(this)
backdrop.call(this, function () {
var transition = $.support.transition && that.$element.hasClass('fade')
- !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
+ if (!that.$element.parent().length) {
+ that.$element.appendTo(document.body) //don't move modals dom position
+ }
that.$element
.show()
@@ -693,21 +743,24 @@
})
}
- , hide: function ( e ) {
+ , hide: function (e) {
e && e.preventDefault()
- if (!this.isShown) return
-
var that = this
+
+ e = $.Event('hide')
+
+ this.$element.trigger(e)
+
+ if (!this.isShown || e.isDefaultPrevented()) return
+
this.isShown = false
$('body').removeClass('modal-open')
escape.call(this)
- this.$element
- .trigger('hide')
- .removeClass('in')
+ this.$element.removeClass('in')
$.support.transition && this.$element.hasClass('fade') ?
hideWithTransition.call(this) :
@@ -733,15 +786,15 @@
})
}
- function hideModal( that ) {
+ function hideModal(that) {
this.$element
.hide()
.trigger('hidden')
backdrop.call(this)
}
- function backdrop( callback ) {
+ function backdrop(callback) {
var that = this
, animate = this.$element.hasClass('fade') ? 'fade' : ''
@@ -795,7 +848,7 @@
/* MODAL PLUGIN DEFINITION
* ======================= */
- $.fn.modal = function ( option ) {
+ $.fn.modal = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('modal')
@@ -829,8 +882,8 @@
})
})
-}( window.jQuery );/* ===========================================================
- * bootstrap-tooltip.js v2.0.1
+}(window.jQuery);/* ===========================================================
+ * bootstrap-tooltip.js v2.0.3
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@@ -849,22 +902,24 @@
* limitations under the License.
* ========================================================== */
-!function( $ ) {
- "use strict"
+!function ($) {
+
+ "use strict"; // jshint ;_;
+
/* TOOLTIP PUBLIC CLASS DEFINITION
* =============================== */
- var Tooltip = function ( element, options ) {
+ var Tooltip = function (element, options) {
this.init('tooltip', element, options)
}
Tooltip.prototype = {
constructor: Tooltip
- , init: function ( type, element, options ) {