Permalink
Browse files

Refactor of website

Add new skin and migrate to Middleman
  • Loading branch information...
Tom Dale
Tom Dale committed Dec 26, 2011
1 parent 8ea9fee commit 9c0c489e7c4d7acd3409f8d2c84d9ce5e6f49ffa
Showing with 445 additions and 266 deletions.
  1. +1 −0 .gitignore
  2. +0 −80 Assetfile
  3. +5 −10 Gemfile
  4. +80 −21 Gemfile.lock
  5. +0 −15 README.md
  6. +0 −8 Rakefile
  7. +0 −53 assets/docs/_documentation.erb
  8. +0 −3 assets/docs/_section.erb
  9. +0 −59 assets/examples/index.html
  10. BIN assets/images/diagonalTexture.png
  11. +73 −0 config.rb
  12. +9 −0 data/docs.yml
  13. 0 {assets → source}/docs/application.md
  14. 0 {assets → source}/docs/documentation.not-md
  15. 0 {assets → source}/docs/enumerables.md
  16. +5 −5 {assets → source}/docs/handlebars.md
  17. +12 −12 {assets → source}/docs/introduction.md
  18. 0 {assets → source}/docs/object_model.md
  19. 0 {assets → source}/docs/views.md
  20. +18 −0 source/documentation.html.erb
  21. 0 {assets → source}/examples/contacts/app.js
  22. BIN {assets → source}/examples/contacts/images/broken_noise.png
  23. BIN {assets → source}/examples/contacts/images/delete.png
  24. BIN {assets → source}/examples/contacts/images/ricepaper2.png
  25. 0 {assets → source}/examples/contacts/index.html
  26. 0 {assets → source}/examples/contacts/server.js
  27. 0 {assets → source}/examples/contacts/style.css
  28. +28 −0 source/examples/index.html.md
  29. 0 {assets → source}/examples/lib/amber.js
  30. 0 {assets → source}/examples/lib/ember.min.js
  31. 0 {assets → source}/examples/lib/examples.js
  32. BIN {assets → source}/examples/simple_bindings/images/ricepaper2.png
  33. 0 {assets → source}/examples/simple_bindings/index.html
  34. 0 {assets → source}/examples/todos/README
  35. BIN {assets → source}/examples/todos/apple-touch-icon-114x114-precomposed.png
  36. BIN {assets → source}/examples/todos/apple-touch-icon-57x57-precomposed.png
  37. BIN {assets → source}/examples/todos/apple-touch-icon-72x72-precomposed.png
  38. BIN {assets → source}/examples/todos/apple-touch-icon-precomposed.png
  39. BIN {assets → source}/examples/todos/apple-touch-icon.png
  40. 0 {assets → source}/examples/todos/css/style.css
  41. 0 {assets → source}/examples/todos/css/todos.css
  42. 0 {assets → source}/examples/todos/css/todos.scss
  43. BIN {assets → source}/examples/todos/favicon.ico
  44. 0 {assets → source}/examples/todos/index.html
  45. 0 {assets → source}/examples/todos/js/app.js
  46. 0 {assets → source}/examples/todos/js/libs/jquery-1.6.1.min.js
  47. 0 {assets → source}/examples/todos/js/libs/sproutcore-2.0.beta.3.js
  48. 0 {assets → source}/examples/todos/js/libs/sproutcore-2.0.beta.3.min.js
  49. BIN source/images/black_linen_v2.png
  50. BIN source/images/dark_mosaic.png
  51. BIN {assets → source}/images/diagonal-noise.png
  52. BIN source/images/groovepaper.png
  53. BIN {assets → source}/images/logo.png
  54. BIN {assets → source}/images/logo.psd
  55. BIN {assets → source}/images/outputScreen.png
  56. +53 −0 source/layout.erb
  57. +37 −0 source/stylesheets/_base.scss
  58. +1 −0 source/stylesheets/highlight.css.erb
  59. +123 −0 source/stylesheets/site.css.scss
View
@@ -3,3 +3,4 @@ tmp
bin/
.bundle/
output
+.sass-cache
View
@@ -1,80 +0,0 @@
-require 'yaml'
-require 'json'
-require 'erb'
-require 'rake-pipeline-web-filters/ordering_concat_filter'
-require 'rake-pipeline-web-filters/markdown_compiler'
-
-WebFilters = Rake::Pipeline::Web::Filters
-
-input "assets"
-output "output"
-
-class StepFilter < Filter
- def generate_output(inputs, output)
- inputs.each do |input|
- yaml = YAML.load(input.read)
- code = "Tutorial.tutorialController.addStep({\n"
- code << yaml.map do |key,value|
- value = value.sub(/\n+$/,'')
- value = (key == "validator") ? "function(context){\n#{value}\n}" : value.to_json
- " #{key}: #{value}"
- end.join(",\n")
- code << "\n});"
- output.write(code)
- end
- end
-end
-
-class HTMLWrapperFilter < Filter
- def initialize(options={})
- @options = options
- super()
- end
-
- def generate_output(inputs, output)
- template = @template || create_template
- inputs.each do |input|
- output.write render_template {
- input.read
- }
- end
- end
-
- def create_template
- template = File.read(@options[:template])
- @template = ERB.new(template)
- end
-
- def render_template
- @template.result(binding)
- end
-end
-
-match "tutorial/steps/*.yml" do
- filter StepFilter do |path|
- path.sub(/\.yml$/, '.js')
- end
-end
-
-match "tutorial/**/*.js" do
- filter WebFilters::OrderingConcatFilter, ['tutorial/tutorial.js'], 'tutorial.js'
-end
-
-match "docs/**/*.md" do
- sections = [ 'introduction', 'application', 'object_model', 'handlebars', 'views' ]
- sections.map! { |file| "docs/#{file}.html" }
-
- filter WebFilters::MarkdownCompiler
- filter HTMLWrapperFilter, :template => 'assets/docs/_section.erb'
-
- filter WebFilters::OrderingConcatFilter, sections, "documention.html"
- filter HTMLWrapperFilter, :template => 'assets/docs/_documentation.erb'
- filter ConcatFilter, "index.html" #"documentation/index.html"
-end
-
-# Hide for now
-match "tutorial.html" do
- filter ConcatFilter, ".hidden"
-end
-
-# vim: filetype=ruby
View
15 Gemfile
@@ -1,12 +1,7 @@
source :rubygems
-gem 'rack'
-gem 'rack-rewrite'
-gem 'json'
-gem 'rack-cache'
-
-group :development do
- gem 'rake-pipeline', :git => "https://github.com/livingsocial/rake-pipeline.git"
- gem 'rake-pipeline-web-filters', :git => "https://github.com/wycats/rake-pipeline-web-filters.git"
- gem 'redcarpet'
-end
+gem "redcarpet"
+gem "rack-codehighlighter", :git => "git://github.com/wbzyl/rack-codehighlighter.git"
+gem "pygments.rb"
+gem "activesupport"
+gem "middleman", :path => "~/Code/middleman"
View
@@ -1,36 +1,95 @@
GIT
- remote: https://github.com/livingsocial/rake-pipeline.git
- revision: bb82ce330c2fc4cc5d918ecd140df3a5c3c6aa10
+ remote: git://github.com/wbzyl/rack-codehighlighter.git
+ revision: 64bf50520cb1d563432832ae30d85bbd94cec5bd
specs:
- rake-pipeline (0.5.0)
- rake (~> 0.9.0)
+ rack-codehighlighter (0.5.0)
+ nokogiri (>= 1.4.1)
+ rack (>= 1.0.0)
-GIT
- remote: https://github.com/wycats/rake-pipeline-web-filters.git
- revision: 671a8d29ca8cf4ead4f945b8623d13f3093bc376
+PATH
+ remote: ~/Code/middleman
specs:
- rake-pipeline-web-filters (0.5.0)
- rake-pipeline
+ middleman (3.0.0.alpha.6)
+ activesupport (~> 3.1.0)
+ coffee-script (~> 2.2.0)
+ compass (~> 0.11.3)
+ execjs (~> 1.2.7)
+ guard (~> 0.9.2)
+ haml (~> 3.1.0)
+ i18n (~> 0.6.0)
+ rack (~> 1.3.5)
+ rack-test (~> 0.6.1)
+ redcarpet (~> 2.0.0)
+ sass (~> 3.1.7)
+ sprockets (~> 2.1.2)
+ sprockets-sass (~> 0.6.0)
+ thin (~> 1.3.1)
+ thor (~> 0.14.0)
+ tilt (~> 1.3.1)
+ uglifier (~> 1.2.0)
GEM
remote: http://rubygems.org/
specs:
- json (1.6.3)
+ activesupport (3.1.3)
+ multi_json (~> 1.0)
+ blankslate (2.1.2.4)
+ chunky_png (1.2.5)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.2.0)
+ compass (0.11.6)
+ chunky_png (~> 1.2)
+ fssm (>= 0.2.7)
+ sass (~> 3.1)
+ daemons (1.1.5)
+ eventmachine (0.12.10)
+ execjs (1.2.13)
+ multi_json (~> 1.0)
+ ffi (1.0.11)
+ fssm (0.2.7)
+ guard (0.9.4)
+ ffi (>= 0.5.0)
+ thor (~> 0.14.6)
+ haml (3.1.4)
+ hike (1.2.1)
+ i18n (0.6.0)
+ multi_json (1.0.4)
+ nokogiri (1.5.0)
+ pygments.rb (0.2.4)
+ rubypython (~> 0.5.3)
rack (1.3.5)
- rack-cache (1.1)
- rack (>= 0.4)
- rack-rewrite (1.2.1)
- rake (0.9.2.2)
- redcarpet (2.0.0)
+ rack-test (0.6.1)
+ rack (>= 1.0)
+ redcarpet (2.0.1)
+ rubypython (0.5.3)
+ blankslate (>= 2.1.2.3)
+ ffi (~> 1.0.7)
+ sass (3.1.12)
+ sprockets (2.1.2)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sprockets-sass (0.6.0)
+ sprockets (~> 2.0)
+ tilt (~> 1.1)
+ thin (1.3.1)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
+ thor (0.14.6)
+ tilt (1.3.3)
+ uglifier (1.2.0)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
PLATFORMS
ruby
DEPENDENCIES
- json
- rack
- rack-cache
- rack-rewrite
- rake-pipeline!
- rake-pipeline-web-filters!
+ activesupport
+ middleman!
+ pygments.rb
+ rack-codehighlighter!
redcarpet
View
@@ -1,15 +0,0 @@
-## Ember Website
-
-The website for the Ember.js project.
-
-### Contributing
-
-To get started:
-
- $ git clone git://github.com/emberjs/website.git
- $ cd website
- $ bundle
- $ bundle exec rakep
-
-Then visit [http://localhost:9292/](http://localhost:9292/)
-
View
@@ -1,8 +0,0 @@
-require "bundler/setup"
-
-namespace :assets do
- task :precompile do
- system "rakep build"
- end
-end
-
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>Ember.js - Documentation</title>
-<link rel=stylesheet href="/styles/documentation.css" />
-<script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-27675533-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
-</script>
- <link type="text/css" rel="stylesheet" href="/styles/shCoreRDark.css"/>
-</head>
-
-<body>
-<div id="wrap">
-<div id="about">
- <div id="logo">&nbsp;</div>
- <p>
- Ember is a JavaScript framework for creating ambitious web applications
- </p>
- <a class="button" href="https://github.com/downloads/emberjs/ember.js/ember-0.9.3.min.js">download</a>
- <small>35k min + gzip | <a href="https://github.com/downloads/emberjs/ember.js/ember-0.9.3.js">debug build</a></small>
-
- <a class="button" href="https://github.com/downloads/emberjs/starter-kit/starter-kit.0.9.3.zip">starter kit</a>
- <ul id="nav">
- <li class="active"><a href="index.html">docs</a></li>
- <li><a href="/examples/">examples</a></li>
- </ul>
-</div>
-<div id="github">
- <a href="https://github.com/emberjs/ember.js"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/assets.github.com/img/e6bef7a091f5f3138b8cd40bc3e114258dd68ddf/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub"></a>
-</div>
-<div id="content">
- <%= yield %>
-</div>
-<script type="text/javascript" src="/scripts/shCore.js"></script>
-<script type="text/javascript" src="/scripts/shBrushJScript.js"></script>
-<script type="text/javascript" src="/scripts/shBrushXml.js"></script>
-<script type="text/javascript" src="/scripts/shBrushCss.js"></script>
-<script type="text/javascript">
- SyntaxHighlighter.defaults.toolbar = false;
- SyntaxHighlighter.all();
-</script>
-</body>
-</html>
View
@@ -1,3 +0,0 @@
-<div class="section">
- <%= yield %>
-</div>
View
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>Ember.js - Examples</title>
-<link rel=stylesheet href="/styles/documentation.css" />
-<script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-27675533-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
-</script>
- <link type="text/css" rel="stylesheet" href="/styles/shCoreRDark.css"/>
-</head>
-
-<body>
-<div id="wrap">
-<div id="about">
- <div id="logo">&nbsp;</div>
- <p>
- Ember is a JavaScript framework that helps developers be more productive by eliminating boilerplate and providing a strong MVC architecture.
- </p>
- <a class="button">download</a>
- <ul id="nav">
- <li><a href="/">docs</a></li>
- <li class="active"><a href="/examples/">examples</a></li>
- </ul>
-</div>
-<div id="github">
- <a href="https://github.com/emberjs/ember.js"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/assets.github.com/img/e6bef7a091f5f3138b8cd40bc3e114258dd68ddf/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub"></a>
-</div>
-<div id="content">
- <div class="section">
- <h2>Todos</h2>
- <p>As required by law, our JavaScript framework includes a Todos demo.</p>
- <p><a href="/examples/todos/">Visit Todos</a></p>
- </div>
- <div class="section">
- <h2>Simple Bindings</h2>
- <p>This demo contains an example a simple view bound to a controller.</p>
- <p><a href="/examples/simple_bindings/">Visit Simple Bindings</a></p>
- </div>
- <div class="section">
- <h2>Contacts</h2>
- <p>A more sophisticated demo application. Add new contacts, change their names, and watch
- as they are updated and sorted in real time. Click on a contact and double-click a field to edit.</p>
- <p>If you check out this code from GitHub, it includes a node.js server that illustrates how to load data
- into a controller.</p>
- <p><a href="/examples/contacts/">Visit Contacts</a></p>
- </div>
-</div>
-</body>
-</html>
Binary file not shown.
Oops, something went wrong.

0 comments on commit 9c0c489

Please sign in to comment.