typus 3.1.0.rc13 → 3.1.0.rc14

data/README.md

@@ -42,6 +42,12 @@ Update your bundle, run the generator and start the application server:
 
 and go to <http://0.0.0.0:3000/admin>.
 
+## Development
+
+To clone repository and initialize submodules:
+
+    $ git clone --recursive git://github.com/typus/typus.git
+
 ## Links
 
 - [Documentation](https://github.com/typus/typus/wiki)

data/app/helpers/admin/base_helper.rb

@@ -5,7 +5,16 @@ module Admin::BaseHelper
   end
 
   def header
-    render "helpers/admin/base/header"
+    locals = { :admin_title => admin_title }
+    render "helpers/admin/base/header", locals
+  end
+
+  def admin_title
+    if defined?(Admin::Setting)
+      Admin::Setting.admin_title || Typus.admin_title
+    else
+      Typus.admin_title
+    end
   end
 
   def has_root_path?

data/app/views/helpers/admin/base/_header.html.erb

@@ -0,0 +1,7 @@
+<h1 class="logo">
+  <% if has_root_path? %>
+    <%= link_to admin_title, main_app.root_path, :title => Typus::I18n.t("View site") %>
+  <% else %>
+    <%= admin_title %>
+  <% end %>
+</h1>

data/lib/typus/engine.rb

@@ -1,8 +1,5 @@
 module Admin
   class Engine < Rails::Engine
 
-    paths["app/assets"] << "app/themes/default/assets"
-    paths["app/views"] << "app/themes/default/views"
-
   end
 end

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc13"
+  VERSION = "3.1.0.rc14"
 end

data/typus.gemspec

@@ -29,5 +29,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "jquery-rails"
   s.add_dependency "kaminari"
+  s.add_dependency "sass-rails", "~> 3.1.0.rc.2"
   s.add_dependency "rails", "~> 3.1.0.rc4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc13
+  version: 3.1.0.rc14
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-07 00:00:00.000000000Z
+date: 2011-07-13 00:00:00.000000000 +02:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &2153129580 !ruby/object:Gem::Requirement
+  requirement: &2153351380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2153129580
+  version_requirements: *2153351380
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2153129140 !ruby/object:Gem::Requirement
+  requirement: &2153350800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153129140
+  version_requirements: *2153350800
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2153128580 !ruby/object:Gem::Requirement
+  requirement: &2153350220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153128580
+  version_requirements: *2153350220
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2153127680 !ruby/object:Gem::Requirement
+  requirement: &2153349680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153127680
+  version_requirements: *2153349680
 - !ruby/object:Gem::Dependency
   name: rails-trash
-  requirement: &2153125960 !ruby/object:Gem::Requirement
+  requirement: &2153349040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +66,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2153125960
+  version_requirements: *2153349040
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2153125020 !ruby/object:Gem::Requirement
+  requirement: &2153348500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153125020
+  version_requirements: *2153348500
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2153124140 !ruby/object:Gem::Requirement
+  requirement: &2153347860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +88,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153124140
+  version_requirements: *2153347860
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: &2153347200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0.rc.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153347200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153123580 !ruby/object:Gem::Requirement
+  requirement: &2153346560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +110,7 @@ dependencies:
         version: 3.1.0.rc4
   type: :runtime
   prerelease: false
-  version_requirements: *2153123580
+  version_requirements: *2153346560
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -112,6 +124,14 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/typus.js
+- app/assets/javascripts/typus/application.js
+- app/assets/javascripts/typus/jquery.application.js
+- app/assets/stylesheets/typus.css
+- app/assets/stylesheets/typus/application.css
+- app/assets/stylesheets/typus/pagination.css
+- app/assets/stylesheets/typus/reset.css
+- app/assets/stylesheets/typus/screen.css
 - app/controllers/admin/account_controller.rb
 - app/controllers/admin/base_controller.rb
 - app/controllers/admin/dashboard_controller.rb
@@ -144,71 +164,63 @@ files:
 - app/helpers/admin/resources/table_helper.rb
 - app/helpers/admin/resources_helper.rb
 - app/mailers/admin/mailer.rb
-- app/themes/default/assets/javascripts/typus.js
-- app/themes/default/assets/javascripts/typus/application.js
-- app/themes/default/assets/javascripts/typus/jquery.application.js
-- app/themes/default/assets/stylesheets/typus.css
-- app/themes/default/assets/stylesheets/typus/application.css
-- app/themes/default/assets/stylesheets/typus/pagination.css
-- app/themes/default/assets/stylesheets/typus/reset.css
-- app/themes/default/assets/stylesheets/typus/screen.css
-- app/themes/default/views/admin/account/forgot_password.html.erb
-- app/themes/default/views/admin/account/new.html.erb
-- app/themes/default/views/admin/base/user_guide.html.erb
-- app/themes/default/views/admin/dashboard/_applications.html.erb
-- app/themes/default/views/admin/dashboard/_sidebar.html.erb
-- app/themes/default/views/admin/dashboard/show.html.erb
-- app/themes/default/views/admin/dashboard/styles.html.erb
-- app/themes/default/views/admin/mailer/reset_password_link.text.erb
-- app/themes/default/views/admin/resources/_edit.html.erb
-- app/themes/default/views/admin/resources/_form.html.erb
-- app/themes/default/views/admin/resources/_form_javascripts.html.erb
-- app/themes/default/views/admin/resources/_index.html.erb
-- app/themes/default/views/admin/resources/_new.html.erb
-- app/themes/default/views/admin/resources/_show.html.erb
-- app/themes/default/views/admin/resources/edit.html.erb
-- app/themes/default/views/admin/resources/index.html.erb
-- app/themes/default/views/admin/resources/new.html.erb
-- app/themes/default/views/admin/resources/show.html.erb
-- app/themes/default/views/admin/session/new.html.erb
-- app/themes/default/views/admin/shared/_head.html.erb
-- app/themes/default/views/admin/templates/README.md
-- app/themes/default/views/admin/templates/_belongs_to.html.erb
-- app/themes/default/views/admin/templates/_belongs_to_with_autocomplete.html.erb
-- app/themes/default/views/admin/templates/_boolean.html.erb
-- app/themes/default/views/admin/templates/_date.html.erb
-- app/themes/default/views/admin/templates/_datetime.html.erb
-- app/themes/default/views/admin/templates/_dragonfly.html.erb
-- app/themes/default/views/admin/templates/_dragonfly_preview.html.erb
-- app/themes/default/views/admin/templates/_has_n.html.erb
-- app/themes/default/views/admin/templates/_has_one.html.erb
-- app/themes/default/views/admin/templates/_paperclip.html.erb
-- app/themes/default/views/admin/templates/_paperclip_preview.html.erb
-- app/themes/default/views/admin/templates/_password.html.erb
-- app/themes/default/views/admin/templates/_position.html.erb
-- app/themes/default/views/admin/templates/_profile_sidebar.html.erb
-- app/themes/default/views/admin/templates/_selector.html.erb
-- app/themes/default/views/admin/templates/_string.html.erb
-- app/themes/default/views/admin/templates/_string_with_preview.html.erb
-- app/themes/default/views/admin/templates/_text.html.erb
-- app/themes/default/views/admin/templates/_text_with_ckeditor.html.erb
-- app/themes/default/views/admin/templates/_text_with_ckeditor_and_assets.html.erb
-- app/themes/default/views/admin/templates/_time.html.erb
-- app/themes/default/views/admin/templates/_tree.html.erb
-- app/themes/default/views/helpers/admin/base/_apps.html.erb
-- app/themes/default/views/helpers/admin/base/_flash_message.html.erb
-- app/themes/default/views/helpers/admin/base/_header.html.erb
-- app/themes/default/views/helpers/admin/base/_login_info.html.erb
-- app/themes/default/views/helpers/admin/dashboard/_resources.html.erb
-- app/themes/default/views/helpers/admin/resources/_actions.html.erb
-- app/themes/default/views/helpers/admin/resources/_errors.html.erb
-- app/themes/default/views/helpers/admin/resources/_filters.html.erb
-- app/themes/default/views/helpers/admin/resources/_search.html.erb
-- app/themes/default/views/helpers/admin/resources/_sidebar.html.erb
-- app/themes/default/views/helpers/admin/resources/_table.html.erb
-- app/themes/default/views/layouts/admin/base.html.erb
-- app/themes/default/views/layouts/admin/headless.html.erb
-- app/themes/default/views/layouts/admin/session.html.erb
+- app/views/admin/account/forgot_password.html.erb
+- app/views/admin/account/new.html.erb
+- app/views/admin/base/user_guide.html.erb
+- app/views/admin/dashboard/_applications.html.erb
+- app/views/admin/dashboard/_sidebar.html.erb
+- app/views/admin/dashboard/show.html.erb
+- app/views/admin/dashboard/styles.html.erb
+- app/views/admin/mailer/reset_password_link.text.erb
+- app/views/admin/resources/_edit.html.erb
+- app/views/admin/resources/_form.html.erb
+- app/views/admin/resources/_form_javascripts.html.erb
+- app/views/admin/resources/_index.html.erb
+- app/views/admin/resources/_new.html.erb
+- app/views/admin/resources/_show.html.erb
+- app/views/admin/resources/edit.html.erb
+- app/views/admin/resources/index.html.erb
+- app/views/admin/resources/new.html.erb
+- app/views/admin/resources/show.html.erb
+- app/views/admin/session/new.html.erb
+- app/views/admin/shared/_head.html.erb
+- app/views/admin/templates/README.md
+- app/views/admin/templates/_belongs_to.html.erb
+- app/views/admin/templates/_belongs_to_with_autocomplete.html.erb
+- app/views/admin/templates/_boolean.html.erb
+- app/views/admin/templates/_date.html.erb
+- app/views/admin/templates/_datetime.html.erb
+- app/views/admin/templates/_dragonfly.html.erb
+- app/views/admin/templates/_dragonfly_preview.html.erb
+- app/views/admin/templates/_has_n.html.erb
+- app/views/admin/templates/_has_one.html.erb
+- app/views/admin/templates/_paperclip.html.erb
+- app/views/admin/templates/_paperclip_preview.html.erb
+- app/views/admin/templates/_password.html.erb
+- app/views/admin/templates/_position.html.erb
+- app/views/admin/templates/_profile_sidebar.html.erb
+- app/views/admin/templates/_selector.html.erb
+- app/views/admin/templates/_string.html.erb
+- app/views/admin/templates/_string_with_preview.html.erb
+- app/views/admin/templates/_text.html.erb
+- app/views/admin/templates/_text_with_ckeditor.html.erb
+- app/views/admin/templates/_text_with_ckeditor_and_assets.html.erb
+- app/views/admin/templates/_time.html.erb
+- app/views/admin/templates/_tree.html.erb
+- app/views/helpers/admin/base/_apps.html.erb
+- app/views/helpers/admin/base/_flash_message.html.erb
+- app/views/helpers/admin/base/_header.html.erb
+- app/views/helpers/admin/base/_login_info.html.erb
+- app/views/helpers/admin/dashboard/_resources.html.erb
+- app/views/helpers/admin/resources/_actions.html.erb
+- app/views/helpers/admin/resources/_errors.html.erb
+- app/views/helpers/admin/resources/_filters.html.erb
+- app/views/helpers/admin/resources/_search.html.erb
+- app/views/helpers/admin/resources/_sidebar.html.erb
+- app/views/helpers/admin/resources/_table.html.erb
+- app/views/layouts/admin/base.html.erb
+- app/views/layouts/admin/headless.html.erb
+- app/views/layouts/admin/session.html.erb
 - config/locales/typus.ca.models.yml
 - config/locales/typus.ca.yml
 - config/locales/typus.de.models.yml
@@ -317,6 +329,7 @@ files:
 - vendor/assets/jquery-searchField/jquery.searchField.js
 - vendor/assets/jquery-tokeninput/jquery.tokeninput.js
 - vendor/assets/jquery-tokeninput/token-input.css
+has_rdoc: true
 homepage: http://core.typuscms.com/
 licenses: []
 post_install_message: 
@@ -337,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: typus
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold

data/app/themes/default/views/helpers/admin/base/_header.html.erb

@@ -1,7 +0,0 @@
-<h1 class="logo">
-  <% if has_root_path? %>
-    <%= link_to Typus.admin_title, main_app.root_path, :title => Typus::I18n.t("View site") %>
-  <% else %>
-    <%= Typus.admin_title %>
-  <% end %>
-</h1>