georgia 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b6c8f5fffd4a1952bcbef59916f29dcf3732132
-  data.tar.gz: f67b41e2197d216bc13713fe0b5f206ebd5b2da0
+  metadata.gz: abd20d9ab3944e295ac4a7f5745aeb6bfa1a97e6
+  data.tar.gz: 6ba851a725b0976c07f71abd9f8b8163d886eddf
 SHA512:
-  metadata.gz: 62c7861acc194afa2009d7f5f66b5dfbc6bc28ad3a22c5f841b117a3c48c5ba01c7a1790f62cae6d800bf2d376cea47b24d464fd0663636f07825329b2b7818f
-  data.tar.gz: 811589698941a68330a283098346d1626fcb5e71d548e3e22d981752bfa955b19ace02d6dc384df9fdf893f6c29f47f085eff0b572505fd8d66def95499f8c49
+  metadata.gz: dbc9ddd0cc66f29d279b3fc906d627d4cfa1d8e2ec871f12ec31f407937961bc569fa0704a955aff468e681104c46108235a6ad156e6cdf5ae1f5e489f9a03ba
+  data.tar.gz: b8fb78cfcde16ffd6b0604ea7f9fee64ee73f05ed8330f7de656cf2a31ff29ba3e72f6d93a2916af52b8b3265e376a043cc777536413b40b1d4741e61c67c9b6

data/README.md

@@ -14,12 +14,9 @@ Then run the generator to mount routes, run migrations & setup initial instances
 
   rails g georgia:install
 
-== Testing
-
-=== Run Foreman to start Solr
+Start your server (`rails server`) and go to (http://localhost:3000/admin)[http://localhost:3000/admin] to get started.
 
-  cd spec/dummy
-  bundle exec foreman start
+== Testing
 
 === Run rspec
 

data/app/assets/stylesheets/georgia/components/_checkbox.scss

@@ -15,7 +15,6 @@ input[type="checkbox"]:indeterminate::after {
   content: image-url('georgia/indeterminate.png');
 }
 
-input[type="radio"],
 input[type="checkbox"] {
   border: initial;
   padding: 0;

data/app/assets/stylesheets/georgia/layout/_base.scss

@@ -27,8 +27,6 @@ h1, h2, h3, h4, h5, h6, legend {
   margin-top: 60px;
 }
 
-.body-main { @include span-columns(10); }
-
 a {
   text-decoration: none;
   color: $font-link;

data/app/assets/stylesheets/georgia/settings/_colors.scss

@@ -14,8 +14,8 @@ $blue: #0362fd;
 
 $bg-header: #28b779;
 $bg-header-active: #16CA7C;
-$bg-header-main: #ecf5fb;
-$bg-header-main-rgba: rgba(236,245,251,0.9);
+$bg-header-main: #f5f5f5;
+$bg-header-main-rgba: rgba(245,245,245,0.9);
 $bg-sidebar: $bg-header-main;
 $bg-sidebar-rgba: $bg-header-main-rgba;
 $bg-sidebar-navlist: $white;

data/app/assets/stylesheets/georgia/vendor/_select2.scss

@@ -1,7 +1,6 @@
 .select2-container { width: 100%; }
 
 .select2-container-multi .select2-choices .select2-search-choice {
-  @extend .tag;
   padding: 4px 6px 4px 18px !important;
   background-image: none;
   background-color: #FFF;

data/app/controllers/georgia/pages_controller.rb

@@ -46,7 +46,7 @@ module Georgia
       Georgia::Page.update_tree(params[:page_tree]) if params[:page_tree]
       if @page.update_attributes(params[:page])
         respond_to do |format|
-          format.html { redirect_to [:settings, @page], notice: "#{@page.title} was successfully updated." }
+          format.html { render :settings, notice: "#{@page.title} was successfully updated." }
           format.js { head :ok }
         end
       else

data/app/helpers/georgia/forms_helper.rb

@@ -4,8 +4,8 @@ module Georgia
     def sortable(column, title=nil)
       title ||= column.humanize
       direction = (column.to_s == params[:o] && params[:dir] == "asc" ? "desc" : "asc")
-      icon = direction == "asc" ? icon_tag('icon-chevron-up') : icon_tag('icon-chevron-down')
-      "#{title} #{link_to(icon, params.merge({o: column, dir: direction}))}".html_safe
+      icon = direction == "asc" ? icon_tag('caret-up') : icon_tag('caret-down')
+      "#{title} #{link_to(icon, params.merge({o: column, dir: direction}))}".html_safe
     end
 
     def render_template template

data/app/helpers/georgia/pagination_helper.rb

@@ -1,9 +1,8 @@
 module Georgia
   module PaginationHelper
 
-    def pagination_tag search
-      return unless search and !search.total.zero?
-      Georgia::PaginationPresenter.new(self, search)
+    def pagination_tag search, options={}
+      Georgia::PaginationPresenter.new(self, search, options)
     end
 
   end

data/app/models/georgia/slide.rb

@@ -9,5 +9,10 @@ module Georgia
     belongs_to :revision, foreign_key: :page_id
     validates :page_id, presence: true
 
+    # Returns a page if revision is a `current_revision` for a Georgia::Page
+    def page
+      @page ||= revision.try(:page)
+    end
+
   end
 end

data/app/presenters/georgia/pagination_presenter.rb

@@ -1,16 +1,14 @@
 module Georgia
-  class PaginationPresenter
+  class PaginationPresenter < Presenter
 
-    attr_accessor :view_context
-
-    delegate :content_tag, :icon_tag, :link_to_previous_page, :link_to_next_page, :link_to, to: :view_context
-
-    def initialize view_context, search
-      @view_context = view_context
+    def initialize view_context, search, options
+      super
       @search = search
+      @options = options
     end
 
     def to_s
+      return unless @search and !@search.total.zero?
       content_tag(:div, class: 'header-pagination') do
         search_count_tag + navigation_tags
       end
@@ -38,12 +36,12 @@ module Georgia
 
     def previous_page
       text = icon_tag('chevron-left')
-      link_to_previous_page(@search.hits, text, class: btn_class) || link_to_disabled(text)
+      link_to_previous_page(@search.hits, text, class: btn_class, params: params) || link_to_disabled(text)
     end
 
     def next_page
       text = icon_tag('chevron-right')
-      link_to_next_page(@search.hits, text, class: btn_class, role: 'button') || link_to_disabled(text)
+      link_to_next_page(@search.hits, text, class: btn_class, role: 'button', params: params) || link_to_disabled(text)
     end
 
     def btn_class

data/app/uploaders/ckeditor_attachment_file_uploader.rb

@@ -9,7 +9,7 @@ class CkeditorAttachmentFileUploader < CarrierWave::Uploader::Base
   end
 
   def extension_white_list
-    %w(doc docx odt xls ods csv pdf rar zip tar tar.gz ppt pptx)
+    %w(doc docx odt xls ods csv pdf rar zip tar tar.gz ppt pptx) + Ckeditor.image_file_types
   end
 
 

data/app/views/georgia/users/sessions/new.html.erb

@@ -3,7 +3,7 @@
   <h1 class='login-logo page-header'>Georgia</h1>
 
   <% flash.each do |name, msg| %>
-    <div class="alert alert-<%= name == :notice ? "success" : "error" %>">
+    <div class="alert alert-<%= name == :notice ? "success" : "danger" %>">
       <a class="close" data-dismiss="alert">×</a>
       <%= msg.html_safe %>
     </div>

data/db/migrate/008_create_georgia_roles.rb

@@ -1,10 +1,16 @@
 class CreateGeorgiaRoles < ActiveRecord::Migration
 
-  def change
+  def up
     create_table :georgia_roles do |t|
       t.string :name
       t.timestamps
     end
+    Georgia::Role.create(name: 'Admin')
+    Georgia::Role.create(name: 'Editor')
+  end
+
+  def down
+    drop_table :georgia_roles
   end
 
 end

data/db/migrate/011_create_georgia_ui_sections.rb

@@ -1,9 +1,15 @@
 class CreateGeorgiaUiSections < ActiveRecord::Migration
 
-  def change
+  def up
     create_table :georgia_ui_sections do |t|
       t.string :name
     end
+    Georgia::UiSection.create(name: 'Footer')
+    Georgia::UiSection.create(name: 'Sidebar')
+  end
+
+  def down
+    drop_table :georgia_ui_sections
   end
 
 end

data/lib/generators/georgia/install/install_generator.rb

@@ -33,6 +33,17 @@ module Georgia
         rake "db:migrate"
       end
 
+      def create_admin_user
+        say("You're almost done. You need an admin user to get started.", :yellow)
+        first_name = ask("First name:")
+        last_name = ask("Last name:")
+        email = ask("Email:")
+        password = ask("Password:")
+        Georgia::User.create(first_name: first_name, last_name: last_name, email: email, password: password, password_confirmation: password) do |user|
+          user.roles << Georgia::Role.all
+        end
+      end
+
       def copy_templates
         template "config/initializers/georgia.rb"
         template "app/controllers/pages_controller.rb"
@@ -47,10 +58,6 @@ module Georgia
         run "bundle"
       end
 
-      def bootstrap
-        rake 'georgia:install'
-      end
-
       def show_readme
         readme "README"
       end

data/lib/georgia.rb

@@ -1,3 +1,4 @@
+require "georgia/version"
 require "georgia/paths"
 require "georgia/engine"
 require "georgia/assets"

data/lib/georgia/version.rb

@@ -1,3 +1,3 @@
 module Georgia
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: georgia
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -783,12 +783,10 @@ files:
 - config/locales/georgia.en.yml
 - config/initializers/ckeditor.rb
 - config/initializers/acts_as_taggable_on.rb
-- config/initializers/revisions.rb
 - config/initializers/inflections.rb
 - config/initializers/devise.rb
 - config/initializers/simple_form.rb
 - db/migrate/006_create_georgia_pages.rb
-- db/migrate/015_create_tags.rb
 - db/migrate/004_create_georgia_menus.rb
 - db/migrate/005_create_georgia_messages.rb
 - db/migrate/003_create_georgia_links.rb
@@ -804,7 +802,6 @@ files:
 - db/migrate/014_create_roles_users.rb
 - lib/tasks/solr.rake
 - lib/tasks/sidekiq.rake
-- lib/tasks/install.rake
 - lib/tasks/georgia.rake
 - lib/tasks/upgrade.rake
 - lib/tasks/assets.rake

data/config/initializers/revisions.rb

@@ -1,5 +0,0 @@
-module ActsAsRevisionable
-  class RevisionRecord < ActiveRecord::Base
-    belongs_to :revisionable, polymorphic: true
-  end
-end

data/db/migrate/015_create_tags.rb

@@ -1,20 +0,0 @@
-class CreateTags < ActiveRecord::Migration
-
-  def change
-    create_table :tags do |t|
-      t.string :name
-    end
-
-    create_table :taggings do |t|
-      t.references :tag
-      t.references :taggable, :polymorphic => true
-      t.references :tagger, :polymorphic => true
-      t.string :context, :limit => 128
-      t.datetime :created_at
-    end
-
-    add_index :taggings, :tag_id
-    add_index :taggings, [:taggable_id, :taggable_type, :context]
-  end
-
-end

data/lib/tasks/install.rake

@@ -1,19 +0,0 @@
-namespace :georgia do
-
-  desc 'Bootstrap Georgia with necessary instances'
-  task install: :environment do
-
-    # Create an admin user to start playing around
-    # Also creates the two main roles
-    support_user = Georgia::User.create(first_name: 'Dummy', last_name: 'Admin', email: 'admin@dummy.com', password: 'motion11', password_confirmation: 'motion11') do |user|
-      user.roles << Georgia::Role.create(name: 'Admin')
-      user.roles << Georgia::Role.create(name: 'Editor')
-    end
-
-    # Creates the default main UI sections
-    Georgia::UiSection.create(name: 'Footer')
-    Georgia::UiSection.create(name: 'Sidebar')
-
-  end
-
-end