tkh_illustrations 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d959cb0c0ee4e29518bf52a69affaa3fef6622a
-  data.tar.gz: 21e0d9c7edb6121a0f0efba648b2d7ebc17f6f6f
+  metadata.gz: e44b135b46bfa957a2c279fd003d28def513d222
+  data.tar.gz: da85adf7580ad137502910c322cc3bbf9595801a
 SHA512:
-  metadata.gz: 6d99b19201c36a0eb27e80e98a9948fbb124d96e85d79b5f72bdf6c02bb7bac494b1132b633355b48e5a901cf842817e8c10c96f1a53c675579d69419d8e800f
-  data.tar.gz: c301088627b0426b2d41d14966f50a9e7b82586580bb5e0bd9d691a5b42eb7700248d2ffa52dad63921c78eb8e9b88f5a56d2876607866e9563ea4b5070f0d93
+  metadata.gz: d9187ec7a812f0c1db4767e33783139e199e4e536f8ca270ef256783d2e7c8d44ef5afac99d257a66d8f4469c8b3501f24646ba10e4b89c97a19ce773f491ffb
+  data.tar.gz: e1dc09d43b828e3ee9981118a756e6117ecdf190ce4b6160bfb907c7cbbfc261ce66009b21db826c7a32f0ddf6aa1492efb595593b0144c636750d053d409ce4

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+
+## 0.9.2
+
+* Implemented search of illustrations in admin panel
+
+
 ## 0.9.1
 
 * Various fixes and tweaks related to the upgrade

data/app/controllers/illustrations_controller.rb

@@ -47,6 +47,16 @@ class IllustrationsController < ApplicationController
     redirect_to illustrations_url
   end
 
+  def search
+    illustration = Illustration.where('name = ?', illustration_params[:name]).first
+    if illustration
+      redirect_to illustration
+    else
+      flash[:warning] = "We could not find the illustration. Please make sure the name is accurate"
+      redirect_to illustrations_path
+    end
+  end
+
   private
 
   # Never trust parameters from the scary internet, only allow the white list through.

data/app/views/illustrations/_form.html.erb

@@ -1,13 +1,9 @@
 <%= simple_form_for @illustration, :html => { multipart: true, class: 'form-horizontal' } do |f| %>
   <%= f.error_notification %>
 
-  <div class="form-inputs">
-    <%= f.input :image, label: t('activerecord.attributes.illustration.image') %>
-    <%= f.input :name, label: t('activerecord.attributes.illustration.name') %>
-  </div>
-
-  <div class="form-actions">
+    <%= f.input :image, label: t('activerecord.attributes.illustration.image') %><br />
+    <%= f.input :name, label: t('activerecord.attributes.illustration.name') %><br />
     <%= f.button :submit, :class => 'btn btn-primary' %>
-    <%= link_to t('illustrations.cancel'), illustrations_path, :class => 'btn' %>
-  </div>
+    <%= link_to t('illustrations.cancel'), illustrations_path, :class => 'btn btn-default btn-xs' %>
+
 <% end %>

data/app/views/illustrations/_search_form.html.erb

@@ -0,0 +1,20 @@
+<%= form_for Illustration.new, url: search_illustrations_path, html: { id: 'search-form' }, method: :get do |f| %>
+<%#= f.error_notification %>
+
+  <%= f.text_field :name,
+              label: false,
+              required: false,
+              placeholder: 'search by illustration name',
+              size: 35,
+              as: :string,
+              autofocus: 'autofocus',
+              id: 'illustration_name',
+              :wrapper_html => { :id => 'name' },
+              :autocomplete => 'off',
+              :data => {  provide: 'typeahead',
+                          items: 10,
+                          source: Illustration.alphabetically.map(&:name).to_json }
+  %>
+  <%= f.submit 'find graphic', :class => 'btn btn-xs btn-primary' %>
+
+<% end %>

data/app/views/illustrations/_section_header.html.erb

@@ -0,0 +1,3 @@
+<h1><%= t('activerecord.models.illustrations') %></h1>
+<%= render 'search_form' %>
+<%= render 'tab_admin_menu' %>

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

@@ -1,6 +1,4 @@
-<h1><%= t('activerecord.models.illustrations') %></h1>
-
-<%= render 'tab_admin_menu' %>
+<%= render 'section_header' %>
 
 <%= render 'form' %>
 <%= render 'shared/admin_sidebar' %>

data/app/views/illustrations/index.html.erb

@@ -1,16 +1,14 @@
-<h1><%= t('activerecord.models.illustrations') %></h1>
-
-<%= render 'tab_admin_menu' %>
+<%= render 'section_header' %>
 
 <table class='table table-striped'>
 	<thead>
-  <tr>	
+  <tr>
 			<th><%= t('activerecord.models.illustration') %></th>
 	    <th><%= t('name_and_paths') %></th>
 	    <th><%= t('actions') %></th>
 	  </tr>
 	</thead>
-	
+
 	<tbody>
 		<% @illustrations.each do |illustration| %>
 		  <tr>
@@ -23,8 +21,8 @@
 					<b>Large</b> path: <%= illustration.image.large %><br />
 					<b>XL</b> path: <%= illustration.image.xl %>
 				</td>
-		    <td><%= link_to t('edit'), edit_illustration_path(illustration), class: 'btn btn-mini' %>
-					<%= link_to t('delete'), illustration, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
+		    <td><%= link_to t('edit'), edit_illustration_path(illustration), class: 'btn btn-xs btn-default' %>
+					<%= link_to t('delete'), illustration, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-xs btn-danger' %></td>
 		  </tr>
 		<% end %>
 	</tbody>
@@ -34,4 +32,4 @@
 
 <%= link_to t('illustrations.create.new'), new_illustration_path, class: 'btn btn-primary' %>
 
-<%= render 'shared/admin_sidebar' %>
+<%= render 'shared/admin_sidebar' %>

data/app/views/illustrations/new.html.erb

@@ -1,6 +1,4 @@
-<h1><%= t('activerecord.models.illustrations') %></h1>
-
-<%= render 'tab_admin_menu' %>
+<%= render 'section_header' %>
 
 <%= render 'form' %>
 <%= render 'shared/admin_sidebar' %>

data/app/views/illustrations/show.html.erb

@@ -1,9 +1,7 @@
 <% content_for :meta_title, @illustration.name %>
 <% content_for :meta_description, @illustration.name %>
 
-<h1><%= t('activerecord.models.illustrations') %></h1>
-
-<%= render 'tab_admin_menu' %>
+<%= render 'section_header' %>
 
 <h3>Name: <%= @illustration.name %></h3>
 <p>
@@ -13,9 +11,7 @@
 	<%= image_tag @illustration.image.large %><br /><%= @illustration.image.large %><br /><br />
 	<%= image_tag @illustration.image.xl %><br /><%= @illustration.image.xl %>
 </p>
-
-<%= link_to t('edit'), edit_illustration_path(@illustration), :class => 'btn btn-primary' %> 
-<%= link_to t('illustrations.all'), illustrations_path, class: 'btn' %> 
-<%= link_to t('illustrations.upload_new'), new_illustration_path, class: 'btn' %>
+<br />
+<%= link_to t('edit'), edit_illustration_path(@illustration), :class => 'btn btn-primary' %><%= link_to t('illustrations.all'), illustrations_path, class: 'btn btn-default' %>
 
 <%= render 'shared/admin_sidebar' %>

data/config/routes.rb

@@ -1,6 +1,10 @@
 Rails.application.routes.draw do
   scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
-    resources :illustrations
+    resources :illustrations do
+      collection do
+        get :search
+      end
+    end
     resources :headers
   end
-end
+end

data/lib/tkh_illustrations/version.rb

@@ -1,3 +1,3 @@
 module TkhIllustrations
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_illustrations
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -146,6 +146,8 @@ files:
 - app/views/headers/new.html.erb
 - app/views/headers/show.html.erb
 - app/views/illustrations/_form.html.erb
+- app/views/illustrations/_search_form.html.erb
+- app/views/illustrations/_section_header.html.erb
 - app/views/illustrations/_tab_admin_menu.html.erb
 - app/views/illustrations/edit.html.erb
 - app/views/illustrations/index.html.erb