typus 0.9.39 → 1.0.0.pre

data/config/{locales → available_locales}/ru.yml

@@ -2,101 +2,123 @@
 # by Alexey Noskov <http://github.com/alno>
 
 ru:
-  "Email": "E-Mail"
-  "Password": "Пароль"
-  "Password confirmation": "Подтверждение пароля"
-  "Sign in": "Войти"
-  "Recover password": "Восстановить пароль"
-  "Sign up": "Зарегистрироваться"
-  "Enter your email below to create the first user": "Введите E-Mail для создания первого пользователя"
-  "That doesn't seem like a valid email address": "E-Mail некорректен"
-  "I remember my password": "Запомнить пароль"
-  "Password recovery link sent to your email": "Ссылка для восставновления пароля выслана по указанному E-Mail"
+
   "A valid token is required": "Необходим корректный ключ"
-  "The email and/or password you entered is invalid": "E-Mail или пароль введены неверно"
-  "There are not defined applications in config/typus/*.yml": "Ни одного приложения не определено в config/typus/*.yml"
-  "Overview": "Обзор"
-  "Options": "Опции"
-  "Password confirmation": "Подтверждение пароля"
+  "Actions": "Действия"
+  "Active":
+  "Add": "Добавить"
+  "Add %{resource}": "Добавить %{resource}"
+  "Add new": "Добавить новый"
+  "Are you sure?":
+  "Are you sure you want to leave this page?": "Вы уверены, что хотите покинуть страницу?"
+  "Are you sure you want to sign out and end your session?":
+  "As you're not the admin or the owner of this record you cannot edit it": "Вы не администратор и не владелец записи и не можете ее редактировать"
+
+  "Back to list": "Назад к списку"
+
+  "Cancel and go back":
   "Change password": "Сменить пароль"
-  "There are no {{records}}": "{{records}} не найдены"
-  "There are no {{records}} under this filter": "{{records}} по такому фильтру не найдены"
+  "Change %{attribute}?": "Изменить %{attribute}?"
+  "Checked if active": "Отмечено, если активно"
+  "Click OK to continue, or click Cancel to stay on this page": "нажмите Ок, чтобы продолжить или Отмена, чтобы остаться на этой странице."
+  "Create %{resource}": "Создать %{resource}"
+  "Create one now":
+
   "Dashboard": "Обзор"
-  "Create entry": "Создать запись"
-  "Update entry": "Изменить запись"
-  "New": "Новый"
-  "Show": "Показать"
+  "Do you want to cancel it?": "Вы хотите отменить это?"
+  "Documentation":
+  "Down": "Вниз"
+
   "Edit": "Изменить"
-  "Login": "Редактировать"
-  "Setup": "Установки"
-  "Create": "Создать"
-  "Sign out": "Выйти"
-  "Update": "Обновить"
-  "View site": "Перейти к сайту"
+  "Edit %{resource}": "Изменить %{resource}"
+  "Enter your email below to create the first user":
+  "Error! Typus User or role doesn't exist":
+
+  "False":
+  "Filter": "фильтр"
+  "Filter by %{attribute}": "фильтр по %{attribute}"
+
+  "Go to": "Перейти к"
+
+  "I remember my password": "Запомнить пароль"
+  "If you didn't request a password update, you can ignore this message": "Если Вы не запрашивали обновление пароля, Вы можете проигнорировать это сообщение."
+  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Если вы сделали какие-то изменения, не кликая на Обновить/Сохранить, то они будут утеряны."
+  "Inactive":
+
+  "Last few days": "Последние дней"
+  "Last 7 days": "Последние 7 дней"
+  "Last 30 days": "Последние 30 дней"
+  "License":
   "Logged as": "Вы вошли как"
-  "Remove filter": "Удалить фильтр"
-  "Back to list": "Назад к списку"
-  "Actions": "Действия"
-  "Add": "Добавить"
-  "Previous": "Предыдующий"
+  "Login": "Редактировать"
+
+  "New": "Новый"
   "Next": "Следующий"
+
+  "Options": "Опции"
+
+  "Password recovery link sent to your email": "Ссылка для восставновления пароля выслана по указанному E-Mail"
+  "Previous": "Предыдующий"
+
+  "Record moved %{to}": "Запись перемещена в %{to}."
+  "Recover password": "Восстановить пароль"
+  "Remove": "Удалить"
+  "Remove %{attribute}": "Удалить %{attribute}"
+  "Remove %{resource}?": "Удалить %{resource}?"
+  "Remove filter": "Удалить фильтр"
+  "Remove search":
+  "Reset password": "Сбросить пароль"
+  "Resources": "Ресурсы"
+
+  "Save %{resource}":
   "Search": "Поиск"
   "Search by": "Искать по"
-  "{{model}} successfully updated": "{{model}} успешно обновлен"
-  "{{model}} successfully created": "{{model}} создан"
-  "{{model}} successfully removed": "{{model}} удален"
-  "{{model}} {{attribute}} changed": "{{model}} {{attribute}} изменен"
-  "You're adding a new {{resource_from}} to {{resource_to}}": "Вы добавляете новый {{resource_from}} для {{resource_to}}."
-  "You're adding a new {{resource_from}}": "Вы добавляете новый {{resource_from}}."
-  "You're updating a {{resource_from}} for {{resource_to}}": "Вы редактируете {{resource_from}} для {{resource_to}}."
-  "You're updating a {{resource_from}}": "Вы редактируете {{resource_from}}."
-  "Toggle is disabled": "Переключение отключено"
-  "Record moved {{to}}": "Запись перемещена в {{to}}."
-  "{{model_a}} related to {{model_b}}": "{{model_a}} присоединен с {{model_b}}."
-  "{{model_a}} successfully assigned to {{model_b}}": "{{model_a}} добавлен к {{model_b}}."
-  "{{model_a}} unrelated from {{model_b}}": "{{model_a}} отсоединен от {{model_b}}."
-  "Your new password is {{password}}": "Ваш новый пароль: {{password}}."
-  "Add entry": "Добавить запись"
-  "Go to": "Перейти к"
-  "First name": "Имя"
-  "Last name": "Фамлия"
-  "Roles": "Роли"
-  "Status": "Статус"
-  "Typus User": "Системный пользователь"
+  "Send us feedback":
+  "Setup": "Установки"
+  "Show": "Показать"
+  "Show %{resource}": "Показать %{resource}"
+  "Sign in": "Войти"
+  "Sign out": "Выйти"
+  "Sign up": "Зарегистрироваться"
+  "Submit a bug report":
   "System Users Administration": "Администрирование системных пользователей"
-  "Resources": "Ресурсы"
+
+  "That doesn't seem like a valid email address": "E-Mail некорректен"
+  "The email and/or password you entered is invalid": "E-Mail или пароль введены неверно"
+  "There are no %{records}": "%{records} не найдены"
+  "There are no %{records} under this filter": "%{records} по такому фильтру не найдены"
+  "Today": "Сегодня"
+  "Toggle is disabled": "Переключение отключено"
+  "True": "ВЕРНО"
+
+  "Unrelate %{unrelate_model} from %{unrelate_model_from}?": "Отсоединить %{unrelate_model} от %{unrelate_model_from}?"
   "Up": "Вверх"
-  "Down": "Вниз"
-  "Filter by": "фильтр по"
-  "Checked if active": "Отмечено, если активно"
-  "As you're not the admin or the owner of this record you cannot edit it": "Вы не администратор и не владелец записи и не можете ее редактировать"
+
+  "View site": "Перейти к сайту"
+
+  "You can update your password at": "Вы можете установить свой пароль на"
   "You can't change your role": "Вы не можете менять свою собственную роль"
-  "Error! Typus User or role doesn't exist": "Ошибка! Пользователь или роль не существует"
-  "You can't toggle your status": "Вы не можете менять свой статус"
-  "You're not allowed to toggle status": "Вам не позволено менять статус"
   "You can't remove yourself": "Вы не можете удалить себя"
+  "You can't toggle your status": "Вы не можете менять свой статус"
+  "You're adding a new %{resource_from}": "Вы добавляете новый %{resource_from}."
+  "You're adding a new %{resource_from} to %{resource_to}": "Вы добавляете новый %{resource_from} для %{resource_to}."
+  "You're updating a %{resource_from}": "Вы редактируете %{resource_from}."
+  "You're updating a %{resource_from} for %{resource_to}": "Вы редактируете %{resource_from} для %{resource_to}."
   "You're not allowed to remove Typus Users": "Вам не позволено удалять системных пользователей"
-  "{{current_user_role}} can't perform action. ({{action}})": "{{current_user_role}} не может выполнить действие. ({{action}})"
-  "{{current_user_role}} can't go to {{action}} on {{controller}}":  "{{current_user_role}} не может перейти к {{action}} в {{controller}}."
-  "{{current_user_role}} can't delete this item": "{{current_user_role}} не может удалить эту запись"
-  "{{current_user_role}} can't display items": "{{current_user_role}} не может отобразить записи"
-  "You can update your password at": "Вы можете установить свой пароль на"
-  "If you didn't request a password update, you can ignore this message": "Если Вы не запрашивали обновление пароля, Вы можете проигнорировать это сообщение."
-  "Reset password": "Сбросить пароль"
-  "Add new": "Добавить новый"
-  "Do you want to cancel it?": "Вы хотите отменить это?"
-  "Click here": "Кликните сюда"
-  "Are you sure you want to leave this page?": "Вы уверены, что хотите покинуть страницу?"
-  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Если вы сделали какие-то изменения, не кликая на Обновить/Сохранить, то они будут утеряны."
-  "Click OK to continue, or click Cancel to stay on this page": "нажмите Ок, чтобы продолжить или Отмена, чтобы остаться на этой странице."
-  "Remove entry?": "Удалить запись?"
-  "Unrelate {{unrelate_model}} from {{unrelate_model_from}}?": "Отсоединить {{unrelate_model}} от {{unrelate_model_from}}?"
-  "Change {{attribute}}?": "Изменить {{attribute}}?"
-  "Today": "Сегодня"
-  "Last few days": "Последние дней"
-  "Last 7 days": "Последние 7 дней"
-  "Last 30 days": "Последние 30 дней"
-  "{{model}} filtered by {{filtered_by}}": 
-  "True": "ВЕРНО"
-  "False": 
-  "Are you sure you want to sign out and end your session?": 
+  "You're not allowed to toggle status": "Вам не позволено менять статус"
+
+  "%{attachment} can't be removed":
+  "%{attachment} removed":
+  "%{model} filtered by %{filtered_by}":
+  "%{current_user_role} can't delete this item": "%{current_user_role} не может удалить эту запись"
+  "%{current_user_role} can't display items": "%{current_user_role} не может отобразить записи"
+  "%{current_user_role} can't perform action. (%{action})": "%{current_user_role} не может выполнить действие. (%{action})"
+  "%{model} successfully created": "%{model} создан"
+  "%{model} successfully removed": "%{model} удален"
+  "%{model} successfully updated": "%{model} успешно обновлен"
+  "%{model_a} cannot be related to %{model_b}":
+  "%{model_a} cannot be unrelated from %{model_b}":
+  "%{model} %{attribute} changed": "%{model} %{attribute} изменен"
+  "%{model_a} related to %{model_b}": "%{model_a} присоединен с %{model_b}."
+  "%{model_a} successfully assigned to %{model_b}": "%{model_a} добавлен к %{model_b}."
+  "%{model_a} unrelated from %{model_b}": "%{model_a} отсоединен от %{model_b}."

data/config/available_locales/ru_models.yml

@@ -0,0 +1,13 @@
+ru:
+  activerecord:
+    models:
+      typus_user: "Системный пользователь"
+    attributes:
+      typus_user:
+        email:
+        first_name: "Имя"
+        last_name: "Фамлия"
+        password: "Пароль"
+        password_confirmation: "Подтверждение пароля"
+        status: "Статус"
+        role:

data/config/routes.rb

@@ -1,13 +1,20 @@
-ActionController::Routing::Routes.draw do |map|
-
-  map.with_options :controller => 'typus', :path_prefix => 'admin' do |i|
-    i.admin_quick_edit 'quick_edit', :action => 'quick_edit'
-    i.admin_dashboard '', :action => 'dashboard'
-    i.admin_sign_in 'sign_in', :action => 'sign_in'
-    i.admin_sign_out 'sign_out', :action => 'sign_out'
-    i.admin_sign_up 'sign_up', :action => 'sign_up'
-    i.admin_recover_password 'recover_password', :action => 'recover_password'
-    i.admin_reset_password 'reset_password', :action => 'reset_password'
+Rails.application.routes.draw do
+
+  resource :admin, :only => [:show], :controller => :admin
+
+  namespace :admin do
+
+    resource :dashboard, :only => [:show], :controller => :dashboard
+
+    if Typus.authentication == :session
+      resource :session, :only => [:new, :create, :destroy], :controller => :session
+      resources :account, :only => [:new, :create, :show, :forgot_password] do
+        collection { get :forgot_password }
+      end
+    end
+
   end
 
-end
+  match ':controller(/:action(/:id))', :controller => /admin\/[^\/]+/
+
+end

data/lib/generators/templates/config/initializers/typus.rb

@@ -0,0 +1,26 @@
+Typus.setup do |config|
+
+  # Application name.
+  config.admin_title = "<%= options[:admin_title] %>"
+  # config.admin_sub_title = ""
+
+  # Configure the e-mail address which will be shown in Admin::Mailer.
+  # When this option is define Typus will allow admin users to recover
+  # lost passwords.
+  # config.mailer_sender = "admin@example.com"
+
+  # Define file attachment settings.
+  # config.file_preview = :typus_preview
+  # config.file_thumbnail = :typus_thumbnail
+
+  # Authentication: :none, :http_basic
+  # config.authentication = :none
+
+  # Define username and password for http authentication
+  # config.username = "admin"
+  # config.password = "columbia"
+
+  # Define available languages on the admin interface.
+  # config.available_locales = [:en]
+
+end

data/lib/generators/templates/config/initializers/typus_authentication.rb

@@ -0,0 +1,18 @@
+Typus.setup do |config|
+
+  # Authentication: none, http_basic, session
+  config.authentication = :session
+
+  # Define the default root.
+  # config.master_role = "admin"
+
+  # Define relationship table.
+  # config.relationship = "typus_users"
+
+  # Define user_class_name and user_fk.
+  config.user_class_name = "<%= options[:user_class_name] %>"
+
+  # Define the user_fk
+  config.user_fk = "<%= options[:user_fk] %>"
+
+end

data/lib/generators/templates/config/initializers/typus_resources.rb

@@ -0,0 +1,30 @@
+Typus::Resources.setup do |config|
+
+  # Defines the default_action_on_item.
+  # config.default_action_on_item = "edit"
+
+  # Defines the end_year.
+  # config.end_year = nil
+
+  # Defines the form_rows.
+  # config.form_rows = 15
+
+  # Defines the action_after_save.
+  # config.action_after_save = "edit"
+
+  # Defines the minute step.
+  # config.minute_step = 5
+
+  # Defines nil.
+  # config.human_nil = "nil"
+
+  # Defines only_user_items.
+  # config.only_user_items = false
+
+  # Defines per_page
+  # config.per_page = 15
+
+  # Defines start year
+  # config.start_year = nil
+
+end

data/{generators/typus → lib/generators}/templates/config/typus/README

@@ -1,11 +1,12 @@
-This is an example of a **Typus** enabled model with all available 
-options. You can use this example to customize your YAML files which 
-only have set the most common settings.
+# Models
 
-Note: To define namespace models use :: as a separator. (i.e. Delayed::Job)
+This is an example of a **Typus** enabled model with all available
+options. You can use this example to customize your YAML files which
+only have set the most common settings.
 
     Post:
       fields:
+        default: id, title, category_id, created_at, is_published?
         list: id, title, category_id, created_at, is_published?
         form: title, body, is_published?, created_at
         show: title, category, is_published?
@@ -18,14 +19,9 @@ Note: To define namespace models use :: as a separator. (i.e. Delayed::Job)
             created_at: post_long
           selectors:
           read_only:
-          tiny_mce:
-            fields: body
-            options:
-              theme: simple
-              theme_advanced_buttons3_add:
-                - fulscreen
-              plugins:
-                - fulscreen
+          filter_by_date_range: valid_until
+          templates:
+            body: rich_text
       actions:
         index: cleanup
         edit: send_as_newsletter
@@ -41,12 +37,34 @@ Note: To define namespace models use :: as a separator. (i.e. Delayed::Job)
         default_action_on_item: show
         end_year: 2015
         form_rows: 25
-        index_after_save: false
+        action_after_save: :index
         minute_step: 15
         nil: 'nil'
-        on_header: true
         only_user_items: true
         per_page: 5
-        sidebar_selector: 5
         start_year: 1990
-        toggle: true
+
+Note: To define namespace models use :: as a separator. (i.e. Delayed::Job)
+
+# Roles
+
+In this file you can configure the actions available for each of
+your models on the application. You can also use the 'all' shortcut
+to allow the user the access to all actions.
+
+    admin:
+      Post: create, read, update, delete
+      Category: create, read, update, delete
+      TypusUser: all
+
+    editor:
+      Post: create, read, update
+      Category: read, update
+
+You can also define `resources` which are not related to a model,
+for example to control MemCached or see the Starling queue
+statistics.
+
+    admin:
+      Starling: index
+      MemCached: index, cleanup

data/lib/generators/templates/config/typus/application.yml

@@ -0,0 +1,5 @@
+# Typus Models Configuration File
+#
+# Use the README file as a reference to customize settings.
+
+<%= configuration[:base] %>

data/lib/generators/templates/config/typus/application_roles.yml

@@ -0,0 +1,6 @@
+# Typus Roles Configuration File
+#
+# Use the README file as a reference to customize settings.
+
+admin:
+<%= configuration[:roles] %>

data/lib/generators/templates/config/typus/typus.yml

@@ -0,0 +1,17 @@
+# Typus Models Configuration File
+#
+# Use the README file as a reference to customize settings.
+
+<%= options[:user_class_name] %>:
+  fields:
+    default: first_name, last_name, role, email, language
+    list: email, role, status
+    form: first_name, last_name, role, email, password, password_confirmation, language
+    options:
+      selectors: role, language
+      booleans:
+        status: Active, Inactive
+  filters: status, role
+  search: first_name, last_name, email, role
+  application: Admin Panel
+  description: Users Administration

data/lib/generators/templates/config/typus/typus_roles.yml

@@ -0,0 +1,6 @@
+# Typus Roles Configuration File
+#
+# Use the README file as a reference to customize settings.
+
+admin:
+  <%= options[:user_class_name] %>: all

data/lib/generators/templates/controller.rb

@@ -0,0 +1,4 @@
+# Controller generated by Typus, use it to extend admin functionality.
+class Admin::<%= resource %>Controller < <%= inherits_from %>
+
+end

data/lib/generators/templates/functional_test.rb

@@ -0,0 +1,21 @@
+require "test_helper"
+
+# ControllerTest generated by Typus, use it to test the extended admin functionality.
+class Admin::<%= resource %>ControllerTest < ActionController::TestCase
+
+  setup do
+    admin = admin_users(:admin)
+    @request.session[:typus_user_id] = admin.id
+  end
+
+  test "should render index" do
+    get :index
+    assert_template :index
+  end
+
+  test "should render new" do
+    get :new
+    assert_template :new
+  end
+
+end

data/{generators/typus/templates/db/create_typus_users.rb → lib/generators/templates/migration.rb}

@@ -1,7 +1,7 @@
-class CreateTypusUsers < ActiveRecord::Migration
+class <%= migration_name %> < ActiveRecord::Migration
 
   def self.up
-    create_table :typus_users do |t|
+    create_table :<%= admin_users_table_name %> do |t|
       t.string :first_name, :default => "", :null => false
       t.string :last_name, :default => "", :null => false
       t.string :role, :null => false
@@ -16,7 +16,7 @@ class CreateTypusUsers < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :typus_users
+    drop_table :<%= admin_users_table_name %>
   end
 
-end
+end

data/lib/generators/templates/model.rb

@@ -0,0 +1,8 @@
+class <%= options[:user_class_name] %> < ActiveRecord::Base
+
+  ROLE = Typus::Configuration.roles.keys.sort
+  LANGUAGE = Typus.locales
+
+  enable_as_typus_user
+
+end

data/lib/generators/templates/model.yml

@@ -0,0 +1,10 @@
+admin:
+  first_name: Admin
+  last_name: Example
+  role: admin
+  email: admin@example.com
+  status: true
+  token: 1A2B3C4D5E6F
+  salt: admin
+  crypted_password: <%= Digest::SHA1.hexdigest("--admin--#{12345678}--") %>
+  preferences: { :locale => :en }

data/lib/generators/templates/public/admin/javascripts/application.js

@@ -0,0 +1,6 @@
+// Place your application-specific JavaScript functions and classes for
+// the admin panel here.
+
+$(function() {
+  $("#quicksearch").searchField();
+});