Permalink
Browse files

Switch from Haml to ERB

  • Loading branch information...
1 parent 19c8a52 commit c87a0f01f1b1d64996f2ab9f96eeda5e53b7024c @manveru committed Jan 6, 2009
View
@@ -0,0 +1,49 @@
+<html>
+ <head>
+ <title>Ramaze Wiki</title>
+ <link rel="stylesheet" type="text/css" href="/css/screen.css" />
+ <link rel="stylesheet" type="text/css" href="/css/coderay.css" />
+ <% if uv_style = session[:uv_style] %>
+ <link rel="stylesheet" type="text/css" href="/css/<%= uv_style %>.css" />
+ <% end %>
+ </head>
+ <body>
+ <div class="head">
+ <div class="title">
+ <a href="/Home" alt="Home"><img src="/logo.png" alt="Ramaze Wiki" /></a>
+ </div>
+ <div class="menu">
+ <div class="locale">
+ <a href="<%= r(:language, 'en') %>">English</a>
+ <a href="<%= r(:language, 'de') %>">Deutsch</a>
+ <a href="<%= r(:language, 'ja') %>">日本語</a>
+ </div>
+ <a href="http://ramaze.net">Ramaze</a>
+ <a href="/list">List Pages</a>
+ <a href="<%= r(:random) %>">Random Page</a>
+ <% if logged_in? %>
+ <a href="<%= Auth.r(:logout) %>">Log out</a>
+ <% else %>
+ <a href="<%= Auth.r(:login) %>">Log in</a>
+ <% end %>
+ </div>
+ </div>
+ <div class="content">
+ <%= @content %>
+ </div>
+ <div class="footer">
+ <div class="copy">
+ <a rel="license" href="http://creativecommons.org/licenses/by-sa/2.1/jp/">
+ <img alt="Creative Commons License" src="http://i.creativecommons.org/l/by-sa/2.1/jp/88x31.png" />
+ </a>
+ <br />
+ <span href="http://purl.org/dc/dcmitype/Text" xmlns:dc="http://purl.org/dc/elements/1.1" property="dc:title" rel="dc:type">Ramaze Wiki</span>
+ by
+ <a href="http://wiki.ramaze.net" xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName" rel="cc:attributionURL">Michael Fellinger</a>
+ is licensed under a
+ <a href="http://creativecommons.org/licenses/by-sa/2.1/jp/" rel="license">Creative Commons Attributions-Share Alike 2.1 Japan License</a>
+ .
+ </div>
+ </div>
+ </body>
+</html>
View
@@ -1,43 +0,0 @@
-!!! XML
-!!!
-
-%html
- %head
- %title= l('Ramaze Wiki')
- %link{:rel => 'stylesheet', :href => '/css/screen.css', :type => 'text/css'}
- %link{:rel => 'stylesheet', :href => '/css/coderay.css', :type => 'text/css'}
- - if uv_style = session[:uv_style]
- %link{:rel => 'stylesheet', :href => "/css/#{uv_style}.css", :type => 'text/css'}
- %body
- .head
- .title
- %a{:href => '/Home', :alt => 'Home'}
- %h1= l('Ramaze Wiki')
- %h2= l('A minimal git based wiki')
- .menu
- .locale
- %a{:href => r(:language, 'en')} English
- %a{:href => r(:language, 'de')} Deutsch
- %a{:href => r(:language, 'ja')} 日本語
- %a{:href => 'http://ramaze.net'}= l('Ramaze')
- %a{:href => '/list'}= l('List Pages')
- %a{:href => r(:random)}= l('Random Page')
- - if logged_in?
- %a{:href => Auth.r(:logout)}= l('Log out')
- - else
- %a{:href => Auth.r(:login)}= l('Log in')
- .content= content
- .footer
- .copy
- %a{:rel => :license, :href => 'http://creativecommons.org/licenses/by-sa/2.1/jp/'}
- %img{:alt => 'Creative Commons License', :style => 'border-width: 0', :src => 'http://i.creativecommons.org/l/by-sa/2.1/jp/88x31.png'}
- %br/
- %span{'xmlns:dc' => 'http://purl.org/dc/elements/1.1', :href => 'http://purl.org/dc/dcmitype/Text', :property => 'dc:title', :rel => 'dc:type'}
- Ramaze Wiki
- by
- %a{'xmlns:cc' => 'http://creativecommons.org/ns#', :href => 'http://wiki.ramaze.net', :property => 'cc:attributionName', :rel => 'cc:attributionURL'}
- Michael Fellinger
- is licensed under a
- %a{:rel => :license, :href => 'http://creativecommons.org/licenses/by-sa/2.1/jp/'}
- Creative Commons Attributions-Share Alike 2.1 Japan License
- \.
View
@@ -1,7 +0,0 @@
-class CSSNode
- include Innate::Node
- map '/css'
-
- provide :css => :none # serve .css plain
- provide :sass => :sass # serve .css.sass through Sass
-end
View
@@ -1,3 +0,0 @@
-require 'node/css'
-require 'node/page'
-require 'node/auth'
View
@@ -4,7 +4,7 @@ class PageNode
layout 'default'
helper :user, :localize
- provide :html => :haml
+ provide :html => :erb
def index(*name)
redirect r(:/, 'Home') if name.empty?
View
@@ -0,0 +1,147 @@
+* {
+ margin: 0;
+ padding: 0;
+}
+body {
+ background: #fff;
+ margin: 0;
+ padding: 0;
+}
+textarea {
+ width: 95%;
+ height: 20em;
+ display: block;
+ padding: 1em;
+}
+input.submit {
+ width: 95%;
+}
+img {
+ border: 0;
+}
+.content {
+ clear: both;
+ padding: 1em;
+}
+.content table {
+ width: 70%;
+ margin: 2em;
+ text-align: center;
+ border-spacing: 0;
+ border-collapse: collapse;
+}
+.content table tr td {
+ padding: 0.2em;
+ width: 25%;
+}
+.content .list {
+ margin-top: 0em;
+}
+.content .list ul {
+ margin-left: 1em;
+}
+.content .list ul li {
+ margin: 0.2em;
+}
+h1, h2, h3, h4, h5, h6 {
+ margin: 0;
+ margin-top: 1em;
+}
+.content .text a.missing-wiki-link, .content .list a.missing-wiki-link {
+ color: #f00;
+}
+.content .text a.existing-wiki-link, .content .list a.existing-wiki-link {
+ color: #00f;
+}
+.content .text p, .content .list p {
+ padding: 0.5em;
+}
+.content .text ul {
+ padding-left: 2em;
+ margin-top: 1em;
+}
+.content .text code, .content .list code {
+ background: #eee;
+}
+.content .text div.CodeRay, .content .list div.CodeRay {
+ margin: 0.5em;
+ padding: 0.5em;
+}
+.content .toc {
+ clear: right;
+ font-size: 0.8em;
+ float: right;
+ padding: 0.5em;
+ border: 1px solid #ddd;
+ background: #eee;
+}
+.content .toc ol {
+ list-style-type: none;
+ margin-left: 0.5em;
+}
+.content .toc ol li {
+ list-style-type: none;
+ margin-left: 0.5em;
+}
+.mod, .uv_select {
+ margin: 0.5em;
+ font-size: 0.8em;
+ float: right;
+ padding: 0.5em;
+ border: 1px solid #ddd;
+ background: #eee;
+}
+.history {
+ padding: 1em;
+}
+.history table {
+ border-collapse: collapse;
+}
+.history table tr.current {
+ background: #efe;
+}
+.history table tr.old {
+ background: #ddd;
+}
+.history table td {
+ border: 1px solid #ddd;
+ padding: 0.2em;
+}
+.diff {
+ margin-top: 1em;
+ overflow: auto;
+}
+.head {
+ background: #38f;
+ color: #fff;
+ height: 4em;
+}
+.head a {
+ color: #fff;
+}
+.head .title {
+ color: #fff;
+ padding: 0.5em;
+}
+.head .menu {
+ background: #38f;
+ position: absolute;
+ right: 0.5em;
+ top: 0.5em;
+ line-height: 1.5em;
+ text-align: right;
+}
+.head .menu a {
+ color: #fff;
+ padding: 0.2em;
+ text-decoration: none;
+}
+.head .menu a:hover {
+ background: #669;
+}
+.footer {
+ clear: both;
+ padding-top: 3em;
+ text-align: center;
+ font-size: 0.8em;
+}
File renamed without changes.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -30,7 +30,7 @@
# gem :uv
# gem :git
- require 'env', 'model/page', 'node/init'
+ require 'env', 'model/page', 'node/page', 'node/auth'
start :adapter => :mongrel
end
View
@@ -0,0 +1,19 @@
+<div id="login">
+ <form method="post">
+ <fieldset>
+ <legend>Log in</legend>
+
+ <div class="pair">
+ <label for="form_user">Username</label>
+ <input id="form_user" type="text" name="user" />
+ </div>
+
+ <div class="pair">
+ <label for="form_pass">Password</label>
+ <input id="form_pass" type="password" name="pass" />
+ </div>
+
+ <input type="submit" value="Log in" />
+ </fieldset>
+ </form>
+</div>
View
@@ -1,11 +0,0 @@
-#login
- %form{:method => :post}
- %fieldset
- %legend= l('Log in')
- .pair
- %label{:for => :form_user}= l('Username')
- %input#form_user{:type => :text, :name => :user}
- .pair
- %label{:for => :form_pass}= l('Password')
- %input#form_pass{:type => :password, :name => :pass}
- %input{:type => :submit, :value => l('Log in')}
Oops, something went wrong.

0 comments on commit c87a0f0

Please sign in to comment.