merrycms 0.1.2 → 0.1.4

data/app/controllers/admin/base_controller.rb

@@ -1,5 +1,6 @@
 module Admin
   class BaseController < ApplicationController
+    include BaseHelper
     
     rescue_from Acl9::AccessDenied, :with => :access_denied
     

data/app/controllers/admin/categories_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class CategoriesController < ApplicationController
+  class CategoriesController < BaseController
   
     layout "admin"
   

data/app/controllers/admin/documents_controller.rb

@@ -0,0 +1,49 @@
+module Admin
+  class DocumentsController < BaseController
+  
+    layout "admin"
+
+    before_filter :authenticate_user!
+    access_control do
+      allow :admin
+    end
+  
+    def index
+      @search = Document.search(params[:search])
+      @documents = @search.order(:title).page(params[:page])
+    end
+  
+    def new
+      @document = Document.new
+    end
+  
+    def create
+      @document = Document.new(params[:document])
+      if @document.save
+        redirect_to admin_documents_path
+      else
+        render :new
+      end
+    end
+  
+    def edit
+      @document = Document.find(params[:id])
+    end
+  
+    def update
+      @document = Document.find(params[:id])
+      if @document.update_attributes(params[:document])
+        redirect_to admin_documents_path
+      else
+        render :edit
+      end
+    end
+  
+    def destroy
+      @document = Document.find(params[:id])
+      @document.destroy
+      redirect_to admin_documents_path
+    end
+  
+  end
+end

data/app/controllers/admin/images_controller.rb

@@ -0,0 +1,49 @@
+module Admin
+  class ImagesController < BaseController
+  
+    layout "admin"
+
+    before_filter :authenticate_user!
+    access_control do
+      allow :admin
+    end
+  
+    def index
+      @search = Image.search(params[:search])
+      @images = @search.order(:title).page(params[:page])
+    end
+  
+    def new
+      @image = Image.new
+    end
+  
+    def create
+      @image = Image.new(params[:image])
+      if @image.save
+        redirect_to admin_images_path
+      else
+        render :new
+      end
+    end
+  
+    def edit
+      @image = Image.find(params[:id])
+    end
+  
+    def update
+      @image = Image.find(params[:id])
+      if @image.update_attributes(params[:image])
+        redirect_to admin_images_path
+      else
+        render :edit
+      end
+    end
+  
+    def destroy
+      @image = Image.find(params[:id])
+      @image.destroy
+      redirect_to admin_images_path
+    end
+  
+  end
+end

data/app/controllers/admin/pages_controller.rb

@@ -11,7 +11,6 @@ module Admin
     def index
       @search = Page.includes(:category).search(params[:search])
       @pages = @search.order("created_at desc").page(params[:page])
-      puts @pages # hack for kaminari
     end
   
     def new

data/app/controllers/admin/translations_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class TranslationsController < ApplicationController
+  class TranslationsController < BaseController
     respond_to :html, :json
   
     layout "admin"

data/app/controllers/admin/videos_controller.rb

@@ -0,0 +1,56 @@
+module Admin
+  class VideosController < BaseController
+  
+    layout "admin"
+
+    before_filter :authenticate_user!
+    access_control do
+      allow :admin
+    end
+  
+    def index
+      @search = Video.search(params[:search])
+      @videos = @search.order(:title).page(params[:page])
+    end
+    
+    def show
+      @video = Video.find(params[:id])
+    end
+  
+    def new
+      @video = Video.new
+      3.times {  @video.sources.build }
+    end
+  
+    def create
+      @video = Video.new(params[:video])
+      if @video.save
+        redirect_to admin_videos_path
+      else
+        render :new
+      end
+    end
+  
+    def edit
+      @video = Video.find(params[:id])
+      n = 3 - @video.sources.size
+      n.times {  @video.sources.build }
+    end
+  
+    def update
+      @video = Video.find(params[:id])
+      if @video.update_attributes(params[:video])
+        redirect_to admin_videos_path
+      else
+        render :edit
+      end
+    end
+  
+    def destroy
+      @video = Video.find(params[:id])
+      @video.destroy
+      redirect_to admin_videos_path
+    end
+  
+  end
+end

data/app/helpers/admin/base_helper.rb

@@ -0,0 +1,15 @@
+module Admin
+  module BaseHelper
+        
+    def render_subnav      
+      if content_for?(:subnav)
+        yield(:subnav)
+      elsif File.exists?(File.join(File.dirname(__FILE__),'..','..','views',params[:controller],'_subnav.erb'))
+        render(:partial=> 'subnav')
+      else
+        render(:partial=> 'admin/shared/subnav')
+      end
+    end
+    
+  end
+end

data/app/helpers/admin/categories_helper.rb

@@ -3,13 +3,9 @@ module Admin
   
     def render_cat hash, options = {}, &block
       sort_proc = options.delete :sort
-      content_tag :tr, options do
-        content_tag :td do
-          hash.keys.sort_by(&sort_proc).each do |node|
-            block.call node, render_tree(hash[node], :sort => sort_proc, &block)
-          end
-        end
-      end if hash.present?
+      hash.keys.sort_by(&sort_proc).each do |node|
+        block.call node, render_tree(hash[node], :sort => sort_proc, &block)
+      end
     end
   
     def display_node(node)

data/app/helpers/admin/documents_helper.rb

@@ -0,0 +1,4 @@
+module Admin
+  module DocumentsHelper
+  end
+end

data/app/helpers/admin/images_helper.rb

@@ -0,0 +1,14 @@
+module Admin
+  module ImagesHelper
+  
+    def display_image_links(image)
+      html = ""
+      html << "<strong>#{t('images.styles.original')}</strong> : #{image.image.url(:original, false)}<br/>"
+      image.image.styles.each do |style, file|
+        html << "<strong>#{t("images.styles.#{style}")}</strong> : #{image.image.url(style, false)}<br/>"
+      end
+      html
+    end
+  
+  end
+end

data/app/helpers/admin/videos_helper.rb

@@ -0,0 +1,53 @@
+module Admin
+  module VideosHelper
+    
+    def display_video_size(video)
+      main_source = video.sources.first
+      number_to_human_size main_source.video_file_size if main_source
+    end
+    
+    def display_video(video, width=nil, height=nil)
+      return unless video
+      
+      main_source = video.sources.first
+      if main_source.nil?
+        html = "<p>#{t('videos.no_source')}</p>"
+        return html
+      end
+      
+      width = width ? width : main_source.width
+      height = height ? height : main_source.height
+      poster = main_source.video.url(:poster, false)
+      flash_player = 'http://releases.flowplayer.org/swf/flowplayer-3.2.1.swf'
+      video_alt = 'Poster image'
+      poster_title = video.title
+      
+      sources = video.sources.map do |source|
+        { :src => "http://localhost:3000#{source.video.url(:original, false)}", :type => "#{source.video_content_type}" }
+      end
+      
+      html = ""
+      
+      html << "<div class='video-js-box vim-css'>"
+      
+      html << "<video id='example_video_1' class='video-js' width='#{width}' height='#{height}' controls='controls' preload='auto' poster='#{poster}'>"
+      
+      sources.each do |source|
+        html << "<source src='#{source[:src]}' type='#{source[:type]}' />"
+      end
+
+      html << "<object id='flash_fallback_1' class='vjs-flash-fallback' width='#{width}' height='#{height}' type='application/x-shockwave-flash' data='#{flash_player}'>"
+      html << "<param name='movie' value='#{flash_player}' />"
+      html << "<param name='allowfullscreen' value='true' />"
+      html << "<param name='flashvars' value='config={\"playlist\":[\"#{poster}\", {\"url\":\"#{sources[0][:src]}\",\"autoPlay\":false,\"autoBuffering\":true}]}' />"
+            
+      html << "<img src='#{poster}' width='#{width}' height='#{height}' alt='#{video_alt}' title='#{poster_title}' />"       
+      html << "</object>"
+      html << "</video>"
+      html << "</div>"
+      
+      html
+    end
+    
+  end
+end

data/app/models/document.rb

@@ -0,0 +1,7 @@
+class Document < ActiveRecord::Base
+  
+  has_attached_file :doc
+  validates_attachment_presence :doc, :message => I18n.t('activerecord.errors.models.document.attributes.doc.blank')
+  validates_presence_of :title
+  
+end

data/app/models/image.rb

@@ -0,0 +1,9 @@
+class Image < ActiveRecord::Base
+  include ValidatesAsImage
+  
+  has_attached_file :image, :styles => { :medium => "300x300>", :thumb => "100x100>" }, :whiny => false
+  validates_attachment_presence :image, :message => I18n.t('activerecord.errors.models.image.attributes.image.blank')
+  validates_as_image :image
+  validates_presence_of :title
+  
+end

data/app/models/source.rb

@@ -0,0 +1,8 @@
+class Source < ActiveRecord::Base
+  belongs_to :video
+  
+  CONTAINER_TYPES = ["mp4", "webm", "theora"]
+  
+  has_attached_file :video, :styles => { :poster => ['100', :jpg] }, :processors => [ :poster ]
+  
+end

data/app/models/video.rb

@@ -0,0 +1,7 @@
+class Video < ActiveRecord::Base
+  has_many :sources
+  accepts_nested_attributes_for :sources, :reject_if => proc { |attributes| attributes['video'].blank? }, :allow_destroy => true
+  
+  validates_presence_of :title
+
+end

data/app/views/admin/categories/index.html.erb

@@ -8,7 +8,7 @@
     <th><%= t('categories.link') %></th>
     <th></th>
   </tr>
-<%= render_cat @categories, :sort => lambda{|x| x.position } do |node, child| %>
+<% render_cat @categories, :sort => lambda{|x| x.position } do |node, child| %>
   <tr>
     <td><%= display_node(node) %></td>
     <td><%= node.link %></td>

data/app/views/admin/documents/_form.erb

@@ -0,0 +1,22 @@
+<%= form_for [:admin, @document], :html => { :multipart => true } do |f| %>
+  <%= render "shared/error_messages", :target => @document %>
+  <div>
+    <%= f.label :title, t('documents.title'), :class => "desc required" %>
+    <%= f.text_field :title, :size => "80" %>
+  </div>
+  <div>
+    <%= f.label :doc, t('documents.doc_field') %>
+    <%= f.file_field :doc %>
+  </div>
+  <div>
+    <%= f.submit t('documents.submit') %>
+    <%= link_to t('cancel'), admin_documents_path %>
+  </div>
+<% end %>
+
+<% if @document.id %>
+  <%= form_for [:admin, @document], :html => { :method => "delete" } do |f| %>
+    <input type="hidden" name="_method" value="delete" />
+    <button type="submit"><%= t('documents.delete') %></button>
+  <% end %>
+<% end %>

data/app/views/admin/documents/_search.erb

@@ -0,0 +1,15 @@
+<%= form_for @search, :url => admin_documents_path, :html => {:method => :get, :class => 'search'} do |f| %>
+<div>
+  <h3><%= t('documents.search.title') %></h3>
+  <div class='top'>
+    <%= f.label :title_contains, t('documents.search.document_title'), :class => 'desc' %>
+    <%= f.text_field :title_contains, :size => "20" %>
+  </div>
+  <div class='top'>
+    <label>&nbsp;</label>
+    <p>
+      <%= f.submit t('documents.search.submit') %>
+    </p>
+  </div>
+</div>
+<% end %>

data/app/views/admin/documents/_subnav.erb

@@ -0,0 +1,7 @@
+<div id="subnav">
+  <ul class='left'>
+    <li><%= link_to t('images.subnav'), admin_images_path %></li>
+    <li><%= link_to t('documents.subnav'), admin_documents_path %></li>
+    <li><%= link_to t('videos.subnav'), admin_videos_path %></li>
+  </ul>
+</div>

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

@@ -0,0 +1,7 @@
+<h1><%= t('documents.edit.title') %></h1>
+
+<p>
+  <strong><%= t('documents.file_name') %></strong> : <%= @document.doc_file_name %>
+</p>
+
+<%= render :partial => "form", :locals => { :document => @document } %>

data/app/views/admin/documents/index.html.erb

@@ -0,0 +1,24 @@
+<h1><%= t('documents.index.title') %></h1>
+
+<p>
+  <%= link_to t('documents.links.new'), new_admin_document_path, :class => 'button' %>
+</p>
+
+<%= render "search" %>
+
+<%= paginate @documents %>
+
+<table>
+  <tr>
+    <th><%= t('documents.title') %></th>
+    <th><%= t('documents.link') %></th>
+    <th><%= t('documents.file_size') %></th>
+  </tr>
+  <% for document in @documents %>
+  <tr>
+    <td><%= link_to document.title, edit_admin_document_path(document) %></td>
+    <td><%= document.doc.url(:original, false) %></td>
+    <td><%= number_to_human_size document.doc_file_size %></td>
+  </tr>
+  <% end %>
+</table>

data/app/views/admin/documents/new.html.erb

@@ -0,0 +1,3 @@
+<h1><%= t('documents.new.title') %></h1>
+
+<%= render :partial => "form", :locals => { :document => @document } %>

data/app/views/admin/images/_form.erb

@@ -0,0 +1,22 @@
+<%= form_for [:admin, @image], :html => { :multipart => true } do |f| %>
+  <%= render "shared/error_messages", :target => @image %>
+  <div>
+    <%= f.label :title, t('images.title'), :class => "desc required" %>
+    <%= f.text_field :title, :size => "80" %>
+  </div>
+  <div>
+    <%= f.label :image, t('images.image_field') %>
+    <%= f.file_field :image %>
+  </div>
+  <div>
+    <%= f.submit t('images.submit') %>
+    <%= link_to t('cancel'), admin_images_path %>
+  </div>
+<% end %>
+
+<% if @image.id %>
+  <%= form_for [:admin, @image], :html => { :method => "delete" } do |f| %>
+    <input type="hidden" name="_method" value="delete" />
+    <button type="submit"><%= t('images.delete') %></button>
+  <% end %>
+<% end %>

data/app/views/admin/images/_search.erb

@@ -0,0 +1,15 @@
+<%= form_for @search, :url => admin_images_path, :html => {:method => :get, :class => 'search'} do |f| %>
+<div>
+  <h3><%= t('images.search.title') %></h3>
+  <div class='top'>
+    <%= f.label :title_contains, t('images.search.image_title'), :class => 'desc' %>
+    <%= f.text_field :title_contains, :size => "20" %>
+  </div>
+  <div class='top'>
+    <label>&nbsp;</label>
+    <p>
+      <%= f.submit t('images.search.submit') %>
+    </p>
+  </div>
+</div>
+<% end %>

data/app/views/admin/images/_subnav.erb

@@ -0,0 +1,7 @@
+<div id="subnav">
+  <ul class='left'>
+    <li><%= link_to t('images.subnav'), admin_images_path %></li>
+    <li><%= link_to t('documents.subnav'), admin_documents_path %></li>
+    <li><%= link_to t('videos.subnav'), admin_videos_path %></li>
+  </ul>
+</div>

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

@@ -0,0 +1,7 @@
+<h1><%= t('images.edit.title') %></h1>
+
+<div id="images">
+  <%= image_tag @image.image.url(:medium), :class => 'image_file' %>
+
+  <%= render :partial => "form", :locals => { :image => @image } %>
+</div>

data/app/views/admin/images/index.html.erb

@@ -0,0 +1,26 @@
+<h1><%= t('images.index.title') %></h1>
+
+<p>
+  <%= link_to t('images.links.new'), new_admin_image_path, :class => 'button' %>
+</p>
+
+<%= render "search" %>
+
+<%= paginate @images %>
+
+<table>
+  <tr>
+    <th width="100"><%= t('images.thumb') %></th>
+    <th><%= t('images.title') %></th>
+    <th><%= t('images.link') %></th>
+    <th><%= t('images.file_size') %></th>
+  </tr>
+  <% for image in @images %>
+  <tr>
+    <td><%= image_tag image.image.url(:thumb), :class => 'thumb' %></td>
+    <td><%= link_to image.title, edit_admin_image_path(image) %></td>
+    <td><%=raw display_image_links(image) %></td>
+    <td><%= number_to_human_size image.image_file_size %></td>
+  </tr>
+  <% end %>
+</table>

data/app/views/admin/images/new.html.erb

@@ -0,0 +1,3 @@
+<h1><%= t('images.new.title') %></h1>
+
+<%= render :partial => "form", :locals => { :image => @image } %>

data/app/views/admin/pages/index.html.erb

@@ -14,20 +14,14 @@
     <th><%= t('pages.state') %></th>
     <th></th>
   </tr>
-  <% if @pages.size == 0 %>
+  <% @pages.each do |page| %>
   <tr>
-    <td colspan="5">Aucune page</td>
+    <td><%= link_to page.title, edit_admin_page_path(page) %></a></td>
+    <td><%= page.link %></td>
+    <td><%= display_page_category(page) %></td>
+    <td><%= display_state(page) %></td>
+    <td><%= display_events(page) %></td>
   </tr>
-  <% else %>
-    <% @pages.each do |page| %>
-    <tr>
-      <td><%= link_to page.title, edit_admin_page_path(page) %></a></td>
-      <td><%= page.link %></td>
-      <td><%= display_page_category(page) %></td>
-      <td><%= display_state(page) %></td>
-      <td><%= display_events(page) %></td>
-    </tr>
-    <% end %>
   <% end %>
 </table>
 

data/app/views/admin/shared/_nav.erb

@@ -0,0 +1,11 @@
+<div id="nav">
+  <ul class="left">
+    <li><%= link_to t('admin.nav.pages'), admin_pages_path %></li>
+    <li><%= link_to t('admin.nav.categories'), admin_categories_path %></li>
+    <li><%= link_to t('admin.nav.translations'), admin_translations_path %></li>
+    <li><%= link_to t('admin.nav.media'), admin_images_path %></li>
+  </ul>
+  <ul class="right">
+    <li><%= link_to t('admin.nav.users'), admin_users_path %></li>
+  </ul>
+</div>

data/app/views/{shared/_toplinks.html.erb → admin/shared/_toplinks.erb}

@@ -1,9 +1,9 @@
 <div id="toplinks">                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
   <% if user_signed_in? %>
-    <%= t('admin.signed_in_as', :user => current_user.email) %>.
-    <%= link_to t('.sign_out'), destroy_user_session_path %> 
+    <%= t('admin.toplinks.signed_in_as', :user => current_user.email) %>.
+    <%= link_to t('admin.toplinks.sign_out'), destroy_user_session_path %> 
   <% else %> 
-    <%= link_to t('.sign_up'), new_user_registration_path %> <%= t('.or') %> <%= link_to t('.sign_in'), new_user_session_path %> 
+    <%= link_to t('admin.toplinks.sign_up'), new_user_registration_path %> <%= t('.or') %> <%= link_to t('admin.toplinks.sign_in'), new_user_session_path %> 
   <% end %>
-  &nbsp;<a href='/'><%= t('admin.website_home') %></a>
+  &nbsp;<a href='/'><%= t('admin.toplinks.website_home') %></a>
 </div>

data/app/views/admin/videos/_form.erb

@@ -0,0 +1,38 @@
+<%= form_for [:admin, @video], :html => { :multipart => true } do |f| %>
+  <%= render "shared/error_messages", :target => @video %>
+  <div>
+    <%= f.label :title, t('videos.title'), :class => "desc required" %>
+    <%= f.text_field :title, :size => "80" %>
+  </div>
+  <h3><%= t('videos.sources.title') %></h3>
+  <%=raw t('videos.sources.instruct') %>
+  
+  <% @index = 0 %>
+  <%= f.fields_for :sources do |source_form| %>
+  <div>
+      <%= source_form.label :video, t('videos.sources.file') %>
+      <%= source_form.object.attributes['video_file_name'] %>
+      <%= source_form.file_field :video %>
+      <%= source_form.label :container_type, t('videos.sources.container_type')%>
+      <%= source_form.hidden_field :container_type, :value => source_form.object.attributes[:container_type] || Source::CONTAINER_TYPES[@index] %>
+      <%= source_form.object.attributes[:container_type] || Source::CONTAINER_TYPES[@index] %>
+      <% if source_form.object.attributes && source_form.object.attributes['video_file_size'] %>
+        <strong><%= t('videos.file_size') %></strong>
+        <%= number_to_human_size source_form.object.attributes['video_file_size'] %>
+      <% end %>
+  </div>
+    <% @index += 1 %>
+  <% end %>
+  
+  <div>
+    <%= f.submit t('videos.submit') %>
+    <%= link_to t('cancel'), admin_videos_path %>
+  </div>
+<% end %>
+
+<% if @video.id %>
+  <%= form_for [:admin, @video], :html => { :method => "delete" } do |f| %>
+    <input type="hidden" name="_method" value="delete" />
+    <button type="submit"><%= t('videos.delete') %></button>
+  <% end %>
+<% end %>

data/app/views/admin/videos/_head_info.erb

@@ -0,0 +1,13 @@
+<% content_for :head do %>
+  <link rel="stylesheet" href="/stylesheets/video-js.css" type="text/css" media="screen" title="Video JS"> 
+  <link rel="stylesheet" href="/stylesheets/skins/vim.css" type="text/css" media="screen" title="Video JS"> 
+  <link rel="stylesheet" href="/stylesheets/skins/hu.css" type="text/css" media="screen" title="Video JS"> 
+
+  <script src="/javascripts/video.js" type="text/javascript" charset="utf-8"></script> 
+
+  <script type="text/javascript">
+    $(function(){
+      $("video").VideoJS()
+    });
+  </script>
+<% end %>

data/app/views/admin/videos/_search.erb

@@ -0,0 +1,15 @@
+<%= form_for @search, :url => admin_videos_path, :html => {:method => :get, :class => 'search'} do |f| %>
+<div>
+  <h3><%= t('videos.search.title') %></h3>
+  <div class='top'>
+    <%= f.label :title_contains, t('videos.search.video_title'), :class => 'desc' %>
+    <%= f.text_field :title_contains, :size => "20" %>
+  </div>
+  <div class='top'>
+    <label>&nbsp;</label>
+    <p>
+      <%= f.submit t('videos.search.submit') %>
+    </p>
+  </div>
+</div>
+<% end %>