RubyGems - merrycms - Versions diffs - 0.1.1 → 0.1.2 - Mend

merrycms 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

data/app/controllers/admin/pages_controller.rb +3 -2
data/app/controllers/admin/translations_controller.rb +3 -3
data/app/models/page.rb +0 -2
data/app/views/admin/pages/index.html.erb +2 -1
data/app/views/admin/translations/_form.erb +1 -1
data/app/views/admin/translations/index.html.erb +1 -1
data/app/views/layouts/admin.html.erb +1 -1
data/app/views/shared/_toplinks.html.erb +3 -2
data/config/locales/fr/admin/admin.fr.yml +3 -3
data/config/locales/fr/admin/pages.fr.yml +1 -1
data/lib/generators/merrycms/{install_generator.rb → install_auth_generator.rb} +18 -32
data/lib/generators/merrycms/install_pages_generator.rb +40 -0
data/lib/generators/merrycms/install_translations_generator.rb +30 -0
data/lib/merrycms/railties/merrycms_tasks.rake +15 -2
metadata +5 -3

data/app/controllers/admin/pages_controller.rb CHANGED Viewed

@@ -9,8 +9,9 @@ module Admin
     end
     def index
-      @search = Page.search(params[:search])
-      @pages = @search.order(:title).page(params[:page]).per(5)
+      @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 CHANGED Viewed

@@ -15,12 +15,12 @@ module Admin
     end
     def all
-      @search = Translation.not_pending.search(params[:search])
+      @search = Translation.not_pending.order("created_at desc").search(params[:search])
       @translations = @search.where(:locale => params[:language]).page(params[:page]).per(10)
     end
     def pending
-      @search = Translation.pending.search(params[:search])
+      @search = Translation.pending.order("created_at desc").search(params[:search])
       @translations = @search.where(:locale => params[:language]).page(params[:page]).per(10)
     end
@@ -43,7 +43,7 @@ module Admin
       @translation = Translation.find(params[:id])
       @translation.destroy
       respond_with(@translation) do |format|
-        format.html { redirect_to new_admin_translation_path(:type => params[:type], :language => params[:language]) }
+        format.html { redirect_to admin_translations_path(:language => params[:language]) }
         format.js
       end
     end

data/app/models/page.rb CHANGED Viewed

@@ -28,10 +28,8 @@ class Page < ActiveRecord::Base
     event :unarchive do
       transitions :to => :draft, :from => :archived, :on_transition => :unset_archived_at
     end
   end
   def available_events
     Page.state_machines[:default].events_for(self.state.to_sym)
   end

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

@@ -4,6 +4,8 @@
 <%= render 'search' %>
+<%= paginate @pages %>
 <table>
   <tr>
     <th><%= t('activerecord.attributes.page.title') %></th>
@@ -29,4 +31,3 @@
   <% end %>
 </table>
-<%= paginate @pages %>

data/app/views/admin/translations/_form.erb CHANGED Viewed

@@ -17,7 +17,7 @@
       <%= hidden_field_tag "translations[#{index}][destroy]", false, :class => 'translation-destroy' %>
       <%= text_area_tag "translations[#{index}][value]", translation[:value] %>
     </td>
-    <td class="actions"><%= link_to t('translations.delete'), admin_translation_path(translation[:id], :type => params[:type], :language => params[:language]), :method => :delete, :class => :delete, :remote => true %></td>
+    <td class="actions"><%= link_to t('translations.delete'), admin_translation_path(translation[:id], :language => params[:language]), :method => :delete, :class => :delete, :remote => true %></td>
   </tr>
   <% end %>
   <tr>

data/app/views/admin/translations/index.html.erb CHANGED Viewed

@@ -10,7 +10,7 @@
   <ul class='pending'>
   <% @pending_translations.each do |translation| %>
     <li>
-    <%= link_to t("translations.locales.#{translation[0]}"), admin_pending_translations_path(:language => translation[0], :type => 'pending') %>
+    <%= link_to t("translations.locales.#{translation[0]}"), admin_pending_translations_path(:language => translation[0]) %>
     <span class="count"><%= translation[1].size %></span>
     </li>
   <% end %>

data/app/views/layouts/admin.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
   <head>
     <title>:: Admin ::</title>
     <%= stylesheet_link_tag ['reset', 'font', 'form', 'admin'] %>
-    <%= javascript_include_tag ['jquery', 'jquery-ui.min', 'autoresize.jquery.min', 'rails', 'admin'] %>
+    <%= javascript_include_tag ['jquery', 'jquery-ui.min', 'autoresize.jquery.min', 'rails', 'form', 'admin'] %>
     <%= csrf_meta_tag %>
     <%= yield(:head) %>

data/app/views/shared/_toplinks.html.erb CHANGED Viewed

@@ -1,8 +1,9 @@
-<div id="toplinks">
+<div id="toplinks">
   <% if user_signed_in? %>
-    <%= t('.signed_in_as', :user => current_user.email) %>.
+    <%= t('admin.signed_in_as', :user => current_user.email) %>.
     <%= link_to t('.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 %>
   <% end %>
+  &nbsp;<a href='/'><%= t('admin.website_home') %></a>
 </div>

data/config/locales/fr/admin/admin.fr.yml CHANGED Viewed

@@ -4,6 +4,6 @@ fr:
       pages: Pages
       users: Utilisateurs
       categories: Catégories
-  layouts:
-    admin:
-      signed_in_as: "Connecté en tant que %{user}"
+    website_home: Site
+    signed_in_as: "%{user}"

data/config/locales/fr/admin/pages.fr.yml CHANGED Viewed

@@ -23,7 +23,7 @@ fr:
     search:
       title: Rechercher
-      page_title: Par titre
+      page_title: Par titre ou contenu
       submit: Rechercher

data/lib/generators/merrycms/{install_generator.rb → install_auth_generator.rb} RENAMED Viewed

@@ -2,7 +2,7 @@ require 'rails/generators'
 require 'rails/generators/migration'
 module Merrycms
-  class InstallGenerator < Rails::Generators::Base
+  class InstallAuthGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
     def self.source_root
@@ -25,55 +25,41 @@ module Merrycms
     def add_devise_routes
       route 'devise_for :users'
     end
+    def create_devise_migration_files
+      migration_template 'devise_create_users_migration.rb', 'db/migrate/devise_create_users.rb'
+      sleep 1
+    end
     def add_merrycms_routes
       route 'merrycms_routes'
     end
-    def copy_locales
-      directory "../../../../config/locales/fr/admin", "config/locales/fr/admin"
-    end
-    def create_migration_files
-      migration_template 'devise_create_users_migration.rb', 'db/migrate/devise_create_users.rb'
-      sleep 1
+    def create_user_management_migration_files
       migration_template 'create_roles_migration.rb', 'db/migrate/create_roles.rb'
       sleep 1
       migration_template 'roles_users_migration.rb', 'db/migrate/roles_users.rb'
       sleep 1
+    end
+    def create_page_and_category_migration_files
       migration_template 'create_pages_and_categories_migration.rb', 'db/migrate/create_pages_and_categories.rb'
       sleep 1
-      migration_template 'create_translations_migration.rb', 'db/migrate/create_translations.rb'
-      sleep 1
     end
-    def copy_stylesheets
-      copy_file '../../../../public/stylesheets/reset.css', 'public/stylesheets/reset.css'
-      copy_file '../../../../public/stylesheets/font.css', 'public/stylesheets/font.css'
-      copy_file '../../../../public/stylesheets/form.css', 'public/stylesheets/form.css'
-      copy_file '../../../../public/stylesheets/login.css', 'public/stylesheets/login.css'
-      copy_file '../../../../public/stylesheets/admin.css', 'public/stylesheets/admin.css'
-    end
-    def copy_javascripts
-      copy_file '../../../../public/javascripts/admin.js', 'public/javascripts/jquery-ui.js'
-      copy_file '../../../../public/javascripts/form.js', 'public/javascripts/form.js'
-      copy_file '../../../../public/javascripts/admin.js', 'public/javascripts/admin.js'
-      copy_file '../../../../public/javascripts/autoresize.jquery.min.js', 'public/javascripts/autoresize.jquery.min.js'
+    # pages and categories
+    def generate_slugs_table
+      invoke 'friendly_id'
     end
-    def copy_images
-      directory '../../../../public/images/merrycms', 'public/images/merrycms'
+    def create_translations_migration_files
+      migration_template 'create_translations_migration.rb', 'db/migrate/create_translations.rb'
+      sleep 1
     end
     def copy_locale_initializer
       copy_file 'locale_initializer.rb', 'config/initializers/locale.rb'
     end
-    # pages and categories
-    def generate_slugs_table
-      invoke 'friendly_id'
-    end
   end
 end

data/lib/generators/merrycms/install_pages_generator.rb ADDED Viewed

@@ -0,0 +1,40 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+module Merrycms
+  class InstallPagesGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+    def self.source_root
+      @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+    end
+    def self.next_migration_number(dirname)
+      if ActiveRecord::Base.timestamped_migrations
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      else
+        "%.3d" % (current_migration_number(dirname) + 1)
+      end
+    end
+    def create_page_and_category_migration_files
+      migration_template 'create_pages_and_categories_migration.rb', 'db/migrate/create_pages_and_categories.rb'
+      sleep 1
+    end
+    # pages and categories
+    def generate_slugs_table
+      invoke 'friendly_id'
+    end
+    def create_translations_migration_files
+      migration_template 'create_translations_migration.rb', 'db/migrate/create_translations.rb'
+      sleep 1
+    end
+    def copy_locale_initializer
+      copy_file 'locale_initializer.rb', 'config/initializers/locale.rb'
+    end
+  end
+end

data/lib/generators/merrycms/install_translations_generator.rb ADDED Viewed

@@ -0,0 +1,30 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+module Merrycms
+  class InstallTranslationsGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+    def self.source_root
+      @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+    end
+    def self.next_migration_number(dirname)
+      if ActiveRecord::Base.timestamped_migrations
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      else
+        "%.3d" % (current_migration_number(dirname) + 1)
+      end
+    end
+    def create_translations_migration_files
+      migration_template 'create_translations_migration.rb', 'db/migrate/create_translations.rb'
+      sleep 1
+    end
+    def copy_locale_initializer
+      copy_file 'locale_initializer.rb', 'config/initializers/locale.rb'
+    end
+  end
+end

data/lib/merrycms/railties/merrycms_tasks.rake CHANGED Viewed

@@ -2,10 +2,23 @@ namespace :merrycms do
   desc "setup"
   task :setup => :environment do
-    system("rails generate merrycms:install")
+    system("rails generate merrycms:install_auth")
+    system("rails generate merrycms:install_pages")
+    system("rails generate merrycms:install_translations")
+    system("rails generate jquery:install")
+    Rake::Task['merrycms:import_assets'].invoke
     Rake::Task['db:migrate'].invoke
     Rake::Task['merrycms:bootstrap'].invoke
-    Rake::Task['jquery:install'].invoke
+  end
+  desc "Copies all merrycms assets to public/ directory"
+  task :import_assets => :environment do
+    merrycms_assets = File.expand_path(File.join(File.dirname(__FILE__), '../../../public/'))
+    command = "cp -R #{merrycms_assets} #{Rails.root}/"
+    puts command
+    system(command)
   end
   desc "bootstrap app"

metadata CHANGED Viewed

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors:
 - Franck D'agostini
@@ -223,7 +223,9 @@ files:
 - config/locales/fr/admin/toplinks.fr.yml
 - config/locales/fr/admin/translations.fr.yml
 - config/locales/fr/admin/users.fr.yml
-- lib/generators/merrycms/install_generator.rb
+- lib/generators/merrycms/install_auth_generator.rb
+- lib/generators/merrycms/install_pages_generator.rb
+- lib/generators/merrycms/install_translations_generator.rb
 - lib/generators/merrycms/templates/create_pages_and_categories_migration.rb
 - lib/generators/merrycms/templates/create_roles_migration.rb
 - lib/generators/merrycms/templates/create_translations_migration.rb