disguise 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/app/controllers/admin/disguise/domain_themes_controller.rb

@@ -2,9 +2,13 @@ class Admin::Disguise::DomainThemesController < ApplicationController
   unloadable
 
   def create
-    @domain_theme = DomainTheme.create(params[:domain_theme])
-    respond_to do |format|
+    @domain_theme = DomainTheme.new(params[:domain_theme])
+    if !@domain_theme.save
+      flash[:notice] = t('disguise.error_creating_domain_theme', :error => @domain_theme.errors.full_messages.to_sentence)
+    else
       flash[:notice] = t('disguise.theme_updated')
+    end
+    respond_to do |format|
       format.html { redirect_to edit_admin_theme_path }
     end
   end
@@ -18,4 +22,13 @@ class Admin::Disguise::DomainThemesController < ApplicationController
     end
   end
 
+  def destroy
+    @domain_theme = DomainTheme.find(params[:id])
+    @domain_theme.destroy
+    respond_to do |format|
+      flash[:notice] = t('disguise.uri_deleted')
+      format.html { redirect_to edit_admin_theme_path }
+    end
+  end
+  
 end

data/app/controllers/admin/disguise/themes_controller.rb

@@ -6,7 +6,7 @@ class Admin::Disguise::ThemesController < ApplicationController
   def edit
     @current_theme, @themes = Theme.available_themes(@theme)
     @domain_themes = {}
-    DomainTheme.all.each{|d| @domain_themes[d.name] = d}
+    DomainTheme.all.each{ |d| @domain_themes[d.name] = @domain_themes[d.name].blank? ? [d] : @domain_themes[d.name] << d }
     if @themes.empty?
       respond_to do |format|
         format.html { render :template => 'admin/themes/no_themes' }

data/app/models/domain_theme.rb

@@ -1,7 +1,6 @@
 class DomainTheme < ActiveRecord::Base
   
   validates_presence_of :name, :uri
-  validates_uniqueness_of :name, :uri
   
   class << self
     def use_domain_themes?

data/app/views/admin/themes/_theme.html.erb

@@ -6,16 +6,26 @@
   	<%= theme[:description] %>
   <% end -%>
   <% if DomainTheme.use_domain_themes? -%>
-    <% domain_theme = @domain_themes[theme[:name]] || DomainTheme.new(:name => theme[:name]) %>
+    <% domain_theme = DomainTheme.new(:name => theme[:name]) %>
     <% form_for [:admin, domain_theme] do |f| -%>
     	<%= f.hidden_field :name %>
     	<%= f.label t('disguise.theme_uri_label') %>
     	<%= f.text_field :uri %>
-    	<% if domain_theme.new_record? -%>
-        <%= submit_tag t('disguise.add_uri') %>
-    	<% else -%>
-    	  <%= submit_tag t('disguise.update_uri') %>
-    	<% end -%>
+      <%= submit_tag t('disguise.add_uri') %>
     <% end -%>
   <% end -%>
-</div>
+  <% if !@domain_themes[theme[:name]].blank? %>
+    <p class="theme-information"><%= t('disguise.uris_title') %></p>
+    <ul class="theme-list">
+      <% @domain_themes[theme[:name]].each do |domain_theme| -%>
+        <li>
+          <% form_for [:admin, domain_theme], :html => { :method => :delete } do |f| -%>
+            <%= domain_theme.uri %>
+            <%= submit_tag t('disguise.delete_uri') %>
+          <% end -%>
+        </li>
+      <% end -%>
+    </ul>
+  <% end -%>
+</div>
+

data/app/views/admin/themes/edit.html.erb

@@ -1,7 +1,7 @@
 <h1><%= t('disguise.set_theme') %></h1>
 <div id="current-theme">
   <% if DomainTheme.use_domain_themes? -%>
-    <%= t('disguise.use_domain_themes') %>
+    <h2><%= t('disguise.use_domain_themes') %></h2>
   <% else -%>
     <h2><%= t('disguise.name_theme') %></h2>
     <% if @current_theme -%>
@@ -13,8 +13,8 @@
     <% else -%>
       <%= t('disguise.no_current_theme') %>
     <% end -%>
+    <h2><%= t('disguise.activate_theme_message') %></h2>
   <% end -%>
 </div>
-<h2><%= t('disguise.activate_theme_message') %></h2>
 <%= error_messages_for :theme %>
-<%= render :partial => 'admin/themes/theme', :collection => @themes %>
+<%= render :partial => 'admin/themes/theme', :collection => @themes %>

data/disguise.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{disguise}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-06-06}
+  s.date = %q{2009-06-11}
   s.description = %q{Add themes to your Rails application to easily change the view layer and impress everyone you know}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [

data/locales/en.yml

@@ -6,8 +6,12 @@ en:
     current_theme: Current Theme
     activate_theme_message: Click on a theme to activate it
     no_current_theme: 'Currently no theme has been selected for this application and so the default application view will be used.'
-    use_domain_themes: 'Themes are currently set to be changed based on the current url.  In this mode the current theme will be determined by the url specified with each theme below.'
+    use_domain_themes: 'The current theme will be determined by the url specified with each theme below.'
     update_uri: Update Url
-    add_uri: Add Url
+    add_uri: Add
+    delete_uri: Delete
     remove_all_themes: "Remove all themes and use default application templates"
-    theme_uri_label: Url for Theme
+    theme_uri_label: Url for Theme
+    uris_title: "This theme will be displayed for all the following urls"
+    error_creating_domain_theme: "There was a problem adding the url: {{error}}"
+    uri_deleted: "The specified url has been deleted"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: disguise
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-06 00:00:00 -06:00
+date: 2009-06-11 00:00:00 -06:00
 default_executable: 
 dependencies: []