Skip to content

Commit

Permalink
Merge pull request #1946 from Quintasan/misc-fixes
Browse files Browse the repository at this point in the history
fix some documentation [skip ci]
  • Loading branch information
ujifgc committed Aug 24, 2015
2 parents a45cebf + f427b02 commit 954a853
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
13 changes: 7 additions & 6 deletions padrino-docs/pages/agnostic.md
Expand Up @@ -11,11 +11,12 @@ The available components and their defaults are listed below:

|Component|Default|Options|
|:--------|:------|:------|
|orm|none|mongomapper, mongoid, activerecord, datamapper, sequel, couchrest|
|script|none|prototype, rightjs, jquery, mootools, extcore|
|renderer|haml|erb, haml|
|test|rspec|bacon, shoulda, cucumber, testspec, riot, rspec|
|stylesheet|none|less, sass|
|orm|none|mongoid, ripple, activerecord, sequel, mongomapper, minirecord, ohm, mongomatic, dynamoid,
couchrest, datamapper|
|script|none|rightjs, extcore, dojo, prototype, jquery, mootools|
|renderer|none|slim, haml, erb|
|test|none|rspec, cucumber, minitest, steak, shoulda, riot, bacon|
|stylesheet|none|compass, sass, scss, less|
|mock|none|rr, mocha|

Just create the project with the usual generator command and pass in your preferred components!
Expand All @@ -24,4 +25,4 @@ Just create the project with the usual generator command and pass in your prefer
$ padrino g project cool --renderer haml --stylesheet sass
$ padrino g project cool --script mootools
$ padrino g project cool --orm mongoid --script mootools
$ padrino g project -h # shows available options
$ padrino g project -h # shows available options
12 changes: 6 additions & 6 deletions padrino-docs/pages/comprehensive.md
Expand Up @@ -7,17 +7,17 @@ title: Comprehensive

Building on our experience in developing web applications, we designed a framework that meets all the requirements for creating a top notch web application in a *clean*, *concise* and *simple environment*, with minimal *deadline* delays.

We provide you with the following out of the box:
Out of the box we give you the following:

||
|**Agnostic:**|Full support for many popular testing, templating, mocking, and database libraries.|
|**Generators:**|Create Padrino applications, models, controllers, admin.|
|**Mountable:**|Unlike other ruby frameworks, principally designed for mounting multiple apps.|
|**Routing:**|Full url named routes, named params, respond\_to support, before/after filter support.|
|**Generators:**|Create Padrino applications, mailers, controllers, helpers, models, migrations and Rake tasks|
|**Mountable:**|Unlike other Ruby frameworks, Padrino is designed for mounting multiple apps.|
|**Routing:**|Full URL named routes, named params, respond\_to support, before/after filter support.|
|**Helpers:**|Different helpers for generating tags, forms, links, images, and more.|
|**Mailer:**|Fast and simple support for delivering emails.|
|**Caching:**|Simple route and fragment caching to easily speed up your web requests.|
|**Admin:**|Built-in admin interface (akin to Django) with authentication.|
|**Admin:**|Built-in admin interface (akin to Django Admin) with authentication.|
|**Logging:**|Provides a unified logger that can interact with your ORM or any library of your choice.|
|**Reloading:**|Automatically reloads server code during development.|
|**Localization:**|Full support for I18n localization.|
|**Localization:**|Full support for I18n localization.|
19 changes: 9 additions & 10 deletions padrino-docs/pages/drop-in-admin.md
Expand Up @@ -5,20 +5,19 @@ email: nesquena@gmail.com
title: Drop-in Admin
---

Padrino ships with an Admin Interface that includes the following features:
Padrino is shipped with a slick and beautiful administration interface, with the following features:

||
|Orm Agnostic|Adapters for datamapper, activerecord, sequel, mongomapper, mongoid|
|Authentication|Account authentication support and permission management|
|Template Agnostic|View support for Erb and Haml rendering engines|
|Scaffold|Create a model “admin interface by invoking a command|
|MultiLanguage|Translated into 10 languages including English, Spanish, and Italian|
|Orm Agnostic|Adapters for Active Record, MiniRecord, DataMapper, CouchRest, Mongoid, MongoMapper, Sequel, Ohm and Dynamoid|
|Authentication|User authentication and authorization management|
|Template Agnostic|Slim, Haml and ERB rendering support|
|Scaffold|You can create a new "admin interface" by providing a single Model|
|MultiLanguage|Translated into 10 languages including English, German and Russian|

Example:

$ padrino-gen project cool --orm activerecord
$ padrino-gen project cool -d datamapper
$ cd cool
$ padrino-gen admin
$ padrino-gen admin_page post
$ padrino g admin

For usage information, check out our detailed [admin guide](/guides/padrino-admin).
For more information, check out our detailed [Padrino Admin guide](/guides/padrino-admin).
2 changes: 1 addition & 1 deletion padrino-docs/pages/lightweight.md
Expand Up @@ -16,4 +16,4 @@ Padrino strives to adhere to the following basic principles:
- Creative
- Concise

This framework can be used with ease for web development for a project of any size from your lightweight json web service to a large full-stack web application!
This framework can be used with ease for web development for a project of any size from your lightweight JSON web service to a large full-stack web application!

0 comments on commit 954a853

Please sign in to comment.