Skip to content

Commit

Permalink
update css
Browse files Browse the repository at this point in the history
  • Loading branch information
chris flöß committed Sep 17, 2010
1 parent e04cf4c commit c9904c2
Show file tree
Hide file tree
Showing 121 changed files with 5,780 additions and 7,477 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -2,3 +2,5 @@
db/*.sqlite3
log/*.log
tmp/**/*
.swp
.swo
8 changes: 4 additions & 4 deletions Gemfile
Expand Up @@ -5,10 +5,10 @@ source :rubygems
gem 'rails', '3.0.0'
gem 'adva-core', :path => File.expand_path('adva-core', '/home/chris/work/projects/adva-cms2')
gem 'adva-blog', :path => File.expand_path('adva-blog', '/home/chris/work/projects/adva-cms2')
gem 'adva-cart', :path => File.expand_path('adva-cart', '/home/chris/work/projects/adva-cms2')
gem 'adva-catalog', :path => File.expand_path('adva-catalog', '/home/chris/work/projects/adva-cms2')
gem 'adva-cnet', :path => File.expand_path('adva-cnet', '/home/chris/work/projects/adva-cms2')
gem 'adva-contacts', :path => File.expand_path('adva-contacts', '/home/chris/work/projects/adva-cms2')
#gem 'adva-cart', :path => File.expand_path('adva-cart', '/home/chris/work/projects/adva-cms2')
#gem 'adva-catalog', :path => File.expand_path('adva-catalog', '/home/chris/work/projects/adva-cms2')
#gem 'adva-cnet', :path => File.expand_path('adva-cnet', '/home/chris/work/projects/adva-cms2')
#gem 'adva-contacts', :path => File.expand_path('adva-contacts', '/home/chris/work/projects/adva-cms2')
gem 'adva-static', :path => File.expand_path('adva-static', '/home/chris/work/projects/adva-cms2')
gem 'adva-user', :path => File.expand_path('adva-user', '/home/chris/work/projects/adva-cms2')

Expand Down
41 changes: 4 additions & 37 deletions Gemfile.lock
Expand Up @@ -5,41 +5,14 @@ PATH
adva-core
truncate_html

PATH
remote: /home/chris/work/projects/adva-cms2/adva-cart
specs:
adva-cart (0.0.1)
adva-catalog
adva-contacts
adva-core

PATH
remote: /home/chris/work/projects/adva-cms2/adva-catalog
specs:
adva-catalog (0.0.1)
adva-core

PATH
remote: /home/chris/work/projects/adva-cms2/adva-cnet
specs:
adva-cnet (0.0.1)
adva-core
globalize3 (= 0.0.5)
pg

PATH
remote: /home/chris/work/projects/adva-cms2/adva-contacts
specs:
adva-contacts (0.0.1)
adva-core

PATH
remote: /home/chris/work/projects/adva-cms2/adva-core
specs:
adva-core (0.0.1)
gem_patching
inherited_resources (= 1.1.2)
minimal (= 0.0.14)
inherited_resources_helpers (= 0.0.7)
minimal (= 0.0.18)
nbrew-country_select
rails (= 3.0.0)
routing-filter (= 0.1.6)
Expand Down Expand Up @@ -120,27 +93,25 @@ GEM
gem_patching (0.0.2)
gherkin (2.1.5)
trollop (~> 1.16.2)
globalize3 (0.0.5)
activerecord (>= 3.0.0.rc)
has_scope (0.5.0)
i18n (0.4.1)
inherited_resources (1.1.2)
has_scope (~> 0.5.0)
responders (~> 0.6.0)
inherited_resources_helpers (0.0.7)
json_pure (1.4.6)
linecache (0.43)
mail (2.2.5)
activesupport (>= 2.3.6)
mime-types
treetop (>= 1.4.5)
mime-types (1.16)
minimal (0.0.14)
minimal (0.0.18)
actionpack (>= 3.0.0.beta2)
mocha (0.9.8)
rake
nbrew-country_select (0.0.1)
nokogiri (1.4.3.1)
pg (0.9.0)
polyglot (0.3.1)
rack (1.2.1)
rack-cache (0.5.2)
Expand Down Expand Up @@ -203,10 +174,6 @@ PLATFORMS

DEPENDENCIES
adva-blog!
adva-cart!
adva-catalog!
adva-cnet!
adva-contacts!
adva-core!
adva-static!
adva-user!
Expand Down
23 changes: 23 additions & 0 deletions app/views/blogs/articles/_article.html.erb
@@ -0,0 +1,23 @@
<% if article %>
<div id="<%= dom_id article %>" class="entry clearing">
<div class="content">
<h2>
<%= link_to_content article %>
</h2>
<div class="meta">
<p>
posted by <%= article.author_name %>
on <%= article.published_at.to_formatted_s(:long) if article.published_at %>
<%= links_to_content_categories article, " &middot; in: %s" %>
<%= links_to_content_tags article, " &middot; tagged: %s" %>
<%= '&middot; ' + link_to_content_comments(article).to_s if mode != :single and article.accept_comments? %>
</p>
</div>
<% if article.has_excerpt? %>
<%= article.excerpt_html %>
<p><%= link_to_content "Read the rest of this entry", article unless mode == :single %></p>
<% end %>
<%= article.body_html if mode == :single || !article.has_excerpt? %>
</div>
</div>
<% end %>
23 changes: 23 additions & 0 deletions app/views/blogs/show.html.rb
@@ -0,0 +1,23 @@
class Blogs::Show < Minimal::Template
def to_html
unless resource.posts.empty?
ul :class => 'posts' do
resource.posts.order('created_at DESC').each do |post|
li :class => 'post hentry' do
#h2 do
# link_to(post.title, [resource, post], :class => 'entry-title', :rel => 'bookmark')
#end
#render :partial => 'posts/meta', :locals => { :post => post }
div truncate_html(post.body, :length => 500, :omission => ' …'), :class => 'entry-content'
p do
link_to('Read the rest of this entry', [resource, post])
end
end
end
end
end
end
end



43 changes: 43 additions & 0 deletions app/views/comments/_form.html.erb
@@ -0,0 +1,43 @@
<% if @comment %>
<div id="comment_form">
<h2>
<% if @comment.new_record? %>
Leave your reply
<% else %>
Edit your comment
<% end %>
</h2>
<% form_for :comment, @comment, :url => (@comment.new_record? ? comments_path : comment_path(@comment)), :html => {:method => (@comment.new_record? ? :post : :put)} do |f| -%>
<%= comment_form_hidden_fields commentable %>
<div id="registered_author" style="display: none;">
<p>Hi <span>user</span>, you are logged in.</p>
</div>
<% fields_for @comment.author do |author| %>
<div id="anonymous_author">
<p>
<%= author.label :name, 'Name' %>
<%= author.text_field :name %>
</p>
<p>
<%= author.label :email, 'E-Mail' %>
<%= author.text_field :email %>
</p>
<p>
<%= author.label :homepage %>
<%= author.text_field :homepage %>
</p>
</div>
<% end %>
<p>
<%= f.text_area :body %>
</p>
<p id="preview"></p>
<p>
<%= submit_tag (@comment.new_record? ? 'Submit Comment' : 'Save Comment') %>
<%= link_to_remote_comment_preview %>
<img src="/images/indicator.gif" id="comment-preview-spinner" style="display: none;" />
</p>
<% end %>
</div>
<% end %>

50 changes: 50 additions & 0 deletions app/views/layouts/default.html.erb
@@ -0,0 +1,50 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<title><%= site.title %></title>
<%= stylesheet_link_tag 'default', 'layout', 'styles', 'widgets', 'comments', 'forms' %>
<%= javascript_include_tag :common, :default %>
<%= yield :head %>
<%# authorize_elements %>
</head>
<body>
<div id="header">
<h1><%= site.title %></h1>
<h2><%= site.subtitle %></h2>
<ul id="sections">
<li class="item active">
<a href="/" id="show_section">Blog</a>
</li>
<li class="item">
<a href="/wiki" id="show_section">Wiki</a>
</li>
</ul>
</div>

<div id="main">
<div id="flashes">
</div>
<div id="content">
<%= yield %>
</div>
</div>

<div id="sidebar">
<p>
adva-cms is an open source cms platform based on Ruby on Rails and Rails Engines.
</p>
<h4>Resources</h4>
<p>
<a href="http://github.com/svenfuchs/adva_cms">GitHub Repository</a><br>
<a href="http://artweb-design.lighthouseapp.com/projects/13992-adva_cms">Lighthouse Tracker</a><br>
<a href="http://groups.google.com/group/adva-cms">Google Mailinglist</a><br>
<a href="irc://irc.freenode.net#adva-cms">irc.freenode.net#adva-cms</a>
</p>

<%= yield :sidebar %>
</div>

<%#= yield :footer or render :partial => 'shared/footer' %>
</body>
</html>
12 changes: 12 additions & 0 deletions app/views/pages/show.html.erb
@@ -0,0 +1,12 @@
<div id="<%= dom_id @page %>" class="entry clearing">
<div class="content">
<%= @page.article.body.html_safe %>
</div>
</div>

<% content_for :sidebar do %>
<h4>Related Pages</h4>
<% @page.parent.children.each do |p| %>
<%= link_to p.title, "/#{p.path}" %><br>
<%end %>
<% end %>
5 changes: 5 additions & 0 deletions app/views/posts/show.html.erb
@@ -0,0 +1,5 @@
<div id="<%= dom_id @post %>" class="entry clearing">
<div class="content">
<%= @post.body.html_safe %>
</div>
</div>
30 changes: 30 additions & 0 deletions app/views/wiki/show.html.erb
@@ -0,0 +1,30 @@
<div id="<%= dom_id @wikipage %>" class="entry clearing">
<div class="content">
<h2><%= @wikipage.title %></h2>
<%= wikify @wikipage.body %>
</div>
<div class="wiki meta">
<%= wiki_edit_links(@wikipage, :prepend => link_to('all pages', wikipages_path)) %>
<p>
revision: <%= @wikipage.version %>
last updated: <%= @wikipage.updated_at.to_s(:long) %>
by: <%= @wikipage.author_link %>
<%= links_to_content_categories(@wikipage, 'in: %s') %>
<%= links_to_content_tags(@wikipage, 'tagged: %s') %>
</p>
</div>
</div>

<%= render :partial => 'comments/list', :locals => {:commentable => @wikipage, :comments => @wikipage.approved_comments} %>
<% if @wikipage.accept_comments? %>
<%= render :partial => 'comments/form', :locals => {:commentable => @wikipage} %>
<% end %>
<%= render :partial => 'footer' %>
<% content_for :sidebar do %>
<h4>All Wikipages</h4>
<%= @section.wikipages.each do |content| %>
<%= link_to_content content %><br>
<% end %>
<% end %>

0 comments on commit c9904c2

Please sign in to comment.