From c9904c2bf46041fe8e76c8567c8b4f8f0ff2aac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?chris=20fl=C3=B6=C3=9F?= Date: Fri, 17 Sep 2010 09:03:34 +0200 Subject: [PATCH] update css --- .gitignore | 2 + Gemfile | 8 +- Gemfile.lock | 41 +- app/views/blogs/articles/_article.html.erb | 23 + app/views/blogs/show.html.rb | 23 + app/views/comments/_form.html.erb | 43 ++ app/views/layouts/default.html.erb | 50 ++ app/views/pages/show.html.erb | 12 + app/views/posts/show.html.erb | 5 + app/views/wiki/show.html.erb | 30 + export/2008/8/27/welcome-to-adva-cms.html | 417 +++++----- export/2009/1/20/adva-cms-0-1-0-released.html | 575 +++++++------- export/2009/2/19/adva-cms-0-1-1-released.html | 560 +++++++------- export/2009/3/20/adva-cms-0-1-2-released.html | 385 ++++------ ...-adva-cms-0-2-0-the-usability-release.html | 538 +++++++------ .../22/adva-cms-0-2-1-the-summer-release.html | 627 +++++++-------- ...adva-cms-0-2-2-the-bug-hunter-release.html | 644 ++++++++-------- ...a-cms-0-2-3-an-autumn-cleanup-release.html | 654 ++++++++-------- export/2009/9/2/adva-cms-and-heroku.html | 287 +++---- ...adva-cms-0-2-4-tiny-but-oh-so-awesome.html | 540 +++++++------ export/2010/3/24/adva-cms-0-3-1.html | 459 ++++++----- export/config.ru | 2 +- export/images/adva-cms-screen_0-2-0_1.png | Bin 0 -> 167940 bytes export/images/adva-cms-screen_0-2-0_2.png | Bin 0 -> 118164 bytes export/images/adva-cms-screen_0-2-0_3.png | Bin 0 -> 278628 bytes export/index.html | 712 ++++-------------- .../adva-core/admin/jquery.admin.js | 77 -- .../adva-core/admin/jquery.article.js | 22 - .../adva-core/admin/jquery.cached_pages.js | 14 - .../adva-core/admin/jquery.table_tree.js | 10 - export/javascripts/adva-core/application.js | 38 - export/javascripts/adva-core/cookie.js | 49 -- export/javascripts/adva-core/jquery.dates.js | 49 -- export/javascripts/adva-core/jquery.flash.js | 40 - export/javascripts/adva-core/jquery.roles.js | 23 - .../adva-core/jquery/jquery-lowpro.js | 224 ------ .../javascripts/adva-core/jquery/jquery-ui.js | 273 ------- export/javascripts/adva-core/jquery/jquery.js | 19 - .../adva-core/jquery/jquery.qtip.min.js | 15 - .../adva-core/jquery/jquery.table_tree.js | 307 -------- .../adva-core/jquery/jquery.tablednd_0_5.js | 386 ---------- export/javascripts/adva-core/json.js | 139 ---- export/javascripts/adva-core/parseuri.js | 39 - export/stylesheets/adva_core/admin/common.css | 81 -- .../stylesheets/adva_core/admin/content.css | 11 - export/stylesheets/adva_core/admin/forms.css | 119 --- export/stylesheets/adva_core/admin/header.css | 114 --- .../stylesheets/adva_core/admin/helptip.css | 35 - export/stylesheets/adva_core/admin/layout.css | 62 -- export/stylesheets/adva_core/admin/lists.css | 152 ---- export/stylesheets/adva_core/admin/reset.css | 25 - .../stylesheets/adva_core/admin/sidebar.css | 67 -- export/stylesheets/adva_core/admin/themes.css | 49 -- export/stylesheets/adva_core/admin/top.css | 83 -- export/stylesheets/adva_core/admin/users.css | 40 - export/stylesheets/adva_core/common.css | 49 -- export/stylesheets/adva_core/default.css | 213 ------ .../adva_core/jquery/jquery-ui.css | 406 ---------- .../adva_core/jquery/jquery.tooltip.css | 10 - export/stylesheets/comments.css | 48 ++ export/stylesheets/default.css | 61 ++ export/stylesheets/{adva_core => }/forms.css | 118 +-- export/stylesheets/layout.css | 32 + export/stylesheets/styles.css | 98 +++ export/stylesheets/widgets.css | 28 + export/users/sign_in.html | 70 -- export/users/sign_up.html | 74 -- export/wiki.html | 180 ----- export/wiki/wikipages.html | 59 ++ .../wikipages/adva-cms-engine-overview.html | 181 +++++ .../wikipages/creating-a-new-website.html | 135 ++++ export/wiki/wikipages/download.html | 133 ++++ export/wiki/wikipages/editing-themes.html | 129 ++++ export/wiki/wikipages/getting-started.html | 133 ++++ export/wiki/wikipages/howtos.html | 151 ++++ export/wiki/wikipages/references.html | 159 ++++ .../wikipages/running-specs-and-stories.html | 117 +++ export/wiki/wikipages/running-tests.html | 130 ++++ export/wiki/wikipages/sites-and-sections.html | 171 +++++ export/wiki/wikipages/updating-adva-cms.html | 121 +++ export/wiki/wikipages/using-adva-cms.html | 119 +++ export/wikipages.html | 180 ----- import/2008/8/27/welcome-to-adva-cms.yml | 8 +- ...va-cms-0-2-3-an-autumn-cleanup-release.yml | 2 +- .../wikipages/adva-cms-engines-overview.yml | 6 - .../wiki/wikipages/creating-a-new-website.yml | 6 - import/wiki/wikipages/download.yml | 8 +- import/wiki/wikipages/editing-themes.yml | 6 - import/wiki/wikipages/howtos.yml | 6 - import/wiki/wikipages/references.yml | 20 +- .../wikipages/running-specs-and-stories.yml | 8 +- import/wiki/wikipages/running-tests.yml | 6 - import/wiki/wikipages/sites-and-sections.yml | 6 - import/wiki/wikipages/updating-adva-cms.yml | 6 - import/wiki/wikipages/using-adva-cms.yml | 6 - .../images/adva-cms-screen_0-2-0_1.medium.png | Bin 0 -> 78259 bytes public/images/adva-cms-screen_0-2-0_1.png | Bin 0 -> 167940 bytes .../images/adva-cms-screen_0-2-0_1.thumb.png | Bin 0 -> 21498 bytes .../images/adva-cms-screen_0-2-0_1.tiny.png | Bin 0 -> 9599 bytes .../images/adva-cms-screen_0-2-0_2.medium.png | Bin 0 -> 59223 bytes public/images/adva-cms-screen_0-2-0_2.png | Bin 0 -> 118164 bytes .../images/adva-cms-screen_0-2-0_2.thumb.png | Bin 0 -> 18596 bytes .../images/adva-cms-screen_0-2-0_2.tiny.png | Bin 0 -> 8593 bytes .../images/adva-cms-screen_0-2-0_3.medium.png | Bin 0 -> 96232 bytes public/images/adva-cms-screen_0-2-0_3.png | Bin 0 -> 278628 bytes .../images/adva-cms-screen_0-2-0_3.thumb.png | Bin 0 -> 27346 bytes .../images/adva-cms-screen_0-2-0_3.tiny.png | Bin 0 -> 10255 bytes public/images/header_bg.png | Bin 0 -> 239 bytes public/images/mark.jpg | Bin 0 -> 7975 bytes public/images/mark.medium.jpg | Bin 0 -> 8438 bytes public/images/mark.thumb.jpg | Bin 0 -> 6659 bytes public/images/mark.tiny.jpg | Bin 0 -> 2227 bytes public/images/minus.gif | Bin 0 -> 69 bytes public/images/preview.png | Bin 0 -> 8244 bytes public/stylesheets/cache/all.css | 332 ++++++++ public/stylesheets/comments.css | 48 ++ public/stylesheets/default.css | 61 ++ public/stylesheets/forms.css | 60 ++ public/stylesheets/layout.css | 32 + public/stylesheets/styles.css | 98 +++ public/stylesheets/widgets.css | 28 + 121 files changed, 5780 insertions(+), 7477 deletions(-) create mode 100644 app/views/blogs/articles/_article.html.erb create mode 100644 app/views/blogs/show.html.rb create mode 100644 app/views/comments/_form.html.erb create mode 100644 app/views/layouts/default.html.erb create mode 100644 app/views/pages/show.html.erb create mode 100644 app/views/posts/show.html.erb create mode 100644 app/views/wiki/show.html.erb create mode 100644 export/images/adva-cms-screen_0-2-0_1.png create mode 100644 export/images/adva-cms-screen_0-2-0_2.png create mode 100644 export/images/adva-cms-screen_0-2-0_3.png delete mode 100644 export/javascripts/adva-core/admin/jquery.admin.js delete mode 100644 export/javascripts/adva-core/admin/jquery.article.js delete mode 100644 export/javascripts/adva-core/admin/jquery.cached_pages.js delete mode 100644 export/javascripts/adva-core/admin/jquery.table_tree.js delete mode 100644 export/javascripts/adva-core/application.js delete mode 100644 export/javascripts/adva-core/cookie.js delete mode 100644 export/javascripts/adva-core/jquery.dates.js delete mode 100644 export/javascripts/adva-core/jquery.flash.js delete mode 100644 export/javascripts/adva-core/jquery.roles.js delete mode 100644 export/javascripts/adva-core/jquery/jquery-lowpro.js delete mode 100644 export/javascripts/adva-core/jquery/jquery-ui.js delete mode 100644 export/javascripts/adva-core/jquery/jquery.js delete mode 100644 export/javascripts/adva-core/jquery/jquery.qtip.min.js delete mode 100644 export/javascripts/adva-core/jquery/jquery.table_tree.js delete mode 100644 export/javascripts/adva-core/jquery/jquery.tablednd_0_5.js delete mode 100644 export/javascripts/adva-core/json.js delete mode 100644 export/javascripts/adva-core/parseuri.js delete mode 100644 export/stylesheets/adva_core/admin/common.css delete mode 100644 export/stylesheets/adva_core/admin/content.css delete mode 100644 export/stylesheets/adva_core/admin/forms.css delete mode 100644 export/stylesheets/adva_core/admin/header.css delete mode 100644 export/stylesheets/adva_core/admin/helptip.css delete mode 100644 export/stylesheets/adva_core/admin/layout.css delete mode 100644 export/stylesheets/adva_core/admin/lists.css delete mode 100644 export/stylesheets/adva_core/admin/reset.css delete mode 100644 export/stylesheets/adva_core/admin/sidebar.css delete mode 100644 export/stylesheets/adva_core/admin/themes.css delete mode 100644 export/stylesheets/adva_core/admin/top.css delete mode 100644 export/stylesheets/adva_core/admin/users.css delete mode 100644 export/stylesheets/adva_core/common.css delete mode 100644 export/stylesheets/adva_core/default.css delete mode 100644 export/stylesheets/adva_core/jquery/jquery-ui.css delete mode 100644 export/stylesheets/adva_core/jquery/jquery.tooltip.css create mode 100644 export/stylesheets/comments.css create mode 100644 export/stylesheets/default.css rename export/stylesheets/{adva_core => }/forms.css (93%) create mode 100644 export/stylesheets/layout.css create mode 100644 export/stylesheets/styles.css create mode 100644 export/stylesheets/widgets.css delete mode 100644 export/users/sign_in.html delete mode 100644 export/users/sign_up.html delete mode 100644 export/wiki.html create mode 100644 export/wiki/wikipages.html create mode 100644 export/wiki/wikipages/adva-cms-engine-overview.html create mode 100644 export/wiki/wikipages/creating-a-new-website.html create mode 100644 export/wiki/wikipages/download.html create mode 100644 export/wiki/wikipages/editing-themes.html create mode 100644 export/wiki/wikipages/getting-started.html create mode 100644 export/wiki/wikipages/howtos.html create mode 100644 export/wiki/wikipages/references.html create mode 100644 export/wiki/wikipages/running-specs-and-stories.html create mode 100644 export/wiki/wikipages/running-tests.html create mode 100644 export/wiki/wikipages/sites-and-sections.html create mode 100644 export/wiki/wikipages/updating-adva-cms.html create mode 100644 export/wiki/wikipages/using-adva-cms.html delete mode 100644 export/wikipages.html create mode 100644 public/images/adva-cms-screen_0-2-0_1.medium.png create mode 100644 public/images/adva-cms-screen_0-2-0_1.png create mode 100644 public/images/adva-cms-screen_0-2-0_1.thumb.png create mode 100644 public/images/adva-cms-screen_0-2-0_1.tiny.png create mode 100644 public/images/adva-cms-screen_0-2-0_2.medium.png create mode 100644 public/images/adva-cms-screen_0-2-0_2.png create mode 100644 public/images/adva-cms-screen_0-2-0_2.thumb.png create mode 100644 public/images/adva-cms-screen_0-2-0_2.tiny.png create mode 100644 public/images/adva-cms-screen_0-2-0_3.medium.png create mode 100644 public/images/adva-cms-screen_0-2-0_3.png create mode 100644 public/images/adva-cms-screen_0-2-0_3.thumb.png create mode 100644 public/images/adva-cms-screen_0-2-0_3.tiny.png create mode 100644 public/images/header_bg.png create mode 100644 public/images/mark.jpg create mode 100644 public/images/mark.medium.jpg create mode 100644 public/images/mark.thumb.jpg create mode 100644 public/images/mark.tiny.jpg create mode 100644 public/images/minus.gif create mode 100644 public/images/preview.png create mode 100644 public/stylesheets/cache/all.css create mode 100644 public/stylesheets/comments.css create mode 100644 public/stylesheets/default.css create mode 100644 public/stylesheets/forms.css create mode 100644 public/stylesheets/layout.css create mode 100644 public/stylesheets/styles.css create mode 100644 public/stylesheets/widgets.css diff --git a/.gitignore b/.gitignore index af64fae..3f7000c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ db/*.sqlite3 log/*.log tmp/**/* +.swp +.swo diff --git a/Gemfile b/Gemfile index b0eb8ca..6d73b9f 100644 --- a/Gemfile +++ b/Gemfile @@ -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') diff --git a/Gemfile.lock b/Gemfile.lock index 71f1682..64f70ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -120,13 +93,12 @@ 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) @@ -134,13 +106,12 @@ GEM 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) @@ -203,10 +174,6 @@ PLATFORMS DEPENDENCIES adva-blog! - adva-cart! - adva-catalog! - adva-cnet! - adva-contacts! adva-core! adva-static! adva-user! diff --git a/app/views/blogs/articles/_article.html.erb b/app/views/blogs/articles/_article.html.erb new file mode 100644 index 0000000..96a9f6a --- /dev/null +++ b/app/views/blogs/articles/_article.html.erb @@ -0,0 +1,23 @@ +<% if article %> +
+
+

+ <%= link_to_content article %> +

+
+

+ posted by <%= article.author_name %> + on <%= article.published_at.to_formatted_s(:long) if article.published_at %> + <%= links_to_content_categories article, " · in: %s" %> + <%= links_to_content_tags article, " · tagged: %s" %> + <%= '· ' + link_to_content_comments(article).to_s if mode != :single and article.accept_comments? %> +

+
+ <% if article.has_excerpt? %> + <%= article.excerpt_html %> +

<%= link_to_content "Read the rest of this entry", article unless mode == :single %>

+ <% end %> + <%= article.body_html if mode == :single || !article.has_excerpt? %> +
+
+<% end %> \ No newline at end of file diff --git a/app/views/blogs/show.html.rb b/app/views/blogs/show.html.rb new file mode 100644 index 0000000..0c047f8 --- /dev/null +++ b/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 + + + diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb new file mode 100644 index 0000000..e63488e --- /dev/null +++ b/app/views/comments/_form.html.erb @@ -0,0 +1,43 @@ +<% if @comment %> +
+

+ <% if @comment.new_record? %> + Leave your reply + <% else %> + Edit your comment + <% end %> +

+ <% 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 %> + + <% fields_for @comment.author do |author| %> +
+

+ <%= author.label :name, 'Name' %> + <%= author.text_field :name %> +

+

+ <%= author.label :email, 'E-Mail' %> + <%= author.text_field :email %> +

+

+ <%= author.label :homepage %> + <%= author.text_field :homepage %> +

+
+ <% end %> +

+ <%= f.text_area :body %> +

+

+

+ <%= submit_tag (@comment.new_record? ? 'Submit Comment' : 'Save Comment') %> + <%= link_to_remote_comment_preview %> + +

+ <% end %> +
+<% end %> + diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb new file mode 100644 index 0000000..e77b0e0 --- /dev/null +++ b/app/views/layouts/default.html.erb @@ -0,0 +1,50 @@ + + + + + <%= site.title %> + <%= stylesheet_link_tag 'default', 'layout', 'styles', 'widgets', 'comments', 'forms' %> + <%= javascript_include_tag :common, :default %> + <%= yield :head %> + <%# authorize_elements %> + + + + +
+
+
+
+ <%= yield %> +
+
+ + + + <%#= yield :footer or render :partial => 'shared/footer' %> + + diff --git a/app/views/pages/show.html.erb b/app/views/pages/show.html.erb new file mode 100644 index 0000000..9ac5c60 --- /dev/null +++ b/app/views/pages/show.html.erb @@ -0,0 +1,12 @@ +
+
+ <%= @page.article.body.html_safe %> +
+
+ +<% content_for :sidebar do %> +

Related Pages

+ <% @page.parent.children.each do |p| %> + <%= link_to p.title, "/#{p.path}" %>
+ <%end %> +<% end %> diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb new file mode 100644 index 0000000..449e281 --- /dev/null +++ b/app/views/posts/show.html.erb @@ -0,0 +1,5 @@ +
+
+ <%= @post.body.html_safe %> +
+
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb new file mode 100644 index 0000000..9715c93 --- /dev/null +++ b/app/views/wiki/show.html.erb @@ -0,0 +1,30 @@ +
+
+

<%= @wikipage.title %>

+ <%= wikify @wikipage.body %> +
+
+ <%= wiki_edit_links(@wikipage, :prepend => link_to('all pages', wikipages_path)) %> +

+ 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') %> +

+
+
+ +<%= 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 %> +

All Wikipages

+ <%= @section.wikipages.each do |content| %> + <%= link_to_content content %>
+ <% end %> +<% end %> diff --git a/export/2008/8/27/welcome-to-adva-cms.html b/export/2008/8/27/welcome-to-adva-cms.html index 0793541..afdd882 100644 --- a/export/2008/8/27/welcome-to-adva-cms.html +++ b/export/2008/8/27/welcome-to-adva-cms.html @@ -1,247 +1,194 @@ - + - - - - - - adva-cms - - - adva-cms - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + adva-cms + + + + + + + + - -