<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>clients/sample_controls/controllers/container.js</filename>
    </added>
    <added>
      <filename>clients/sample_controls/english.lproj/button_page.css</filename>
    </added>
    <added>
      <filename>clients/sample_controls/english.lproj/button_page.js</filename>
    </added>
    <added>
      <filename>clients/sample_controls/english.lproj/container_page.css</filename>
    </added>
    <added>
      <filename>clients/sample_controls/english.lproj/container_page.js</filename>
    </added>
    <added>
      <filename>clients/sample_controls/english.lproj/control_sample.css</filename>
    </added>
    <added>
      <filename>clients/sample_controls/tests/controllers/container.rhtml</filename>
    </added>
    <added>
      <filename>clients/sample_controls/views/control_sample.js</filename>
    </added>
    <added>
      <filename>samples.esproj/Project.espressostorage</filename>
    </added>
    <added>
      <filename>samples.esproj/user.charles.espressostorage</filename>
    </added>
    <added>
      <filename>sc-config.yaml</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -8,7 +8,11 @@
 // how your UI will look and you'll notice right away when something needs a
 // localized string added to this file!
 //
-Object.extend(String.English,{
+SC.stringsFor('en',{
+  
+  &quot;Loc.Title&quot;: &quot;Localized Title!&quot;,
+  &quot;Loc.Label&quot;: &quot;Localized Label!&quot;,
+  
  // Global
   &quot;Class&quot;: &quot;Class&quot;,
  // TabView</diff>
      <filename>clients/sample_controls/english.lproj/strings.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,7 @@
 // ==========================================================================
 // SampleControls
 // ==========================================================================
+/*global SampleControls */
 
 // This is the function that will start your app running.  The default
 // implementation will load any fixtures you have created then instantiate
@@ -20,20 +21,23 @@ function main() {
   SC.Benchmark.start('end fixtures') ;
 
   // Set content controller for display
-  SC.Benchmark.start('SampleControls.contentController.content') ;
-  SampleControls.contentController.set('content', SampleControls.Photo.findAll());
-  SC.Benchmark.end('SampleControls.contentController.content') ;
-
-  SC.Benchmark.start('SampleControls.sourceListController.content') ;
-  var playlists = SampleControls.Playlist.findAll();
-
-  SampleControls.sourceListController.set('content', playlists);
-  SC.Benchmark.end('SampleControls.sourceListController.content') ;
-
-  SC.Benchmark.start('SC.page.controlTabs.nowShowing = collections2') ;
-  SC.page.get('controlTabs').set('nowShowing', 'welcome') ;
-  SC.Benchmark.end('SC.page.controlTabs.nowShowing = collections2') ;
-
-  SC.page.get('pickerPane') ;
-
-} ;
+  // SC.Benchmark.start('SampleControls.contentController.content') ;
+  // SampleControls.contentController.set('content', SampleControls.Photo.findAll());
+  // SC.Benchmark.end('SampleControls.contentController.content') ;
+  // 
+  // SC.Benchmark.start('SampleControls.sourceListController.content') ;
+  // var playlists = SampleControls.Playlist.findAll();
+  // 
+  // SampleControls.sourceListController.set('content', playlists);
+  // SC.Benchmark.end('SampleControls.sourceListController.content') ;
+  // 
+  // SC.Benchmark.start('SC.page.controlTabs.nowShowing = collections2') ;
+  // SC.page.get('controlTabs').set('nowShowing', 'welcome') ;
+  // SC.Benchmark.end('SC.page.controlTabs.nowShowing = collections2') ;
+  // 
+  // SC.page.get('pickerPane') ;
+  
+  SC.Benchmark.start('buttonPage.mainPane.append()') ;
+  SampleControls.getPath('buttonPage.mainPane').append();
+  SC.Benchmark.end('buttonPage.mainPane.append()') ;
+} </diff>
      <filename>clients/sample_controls/main.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,22 +1,22 @@
-// ==========================================================================
-// SampleControls.GridView
-// ==========================================================================
-
-require('core');
-
-/** @class
-
-  (Document Your View Here)
-
-  @extends SC.ClassicView
-  @author    AuthorName
-  @version 0.1
-*/
-SampleControls.GridView = SC.GridView.extend(SC.Scrollable,
-/** @scope SampleControls.GridView.prototype */ {
-
-  verticalLineScroll: function() {
-    return this.get('rowHeight') ;
-  }.property('rowHeight')
-
-}) ;
+// // ==========================================================================
+// // SampleControls.GridView
+// // ==========================================================================
+// 
+// require('core');
+// 
+// /** @class
+// 
+//   (Document Your View Here)
+// 
+//   @extends SC.ClassicView
+//   @author    AuthorName
+//   @version 0.1
+// */
+// SampleControls.GridView = SC.GridView.extend(SC.Scrollable,
+// /** @scope SampleControls.GridView.prototype */ {
+// 
+//   verticalLineScroll: function() {
+//     return this.get('rowHeight') ;
+//   }.property('rowHeight')
+// 
+// }) ;</diff>
      <filename>clients/sample_controls/views/grid.js</filename>
    </modified>
    <modified>
      <diff>@@ -1,20 +1,20 @@
-// ==========================================================================
-// SampleControls.ListView
-// ==========================================================================
-
-require('core');
-
-/** @class
-
-  (Document Your View Here)
-
-  @extends SC.ClassicView
-  @author    AuthorName
-  @version 0.1
-*/
-SampleControls.ListView = SC.ListView.extend(SC.Scrollable,
-/** @scope SampleControls.ListView.prototype */ {
-
-  // TODO: Add your own code here.
-
-}) ;
+// // ==========================================================================
+// // SampleControls.ListView
+// // ==========================================================================
+// 
+// require('core');
+// 
+// /** @class
+// 
+//   (Document Your View Here)
+// 
+//   @extends SC.ClassicView
+//   @author    AuthorName
+//   @version 0.1
+// */
+// SampleControls.ListView = SC.ListView.extend(SC.Scrollable,
+// /** @scope SampleControls.ListView.prototype */ {
+// 
+//   // TODO: Add your own code here.
+// 
+// }) ;</diff>
      <filename>clients/sample_controls/views/list.js</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>clients/sample_controls/english.lproj/body.rhtml</filename>
    </removed>
    <removed>
      <filename>clients/sample_controls/english.lproj/buttons.rhtml</filename>
    </removed>
    <removed>
      <filename>clients/sample_controls/english.lproj/collections.rhtml</filename>
    </removed>
    <removed>
      <filename>clients/sample_controls/english.lproj/collections2.rhtml</filename>
    </removed>
    <removed>
      <filename>clients/sample_controls/english.lproj/forms.rhtml</filename>
    </removed>
    <removed>
      <filename>clients/sample_controls/english.lproj/icons.rhtml</filename>
    </removed>
    <removed>
      <filename>clients/sample_controls/english.lproj/panes.rhtml</filename>
    </removed>
    <removed>
      <filename>clients/sample_controls/english.lproj/welcome.rhtml</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>781dad5a8145e6c849f5aae6b1219f807ea1f66e</id>
    </parent>
  </parents>
  <author>
    <name>Charles Jolley</name>
    <email>charles@sproutit.com</email>
  </author>
  <url>http://github.com/sproutit/sproutcore-samples/commit/6d92e98f2213ded480f1b783e74e78dd529047a5</url>
  <id>6d92e98f2213ded480f1b783e74e78dd529047a5</id>
  <committed-date>2008-11-26T05:50:49-08:00</committed-date>
  <authored-date>2008-11-26T05:50:49-08:00</authored-date>
  <message>Begin converting SampleControls over to new view layer</message>
  <tree>57d88d219b95fab3a52a3c8321df60fd6a123d37</tree>
  <committer>
    <name>Charles Jolley</name>
    <email>charles@sproutit.com</email>
  </committer>
</commit>
