lib/utype/part_controllers.rb
@@ -12,6 +12,7 @@ Utype::App.after_components_init do
klass.is(:configurable, :with => {
:comments_expire_time => { :default => 0 }
})
+ klass.has_liquid_properties :comments_count
end
end
app/components/comments/init.rb
@@ -5,6 +5,13 @@ module Utype::ContentExtensions
receiver.before :destroy do
self.comments.destroy!
end
+ receiver.send(:include, InstanceMethods)
+ end
+
+ module InstanceMethods
+ def comments_count
+ self.comments.count
+ end
end
end
end
\ No newline at end of file
app/components/comments/lib/utype/content_extensions/has_comments.rb
@@ -1,21 +1,28 @@
-class CommentsPart < Utype::Parts::Controller
+class CommentsPart < Utype::PartControllers::Components
+ register_data_fetchers :set_javascripts => [:comment_form] # TODO: this should be handled somewhere else
+ before :fetch_content
+
def comment_form
- fetch_content
- @template_data['javascripts'] = ['comments/form']
+ render
end
def comments_list
- content = fetch_content
- if content
- @template_data['comments'] = content.comments.all(:published => true, :order => [:published_at.desc])
+ if @template_data['content']
+ @template_data['comments'] = @template_data['content'].comments.all(
+ :published => true, :order => [:published_at.desc])
end
+ render
end
private
- def fetch_content
- content = @web_controller.template_data.find {
- |k, v| v if Comment::COMMENTABLE_TYPES.include?(v.class.to_s.downcase.to_sym) }
- @template_data['content'] = content.last if content
- end
+ def fetch_content
+ content = @web_controller.template_data.find {
+ |k, v| v if Comment::COMMENTABLE_TYPES.include?(v.class.to_s.downcase.to_sym) }
+ @template_data['content'] = content.last if content
+ end
+
+ def set_javascripts
+ @template_data['javascripts'] = ['utype/ui/watermark', 'comments/form']
+ end
end
app/components/comments/parts/comments_part.rb
@@ -1,17 +1,19 @@
-class PublisherPart < Utype::Parts::Controller
+class PublisherPart < Utype::PartControllers::Components
+ register_data_fetchers :get_post => [:post_content]
+
def post_list
- set_stylesheets
@template_data['posts'] = Post.all(:published => true, :order => [:published_at.desc])
+ render
end
def post_content
- set_stylesheets
- @template_data['post'] = params[:permalink].nil? ?
- Post.get(params[:id]) : Post.first(:published => true, :permalink => params[:permalink])
+ render
end
- private
- def set_stylesheets
- @template_data['stylesheets'] = ['publisher/post']
+ protected
+
+ def get_post
+ @template_data['post'] = params[:permalink].nil? ?
+ Post.get(params[:id]) : Post.first(:published => true, :permalink => params[:permalink])
end
end
app/components/publisher/parts/publisher_part.rb
@@ -1,10 +1,12 @@
-class TagsPart < Utype::Parts::Controller
+class TagsPart < Utype::PartControllers::Components
def tagged_content
@template_data['tag'] = Tag.first(:name => params[:tag_list])
@template_data['contents'] = Content.tagged_with(params[:tag_list]).sort_by {|c| [c.published_at, c.title]}.reverse
+ render
end
def tags_claud
@template_data['tags'] = Tag.all.sort_by {|t| [t.name, t.taggables_count]}
+ render
end
end
\ No newline at end of file
app/components/tags/parts/tags_part.rb
@@ -6,4 +6,4 @@ Merb::Router.prepare([], Merb::Router.routes) do
end
# Add tag specific routes
-Utype::Routes.load_site_routes('/:tag_list', { :tag_list => /\w+/ }, :prepend)
\ No newline at end of file
+Utype::Routes.load_site_routes('/:tag_list', { :tag_list => /\w+/ })
\ No newline at end of file
app/components/tags/routes.rb
@@ -22,6 +22,7 @@ module Admin
@page = ::Page.new(params[:page])
@page.site_id = @current_site.id
@page.site = @current_site
+ @page.is_static = params[:page][:component_installation_ids].blank?
if @page.save
@page_type = PageType.get(params[:page][:page_type_id])
if @page_type
@@ -50,6 +51,7 @@ module Admin
new_default.save
end
@page.component_installation_ids = params[:component_installation_ids] || []
+ @page.is_static = params[:component_installation_ids].blank?
@page.update_attributes(params[:page])
@page.create_or_update_content(params[:content_body]) unless params[:content_body].blank?
redirect url(:admin_pages)
app/controllers/admin/pages.rb
@@ -11,6 +11,7 @@ class Page
property :template, String, :length => 1..255
property :template_layout, String, :default => nil
property :is_default, Boolean, :default => false
+ property :is_static, Boolean, :default => true
property :position, Integer, :default => nil
property :menu_location, String, :default => nil
property :created_at, DateTime
@@ -68,7 +69,7 @@ class Page
end
def is_static?
- self.page_type_id.nil?
+ self.is_static
end
def has_site?
app/models/page.rb
@@ -9,6 +9,7 @@ class User
property :login, String, :unique => true, :length => 3..50
property :password_hash, String
property :email, String, :format => :email_address
+ property :www, String, :format => :url
property :admin_theme, String, :default => 'utype'
property :created_at, DateTime
property :updated_at, DateTime
app/models/user.rb
@@ -1,8 +1,10 @@
+require 'utype/part_controllers'
+
module Admin
- class PageMenuPart < Utype::Parts::Controller
- def set_data
+ class PageMenuPart < Utype::PartControllers::Components
+ def page_menu
selected_action = "/#{params[:controller]}/#{params[:action]}"
- selected = { @component.site.page.id => 'selected' }
+ selected = { @components.values.first.site.page.id => 'selected' }
@template_data = {
'pages' => Admin::Page.all(
:site_id => Admin::Site.current.id,
@@ -19,6 +21,7 @@ module Admin
end
end unless page['actions'].nil?
end
+ render
end
end
end
app/parts/admin/page_menu_part.rb
@@ -1,25 +1,21 @@
-require 'utype/parts/controller'
+require 'utype/part_controllers'
-class PagePart < Utype::Parts::Controller
+class PagePart < Utype::PartControllers::Front
def initialize(controller, page)
super(controller, page)
@page = page
end
- def set_data
- component_parts = []
- @page.components.each do |c|
- component_parts << cp = c.part_class.new(self, c)
- cp.send(c.action) if cp.respond_to?(c.action)
- @template_data.merge!(cp.template_data)
- end
- # Render the components
- component_parts.each do |cp|
- @template_data[cp.component.action] = cp._dispatch(:index)
- end
- # Set the content associated with the page
+ def set_template_data
+ @template_data['javascripts'] = []
+ @template_data['stylesheets'] = []
+
+ # if it's a static page, then just set the content
+ # otherwise render the associated components
if @page.content && @page.is_static?
@template_data['content'] = @page.content
+ else
+ render_components
end
end
end
app/parts/page_part.rb
@@ -1,33 +1,25 @@
-require 'utype/parts/controller'
+require 'utype/part_controllers'
-class SitePart < Utype::Parts::Controller
+class SitePart < Utype::PartControllers::Front
attr_reader :page_part
def initialize(controller, site, page)
super(controller, site)
@site = site
- @page = page
- @page_part = PagePart.new(controller, @page)
+ @page_part = PagePart.new(controller, page)
end
- def set_data
- component_parts = []
- @site.components.each do |c|
- component_parts << cp = c.part_class.new(self, c)
- cp.send(c.action) if cp.respond_to?(c.action)
- @template_data.merge!(cp.template_data)
- end
- # Render the components
- component_parts.each do |cp|
- @template_data[cp.component.action] = cp._dispatch(:index)
- end
+ def set_template_data
+ # render site components
+ render_components
# Setup data
@template_data.merge!({
'site' => @site,
'pages' => @site.pages.all(:menu_location.not => nil),
'content' => @page_part._dispatch(:index),
- 'javascripts' => @page_part.template_data['javascripts'],
- 'stylesheets' => @page_part.template_data['stylesheets']
+ 'javascripts' => @page_part.template_data['javascripts'].flatten.uniq,
+ 'stylesheets' => @page_part.template_data['stylesheets'].flatten.uniq,
+ 'utype_version' => Utype::Constants::VERSION
})
end
app/parts/site_part.rb
@@ -4,8 +4,18 @@
<head>
<meta http-equiv="Content-type" content="text/html;charset=utf-8" />
<title>{{ current_site.name }} « Administration</title>
- {% include 'stylesheets' %}
- {% include 'javascripts' %}
+ <link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/reset-min.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/common.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/admin/main.css" />
+ {% for stylesheet in stylesheets %}
+ <script src="/stylesheets/{{stylesheet}}.css" type="text/css" media="screen"></script>
+ {% endfor %}
+ <script src="/javascripts/vendor/jquery-1.2.6.min.js" type="text/javascript"></script>
+ <script src="/javascripts/utype/ui/watermark.js" type="text/javascript"></script>
+ <script src="/javascripts/admin/main.js" type="text/javascript"></script>
+ {% for javascript in javascripts %}
+ <script src="/javascripts/{{javascript}}.js" type="text/javascript"></script>
+ {% endfor %}
</head>
<body class="admin">
<div id="header">
themes/admin/utype/layouts/index.liquid
lib/utype/parts/controller.rb
lib/utype/renderers/liquid.rb
public/javascripts/common/utype.watermark.js
themes/admin/utype/layouts/parts/_javascripts.liquid
themes/admin/utype/layouts/parts/_stylesheets.liquid
fbab2ac8251afa62cc20d8b99d350e679d8ab41a
solnic
piotr@zenbe.com
http://github.com/mariusz/utype/commit/d39d3dc5862794c7766521ce975ade70761646fd
d39d3dc5862794c7766521ce975ade70761646fd
2008-11-11T09:26:22-08:00
2008-11-11T09:26:22-08:00
refactored (again) the way how parts are rendered + comments related work
3b77029991ac679c1c007ed0b7f322f360e24143
solnic
piotr@zenbe.com