コミット: 51329f5ce8de435ea1de63035277199531bd1a42 - ginmaku (git)

コミットメタ情報

• リビジョン: 51329f5ce8de435ea1de63035277199531bd1a42 (tree)
• 日時: 2013-04-04 00:03:25
• 作者: SHIMADA Keiki <shimada.cake@gmai...>
• コミッター: SHIMADA Keiki

ログメッセージ

#10 主にslideのshow画面を中心に実装

変更サマリ

• modified: app/assets/javascripts/application.js
• add: app/assets/stylesheets/slides.css.scss
• modified: app/controllers/slides_controller.rb
• modified: app/models/slide.rb
• modified: app/views/layouts/application.html.erb
• modified: app/views/slides/_form.html.erb
• modified: app/views/slides/_list.html.erb
• modified: app/views/slides/show.html.erb
• modified: app/views/songs/detail.html.erb
• modified: app/views/songs/show.html.erb
• modified: config/routes.rb

差分

--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,4 +13,3 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui
-//= require_tree .

--- /dev/null
+++ b/app/assets/stylesheets/slides.css.scss
@@ -0,0 +1,18 @@
+// Place all the styles related to the Slides controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+
+#thumbnail-area {
+  margin: 10px;
+  width: 420px;
+  float: left;
+  font-size: 12px;
+}
+
+.thumbnail {
+  margin: 10px;
+  padding: 3px;
+  width: 400px;
+  width: 300px;
+  border: 1px dashed white;
+}

--- a/app/controllers/slides_controller.rb
+++ b/app/controllers/slides_controller.rb
@@ -2,8 +2,7 @@ class SlidesController < ApplicationController
   # GET /slides
   # GET /slides.json
   def index
-    @slides = Slide.all
-    @recents = []
+    @recents = Slide.recents
 
     respond_to do |format|
       format.html # index.html.erb

--- a/app/models/slide.rb
+++ b/app/models/slide.rb
@@ -1,3 +1,20 @@
 class Slide < ActiveRecord::Base
+  acts_as_paranoid
   attr_accessible :author, :body, :deleted_at, :title
+
+  def pages
+    normalize_eol(body.to_s).split(/\n{4,}/)
+  end
+
+  def outline
+    pages.map{ |page| page.gsub(/\n.*/, '') }
+  end
+
+  def self.recents
+    self.order('updated_at DESC').limit(10)
+  end
+
+  def normalize_eol(str)
+    str.gsub(/\r\n/,"\n").gsub(/\r/, "\n")
+  end
 end

--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,6 +4,7 @@
   <title><%=h yield(:title) %></title>
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
+  <%= javascript_include_tag params[:controller] %>
   <%= csrf_meta_tags %>
   <%= yield :header %>
 </head>

--- a/app/views/slides/_form.html.erb
+++ b/app/views/slides/_form.html.erb
@@ -23,10 +23,6 @@
     <%= f.label :author %><br />
     <%= f.text_field :author %>
   </div>
-  <div class="field">
-    <%= f.label :deleted_at %><br />
-    <%= f.datetime_select :deleted_at %>
-  </div>
   <div class="actions">
     <%= f.submit %>
   </div>

--- a/app/views/slides/_list.html.erb
+++ b/app/views/slides/_list.html.erb
@@ -1,3 +1,4 @@
+<%= paginate @slides %>
 <table>
   <tr>
     <th>Id</th>
@@ -8,15 +9,15 @@
     <th></th>
   </tr>
 
-  <%= paginate @slides %>
   <% @slides.each do |slide| %>
       <tr>
         <td><%= slide.id %></td>
-        <td><%= slide.title %></td>
+        <td><%= link_to slide.title, slide %></td>
         <td><%= slide.updated_at %></td>
         <td><%= link_to 'Show', slide %></td>
         <td><%= link_to 'Edit', edit_slide_path(slide) %></td>
         <td><%= link_to 'Destroy', slide, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
   <% end %>
-</table>
\ No newline at end of file
+</table>
+<%= paginate @slides %>

--- a/app/views/slides/show.html.erb
+++ b/app/views/slides/show.html.erb
@@ -1,25 +1,24 @@
 <p id="notice"><%= notice %></p>
 
-<p>
-  <b>Title:</b>
-  <%= @slide.title %>
-</p>
+<div id="thumbnail-area">
+<%- @slide.pages.each do |page| -%>
+<pre class="thumbnail"><%= page %></pre>
+<%- end -%>
+</div>
+<script type="text/javascript">
+  $('#thumbnail-area').draggable({axis:'y', revert: true, cursor:'move'});
+</script>
 
-<p>
-  <b>Body:</b>
-  <%=simple_format @slide.body %>
-</p>
-
-<p>
-  <b>Author:</b>
-  <%= @slide.author %>
-</p>
-
-<p>
-  <b>Deleted at:</b>
-  <%= @slide.deleted_at %>
-</p>
+<div id="controll-area">
+  <p>『 <%= @slide.title %>』</p>
 
+<%- @slide.outline.each_with_index do |line, idx| -%>
+  <p><%= link_to_function(line,
+                         "change_remote(#{idx}, '#{detail_slide_url(@slide)}')",
+                         :id => "change-button-#{idx}",
+                         :class => 'change-button')%></p>
+<%- end -%>
 
 <%= link_to 'Edit', edit_slide_path(@slide) %> |
 <%= link_to 'Back', slides_path %>
+</div>

--- a/app/views/songs/detail.html.erb
+++ b/app/views/songs/detail.html.erb
@@ -11,9 +11,10 @@
 
 <script type="text/javascript">
     $(document).keydown(function(event) {
-        switch(event.keyCode) {
-            case 38: return prev();
-            case 40: return next();
+        if (event.keyCode == 38) {
+            return prev();
+        } else if (event.keyCode == 40) {
+            return next();
         }
     });
 </script>
\ No newline at end of file

--- a/app/views/songs/show.html.erb
+++ b/app/views/songs/show.html.erb
@@ -4,7 +4,7 @@
 <div id="boxA">
 <pre class='small'><%= suppress_ruby @song.words %></pre>
   <script type="text/javascript">
-    $('pre.small').draggable({axis:'y', cursor:'move'});
+    $('pre.small').draggable({axis:'y', revert: true, cursor:'move'});
   </script>
 </div>
 

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,13 +1,14 @@
 Ginmaku::Application.routes.draw do
   resources :slides do
+    member do
+      get :detail
+    end
+
     collection do
       get :list
     end
   end
 
-
-  resources :preaches
-
   resources :songs do
     member do
       get :detail