From 8e49d6927cf2bee1dd863e8a9dff2ccdaa885ebe Mon Sep 17 00:00:00 2001 From: yasushiito Date: Thu, 13 Dec 2012 18:38:57 +0900 Subject: [PATCH] follow --- app/assets/javascripts/demander_statuses.js.coffee | 3 --- app/assets/javascripts/demanders.js.coffee | 3 --- app/assets/javascripts/provider_statuses.js.coffee | 3 --- app/assets/javascripts/providers.js.coffee | 3 --- app/assets/stylesheets/demander_statuses.css.scss | 3 --- app/assets/stylesheets/demanders.css.scss | 3 --- app/assets/stylesheets/provider_statuses.css.scss | 3 --- app/assets/stylesheets/providers.css.scss | 3 --- app/views/ground_pictures/_list_item.html.erb | 11 +++++++++++ app/views/original_pictures/_form.html.erb | 6 ++++++ app/views/panel_colors/_list_item.html.erb | 7 +++++++ spec/helpers/demander_statuses_helper_spec.rb | 1 - spec/helpers/demanders_helper_spec.rb | 1 - spec/helpers/provider_sources_helper_spec.rb | 1 - spec/helpers/provider_statuses_helper_spec.rb | 1 - spec/helpers/providers_helper_spec.rb | 1 - 16 files changed, 24 insertions(+), 29 deletions(-) delete mode 100644 app/assets/javascripts/demander_statuses.js.coffee delete mode 100644 app/assets/javascripts/demanders.js.coffee delete mode 100644 app/assets/javascripts/provider_statuses.js.coffee delete mode 100644 app/assets/javascripts/providers.js.coffee delete mode 100644 app/assets/stylesheets/demander_statuses.css.scss delete mode 100644 app/assets/stylesheets/demanders.css.scss delete mode 100644 app/assets/stylesheets/provider_statuses.css.scss delete mode 100644 app/assets/stylesheets/providers.css.scss create mode 100644 app/views/ground_pictures/_list_item.html.erb create mode 100644 app/views/original_pictures/_form.html.erb create mode 100644 app/views/panel_colors/_list_item.html.erb diff --git a/app/assets/javascripts/demander_statuses.js.coffee b/app/assets/javascripts/demander_statuses.js.coffee deleted file mode 100644 index 76156794..00000000 --- a/app/assets/javascripts/demander_statuses.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/javascripts/demanders.js.coffee b/app/assets/javascripts/demanders.js.coffee deleted file mode 100644 index 76156794..00000000 --- a/app/assets/javascripts/demanders.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/javascripts/provider_statuses.js.coffee b/app/assets/javascripts/provider_statuses.js.coffee deleted file mode 100644 index 76156794..00000000 --- a/app/assets/javascripts/provider_statuses.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/javascripts/providers.js.coffee b/app/assets/javascripts/providers.js.coffee deleted file mode 100644 index 76156794..00000000 --- a/app/assets/javascripts/providers.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/demander_statuses.css.scss b/app/assets/stylesheets/demander_statuses.css.scss deleted file mode 100644 index 569e412e..00000000 --- a/app/assets/stylesheets/demander_statuses.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the demander_statuses controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/demanders.css.scss b/app/assets/stylesheets/demanders.css.scss deleted file mode 100644 index c0d0c383..00000000 --- a/app/assets/stylesheets/demanders.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the demanders controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/provider_statuses.css.scss b/app/assets/stylesheets/provider_statuses.css.scss deleted file mode 100644 index da190ba9..00000000 --- a/app/assets/stylesheets/provider_statuses.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the provider_statuses controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/providers.css.scss b/app/assets/stylesheets/providers.css.scss deleted file mode 100644 index 298aeaf6..00000000 --- a/app/assets/stylesheets/providers.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the providers controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/views/ground_pictures/_list_item.html.erb b/app/views/ground_pictures/_list_item.html.erb new file mode 100644 index 00000000..e2bd16b1 --- /dev/null +++ b/app/views/ground_pictures/_list_item.html.erb @@ -0,0 +1,11 @@ + + <%= link_to ground_picture.panel_id, panel_path(ground_picture.panel_id) %> + <%= tag :img, ground_picture.picture.tmb_opt_img_tag -%> + <%= render ground_picture.picture.credit_template, :picture => ground_picture.picture %> + <%= ground_picture.z %> + <%= ground_picture.repeat %><%= MagicNumber['ground_picture_repeat_items'][ground_picture.repeat] %> + <%= ground_picture.x %> + <%= ground_picture.y %> + <%= distance_of_time_in_words_to_now ground_picture.created_at %> + <%= distance_of_time_in_words_to_now ground_picture.updated_at %> + diff --git a/app/views/original_pictures/_form.html.erb b/app/views/original_pictures/_form.html.erb new file mode 100644 index 00000000..8ccc26ac --- /dev/null +++ b/app/views/original_pictures/_form.html.erb @@ -0,0 +1,6 @@ +<% if @artist -%> + <%= form_tag( original_pictures_path , { :multipart => true, :method => :post }) do %> + <%= file_field_tag "original_picture[file]" %> + <%= submit_tag t 'original_pictures.upload' -%> + <% end -%> +<% end -%> diff --git a/app/views/panel_colors/_list_item.html.erb b/app/views/panel_colors/_list_item.html.erb new file mode 100644 index 00000000..f7c0a2e1 --- /dev/null +++ b/app/views/panel_colors/_list_item.html.erb @@ -0,0 +1,7 @@ + + <%= link_to panel_color.panel_id, panel_path(panel_color.panel_id) %> + ; background-color: #<%= format("%06x", panel_color.code) -%>;"><%= format("%06x", panel_color.code ^ 0xffffff) %> + <%= panel_color.z %> + <%= distance_of_time_in_words_to_now panel_color.created_at %> + <%= distance_of_time_in_words_to_now panel_color.updated_at %> + diff --git a/spec/helpers/demander_statuses_helper_spec.rb b/spec/helpers/demander_statuses_helper_spec.rb index b9bf9699..a233dbad 100644 --- a/spec/helpers/demander_statuses_helper_spec.rb +++ b/spec/helpers/demander_statuses_helper_spec.rb @@ -11,5 +11,4 @@ require 'spec_helper' # end # end describe DemanderStatusesHelper do - pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/helpers/demanders_helper_spec.rb b/spec/helpers/demanders_helper_spec.rb index 6ef0e197..e739be55 100644 --- a/spec/helpers/demanders_helper_spec.rb +++ b/spec/helpers/demanders_helper_spec.rb @@ -11,5 +11,4 @@ require 'spec_helper' # end # end describe DemandersHelper do - pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/helpers/provider_sources_helper_spec.rb b/spec/helpers/provider_sources_helper_spec.rb index 50464806..8cc2f3a9 100644 --- a/spec/helpers/provider_sources_helper_spec.rb +++ b/spec/helpers/provider_sources_helper_spec.rb @@ -11,5 +11,4 @@ require 'spec_helper' # end # end describe ProviderSourcesHelper do - pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/helpers/provider_statuses_helper_spec.rb b/spec/helpers/provider_statuses_helper_spec.rb index 8d0e3111..fed06c7d 100644 --- a/spec/helpers/provider_statuses_helper_spec.rb +++ b/spec/helpers/provider_statuses_helper_spec.rb @@ -11,5 +11,4 @@ require 'spec_helper' # end # end describe ProviderStatusesHelper do - pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/helpers/providers_helper_spec.rb b/spec/helpers/providers_helper_spec.rb index cd2a9a46..57685d9d 100644 --- a/spec/helpers/providers_helper_spec.rb +++ b/spec/helpers/providers_helper_spec.rb @@ -11,5 +11,4 @@ require 'spec_helper' # end # end describe ProvidersHelper do - pending "add some examples to (or delete) #{__FILE__}" end -- 2.11.0