copycat 0.0.7 → 0.1.0

data/app/assets/stylesheets/copycat_engine.css

@@ -393,6 +393,13 @@ div.edit {
   width: 99%;
 }
 
+div.edit h2 {
+  float: left;
+  max-width: 75%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 div.edit textarea {
   width: 99%;
   margin-top: 1em;
@@ -400,7 +407,14 @@ div.edit textarea {
 
 div.edit a {
   display: block;
-  margin: -2em 0 0 .5em;
+  margin: 0 0 0 .5em;
+}
+
+div.edit form {
+  margin-bottom: 0px;
+}
+div.edit form.button_to {
+  float: right;
 }
 
 body {
@@ -441,7 +455,9 @@ body {
 
 #notice {
   height: 2em;
-  background-color: #FFFFBB;
+  background-color: #FFD;
   text-align: center;
+  padding-top: .5em;
+  margin-bottom: .5em;
 }
 

data/app/controllers/copycat_translations_controller.rb

@@ -22,21 +22,14 @@ class CopycatTranslationsController < ActionController::Base
   end
 
   def edit
-    @copycat_translation = CopycatTranslation.find_by_id(params["id"])
+    @copycat_translation = CopycatTranslation.find(params[:id])
   end
   
   def update
-    cct = CopycatTranslation.find_by_id(params["id"])
-    cct.value = params["copycat_translation"]["value"]
-    if cct.save
-      redirect_to copycat_translations_path
-    else
-      @copycat_translation = cct
-      render :action => 'edit'
-    end
-  end
-
-  def help
+    @copycat_translation = CopycatTranslation.find(params[:id])
+    @copycat_translation.value = params[:copycat_translation][:value]
+    @copycat_translation.save!
+    redirect_to copycat_translations_path, :notice => "#{@copycat_translation.key} updated!"
   end
 
   def import_export
@@ -51,6 +44,7 @@ class CopycatTranslationsController < ActionController::Base
     begin
       CopycatTranslation.import_yaml(params["file"].tempfile)
     rescue StandardError => e
+      logger.info "\n#{e.class}\n#{e.message}"
       flash[:notice] = "There was an error processing your upload!"
       render :action => 'import_export', :status => 400
     else
@@ -58,4 +52,13 @@ class CopycatTranslationsController < ActionController::Base
     end
   end
 
+  def destroy
+    @copycat_translation = CopycatTranslation.find(params[:id])
+    notice = "#{@copycat_translation.key} deleted!"
+    @copycat_translation.destroy
+    redirect_to copycat_translations_path, :notice => notice
+  end
+
+  def help
+  end
 end

data/app/views/copycat_translations/edit.html.erb

@@ -1,10 +1,9 @@
 <div class="edit">
-<%= form_for @copycat_translation, :url => { :action => "update" }, :html => {:class => "copycat_translation"} do |f| %>
-  <span class="copycat-edit-form-key"><%= @copycat_translation.key %></span>
-  <br>
-  <%= f.text_area :value, :size => "60x12" %>
-  <br>
-  <%= f.submit "Update" %>
-<% end %>
-<%= link_to "Cancel", copycat_translations_path %>
+  <h2><%= @copycat_translation.key%></h2>
+  <%= button_to "Delete this item", copycat_translation_path(@copycat_translation), :method => :delete, :onclick => "return confirm('Are you sure?');" %>
+  <%= form_for @copycat_translation, :url => { :action => "update" } do |f| %>
+    <%= f.text_area :value, :rows => 12 %>
+    <%= f.submit "Update" %>
+  <% end %>
+  <%= link_to "Cancel", copycat_translations_path %>
 </div>

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  resources :copycat_translations, :only => [:index, :edit, :update] do
+  resources :copycat_translations, :only => [:index, :edit, :update, :destroy] do
     collection do
       get 'help'
       get 'import_export'

data/lib/copycat/version.rb

@@ -1,3 +1,3 @@
 module Copycat
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end