Changeset 226

Show
Ignore:
Timestamp:
11/06/08 22:26:59 (2 months ago)
Author:
louis.dejardin
Message:

Updating samples

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/Samples/AspNetMvc/ClientRenderingViews

    • Property svn:ignore changed from
      bin
      obj
      *.user
       to
      bin
      obj
      *.user
      _ReSharper.ClientRenderingViews

  • trunk/src/Samples/AspNetMvc/ClientRenderingViews/ClientRenderingViews.csproj

    r174 r226  
    126126          <UseIIS>False</UseIIS> 
    127127          <AutoAssignPort>True</AutoAssignPort> 
    128           <DevelopmentServerPort>1155</DevelopmentServerPort> 
     128          <DevelopmentServerPort>52252</DevelopmentServerPort> 
    129129          <DevelopmentServerVPath>/</DevelopmentServerVPath> 
    130130          <IISUrl> 

  • trunk/src/Samples/AspNetMvc/ClientRenderingViews/Controllers/HomeController.cs

    r188 r226  
    5353        } 
    5454 
    55         public object Index(string ajax) 
     55        public ActionResult Index(string ajax) 
    5656        { 
    5757            ViewData["ajaxEnabled"] = (string) Session["ajax"] == "disabled" ? false : true; 
    …… 
    6161        } 
    6262 
    63         public object EnableAjax() 
     63        public ActionResult EnableAjax() 
    6464        { 
    6565            Session["ajax"] = "enabled"; 
    …… 
    6767        } 
    6868 
    69         public object DisableAjax() 
     69        public ActionResult DisableAjax() 
    7070        { 
    7171            Session["ajax"] = "disabled"; 
    …… 
    7373        } 
    7474 
    75         public object ShowCart() 
     75        public ActionResult ShowCart() 
    7676        { 
    7777            return new JavascriptViewResult {ViewName = "_ShowCart"}; 
    7878        } 
    7979 
    80         public object RefreshCart() 
     80        public ActionResult RefreshCart() 
    8181        { 
    8282            return Json(GetCurrentCart()); 
    8383        } 
    8484 
    85         public object Reset() 
     85        public ActionResult Reset() 
    8686        { 
    8787            Session["cartId"] = null; 
    …… 
    9494        } 
    9595 
    96         public object Remove(int id) 
     96        public ActionResult Remove(int id) 
    9797        { 
    9898            Cart cart = GetCurrentCart(); 
    …… 
    107107        } 
    108108 
    109         public object AddToCart(int id) 
     109        public ActionResult AddToCart(int id) 
    110110        { 
    111111            Cart cart = GetCurrentCart(); 

  • trunk/src/Samples/AspNetMvc/ClientRenderingViews/Models/Product.cs

    r187 r226  
    1313// limitations under the License. 
    1414//  
     15using System.Runtime.Serialization; 
     16 
    1517namespace ClientRenderingViews.Models 
    1618{ 
     19    [DataContract] 
    1720    public class Product 
    1821    { 
     22        [DataMember] 
    1923        public int Id { get; set; } 
     24         
     25        [DataMember] 
    2026        public string Name { get; set; } 
     27         
     28        [DataMember] 
    2129        public decimal UnitPrice { get; set; } 
    2230    } 

  • trunk/src/Samples/AspNetMvc/ClientRenderingViews/Views/Home/Index.spark

    r174 r226  
    22<p> 
    33  Ajax <strong>${ajaxEnabled ? 'enabled' : 'disabled'}</strong>. 
    4   <a href="~/home/enableajax">enable</a> &bull; <a href="~/home/disableajax">disable</a>. 
     4  <a href="~/home/enableajax">enable</a> 
     5  &bull; 
     6  <a href="~/home/disableajax">disable</a>. 
    57</p> 
    68<p> 
    …… 
    911</p> 
    1012 
    11 <viewdata products="IList[[Models.Product]]" ajaxEnabled="bool"/> 
     13<viewdata 
     14  products="IList[[Models.Product]]" 
     15  ajaxEnabled="bool"/> 
    1216 
    13 <test if="ajaxEnabled"> 
    14   <content:head> 
    15     <script type="text/javascript" src="~/Content/jquery-1.2.6.js"></script> 
    16     <script type="text/javascript" src="~/Content/jquery.livequery.js"></script> 
    17     <script type="text/javascript" src="~/Home/ShowCart"></script> 
    18     <script type="text/javascript" src="~/Content/home-index.js"></script> 
    19   </content:head> 
    20 </test> 
     17<content:head if="ajaxEnabled"> 
     18  <script type="text/javascript" src="~/Content/jquery-1.2.6.js" once="js-jquery"></script> 
     19  <script type="text/javascript" src="~/Content/jquery.livequery.js" once="js-livequery"></script> 
     20  <script type="text/javascript" src="~/Home/ShowCart"></script> 
     21  <script type="text/javascript" src="~/Content/home-index.js"></script> 
     22</content:head> 
    2123 
    2224<ul> 
    …… 
    2426    ${product.Name} 
    2527    ${product.UnitPrice} 
    26     <a class="cartajax" href="~/home/addtocart/${product.Id}">Add to cart</a> 
     28    <a class="cartajax?{ajaxEnabled}" href="~/home/addtocart/${product.Id}">Add to cart</a> 
    2729  </li> 
    2830</ul> 
    2931 
    3032<content:subcontent> 
    31   <a class="refresh" href="~/home/index">Refresh</a> &bull; <a class="cartajax" href="~/home/Reset">Reset cart</a> 
     33  <a class="refresh" href="~/home/index">Refresh</a> 
     34  &bull; 
     35  <a class="cartajax?{ajaxEnabled}" href="~/home/Reset">Reset cart</a> 
    3236  <div id="cart"> 
    3337    <ShowCart/> 

  • trunk/src/Samples/AspNetMvc/ModularForum/Models/ForumRepository.cs

    r188 r226  
    2121namespace ModularForum.Models 
    2222{ 
     23    [DataContract] 
    2324    public class Forum 
    2425    { 
     26        [DataMember] 
    2527        public string Id { get; set; } 
     28         
     29        [DataMember] 
    2630        public string Name { get; set; } 
     31         
     32        [DataMember] 
    2733        public string Description { get; set; } 
    2834    } 
    2935 
     36    [DataContract] 
    3037    public class ForumData 
    3138    { 
     39        [DataMember] 
    3240        public List<Forum> Forums { get; set; } 
    3341    }