ActionItem122: implementing theme editor

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2425 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem122: implementing theme editor
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2425 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 9f8b8883
Showing 22 changed files with 801 additions and 89 deletions Show diff stats
app/controllers/my_profile/themes_controller.rb
app/helpers/application_helper.rb
app/models/profile.rb
app/models/theme.rb
app/views/layouts/application.rhtml
app/views/shared/codepress.rhtml
app/views/shared/theme_test_panel.rhtml
app/views/themes/add_css.rhtml
app/views/themes/add_image.rhtml
app/views/themes/css_editor.rhtml
app/views/themes/edit.rhtml
app/views/themes/index.rhtml
app/views/themes/new.rhtml
db/migrate/051_add_edit_appearance_permission.rb
db/schema.rb
lib/tasks/populate.rake
public/stylesheets/common.css
test/functional/application_controller_test.rb
test/functional/themes_controller_test.rb
test/unit/application_helper_test.rb
 class ThemesController < MyProfileController
  
+  protect 'edit_appearance', :profile
   no_design_blocks
  
   def set
@@ -12,4 +13,66 @@ class ThemesController &lt; MyProfileController
     @selected_theme = profile.theme
   end
  
+  def new
+    if !request.xhr?
+      id = params[:name].to_slug
+      t = Theme.new(id, :name => params[:name], :owner => profile)
+      t.save
+      redirect_to :action => 'index'
+    else
+      render :action => 'new', :layout => false
+    end
+  end
+
+  def edit
+    @theme = profile.find_theme(params[:id])
+    @css_files = @theme.css_files
+    @image_files = @theme.image_files
+  end
+
+  def add_css
+    @theme = profile.find_theme(params[:id])
+    if request.xhr?
+      render :action => 'add_css', :layout => false
+    else
+      @theme.add_css(params[:css])
+      redirect_to :action => 'edit', :id => @theme.id
+    end
+  end
+
+  def css_editor
+    @theme = profile.find_theme(params[:id])
+    @css = params[:css]
+
+    @code = @theme.read_css(@css)
+    render :action => 'css_editor', :layout => false
+  end
+
+  post_only :update_css
+  def update_css
+    @theme = profile.find_theme(params[:id])
+    @theme.update_css(params[:css], params[:csscode])
+    redirect_to :action => 'edit', :id => @theme.id
+  end
+
+  def add_image
+    @theme = profile.find_theme(params[:id])
+    if request.xhr?
+      render :action => 'add_image', :layout => false
+    else
+      @theme.add_image(params[:image].original_filename, params[:image].read)
+      redirect_to :action => 'edit', :id => @theme.id
+    end
+  end
+
+  def start_test
+    session[:theme] = params[:id]
+    redirect_to :controller => 'content_viewer', :profile => profile.identifier, :action => 'view_page'
+  end
+
+  def stop_test
+    session[:theme] = nil
+    redirect_to :action => 'index'
+  end
+
 end
@@ -220,24 +220,12 @@ module ApplicationHelper
     link_to(content_tag('span', label), url, html_options.merge(:class => the_class ))
   end
  
-  def button_to_function(type, label, js_code, html_options = {})
-    html_options[:class] = "button with-text" unless html_options[:class]
-    html_options[:class] << " icon-#{type}"
-    link_to_function(label, js_code, html_options)
-  end
-
   def button_to_function(type, label, js_code, html_options = {}, &block)
     html_options[:class] = "button with-text" unless html_options[:class]
     html_options[:class] << " icon-#{type}"
     link_to_function(label, js_code, html_options, &block)
   end
  
-  def button_to_function_without_text(type, label, js_code, html_options = {})
-    html_options[:class] = "" unless html_options[:class]
-    html_options[:class] << " button icon-#{type}"
-    link_to_function(content_tag('span', label), js_code, html_options)
-  end
-
   def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
     html_options[:class] = "" unless html_options[:class]
     html_options[:class] << " button icon-#{type}"
@@ -323,12 +311,21 @@ module ApplicationHelper
   def filename_for_stylesheet(name, in_theme)
     result = ''
     if in_theme
-      result << '/designs/themes/' + current_theme
+      result << theme_path
     end
     result << '/stylesheets/' << name << '.css'
   end
  
+  def theme_path
+    if session[:theme]
+      '/user_themes/' + current_theme
+    else
+      '/designs/themes/' + current_theme
+    end
+  end
+
   def current_theme
+    return session[:theme] if (session[:theme])
     p = profile
     if p
       p.theme
@@ -337,6 +334,21 @@ module ApplicationHelper
     end
   end
  
+  def theme_footer
+    footer = ('../../public' + theme_path + '/footer.rhtml')
+    if File.exists?(RAILS_ROOT + '/app/views/' + footer)
+      render :file => footer
+    end
+  end
+
+  def is_testing_theme
+    !@controller.session[:theme].nil?
+  end
+
+  def theme_owner
+    Theme.find(current_theme).owner.identifier
+  end
+
   # generates a image tag for the profile. 
   #
   # If the profile has no image set yet, then a default image is used.
@@ -492,8 +504,7 @@ module ApplicationHelper
  
   def theme_option(opt = nil)
     conf = RAILS_ROOT.to_s() +
-           '/public/designs/themes/' +
-           current_theme.to_s() +
+           '/public' + theme_path +
            '/theme.yml'
     if File.exists?(conf)
       opt ? YAML.load_file(conf)[opt.to_s()] : YAML.load_file(conf)
@@ -529,7 +540,7 @@ module ApplicationHelper
     return if option.nil?
     html = []
     option.each do |file|
-      file = '/designs/themes/'+ current_theme.to_s() +
+      file = theme_path +
              '/javascript/'+ file +'.js'
       if File.exists? RAILS_ROOT.to_s() +'/public'+ file
         html << javascript_src_tag( file, {} )
@@ -35,6 +35,7 @@ class Profile &lt; ActiveRecord::Base
     'validate_enterprise' => N_('Validate enterprise'),
     'perform_task'        => N_('Perform task'),
     'moderate_comments'   => N_('Moderate comments'),
+    'edit_appearance'     => N_('Edit appearance'),
   }
  
   acts_as_accessible
@@ -450,4 +451,13 @@ class Profile &lt; ActiveRecord::Base
   def public?
     public_profile
   end
+
+  def themes
+    Theme.find_by_owner(self)
+  end
+
+  def find_theme(the_id)
+    themes.find { |item| item.id == the_id }
+  end
+
 end
 class Theme
  
+  class << self
+    def system_themes
+      Dir.glob(RAILS_ROOT + '/public/designs/themes/*').map do |item|
+        File.basename(item)
+      end.map do |item|
+        new(item)
+      end
+    end
+
+    def user_themes_dir
+      File.join(RAILS_ROOT, 'public', 'user_themes')
+    end
+
+    def create(id, attributes = {})
+      if find(id) || system_themes.map(&:id).include?(id)
+        raise DuplicatedIdentifier
+      end
+      Theme.new(id, attributes).save
+    end
+
+    def find(the_id)
+      if File.directory?(File.join(user_themes_dir, the_id))
+        Theme.new(the_id)
+      else
+        nil
+      end
+    end
+
+    def find_by_owner(owner)
+      Dir.glob(File.join(user_themes_dir, '*', 'theme.yml')).select do |desc|
+        config = YAML.load_file(desc)
+        (config['owner_type'] == owner.class.base_class.name) && (config['owner_id'] == owner.id)
+      end.map do |desc|
+        Theme.find(File.basename(File.dirname(desc)))
+      end
+    end
+
+  end
+
+  class DuplicatedIdentifier < Exception; end
+
   attr_reader :id
+  attr_reader :config
  
-  def initialize(id)
+  def initialize(id, attributes = {})
     @id = id
+    load_config
+    attributes.each do |k,v|
+      self.send("#{k}=", v)
+    end
   end
  
   def name
-    id
+    config['name'] || id
   end
  
-  class << self
-    def system_themes
-      Dir.glob(RAILS_ROOT + '/public/designs/themes/*').map do |item|
-        File.basename(item)
-      end.map do |item|
-        new(item)
-      end
+  def name=(value)
+    config['name'] = value
+  end
+
+  def ==(other)
+    other.is_a?(self.class) && (other.id == self.id)
+  end
+
+  def add_css(filename)
+    FileUtils.mkdir_p(stylesheets_directory)
+    FileUtils.touch(stylesheet_path(filename))
+  end
+
+  def update_css(filename, content)
+    add_css(filename)
+    File.open(stylesheet_path(filename), 'w') do |f|
+      f.write(content)
+    end
+  end
+
+  def read_css(filename)
+    File.read(stylesheet_path(filename))
+  end
+
+  def css_files
+    Dir.glob(File.join(stylesheets_directory, '*.css')).map { |f| File.basename(f) }
+  end
+
+  def add_image(filename, data)
+    FileUtils.mkdir_p(images_directory)
+    File.open(image_path(filename), 'w') do |f|
+      f.write(data)
     end
   end
+
+  def image_files
+    Dir.glob(image_path('*')).map {|item| File.basename(item)}
+  end
+
+  def stylesheet_path(filename)
+    suffix = ''
+    unless filename =~ /\.css$/
+      suffix = '.css'
+    end
+    File.join(stylesheets_directory, filename + suffix)
+  end
+
+  def stylesheets_directory
+    File.join(Theme.user_themes_dir, self.id, 'stylesheets')
+  end
+
+  def image_path(filename)
+    File.join(images_directory, filename)
+  end
+
+  def images_directory
+    File.join(self.class.user_themes_dir, id, 'images')
+  end
+
+  def save
+    FileUtils.mkdir_p(self.class.user_themes_dir)
+    FileUtils.mkdir_p(File.join(self.class.user_themes_dir, id))
+    %w[ common help menu article button search blocks forms login-box ].each do |item|
+      add_css(item)
+    end
+    write_config
+    self
+  end
+
+  def owner
+    return nil unless config['owner_type'] && config['owner_id']
+    @owner ||= config['owner_type'].constantize.find(config['owner_id'])
+  end
+
+  def owner=(model)
+    config['owner_type'] = model.class.base_class.name
+    config['owner_id'] = model.id
+    @owner = model
+  end
+
+  protected
+
+  def write_config
+    File.open(File.join(self.class.user_themes_dir, self.id, 'theme.yml'), 'w') do |f|
+      f.write(config.to_yaml)
+    end
+  end
+
+  def load_config
+    if File.exists?(File.join(self.class.user_themes_dir, self.id, 'theme.yml'))
+      @config = YAML.load_file(File.join(self.class.user_themes_dir, self.id, 'theme.yml'))
+    else
+      @config = {}
+    end
+  end
+
 end
@@ -154,7 +154,7 @@
     </div><!-- id="wrap" -->
  
     <div id="footer">
-      <%= render :file => ('../../public/designs/themes/' + current_theme + '/footer.rhtml' ) %>
+      <%= theme_footer %>
     </div><!-- id="footer" -->
  
     <div id="helpBox" style="display:none">
@@ -177,5 +177,9 @@
     </div>
     <%= javascript_include_tag 'better-browser-promotion' %>
  
+    <% if is_testing_theme %>
+      <%= render :file => 'shared/theme_test_panel' %>
+    <% end %>
+
   </body>
 </html>
-<%= javascript_include_tag 'codepress/codepress.js' %>
+<%= javascript_include_tag 'codepress/codepress' %>
@@ -0,0 +1,13 @@
+<div id='theme-test-panel'>
+  <h4>
+    <%= _('Testing theme "%s"') % current_theme %>
+  </h4>
+
+  <p><small><em><%= _('You can move this window away to have a better visualization of specific parts of screen.') %></em></small></p>
+
+  <% button_bar do %>
+    <%= button(:ok, _('Finished testing'), :controller => 'themes', :profile => theme_owner, :action => 'stop_test', :id => current_theme) %>
+    <%= button(:edit, _('Edit theme'), :controller => 'themes', :profile => theme_owner, :action => 'edit', :id => current_theme) %>
+  <% end %>
+</div>
+<%= draggable_element('theme-test-panel') %>
@@ -0,0 +1,11 @@
+<h2><%= _('Add a CSS file') %></h2>
+
+<% form_tag do %>
+  <%= labelled_form_field(_('File name'), text_field_tag('css')) %>
+
+  <% button_bar do %>
+    <%= submit_button(:add, _('Add')) %>
+    <%= lightbox_close_button(_('Cancel')) %>
+  <% end %>
+
+<% end %>
@@ -0,0 +1,6 @@
+<% form_tag({:action => 'add_image', :id => @theme.id}, :multipart => true) do %>
+  <%= labelled_form_field(_('Choose the image file'), file_field_tag(:image)) %>
+  <% button_bar do %>
+    <%= submit_button(:add, _('Add image')) %>
+  <% end %>
+<% end %>
@@ -0,0 +1,13 @@
+<h2><%= _('CSS code: "%s"') % @css %></h2>
+
+<% form_tag({:action => 'update_css', :id => @theme.id }, :name => 'csscode_form') do %>
+  <%= hidden_field_tag('css', @css) %>
+  <%= text_area_tag('csscode', @code, :id => "codepressWindow", :class => 'codepress css') %>
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save')) %>
+  <% end %>
+<% end %>
+
+<!--<script type='text/javascript'>-->
+  <!--CodePress.run();-->
+<!--</script>-->
 <form>
   <%# FIXME %>
   <h1 id='theme-name'>
-    <%= _('Editing theme %s') % text_field_tag('theme_name', 'my theme') %>
-    <%= icon_button(:save, _('Save'), '#') %>
+    <%= _('Editing theme "%s"') % @theme.name %>
+    <%= button(:search, _('Preview this theme'), :action => 'index') %>
+    <%= button(:back, _('Back'), :action => 'index') %>
   </h1>
 </form>
  
+
 <div id='css-files-list'>
   <h2><%= _('CSS files') %></h2>
   <ul>
-    <li><a href="">common.css</a></li>
-    <li><a href="">header.css</a></li>
-    <li><a href="">footer.css</a></li>
-    <li><a href="">sideboxes.css</a></li>
-    <li><a href="">otherstuff1.css</a></li>
-    <li><a href="">otherstuff1.css</a></li>
-    <li><a href="">otherstuff1.css</a></li>
-    <li><a href="">otherstuff2css</a></li>
-    <li><a href="">otherstuff3.css</a></li>
-    <li><a href="">otherstuff4.css</a></li>
-    <li><a href="">otherstuff2css</a></li>
-    <li><a href="">otherstuff3.css</a></li>
-    <li><a href="">otherstuff4.css</a></li>
-    <li><a href="">otherstuff2css</a></li>
-    <li><a href="">otherstuff3.css</a></li>
-    <li><a href="">otherstuff4.css</a></li>
+    <% for css in @css_files %>
+      <li><%= link_to_remote(css, :url => { :action => 'css_editor', :id => @theme.id, :css => css }, :update => { :success => 'css-code' }) %></li>
+    <% end %>
   </ul>
   <% button_bar do %>
-    <%= button(:add, _('New CSS'), '') %>
+    <%= lightbox_button(:add, _('New CSS'), :action => 'add_css', :id => @theme.id) %>
   <% end %>
 </div>
  
 <div id='image-files-list'>
   <h2><%= _('Images') %></h2>
   <ul>
-    <li><img src='/images/icons-app/gtk-cancel.png' /><span>Image 1</span></li>
-    <li><img src='/images/icons-app/cms.png' /><span>Image_2_a_very_large_filename</span></li>
-    <li><img src='http://www.ynternet.org/banner/' /><span>a wide image</span></li>
-    <li><img src='/images/icons-app/enable.png' /><span>Image 3</span></li>
-    <li><img src='/images/icons-app/gnome-globe.png' /><span>Image 4</span></li>
-    <li><img src='/images/icons-app/gtk-yes.png' /><span>Image 5</span></li>
-    <li><img src='/images/icons-app/mail.png' /><span>Image 6</span></li>
+    <% for image in @image_files %>
+      <li><%= image_tag("/user_themes/#{@theme.id}/images/#{image}") %></li>
+    <% end %> 
   </ul>
   <% button_bar do %>
-    <%= button(:add, _('Upload image'), '') %>
+    <%= lightbox_button(:add, _('Add image'), :action => 'add_image', :id =>  @theme.id) %>
   <% end %>
 </div>
  
-<form id='css-code'>
-  <%# FIXME %>
-  <h2><%= _('CSS code: "%s"') % 'common.css' %></h2>
-  <textarea name='csscode' id="csscode" class='codepress css'>
-    body {
-      background: yellow;
-    }
-  </textarea>
-  <% button_bar do %>
-    <%= button(:save, _('Save'), '') %>
-  <% end %>
-</form>
+<div id='css-code'>
+  <center style='padding-top: 5em;'>
+    <em><%= _('Select a CSS file to edit') %></em>
+  </center>
+</div>
  
-<%= render :file => 'shared/codepress' %>
+<%# javascript_include_tag 'codepress/codepress' %>
@@ -2,13 +2,53 @@
  
 <h2><%= _('Select theme') %></h2>
  
-<div>
-  <% for theme in @themes %>
-    <%= link_to image_tag('/images/icons-app/design-editor.png', :alt => (_('Select the "%s" theme.') % theme.name)) + content_tag('span', theme.name), :action => 'set', :id => theme.id %>
+<table style='margin: auto'>
+  <% for themes in @themes.in_groups_of(3)  %>
+    <tr>
+      <% for theme in themes %>
+        <td>
+          <%# FIXME add proper thumbnails %>
+          <%= image_tag('/images/icons-app/design-editor.png', :alt => (_('The "%s" theme.') % theme.name)) if theme %>
+        </td>
+        <td>
+          <strong><%= theme.name if theme%></strong><br/>
+          <%= link_to(_('Use this theme'), :action => 'set', :id => theme.id) if theme %>
+        </td>
+        <td>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+        </td>
+      <% end %>
+    </tr>
+    <tr><td colspan='3'>&nbsp;</td></tr>
   <% end %>
-</div>
+</table>
  
+<h2><%= _('My themes') %></h2>
+
+<table style='margin: auto'>
+  <% for themes in profile.themes.in_groups_of(3)  %>
+    <tr>
+      <% for theme in themes %>
+        <td>
+          <%# FIXME add proper thumbnails %>
+          <%= image_tag('/images/icons-app/design-editor.png', :alt => (_('The "%s" theme.') % theme.name)) if theme %>
+        </td>
+        <td>
+          <strong><%= theme.name if theme%></strong><br/>
+          <%= link_to(_('Edit this theme'), :action => 'edit', :id => theme.id) if theme %>
+          <br/>
+          <%= link_to(_('Test this theme'), :action => 'start_test', :id => theme.id) if theme %>
+        </td>
+        <td>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+        </td>
+      <% end %>
+    </tr>
+    <tr><td colspan='3'>&nbsp;</td></tr>
+  <% end %>
+</table>
  
 <% button_bar do %>
+  <%= lightbox_button(:add, _('New theme ...'), :action => 'new') %>
   <%= button(:back, _('Back'), :controller => 'profile_editor', :action => 'index') %>
 <% end %>
@@ -0,0 +1,10 @@
+<h2><%= _('Create new theme') %></h2>
+
+<% form_tag(:action => 'new') do %>
+
+  <%= labelled_form_field(_('Name of the new theme:'), text_field_tag(:name)) %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Create')) %>
+  <% end %>
+<% end %>
@@ -0,0 +1,16 @@
+class AddEditAppearancePermission < ActiveRecord::Migration
+
+  def self.up
+    [ Profile::Roles.admin, Environment::Roles.admin].each do |item|
+      item.permissions += [ 'edit_appearance' ]
+      item.save!
+    end
+  end
+
+  def self.down
+    [ Profile::Roles.admin, Environment::Roles.admin].each do |item|
+      item.permissions -= [ 'edit_appearance' ]
+      item.save!
+    end
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
  
-ActiveRecord::Schema.define(:version => 50) do
+ActiveRecord::Schema.define(:version => 51) do
  
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -73,8 +73,8 @@ ActiveRecord::Schema.define(:version =&gt; 50) do
     t.boolean "virtual",     :default => false
   end
  
-  add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"
   add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
+  add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"
  
   create_table "blocks", :force => true do |t|
     t.string  "title"
@@ -114,8 +114,8 @@ ActiveRecord::Schema.define(:version =&gt; 50) do
     t.boolean "virtual",     :default => false
   end
  
-  add_index "categories_profiles", ["profile_id"], :name => "index_categories_profiles_on_profile_id"
   add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id"
+  add_index "categories_profiles", ["profile_id"], :name => "index_categories_profiles_on_profile_id"
  
   create_table "comments", :force => true do |t|
     t.string   "title"
@@ -182,8 +182,8 @@ ActiveRecord::Schema.define(:version =&gt; 50) do
     t.datetime "updated_at"
   end
  
-  add_index "product_categorizations", ["product_id"], :name => "index_product_categorizations_on_product_id"
   add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id"
+  add_index "product_categorizations", ["product_id"], :name => "index_product_categorizations_on_product_id"
  
   create_table "products", :force => true do |t|
     t.integer  "enterprise_id"
@@ -254,8 +254,8 @@ ActiveRecord::Schema.define(:version =&gt; 50) do
     t.datetime "created_at"
   end
  
-  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
   add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
+  add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
  
   create_table "tags", :force => true do |t|
     t.string  "name"
@@ -36,6 +36,7 @@ def create_roles
     'post_content',
     'edit_profile_design',
     'manage_products',
+    'edit_appearance',
   ])
   Role.create!(:key => 'profile_admin', :name => N_('Profile Administrator'), :permissions => [
     'edit_profile',
@@ -44,6 +45,7 @@ def create_roles
     'post_content',
     'edit_profile_design',
     'manage_products',
+    'edit_appearance',
   ])
   # members for enterprises, communities etc
   Role.create!(:key => "profile_member", :name => N_('Member'), :permissions => [
@@ -387,3 +387,23 @@ div.pending-tasks {
   max-width: 100%;
   overflow: hidden;
 }
+
+/* theme test panel */
+#theme-test-panel {
+  z-index: 1000;
+  position: absolute;
+  width: 300px;
+  height: 180;
+  right: 50px;
+  top: 50px;
+  background: white;
+  border: 2px solid black;
+}
+
+#theme-test-panel {
+  text-align: center;
+  cursor: move;
+}
+#theme-test-panel .button-bar {
+  margin: 1em;
+}
@@ -193,4 +193,25 @@ class ApplicationControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'base', :attributes => { :href => 'http://www.lala.net' }
   end
  
+  should 'display theme test panel when testing theme' do
+    @request.session[:theme] = 'my-test-theme'
+    theme = mock
+    profile = mock
+    theme.expects(:owner).returns(profile).at_least_once
+    profile.expects(:identifier).returns('testinguser').at_least_once
+    Theme.expects(:find).with('my-test-theme').returns(theme).at_least_once
+    get :index
+
+    assert_tag :tag => 'div', :attributes => { :id => 'theme-test-panel' }, :descendant => {
+      :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/edit/my-test-theme'}
+    }
+      #{ :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/stop_test/my-test-theme'} }
+  end
+
+  should 'not display theme test panel in general' do
+    @controller.stubs(:session).returns({})
+    get :index
+    assert_no_tag :tag => 'div', :attributes => { :id => 'theme-test-panel' }
+  end
+
 end
 require File.dirname(__FILE__) + '/../test_helper'
+require 'themes_controller'
  
-class ThemesControllerTest < ActionController::TestCase
+class ThemesController; def rescue_action(e) raise e end; end
+
+class ThemesControllerTest < Test::Unit::TestCase
+
+  def setup
+    @controller = ThemesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    Theme.stubs(:user_themes_dir).returns(TMP_THEMES_DIR)
+
+    @profile = create_user('testinguser').person
+    login_as('testinguser')
+  end
+  attr_reader :profile
+
+  def teardown
+    FileUtils.rm_rf(TMP_THEMES_DIR)
+  end
+
+  TMP_THEMES_DIR = RAILS_ROOT + '/test/tmp/themes_controller'
  
   should 'display list of themes for selection' do
-    profile = create_user('testinguser').person
     Theme.expects(:system_themes).returns([Theme.new('first'), Theme.new('second')])
     get :index, :profile => 'testinguser'
  
     %w[ first second ].each do |item|
-      assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/#{item}" }, :descendant => { :tag => 'img' }
+      assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/#{item}" }
     end
   end
  
-  should 'save selection of theme' do
-    profile = create_user('testinguser').person
+  should 'display list of my themes for edition' do
+    Theme.create('first', :owner => profile)
+    Theme.create('second', :owner => profile)
+
+    get :index, :profile => 'testinguser'
+
+    %w[ first second ].each do |item|
+      assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/edit/#{item}" }
+    end
+  end
  
+  should 'save selection of theme' do
     get :set, :profile => 'testinguser', :id => 'onetheme'
     profile.reload
     assert_equal 'onetheme', profile.theme
   end
  
   should 'point back to control panel' do
-    create_user('testinguser').person
     get :index, :profile => 'testinguser'
     assert_tag :tag => 'a', :attributes => { :href =>  '/myprofile/testinguser' }, :content => 'Back'
   end
  
-  should 'check access control when choosing theme'
+  should 'display screen for creating new theme' do
+    @request.expects(:xhr?).returns(true).at_least_once
+    get :new, :profile => 'testinguser'
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/new', :method => /post/i }, :descendant => { :tag => 'input', :attributes => { :type => 'text', :name => 'name' } }
+  end
+
+  should 'create a new theme' do
+    post :new, :profile => 'testinguser', :name => 'My theme'
+    
+    ok('theme should be created') do
+      profile.themes.first.id == 'my-theme'
+    end
+  end
+
+  should 'edit a theme' do
+    theme = Theme.create('mytheme', :owner => profile)
+    get :edit, :profile => 'testinguser', :id => 'mytheme'
+
+    assert_equal theme, assigns(:theme)
+  end
+
+  should 'list CSS files in theme' do
+    theme = Theme.create('mytheme', :owner => profile)
+    theme.add_css('one.css')
+    theme.add_css('two.css')
+
+    get :edit, :profile => 'testinguser', :id => 'mytheme'
+
+    %w[ one.css two.css ].each do |item|
+      assert_includes assigns(:css_files), item
+      assert_tag :tag => 'li', :descendant => { :tag => 'a', :content => item}
+    end
+  end
+
+  should 'display dialog for creating new CSS' do
+    theme = Theme.create('mytheme', :owner => profile)
+    @request.expects(:xhr?).returns(true)
+    get :add_css, :profile => 'testinguser', :id => 'mytheme'
+
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/add_css/mytheme', :method => /post/i}
+    assert_tag :tag => 'input', :attributes => { :name => 'css', :type => 'text' }
+    assert_tag :tag => 'input', :attributes => { :type => 'submit' }
+  end
+
+  should 'be able to add new CSS to theme' do
+    theme = Theme.create('mytheme', :owner => profile)
+    post :add_css, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css'
+
+    assert_response :redirect
+
+    reloaded_theme = Theme.find('mytheme')
+    assert_includes reloaded_theme.css_files, 'test.css'
+  end
+
+  should 'load code from a given CSS file' do
+    theme = Theme.create('mytheme', :owner => profile); theme.update_css('test.css', '/* sample code */')
+    get :css_editor, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css'
+
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/update_css/mytheme' }, :descendant => { :tag => 'textarea', :content => '/* sample code */' }
+  end
+
+  should 'be able to save CSS code' do
+    theme = Theme.create('mytheme', :owner => profile); theme.update_css('test.css', '/* sample code */')
+    get :css_editor, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css'
+
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/update_css/mytheme' }, :descendant => { :tag => 'input', :attributes => { :type => 'submit' } }
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/update_css/mytheme' }, :descendant => { :tag => 'input', :attributes => { :type => 'hidden', :name => 'css', :value => 'test.css' } }
+  end
+
+  should 'update css code when saving' do
+    theme = Theme.create('mytheme', :owner => profile); theme.update_css('test.css', '/* sample code */')
+    post :update_css, :profile => 'testinguser', :id => 'mytheme', :css => 'test.css', :csscode => 'body { background: white; }'
+    assert_equal 'body { background: white; }', theme.read_css('test.css')
+  end
+
+  should 'list image files in theme' do
+    theme = Theme.create('mytheme', :owner => profile)
+    theme.add_image('one.png', 'FAKE IMAGE DATA 1')
+    theme.add_image('two.png', 'FAKE IMAGE DATA 2')
+
+    get :edit, :profile => 'testinguser', :id => 'mytheme'
+
+    assert_tag :tag => 'img', :attributes => { :src => '/user_themes/mytheme/images/one.png' }
+    assert_tag :tag => 'img', :attributes => { :src => '/user_themes/mytheme/images/two.png' }
+  end
+
+  should 'display "add image" button' do
+    theme = Theme.create('mytheme', :owner => profile)
+    get :edit, :profile => 'testinguser', :id => 'mytheme'
+    
+    assert_tag :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/add_image/mytheme' }
+  end
  
-  should 'check access control when editing themes'
+  should 'display the "add image" dialog' do
+    theme = Theme.create('mytheme', :owner => profile)
+    @request.expects(:xhr?).returns(true)
  
-  should 'only allow environment-approved themes to be selected'
+    get :add_image, :profile => 'testinguser', :id => 'mytheme'
+    assert_tag :tag => 'form', :attributes => { :action => '/myprofile/testinguser/themes/add_image/mytheme', :method => /post/i, :enctype => 'multipart/form-data' }, :descendant => { :tag => 'input', :attributes => { :name => 'image', :type => 'file' } }
+  end
  
-  should 'list user-created themes with link for editing'
+  should 'be able to add new image to theme' do
+    theme = Theme.create('mytheme', :owner => profile)
+    @request.expects(:xhr?).returns(false)
  
-  should 'offer to create new theme'
+    post :add_image, :profile => 'testinguser', :id => 'mytheme', :image => fixture_file_upload('/files/rails.png', 'image/png', :binary)
+    assert_redirected_to :action => "edit", :id => 'mytheme'
+    assert theme.image_files.include?('rails.png')
+    assert(system('diff', RAILS_ROOT + '/test/fixtures/files/rails.png', TMP_THEMES_DIR + '/mytheme/images/rails.png'), 'should put the correct uploaded file in the right place')
+  end
  
-  should 'be able to save new theme'
+  should 'link to "test theme"' do
+    Theme.create('one', :owner => profile)
+    Theme.create('two', :owner => profile)
+    get :index, :profile => 'testinguser'
  
-  should 'be able to save existing theme'
+    %w[ one two ].each do |item|
+      assert_tag :tag => 'a', :attributes => { :href => '/myprofile/testinguser/themes/start_test/' + item }
+    end
+  end
+
+  should 'start testing theme' do
+    theme = Theme.create('theme-under-test', :owner => profile)
+    post :start_test, :profile => 'testinguser', :id => 'theme-under-test'
+
+    assert_equal 'theme-under-test', session[:theme]
+    assert_redirected_to :controller => 'content_viewer', :profile => 'testinguser'
+  end
+
+  should 'stop testing theme' do
+    theme = Theme.create('theme-under-test', :owner => profile)
+    post :stop_test, :profile => 'testinguser', :id => 'theme-under-test'
+
+    assert_nil session[:theme]
+    assert_redirected_to :action => 'index'
+  end
  
 end
@@ -4,6 +4,10 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
  
   include ApplicationHelper
  
+  def setup
+    self.stubs(:session).returns({})
+  end
+
   should 'calculate correctly partial for object' do
     self.stubs(:params).returns({:controller => 'test'})
  
@@ -150,6 +154,52 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert_equal 'my-profile-theme', current_theme
   end
  
+  should 'override theme with testing theme from session' do
+    stubs(:session).returns(:theme => 'theme-under-test')
+    assert_equal 'theme-under-test', current_theme
+  end
+
+  should 'point to system theme path by default' do
+    expects(:current_theme).returns('my-system-theme')
+    assert_equal '/designs/themes/my-system-theme', theme_path
+  end
+
+  should 'point to user theme path when testing theme' do
+    stubs(:session).returns({:theme => 'theme-under-test'})
+    assert_equal '/user_themes/theme-under-test', theme_path
+  end
+
+  should 'render theme footer' do
+    stubs(:theme_path).returns('/user_themes/mytheme')
+    footer = '../../public/user_themes/mytheme/footer.rhtml'
+
+    File.expects(:exists?).with(RAILS_ROOT + '/app/views/../../public/user_themes/mytheme/footer.rhtml').returns(true)
+    expects(:render).with(:file => footer).returns("BLI")
+
+    assert_equal "BLI", theme_footer
+  end
+
+  should 'ignore unexisting theme footer' do
+    stubs(:theme_path).returns('/user_themes/mytheme')
+    footer = '../../public/user_themes/mytheme/footer.rhtml'
+
+    File.expects(:exists?).with(RAILS_ROOT + '/app/views/../../public/user_themes/mytheme/footer.rhtml').returns(false)
+    expects(:render).with(:file => footer).never
+
+    assert_nil theme_footer
+  end
+
+  should 'expose theme owner' do
+    theme = mock
+    profile = mock
+    Theme.expects(:find).with('theme-under-test').returns(theme)
+    theme.expects(:owner).returns(profile)
+    profile.expects(:identifier).returns('sampleuser')
+
+    stubs(:current_theme).returns('theme-under-test')
+
+    assert_equal 'sampleuser', theme_owner
+  end
  
   protected
  
@@ -854,6 +854,33 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal 1, p.boxes[0].blocks.size
   end
  
+  TMP_THEMES_DIR = RAILS_ROOT + '/test/tmp/profile_themes'
+  should 'have themes' do
+    Theme.stubs(:user_themes_dir).returns(TMP_THEMES_DIR)
+
+    begin
+      p1 = Profile.create!(:name => 'test profile 1', :identifier => 'test_profile1')
+      t = Theme.new('test_theme'); t.owner = p1; t.save
+
+      assert_equal  [t], p1.themes
+    ensure
+      FileUtils.rm_rf(TMP_THEMES_DIR)
+    end
+  end
+
+  should 'find theme by id' do
+    Theme.stubs(:user_themes_dir).returns(TMP_THEMES_DIR)
+
+    begin
+      p1 = Profile.create!(:name => 'test profile 1', :identifier => 'test_profile1')
+      t = Theme.new('test_theme'); t.owner = p1; t.save
+
+      assert_equal  t, p1.find_theme('test_theme')
+    ensure
+      FileUtils.rm_rf(TMP_THEMES_DIR)
+    end
+  end
+
   private
  
   def assert_invalid_identifier(id)
 require File.dirname(__FILE__) + '/../test_helper'
  
 class ThemeTest < ActiveSupport::TestCase
+
+  TMP_THEMES_DIR = RAILS_ROOT + '/test/tmp/themes'
+
+  def setup
+    Theme.stubs(:user_themes_dir).returns(TMP_THEMES_DIR)
+  end
+
+  def teardown
+    FileUtils.rm_rf(TMP_THEMES_DIR)
+  end
+
   should 'list system themes' do
     Dir.expects(:glob).with(RAILS_ROOT + '/public/designs/themes/*').returns(
       [
@@ -16,5 +27,127 @@ class ThemeTest &lt; ActiveSupport::TestCase
     assert_equal 'the-id', Theme.new('the-id').name
   end
  
+  should 'create theme' do
+    t = Theme.create('mytheme')
+    assert_equal t, Theme.find('mytheme')
+  end
+
+  should 'not be able to create two themes with the same identifier' do
+    Theme.create('themeid')
+    assert_raise Theme::DuplicatedIdentifier do
+      Theme.create('themeid')
+    end
+  end
+
+  should 'not be able to create a theme named after a system theme' do
+    Theme.expects(:system_themes).returns([Theme.new('somesystemtheme')])
+    assert_raise Theme::DuplicatedIdentifier do
+      Theme.create('somesystemtheme')
+    end
+  end
+
+  should 'be able to add new CSS file to theme' do
+    t = Theme.create('mytheme')
+    t.add_css('common.css')
+    assert_equal '', File.read(TMP_THEMES_DIR + '/mytheme/stylesheets/common.css')
+  end
+
+  should 'be able to update CSS file' do
+    t = Theme.create('mytheme')
+    t.add_css('common.css')
+    t.update_css('common.css', '/* only a comment */')
+    assert_equal '/* only a comment */', File.read(TMP_THEMES_DIR + '/mytheme/stylesheets/common.css')
+  end
+
+  should 'be able to get content of CSS file' do
+    t = Theme.create('mytheme')
+    t.update_css('common.css', '/* only a comment */')
+    assert_equal '/* only a comment */', t.read_css('common.css')
+  end
+
+  should 'force .css suffix for CSS files when adding' do
+    t = Theme.create('mytheme')
+    t.add_css('xyz')
+    assert_includes t.css_files, 'xyz.css'
+  end
+
+  should 'list CSS files' do
+    t = Theme.create('mytheme')
+    t.add_css('one.css')
+    t.add_css('two.css')
+    assert_includes t.css_files, 'one.css'
+    assert_includes t.css_files, 'two.css'
+  end
+
+  should 'add default stylesheets' do
+    theme = Theme.create('test')
+    %w[ common help menu article button search blocks forms login-box ].each do |item|
+      assert_includes theme.css_files, item + '.css'
+    end
+  end
+
+  should 'be able to save twice' do
+    t = Theme.new('testtheme')
+
+    assert_nothing_raised do
+      t.save
+      t.save
+    end
+  end
+
+  should 'have an owner' do
+    profile = create_user('testinguser').person
+    t = Theme.new('mytheme')
+    t.owner = profile
+    t.save
+
+    t = Theme.find('mytheme')
+    assert_equal profile, t.owner
+  end
+
+  should 'have no owner by default' do
+    assert_nil Theme.new('test').owner
+  end
+
+  should 'be able to find by owner' do
+    profile = create_user('testinguser').person
+    t = Theme.new('mytheme')
+    t.owner = profile
+    t.save
+
+    assert_equal [t], Theme.find_by_owner(profile)
+  end
+
+  should 'be able to set attributes in constructor' do
+    p = create_user('testuser').person
+    assert_equal p, Theme.new('test', :owner => p).owner
+  end
+
+  should 'pass attributes to constructor' do
+    p = create_user('testuser').person
+    assert_equal p, Theme.create('test', :owner => p).owner
+  end
+
+  should 'have a name' do
+    theme = Theme.new('mytheme', :name => 'My Theme')
+    assert_equal 'My Theme', theme.name
+    assert_equal 'My Theme', theme.config['name']
+  end
+
+  should 'insert image' do
+    theme = Theme.create('mytheme')
+    theme.add_image('test.png', 'FAKE IMAGE DATA')
+
+    assert_equal 'FAKE IMAGE DATA', File.read(TMP_THEMES_DIR + '/mytheme/images/test.png')
+  end
+
+  should 'list images' do
+    theme = Theme.create('mytheme')
+    theme.add_image('one.png', 'FAKE IMAGE DATA')
+    theme.add_image('two.png', 'FAKE IMAGE DATA')
+
+    assert_equivalent [ 'one.png', 'two.png' ], theme.image_files
+  end
+
 end
1	1	class ThemesController < MyProfileController
2	2
	3	+ protect 'edit_appearance', :profile
3	4	no_design_blocks
4	5
5	6	def set
...	...	@@ -12,4 +13,66 @@ class ThemesController < MyProfileController
12	13	@selected_theme = profile.theme
13	14	end
14	15
	16	+ def new
	17	+ if !request.xhr?
	18	+ id = params[:name].to_slug
	19	+ t = Theme.new(id, :name => params[:name], :owner => profile)
	20	+ t.save
	21	+ redirect_to :action => 'index'
	22	+ else
	23	+ render :action => 'new', :layout => false
	24	+ end
	25	+ end
	26	+
	27	+ def edit
	28	+ @theme = profile.find_theme(params[:id])
	29	+ @css_files = @theme.css_files
	30	+ @image_files = @theme.image_files
	31	+ end
	32	+
	33	+ def add_css
	34	+ @theme = profile.find_theme(params[:id])
	35	+ if request.xhr?
	36	+ render :action => 'add_css', :layout => false
	37	+ else
	38	+ @theme.add_css(params[:css])
	39	+ redirect_to :action => 'edit', :id => @theme.id
	40	+ end
	41	+ end
	42	+
	43	+ def css_editor
	44	+ @theme = profile.find_theme(params[:id])
	45	+ @css = params[:css]
	46	+
	47	+ @code = @theme.read_css(@css)
	48	+ render :action => 'css_editor', :layout => false
	49	+ end
	50	+
	51	+ post_only :update_css
	52	+ def update_css
	53	+ @theme = profile.find_theme(params[:id])
	54	+ @theme.update_css(params[:css], params[:csscode])
	55	+ redirect_to :action => 'edit', :id => @theme.id
	56	+ end
	57	+
	58	+ def add_image
	59	+ @theme = profile.find_theme(params[:id])
	60	+ if request.xhr?
	61	+ render :action => 'add_image', :layout => false
	62	+ else
	63	+ @theme.add_image(params[:image].original_filename, params[:image].read)
	64	+ redirect_to :action => 'edit', :id => @theme.id
	65	+ end
	66	+ end
	67	+
	68	+ def start_test
	69	+ session[:theme] = params[:id]
	70	+ redirect_to :controller => 'content_viewer', :profile => profile.identifier, :action => 'view_page'
	71	+ end
	72	+
	73	+ def stop_test
	74	+ session[:theme] = nil
	75	+ redirect_to :action => 'index'
	76	+ end
	77	+
15	78	end
...	...
...	...	@@ -220,24 +220,12 @@ module ApplicationHelper
220	220	link_to(content_tag('span', label), url, html_options.merge(:class => the_class ))
221	221	end
222	222
223		- def button_to_function(type, label, js_code, html_options = {})
224		- html_options[:class] = "button with-text" unless html_options[:class]
225		- html_options[:class] << " icon-#{type}"
226		- link_to_function(label, js_code, html_options)
227		- end
228		-
229	223	def button_to_function(type, label, js_code, html_options = {}, &block)
230	224	html_options[:class] = "button with-text" unless html_options[:class]
231	225	html_options[:class] << " icon-#{type}"
232	226	link_to_function(label, js_code, html_options, &block)
233	227	end
234	228
235		- def button_to_function_without_text(type, label, js_code, html_options = {})
236		- html_options[:class] = "" unless html_options[:class]
237		- html_options[:class] << " button icon-#{type}"
238		- link_to_function(content_tag('span', label), js_code, html_options)
239		- end
240		-
241	229	def button_to_function_without_text(type, label, js_code, html_options = {}, &block)
242	230	html_options[:class] = "" unless html_options[:class]
243	231	html_options[:class] << " button icon-#{type}"
...	...	@@ -323,12 +311,21 @@ module ApplicationHelper
323	311	def filename_for_stylesheet(name, in_theme)
324	312	result = ''
325	313	if in_theme
326		- result << '/designs/themes/' + current_theme
	314	+ result << theme_path
327	315	end
328	316	result << '/stylesheets/' << name << '.css'
329	317	end
330	318
	319	+ def theme_path
	320	+ if session[:theme]
	321	+ '/user_themes/' + current_theme
	322	+ else
	323	+ '/designs/themes/' + current_theme
	324	+ end
	325	+ end
	326	+
331	327	def current_theme
	328	+ return session[:theme] if (session[:theme])
332	329	p = profile
333	330	if p
334	331	p.theme
...	...	@@ -337,6 +334,21 @@ module ApplicationHelper
337	334	end
338	335	end
339	336
	337	+ def theme_footer
	338	+ footer = ('../../public' + theme_path + '/footer.rhtml')
	339	+ if File.exists?(RAILS_ROOT + '/app/views/' + footer)
	340	+ render :file => footer
	341	+ end
	342	+ end
	343	+
	344	+ def is_testing_theme
	345	+ !@controller.session[:theme].nil?
	346	+ end
	347	+
	348	+ def theme_owner
	349	+ Theme.find(current_theme).owner.identifier
	350	+ end
	351	+
340	352	# generates a image tag for the profile.
341	353	#
342	354	# If the profile has no image set yet, then a default image is used.
...	...	@@ -492,8 +504,7 @@ module ApplicationHelper
492	504
493	505	def theme_option(opt = nil)
494	506	conf = RAILS_ROOT.to_s() +
495		- '/public/designs/themes/' +
496		- current_theme.to_s() +
	507	+ '/public' + theme_path +
497	508	'/theme.yml'
498	509	if File.exists?(conf)
499	510	opt ? YAML.load_file(conf)[opt.to_s()] : YAML.load_file(conf)
...	...	@@ -529,7 +540,7 @@ module ApplicationHelper
529	540	return if option.nil?
530	541	html = []
531	542	option.each do \|file\|
532		- file = '/designs/themes/'+ current_theme.to_s() +
	543	+ file = theme_path +
533	544	'/javascript/'+ file +'.js'
534	545	if File.exists? RAILS_ROOT.to_s() +'/public'+ file
535	546	html << javascript_src_tag( file, {} )
...	...
...	...	@@ -35,6 +35,7 @@ class Profile < ActiveRecord::Base
35	35	'validate_enterprise' => N_('Validate enterprise'),
36	36	'perform_task' => N_('Perform task'),
37	37	'moderate_comments' => N_('Moderate comments'),
	38	+ 'edit_appearance' => N_('Edit appearance'),
38	39	}
39	40
40	41	acts_as_accessible
...	...	@@ -450,4 +451,13 @@ class Profile < ActiveRecord::Base
450	451	def public?
451	452	public_profile
452	453	end
	454	+
	455	+ def themes
	456	+ Theme.find_by_owner(self)
	457	+ end
	458	+
	459	+ def find_theme(the_id)
	460	+ themes.find { \|item\| item.id == the_id }
	461	+ end
	462	+
453	463	end
...	...
1	1	class Theme
2	2
	3	+ class << self
	4	+ def system_themes
	5	+ Dir.glob(RAILS_ROOT + '/public/designs/themes/*').map do \|item\|
	6	+ File.basename(item)
	7	+ end.map do \|item\|
	8	+ new(item)
	9	+ end
	10	+ end
	11	+
	12	+ def user_themes_dir
	13	+ File.join(RAILS_ROOT, 'public', 'user_themes')
	14	+ end
	15	+
	16	+ def create(id, attributes = {})
	17	+ if find(id) \|\| system_themes.map(&:id).include?(id)
	18	+ raise DuplicatedIdentifier
	19	+ end
	20	+ Theme.new(id, attributes).save
	21	+ end
	22	+
	23	+ def find(the_id)
	24	+ if File.directory?(File.join(user_themes_dir, the_id))
	25	+ Theme.new(the_id)
	26	+ else
	27	+ nil
	28	+ end
	29	+ end
	30	+
	31	+ def find_by_owner(owner)
	32	+ Dir.glob(File.join(user_themes_dir, '*', 'theme.yml')).select do \|desc\|
	33	+ config = YAML.load_file(desc)
	34	+ (config['owner_type'] == owner.class.base_class.name) && (config['owner_id'] == owner.id)
	35	+ end.map do \|desc\|
	36	+ Theme.find(File.basename(File.dirname(desc)))
	37	+ end
	38	+ end
	39	+
	40	+ end
	41	+
	42	+ class DuplicatedIdentifier < Exception; end
	43	+
3	44	attr_reader :id
	45	+ attr_reader :config
4	46
5		- def initialize(id)
	47	+ def initialize(id, attributes = {})
6	48	@id = id
	49	+ load_config
	50	+ attributes.each do \|k,v\|
	51	+ self.send("#{k}=", v)
	52	+ end
7	53	end
8	54
9	55	def name
10		- id
	56	+ config['name'] \|\| id
11	57	end
12	58
13		- class << self
14		- def system_themes
15		- Dir.glob(RAILS_ROOT + '/public/designs/themes/*').map do \|item\|
16		- File.basename(item)
17		- end.map do \|item\|
18		- new(item)
19		- end
	59	+ def name=(value)
	60	+ config['name'] = value
	61	+ end
	62	+
	63	+ def ==(other)
	64	+ other.is_a?(self.class) && (other.id == self.id)
	65	+ end
	66	+
	67	+ def add_css(filename)
	68	+ FileUtils.mkdir_p(stylesheets_directory)
	69	+ FileUtils.touch(stylesheet_path(filename))
	70	+ end
	71	+
	72	+ def update_css(filename, content)
	73	+ add_css(filename)
	74	+ File.open(stylesheet_path(filename), 'w') do \|f\|
	75	+ f.write(content)
	76	+ end
	77	+ end
	78	+
	79	+ def read_css(filename)
	80	+ File.read(stylesheet_path(filename))
	81	+ end
	82	+
	83	+ def css_files
	84	+ Dir.glob(File.join(stylesheets_directory, '*.css')).map { \|f\| File.basename(f) }
	85	+ end
	86	+
	87	+ def add_image(filename, data)
	88	+ FileUtils.mkdir_p(images_directory)
	89	+ File.open(image_path(filename), 'w') do \|f\|
	90	+ f.write(data)
20	91	end
21	92	end
	93	+
	94	+ def image_files
	95	+ Dir.glob(image_path('*')).map {\|item\| File.basename(item)}
	96	+ end
	97	+
	98	+ def stylesheet_path(filename)
	99	+ suffix = ''
	100	+ unless filename =~ /\.css$/
	101	+ suffix = '.css'
	102	+ end
	103	+ File.join(stylesheets_directory, filename + suffix)
	104	+ end
	105	+
	106	+ def stylesheets_directory
	107	+ File.join(Theme.user_themes_dir, self.id, 'stylesheets')
	108	+ end
	109	+
	110	+ def image_path(filename)
	111	+ File.join(images_directory, filename)
	112	+ end
	113	+
	114	+ def images_directory
	115	+ File.join(self.class.user_themes_dir, id, 'images')
	116	+ end
	117	+
	118	+ def save
	119	+ FileUtils.mkdir_p(self.class.user_themes_dir)
	120	+ FileUtils.mkdir_p(File.join(self.class.user_themes_dir, id))
	121	+ %w[ common help menu article button search blocks forms login-box ].each do \|item\|
	122	+ add_css(item)
	123	+ end
	124	+ write_config
	125	+ self
	126	+ end
	127	+
	128	+ def owner
	129	+ return nil unless config['owner_type'] && config['owner_id']
	130	+ @owner \|\|= config['owner_type'].constantize.find(config['owner_id'])
	131	+ end
	132	+
	133	+ def owner=(model)
	134	+ config['owner_type'] = model.class.base_class.name
	135	+ config['owner_id'] = model.id
	136	+ @owner = model
	137	+ end
	138	+
	139	+ protected
	140	+
	141	+ def write_config
	142	+ File.open(File.join(self.class.user_themes_dir, self.id, 'theme.yml'), 'w') do \|f\|
	143	+ f.write(config.to_yaml)
	144	+ end
	145	+ end
	146	+
	147	+ def load_config
	148	+ if File.exists?(File.join(self.class.user_themes_dir, self.id, 'theme.yml'))
	149	+ @config = YAML.load_file(File.join(self.class.user_themes_dir, self.id, 'theme.yml'))
	150	+ else
	151	+ @config = {}
	152	+ end
	153	+ end
	154	+
22	155	end
...	...
...	...	@@ -154,7 +154,7 @@
154	154	</div><!-- id="wrap" -->
155	155
156	156	<div id="footer">
157		- <%= render :file => ('../../public/designs/themes/' + current_theme + '/footer.rhtml' ) %>
	157	+ <%= theme_footer %>
158	158	</div><!-- id="footer" -->
159	159
160	160	<div id="helpBox" style="display:none">
...	...	@@ -177,5 +177,9 @@
177	177	</div>
178	178	<%= javascript_include_tag 'better-browser-promotion' %>
179	179
	180	+ <% if is_testing_theme %>
	181	+ <%= render :file => 'shared/theme_test_panel' %>
	182	+ <% end %>
	183	+
180	184	</body>
181	185	</html>
...	...
1		-<%= javascript_include_tag 'codepress/codepress.js' %>
	1	+<%= javascript_include_tag 'codepress/codepress' %>
...	...
...	...	@@ -0,0 +1,13 @@
	1	+<div id='theme-test-panel'>
	2	+ <h4>
	3	+ <%= _('Testing theme "%s"') % current_theme %>
	4	+ </h4>
	5	+
	6	+ <p><small><em><%= _('You can move this window away to have a better visualization of specific parts of screen.') %></em></small></p>
	7	+
	8	+ <% button_bar do %>
	9	+ <%= button(:ok, _('Finished testing'), :controller => 'themes', :profile => theme_owner, :action => 'stop_test', :id => current_theme) %>
	10	+ <%= button(:edit, _('Edit theme'), :controller => 'themes', :profile => theme_owner, :action => 'edit', :id => current_theme) %>
	11	+ <% end %>
	12	+</div>
	13	+<%= draggable_element('theme-test-panel') %>
...	...
...	...	@@ -0,0 +1,11 @@
	1	+<h2><%= _('Add a CSS file') %></h2>
	2	+
	3	+<% form_tag do %>
	4	+ <%= labelled_form_field(_('File name'), text_field_tag('css')) %>
	5	+
	6	+ <% button_bar do %>
	7	+ <%= submit_button(:add, _('Add')) %>
	8	+ <%= lightbox_close_button(_('Cancel')) %>
	9	+ <% end %>
	10	+
	11	+<% end %>
...	...
...	...	@@ -0,0 +1,6 @@
	1	+<% form_tag({:action => 'add_image', :id => @theme.id}, :multipart => true) do %>
	2	+ <%= labelled_form_field(_('Choose the image file'), file_field_tag(:image)) %>
	3	+ <% button_bar do %>
	4	+ <%= submit_button(:add, _('Add image')) %>
	5	+ <% end %>
	6	+<% end %>
...	...
...	...	@@ -0,0 +1,13 @@
	1	+<h2><%= _('CSS code: "%s"') % @css %></h2>
	2	+
	3	+<% form_tag({:action => 'update_css', :id => @theme.id }, :name => 'csscode_form') do %>
	4	+ <%= hidden_field_tag('css', @css) %>
	5	+ <%= text_area_tag('csscode', @code, :id => "codepressWindow", :class => 'codepress css') %>
	6	+ <% button_bar do %>
	7	+ <%= submit_button(:save, _('Save')) %>
	8	+ <% end %>
	9	+<% end %>
	10	+
	11	+<!--<script type='text/javascript'>-->
	12	+ <!--CodePress.run();-->
	13	+<!--</script>-->
...	...