roroacms 0.0.6.9 → 0.0.7

data/config/locales/devise.en.yml

@@ -1,116 +1,116 @@
-# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
-
-en:
-  devise:
-    confirmations:
-      new:
-        resend_confirmation_instructions: "Resend confirmation instructions"
-      confirmed: "Your account was successfully confirmed."
-      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
-    failure:
-      already_authenticated: "You are already signed in."
-      inactive: "Your account is not activated yet."
-      invalid: "Invalid email or password."
-      invalid_token: "Invalid authentication token."
-      locked: "Your account is locked."
-      not_found_in_database: "Invalid email or password."
-      timeout: "Your session expired. Please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your account before continuing."
-    mailer:
-      confirmation_instructions:
-        action: "Confirm my account"
-        greeting: "Welcome %{recipient}!"
-        instruction: "You can confirm your account email through the link below:"
-        subject: "Confirmation instructions"
-      reset_password_instructions:
-        action: "Change my password"
-        greeting: "Hello %{recipient}!"
-        instruction: "Someone has requested a link to change your password, and you can do this through the link below."
-        instruction_2: "If you didn't request this, please ignore this email."
-        instruction_3: "Your password won't change until you access the link above and create a new one."
-        subject: "Reset password instructions"
-      unlock_instructions:
-        action: "Unlock my account"
-        greeting: "Hello %{recipient}!"
-        instruction: "Click the link below to unlock your account:"
-        message: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
-        subject: "Unlock Instructions"
-    omniauth_callbacks:
-      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
-      success: "Successfully authenticated from %{kind} account."
-    passwords:
-      new:
-        forgot_your_password: "Forgot your password?"
-        send_me_reset_password_instructions: "Send me reset password instructions"
-        placeholder: "Email / Username"
-      edit:
-        change_your_password: "Change your password"
-        new_password: "New password"
-        confirm_new_password: "Confirm new password"
-        change_my_password: "Change my password"
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
-      updated: "Your password was changed successfully. You are now signed in."
-      updated_not_active: "Your password was changed successfully."
-    registrations:
-      edit:
-        are_you_sure: "Are you sure?"
-        cancel_my_account: "Cancel my account"
-        leave_blank_if_you_don_t_want_to_change_it: "leave blank if you dont want to change it"
-        title: "Edit %{resource}"
-        we_need_your_current_password_to_confirm_your_changes: "we need your current password to confirm your changes"
-        update: "Update"
-        unhappy: "Unhappy"
-      new:
-        sign_up: "Sign up"
-      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
-      signed_up: "Welcome! You have signed up successfully."
-      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
-      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
-      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
-      updated: "You updated your account successfully."
-    sessions:
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
-      new:
-        placeholder_email: "Email / Username"
-        placeholder_password: "Password"
-        sign_in: "Sign in"
-        remember_me: "Remember me"
-    shared:
-      links:
-        didn_t_receive_confirmation_instructions: "Didn't receive confirmation instructions?"
-        didn_t_receive_unlock_instructions: "Didn't receive unlock instructions?"
-        forgot_your_password: "Forgot your password?"
-        sign_in: "Sign in"
-        sign_in_with_provider: "Sign in with %{provider}"
-        sign_up: "Sign up"
-    unlocks:
-      new:
-        resend_unlock_instructions: "Resend unlock instructions"
-      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
-      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
-  errors:
-    messages:
-      already_confirmed: "was already confirmed, please try signing in"
-      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
-      expired: "has expired, please request a new one"
-      not_found: "not found"
-      not_locked: "was not locked"
-      not_saved:
-        one: "Something went wrong:"
-        other: "%{count} errors prohibited this %{resource} from being saved:"
-  activerecord:
-    models:
-      user: "User"
-    attributes:
-      user:
-        current_sign_in_at: "Signed in at"
-        email: "Email"
-        password: "Password"
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      new:
+        resend_confirmation_instructions: "Resend confirmation instructions"
+      confirmed: "Your account was successfully confirmed."
+      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid email or password."
+      invalid_token: "Invalid authentication token."
+      locked: "Your account is locked."
+      not_found_in_database: "Invalid email or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your account before continuing."
+    mailer:
+      confirmation_instructions:
+        action: "Confirm my account"
+        greeting: "Welcome %{recipient}!"
+        instruction: "You can confirm your account email through the link below:"
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        action: "Change my password"
+        greeting: "Hello %{recipient}!"
+        instruction: "Someone has requested a link to change your password, and you can do this through the link below."
+        instruction_2: "If you didn't request this, please ignore this email."
+        instruction_3: "Your password won't change until you access the link above and create a new one."
+        subject: "Reset password instructions"
+      unlock_instructions:
+        action: "Unlock my account"
+        greeting: "Hello %{recipient}!"
+        instruction: "Click the link below to unlock your account:"
+        message: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        subject: "Unlock Instructions"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      new:
+        forgot_your_password: "Forgot your password?"
+        send_me_reset_password_instructions: "Send me reset password instructions"
+        placeholder: "Email / Username"
+      edit:
+        change_your_password: "Change your password"
+        new_password: "New password"
+        confirm_new_password: "Confirm new password"
+        change_my_password: "Change my password"
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password was changed successfully. You are now signed in."
+      updated_not_active: "Your password was changed successfully."
+    registrations:
+      edit:
+        are_you_sure: "Are you sure?"
+        cancel_my_account: "Cancel my account"
+        leave_blank_if_you_don_t_want_to_change_it: "leave blank if you dont want to change it"
+        title: "Edit %{resource}"
+        we_need_your_current_password_to_confirm_your_changes: "we need your current password to confirm your changes"
+        update: "Update"
+        unhappy: "Unhappy"
+      new:
+        sign_up: "Sign up"
+      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      updated: "You updated your account successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      new:
+        placeholder_email: "Email / Username"
+        placeholder_password: "Password"
+        sign_in: "Sign in"
+        remember_me: "Remember me"
+    shared:
+      links:
+        didn_t_receive_confirmation_instructions: "Didn't receive confirmation instructions?"
+        didn_t_receive_unlock_instructions: "Didn't receive unlock instructions?"
+        forgot_your_password: "Forgot your password?"
+        sign_in: "Sign in"
+        sign_in_with_provider: "Sign in with %{provider}"
+        sign_up: "Sign up"
+    unlocks:
+      new:
+        resend_unlock_instructions: "Resend unlock instructions"
+      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "Something went wrong:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
+  activerecord:
+    models:
+      user: "User"
+    attributes:
+      user:
+        current_sign_in_at: "Signed in at"
+        email: "Email"
+        password: "Password"
         last_sign_in_at: "Last signed in at"

data/config/routes.rb

@@ -1,96 +1,96 @@
-Roroacms::Engine.routes.draw do
-
-  devise_for :admins, class_name: "Roroacms::Admin", :path => "admin", :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'reset', :confirmation => 'verification', :unlock => 'unblock', :registration => 'register', :sign_up => 'register' }, skip: :registrations, module: :devise
-  
-  devise_scope :admin do
-    get "admin/login", :to => "devise/sessions#new"
-    get "admin/logout", :to => "devise/sessions#new"
-  end
-  
-  resources :pages
-  resources :comments
-
-  resources :setup do 
-    member { get 'tour_complete' }
-    collection do 
-      get 'administrator'
-      post 'create_user'
-      post 'tour_complete'
-    end
-  end
-  
-  namespace :admin do
-    get '', to: 'dashboard#index'
-    get 'trash', to: 'trash#index', as: 'trash'
-    get 'article/categories', to: 'terms#categories', as: 'article_categories'
-    get 'article/tags', to: 'terms#tags', as: 'article_tags'
-    
-    resources :users, :themes
-
-
-    resources :administrators, :except => [:show]
-
-    resources :comments do
-      member {get 'mark_as_spam'}
-      collection do
-        post 'bulk_update'
-      end
-    end
-
-    resources :menus do 
-
-      collection do 
-        post 'save_menu'
-        post 'ajax_dropbox'
-      end
-
-    end 
-
-    resources :revisions, :only=> [:edit, :restore] do
-        member {get 'restore'}
-    end
-
-    resources :terms do
-      collection do
-        post 'bulk_update'
-      end
-    end
-
-
-    resources :articles do
-      collection do
-        post 'bulk_update'
-        post 'autosave_create'
-        post 'create_additional_data'
-        post 'autosave'
-        put 'autosave_update'
-      end
-    end
-
-    resources :pages do
-      collection do
-        post 'bulk_update'
-        post 'infinate_scroll'
-      end
-    end
-
-    resources :trash do
-      collection do
-        get 'empty_articles'
-        post 'deal_with_form'
-      end
-    end
-
-    resources :settings do
-      post :update_general
-      collection do 
-        post 'create_user_group'
-      end
-    end
-
-  end 
-
-  root to: 'pages#index'
-  match '/*slug', :to => 'pages#dynamic_page', via: [:get], :constraints => lambda{|req| req.path !~ /\.(png|jpg|js|css)$/ }
-	
-end
+Roroacms::Engine.routes.draw do
+
+  devise_for :admins, class_name: "Roroacms::Admin", :path => "admin", :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'reset', :confirmation => 'verification', :unlock => 'unblock', :registration => 'register', :sign_up => 'register' }, skip: :registrations, module: :devise
+  
+  devise_scope :admin do
+    get "admin/login", :to => "devise/sessions#new"
+    get "admin/logout", :to => "devise/sessions#new"
+  end
+  
+  resources :pages
+  resources :comments
+
+  resources :setup do 
+    member { get 'tour_complete' }
+    collection do 
+      get 'administrator'
+      post 'create_user'
+      post 'tour_complete'
+    end
+  end
+  
+  namespace :admin do
+    get '', to: 'dashboard#index'
+    get 'trash', to: 'trash#index', as: 'trash'
+    get 'article/categories', to: 'terms#categories', as: 'article_categories'
+    get 'article/tags', to: 'terms#tags', as: 'article_tags'
+    
+    resources :users, :themes
+
+
+    resources :administrators, :except => [:show]
+
+    resources :comments do
+      member {get 'mark_as_spam'}
+      collection do
+        post 'bulk_update'
+      end
+    end
+
+    resources :menus do 
+
+      collection do 
+        post 'save_menu'
+        post 'ajax_dropbox'
+      end
+
+    end 
+
+    resources :revisions, :only=> [:edit, :restore] do
+        member {get 'restore'}
+    end
+
+    resources :terms do
+      collection do
+        post 'bulk_update'
+      end
+    end
+
+
+    resources :articles do
+      collection do
+        post 'bulk_update'
+        post 'autosave_create'
+        post 'create_additional_data'
+        post 'autosave'
+        put 'autosave_update'
+      end
+    end
+
+    resources :pages do
+      collection do
+        post 'bulk_update'
+        post 'infinate_scroll'
+      end
+    end
+
+    resources :trash do
+      collection do
+        get 'empty_articles'
+        post 'deal_with_form'
+      end
+    end
+
+    resources :settings do
+      post :update_general
+      collection do 
+        post 'create_user_group'
+      end
+    end
+
+  end 
+
+  root to: 'pages#index'
+  match '/*slug', :to => 'pages#dynamic_page', via: [:get], :constraints => lambda{|req| req.path !~ /\.(png|jpg|js|css)$/ }
+	
+end

data/db/migrate/20140801203556_add_admins.rb

@@ -1,44 +1,44 @@
-class AddAdmins < ActiveRecord::Migration
-
-   def self.up
-
-    create_table(:roroacms_admins) do |t|
-      t.string   "email",                            default: "",  null: false
-      t.text     "password_digest"
-      t.text     "description"
-      t.string   "first_name"
-      t.string   "last_name"
-      t.string   "username"
-      t.string   "access_level"
-      t.text     "avatar"
-      t.text     "cover_picture"
-      t.string   "overlord",                         limit: 1, default: "Y"
-      t.string   "encrypted_password",               default: "",  null: false
-      t.string   "reset_password_token"
-      t.datetime "reset_password_sent_at"
-      t.datetime "remember_created_at"
-      t.integer  "sign_in_count",                    default: 0,   null: false
-      t.datetime "current_sign_in_at"
-      t.datetime "last_sign_in_at"
-      t.string   "current_sign_in_ip"
-      t.string   "last_sign_in_ip"
-      t.integer  "failed_attempts",                  default: 0,   null: false
-      t.string   "unlock_token"
-      t.datetime "locked_at"
-      t.datetime "created_at",                                     null: false
-      t.datetime "updated_at",                                     null: false
-    end
-
-    add_index "roroacms_admins", ["email"], name: "index_admins_on_email", unique: true, using: :btree
-    add_index "roroacms_admins", ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true, using: :btree
-    add_index "roroacms_admins", ["username"], name: "unique_username", unique: true, using: :btree
-    
-  end
-
-  def self.down
-
-    drop_table :roroacms_admins
-
-  end
-
-end
+class AddAdmins < ActiveRecord::Migration
+
+   def self.up
+
+    create_table(:roroacms_admins) do |t|
+      t.string   "email",                            default: "",  null: false
+      t.text     "password_digest"
+      t.text     "description"
+      t.string   "first_name"
+      t.string   "last_name"
+      t.string   "username"
+      t.string   "access_level"
+      t.text     "avatar"
+      t.text     "cover_picture"
+      t.string   "overlord",                         limit: 1, default: "Y"
+      t.string   "encrypted_password",               default: "",  null: false
+      t.string   "reset_password_token"
+      t.datetime "reset_password_sent_at"
+      t.datetime "remember_created_at"
+      t.integer  "sign_in_count",                    default: 0,   null: false
+      t.datetime "current_sign_in_at"
+      t.datetime "last_sign_in_at"
+      t.string   "current_sign_in_ip"
+      t.string   "last_sign_in_ip"
+      t.integer  "failed_attempts",                  default: 0,   null: false
+      t.string   "unlock_token"
+      t.datetime "locked_at"
+      t.datetime "created_at",                                     null: false
+      t.datetime "updated_at",                                     null: false
+    end
+
+    add_index "roroacms_admins", ["email"], name: "index_admins_on_email", unique: true, using: :btree
+    add_index "roroacms_admins", ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true, using: :btree
+    add_index "roroacms_admins", ["username"], name: "unique_username", unique: true, using: :btree
+    
+  end
+
+  def self.down
+
+    drop_table :roroacms_admins
+
+  end
+
+end

data/db/migrate/20140802084604_add_roroacms_comments.rb

@@ -1,31 +1,31 @@
-class AddRoroacmsComments < ActiveRecord::Migration
-  	
-  def self.up
-
-    create_table(:roroacms_comments) do |t|
-      t.integer  "post_id"
-	    t.text     "author"
-	    t.text     "email"
-	    t.text     "website"
-	    t.text     "comment"
-	    t.text     "comment_approved"
-	    t.text     "parent_id"
-	    t.datetime "submitted_on"
-	    t.datetime "created_at",                               null: false
-	    t.datetime "updated_at",                               null: false
-	    t.string   "is_spam",          limit: 1, default: "N"
-	    t.string   "ancestry"
-    end
-
-    add_index "roroacms_comments", ["ancestry"], name: "index_comments_on_ancestry", using: :btree
-	    
-	end
-
-  def self.down
-
-    drop_table :roroacms_comments
-
-  end
-
-
-end
+class AddRoroacmsComments < ActiveRecord::Migration
+  	
+  def self.up
+
+    create_table(:roroacms_comments) do |t|
+      t.integer  "post_id"
+	    t.text     "author"
+	    t.text     "email"
+	    t.text     "website"
+	    t.text     "comment"
+	    t.text     "comment_approved"
+	    t.text     "parent_id"
+	    t.datetime "submitted_on"
+	    t.datetime "created_at",                               null: false
+	    t.datetime "updated_at",                               null: false
+	    t.string   "is_spam",          limit: 1, default: "N"
+	    t.string   "ancestry"
+    end
+
+    add_index "roroacms_comments", ["ancestry"], name: "index_comments_on_ancestry", using: :btree
+	    
+	end
+
+  def self.down
+
+    drop_table :roroacms_comments
+
+  end
+
+
+end

data/db/migrate/20140802084615_add_roroacms_menu_options.rb

@@ -1,24 +1,24 @@
-class AddRoroacmsMenuOptions < ActiveRecord::Migration
-  
-  def self.up
-
-    create_table(:roroacms_menu_options) do |t|
-      t.integer "menu_id"
-	    t.integer "option_id"
-	    t.integer "parent_id"
-	    t.string  "data_type"
-	    t.integer "lft"
-	    t.integer "rgt"
-	    t.string  "label"
-	    t.text    "custom_data"
-    end
-	    
-	end
-
-  def self.down
-
-    drop_table :roroacms_menu_options
-
-  end
-
-end
+class AddRoroacmsMenuOptions < ActiveRecord::Migration
+  
+  def self.up
+
+    create_table(:roroacms_menu_options) do |t|
+      t.integer "menu_id"
+	    t.integer "option_id"
+	    t.integer "parent_id"
+	    t.string  "data_type"
+	    t.integer "lft"
+	    t.integer "rgt"
+	    t.string  "label"
+	    t.text    "custom_data"
+    end
+	    
+	end
+
+  def self.down
+
+    drop_table :roroacms_menu_options
+
+  end
+
+end