Skip to content

Commit

Permalink
add init page
Browse files Browse the repository at this point in the history
  • Loading branch information
momolog committed Aug 7, 2012
1 parent ece6dd4 commit 9beb00d
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 252 deletions.
Binary file added app/assets/images/poussin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/stylesheets/welcome.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the welcome controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
2 changes: 2 additions & 0 deletions app/controllers/welcome_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class WelcomeController < ApplicationController
end
2 changes: 2 additions & 0 deletions app/views/welcome/index.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#wrapper
= image_tag "poussin.png", :style => 'margin: auto'
18 changes: 8 additions & 10 deletions categories.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
---
- key: hotels
name: HOTEL
- key: bueros
name: BÜRO
- key: gewerbe
name: GEWERBE
- key: oeffentlich
name: ÖFFENTLICH
- key: wohnen
name: WOHNEN
- key: grafik
name: Grafik
- key: buch
name: Bücher
- key: illustration
name: Illustration
- key: web
name: Web
1 change: 1 addition & 0 deletions config.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
enable_output_diff: true
text_extensions: [ 'css', 'erb', 'haml', 'htm', 'html', 'js', 'less', 'markdown', 'md', 'php', 'rb', 'sass', 'scss', 'txt', 'xhtml', 'xml', 'coffee' ]
2 changes: 1 addition & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

# You can have the root of your site routed with "root"
# just remember to delete public/index.html.
# root :to => 'welcome#index'
root :to => 'welcome#index'

# See how all your routes lay out with "rake routes"

Expand Down
241 changes: 0 additions & 241 deletions public/index.html

This file was deleted.

5 changes: 5 additions & 0 deletions spec/controllers/welcome_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'spec_helper'

describe WelcomeController do

end
15 changes: 15 additions & 0 deletions spec/helpers/welcome_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'spec_helper'

# Specs in this file have access to a helper object that includes
# the WelcomeHelper. For example:
#
# describe WelcomeHelper do
# describe "string concat" do
# it "concats two strings with spaces" do
# helper.concat_strings("this","that").should == "this that"
# end
# end
# end
describe WelcomeHelper do
pending "add some examples to (or delete) #{__FILE__}"
end

0 comments on commit 9beb00d

Please sign in to comment.