EDIT / kanjai · Commits

Commit c098be8a2eac2f45cf8a8e9bb1923ecdf633f383

Authored by Karpikau Andrei
1 parent 60f81fff

add cache

Inline Side-by-side
Showing 6 changed files with 96 additions and 181 deletions
@@ -4,4 +4,4 @@ You are allowed to: @@ -4,4 +4,4 @@ You are allowed to:
4 1. Remove rake task 4 1. Remove rake task
5 2. Add existing rake tasks 5 2. Add existing rake tasks
6 To add existing rake tasks automatically delete this file and reload the project. 6 To add existing rake tasks automatically delete this file and reload the project.
7 ---><RakeGroup description="" fullCmd="" taksId="rake"><RakeGroup description="" fullCmd="" taksId="app"><RakeTask description="List versions of all Rails frameworks and the environment" fullCmd="app:about" taksId="about" /><RakeGroup description="" fullCmd="" taksId="assets"><RakeTask description="Remove old compiled assets" fullCmd="app:assets:clean[keep]" taksId="clean[keep]" /><RakeTask description="Remove compiled assets" fullCmd="app:assets:clobber" taksId="clobber" /><RakeTask description="Load asset compile environment" fullCmd="app:assets:environment" taksId="environment" /><RakeTask description="Compile all the assets named in config.assets.precompile" fullCmd="app:assets:precompile" taksId="precompile" /><RakeTask description="" fullCmd="app:assets:clean" taksId="clean" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="cache_digests"><RakeTask description="Lookup first-level dependencies for TEMPLATE (like messages/show or comments/_comment.html)" fullCmd="app:cache_digests:dependencies" taksId="dependencies" /><RakeTask description="Lookup nested dependencies for TEMPLATE (like messages/show or comments/_comment.html)" fullCmd="app:cache_digests:nested_dependencies" taksId="nested_dependencies" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="db"><RakeTask description="Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config)" fullCmd="app:db:create" taksId="create" /><RakeTask description="Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config)" fullCmd="app:db:drop" taksId="drop" /><RakeGroup description="" fullCmd="" taksId="fixtures"><RakeTask description="Load fixtures into the current environment's database" fullCmd="app:db:fixtures:load" taksId="load" /><RakeTask description="" fullCmd="app:db:fixtures:identify" taksId="identify" /></RakeGroup><RakeTask description="Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)" fullCmd="app:db:migrate" taksId="migrate" /><RakeGroup description="" fullCmd="" taksId="migrate"><RakeTask description="Display status of migrations" fullCmd="app:db:migrate:status" taksId="status" /><RakeTask description="" fullCmd="app:db:migrate:down" taksId="down" /><RakeTask description="" fullCmd="app:db:migrate:redo" taksId="redo" /><RakeTask description="" fullCmd="app:db:migrate:reset" taksId="reset" /><RakeTask description="" fullCmd="app:db:migrate:up" taksId="up" /></RakeGroup><RakeTask description="Rolls the schema back to the previous version (specify steps w/ STEP=n)" fullCmd="app:db:rollback" taksId="rollback" /><RakeGroup description="" fullCmd="" taksId="schema"><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="Clear a db/schema_cache.dump file" fullCmd="app:db:schema:cache:clear" taksId="clear" /><RakeTask description="Create a db/schema_cache.dump file" fullCmd="app:db:schema:cache:dump" taksId="dump" /></RakeGroup><RakeTask description="Create a db/schema.rb file that is portable against any DB supported by AR" fullCmd="app:db:schema:dump" taksId="dump" /><RakeTask description="Load a schema.rb file into the database" fullCmd="app:db:schema:load" taksId="load" /><RakeTask description="" fullCmd="app:db:schema:load_if_ruby" taksId="load_if_ruby" /></RakeGroup><RakeTask description="Load the seed data from db/seeds.rb" fullCmd="app:db:seed" taksId="seed" /><RakeTask description="Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the database first)" fullCmd="app:db:setup" taksId="setup" /><RakeGroup description="" fullCmd="" taksId="structure"><RakeTask description="Dump the database structure to db/structure.sql" fullCmd="app:db:structure:dump" taksId="dump" /><RakeTask description="Recreate the databases from the structure.sql file" fullCmd="app:db:structure:load" taksId="load" /><RakeTask description="" fullCmd="app:db:structure:load_if_sql" taksId="load_if_sql" /></RakeGroup><RakeTask description="Retrieves the current schema version number" fullCmd="app:db:version" taksId="version" /><RakeTask description="" fullCmd="app:db:_dump" taksId="_dump" /><RakeTask description="" fullCmd="app:db:abort_if_pending_migrations" taksId="abort_if_pending_migrations" /><RakeTask description="" fullCmd="app:db:charset" taksId="charset" /><RakeTask description="" fullCmd="app:db:collation" taksId="collation" /><RakeGroup description="" fullCmd="" taksId="create"><RakeTask description="" fullCmd="app:db:create:all" taksId="all" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="drop"><RakeTask description="" fullCmd="app:db:drop:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="app:db:forward" taksId="forward" /><RakeTask description="" fullCmd="app:db:load_config" taksId="load_config" /><RakeTask description="" fullCmd="app:db:purge" taksId="purge" /><RakeGroup description="" fullCmd="" taksId="purge"><RakeTask description="" fullCmd="app:db:purge:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="app:db:reset" taksId="reset" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="" fullCmd="app:db:test:clone" taksId="clone" /><RakeTask description="" fullCmd="app:db:test:clone_schema" taksId="clone_schema" /><RakeTask description="" fullCmd="app:db:test:clone_structure" taksId="clone_structure" /><RakeTask description="" fullCmd="app:db:test:deprecated" taksId="deprecated" /><RakeTask description="" fullCmd="app:db:test:load" taksId="load" /><RakeTask description="" fullCmd="app:db:test:load_schema" taksId="load_schema" /><RakeTask description="" fullCmd="app:db:test:load_structure" taksId="load_structure" /><RakeTask description="" fullCmd="app:db:test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="app:db:test:purge" taksId="purge" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="doc"><RakeTask description="Generate docs for the app -- also available doc:rails, doc:guides (options: TEMPLATE=/rdoc-template.rb, TITLE=&quot;Custom Title&quot;)" fullCmd="app:doc:app" taksId="app" /><RakeTask description="" fullCmd="app:doc:clobber" taksId="clobber" /><RakeTask description="" fullCmd="app:doc:clobber_app" taksId="clobber_app" /><RakeTask description="" fullCmd="app:doc:clobber_rails" taksId="clobber_rails" /><RakeTask description="" fullCmd="app:doc:guides" taksId="guides" /><RakeTask description="" fullCmd="app:doc:rails" taksId="rails" /><RakeTask description="" fullCmd="app:doc:reapp" taksId="reapp" /><RakeTask description="" fullCmd="app:doc:rerails" taksId="rerails" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="This task test soap" fullCmd="app:install:user" taksId="user" /><RakeTask description="" fullCmd="app:install:zip_example" taksId="zip_example" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="jobs"><RakeTask description="Exit with error status if any jobs older than max_age seconds haven't been attempted yet" fullCmd="app:jobs:check[max_age]" taksId="check[max_age]" /><RakeTask description="Clear the delayed_job queue" fullCmd="app:jobs:clear" taksId="clear" /><RakeTask description="Start a delayed_job worker" fullCmd="app:jobs:work" taksId="work" /><RakeTask description="Start a delayed_job worker and exit when all available jobs are complete" fullCmd="app:jobs:workoff" taksId="workoff" /><RakeTask description="" fullCmd="app:jobs:check" taksId="check" /><RakeTask description="" fullCmd="app:jobs:environment_options" taksId="environment_options" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="kanjai"><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Copy migrations from kanjai to application" fullCmd="app:kanjai:install:migrations" taksId="migrations" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="log"><RakeTask description="Truncates all *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)" fullCmd="app:log:clear" taksId="clear" /></RakeGroup><RakeTask description="Prints out your Rack middleware stack" fullCmd="app:middleware" taksId="middleware" /><RakeTask description="Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)" fullCmd="app:notes" taksId="notes" /><RakeGroup description="" fullCmd="" taksId="notes"><RakeTask description="Enumerate a custom annotation, specify with ANNOTATION=CUSTOM" fullCmd="app:notes:custom" taksId="custom" /><RakeTask description="" fullCmd="app:notes:fixme" taksId="fixme" /><RakeTask description="" fullCmd="app:notes:optimize" taksId="optimize" /><RakeTask description="" fullCmd="app:notes:todo" taksId="todo" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="rails"><RakeTask description="Applies the template supplied by LOCATION=(/path/to/template) or URL" fullCmd="app:rails:template" taksId="template" /><RakeTask description="Update configs and some other initially generated files (or use just update:configs or update:bin)" fullCmd="app:rails:update" taksId="update" /><RakeGroup description="" fullCmd="" taksId="templates"><RakeTask description="" fullCmd="app:rails:templates:copy" taksId="copy" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="update"><RakeTask description="" fullCmd="app:rails:update:bin" taksId="bin" /><RakeTask description="" fullCmd="app:rails:update:configs" taksId="configs" /></RakeGroup></RakeGroup><RakeTask description="Print out all defined routes in match order, with names" fullCmd="app:routes" taksId="routes" /><RakeTask description="Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions)" fullCmd="app:secret" taksId="secret" /><RakeTask description="Runs all tests in test folder" fullCmd="app:test" taksId="test" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="Run tests quickly by merging all types and not resetting db" fullCmd="app:test:all" taksId="all" /><RakeGroup description="" fullCmd="" taksId="all"><RakeTask description="Run tests quickly, but also reset db" fullCmd="app:test:all:db" taksId="db" /></RakeGroup><RakeTask description="Run tests quickly, but also reset db" fullCmd="app:test:db" taksId="db" /><RakeTask description="" fullCmd="app:test:controllers" taksId="controllers" /><RakeTask description="" fullCmd="app:test:deprecate_all" taksId="deprecate_all" /><RakeTask description="" fullCmd="app:test:functionals" taksId="functionals" /><RakeTask description="" fullCmd="app:test:generators" taksId="generators" /><RakeTask description="" fullCmd="app:test:helpers" taksId="helpers" /><RakeTask description="" fullCmd="app:test:integration" taksId="integration" /><RakeTask description="" fullCmd="app:test:jobs" taksId="jobs" /><RakeTask description="" fullCmd="app:test:mailers" taksId="mailers" /><RakeTask description="" fullCmd="app:test:models" taksId="models" /><RakeTask description="" fullCmd="app:test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="app:test:run" taksId="run" /><RakeTask description="" fullCmd="app:test:single" taksId="single" /><RakeTask description="" fullCmd="app:test:units" taksId="units" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="time"><RakeGroup description="" fullCmd="" taksId="zones"><RakeTask description="Displays all time zones, also available: time:zones:us, time:zones:local -- filter with OFFSET parameter, e.g., OFFSET=-6" fullCmd="app:time:zones:all" taksId="all" /><RakeTask description="" fullCmd="app:time:zones:local" taksId="local" /><RakeTask description="" fullCmd="app:time:zones:us" taksId="us" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="tmp"><RakeTask description="Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)" fullCmd="app:tmp:clear" taksId="clear" /><RakeTask description="Creates tmp directories for sessions, cache, sockets, and pids" fullCmd="app:tmp:create" taksId="create" /><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="" fullCmd="app:tmp:cache:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="pids"><RakeTask description="" fullCmd="app:tmp:pids:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="sessions"><RakeTask description="" fullCmd="app:tmp:sessions:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="sockets"><RakeTask description="" fullCmd="app:tmp:sockets:clear" taksId="clear" /></RakeGroup></RakeGroup><RakeTask description="" fullCmd="app:default" taksId="default" /><RakeTask description="" fullCmd="app:environment" taksId="environment" /><RakeGroup description="" fullCmd="" taksId="railties"><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="" fullCmd="app:railties:install:migrations" taksId="migrations" /></RakeGroup></RakeGroup></RakeGroup><RakeTask description="Build kanjai-0.0.11.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove RDoc HTML files" fullCmd="clobber_rdoc" taksId="clobber_rdoc" /><RakeGroup description="" fullCmd="" taksId="db"><RakeTask description="Create the database from config/database.yml for the current Rails.env (use db:create:all to create all databases in the config)" fullCmd="db:create" taksId="create" /><RakeTask description="Drops the database for the current Rails.env (use db:drop:all to drop all databases)" fullCmd="db:drop" taksId="drop" /><RakeGroup description="" fullCmd="" taksId="fixtures"><RakeTask description="Load fixtures into the current environment's database" fullCmd="db:fixtures:load" taksId="load" /></RakeGroup><RakeTask description="Migrate the database (options: VERSION=x, VERBOSE=false)" fullCmd="db:migrate" taksId="migrate" /><RakeGroup description="" fullCmd="" taksId="migrate"><RakeTask description="Display status of migrations" fullCmd="db:migrate:status" taksId="status" /><RakeTask description="" fullCmd="db:migrate:down" taksId="down" /><RakeTask description="" fullCmd="db:migrate:redo" taksId="redo" /><RakeTask description="" fullCmd="db:migrate:reset" taksId="reset" /><RakeTask description="" fullCmd="db:migrate:up" taksId="up" /></RakeGroup><RakeTask description="Rolls the schema back to the previous version (specify steps w/ STEP=n)" fullCmd="db:rollback" taksId="rollback" /><RakeGroup description="" fullCmd="" taksId="schema"><RakeTask description="Create a db/schema.rb file that can be portably used against any DB supported by AR" fullCmd="db:schema:dump" taksId="dump" /><RakeTask description="Load a schema.rb file into the database" fullCmd="db:schema:load" taksId="load" /></RakeGroup><RakeTask description="Load the seed data from db/seeds.rb" fullCmd="db:seed" taksId="seed" /><RakeTask description="Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the db first)" fullCmd="db:setup" taksId="setup" /><RakeGroup description="" fullCmd="" taksId="structure"><RakeTask description="Dump the database structure to an SQL file" fullCmd="db:structure:dump" taksId="dump" /></RakeGroup><RakeTask description="Retrieves the current schema version number" fullCmd="db:version" taksId="version" /><RakeGroup description="" fullCmd="" taksId="create"><RakeTask description="" fullCmd="db:create:all" taksId="all" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="drop"><RakeTask description="" fullCmd="db:drop:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="db:reset" taksId="reset" /></RakeGroup><RakeTask description="Build and install kanjai-0.0.11.gem into system gems" fullCmd="install" taksId="install" /><RakeTask description="Build RDoc HTML files" fullCmd="rdoc" taksId="rdoc" /><RakeTask description="Create tag v0.0.11 and build and push kanjai-0.0.11.gem to Rubygems" fullCmd="release" taksId="release" /><RakeTask description="Rebuild RDoc HTML files" fullCmd="rerdoc" taksId="rerdoc" /><RakeTask description="Report code statistics (KLOCs, etc) from the application or engine" fullCmd="stats" taksId="stats" /><RakeTask description="Run tests" fullCmd="test" taksId="test" /><RakeTask description="" fullCmd="clobber" taksId="clobber" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="doc" taksId="doc" /><RakeTask description="" fullCmd="doc/app" taksId="doc/app" /><RakeTask description="" fullCmd="doc/app/created.rid" taksId="doc/app/created.rid" /><RakeTask description="" fullCmd="environment" taksId="environment" /><RakeTask description="" fullCmd="html" taksId="html" /><RakeTask description="" fullCmd="html/created.rid" taksId="html/created.rid" /><RakeTask description="" fullCmd="load_app" taksId="load_app" /><RakeTask description="" fullCmd="rdoc/created.rid" taksId="rdoc/created.rid" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup><RakeTask description="" fullCmd="tmp" taksId="tmp" /><RakeTask description="" fullCmd="tmp/cache" taksId="tmp/cache" /><RakeTask description="" fullCmd="tmp/cache/assets" taksId="tmp/cache/assets" /><RakeTask description="" fullCmd="tmp/cache/assets/development" taksId="tmp/cache/assets/development" /><RakeTask description="" fullCmd="tmp/cache/assets/production" taksId="tmp/cache/assets/production" /><RakeTask description="" fullCmd="tmp/cache/assets/test" taksId="tmp/cache/assets/test" /><RakeTask description="" fullCmd="tmp/pids" taksId="tmp/pids" /><RakeTask description="" fullCmd="tmp/sessions" taksId="tmp/sessions" /><RakeTask description="" fullCmd="tmp/sockets" taksId="tmp/sockets" /></RakeGroup></Settings> 7 +--><RakeGroup description="" fullCmd="" taksId="rake"><RakeGroup description="" fullCmd="" taksId="app"><RakeTask description="List versions of all Rails frameworks and the environment" fullCmd="app:about" taksId="about" /><RakeGroup description="" fullCmd="" taksId="assets"><RakeTask description="Remove old compiled assets" fullCmd="app:assets:clean[keep]" taksId="clean[keep]" /><RakeTask description="Remove compiled assets" fullCmd="app:assets:clobber" taksId="clobber" /><RakeTask description="Load asset compile environment" fullCmd="app:assets:environment" taksId="environment" /><RakeTask description="Compile all the assets named in config.assets.precompile" fullCmd="app:assets:precompile" taksId="precompile" /><RakeTask description="" fullCmd="app:assets:clean" taksId="clean" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="cache_digests"><RakeTask description="Lookup first-level dependencies for TEMPLATE (like messages/show or comments/_comment.html)" fullCmd="app:cache_digests:dependencies" taksId="dependencies" /><RakeTask description="Lookup nested dependencies for TEMPLATE (like messages/show or comments/_comment.html)" fullCmd="app:cache_digests:nested_dependencies" taksId="nested_dependencies" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="db"><RakeTask description="Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config)" fullCmd="app:db:create" taksId="create" /><RakeTask description="Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config)" fullCmd="app:db:drop" taksId="drop" /><RakeGroup description="" fullCmd="" taksId="fixtures"><RakeTask description="Load fixtures into the current environment's database" fullCmd="app:db:fixtures:load" taksId="load" /><RakeTask description="" fullCmd="app:db:fixtures:identify" taksId="identify" /></RakeGroup><RakeTask description="Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)" fullCmd="app:db:migrate" taksId="migrate" /><RakeGroup description="" fullCmd="" taksId="migrate"><RakeTask description="Display status of migrations" fullCmd="app:db:migrate:status" taksId="status" /><RakeTask description="" fullCmd="app:db:migrate:down" taksId="down" /><RakeTask description="" fullCmd="app:db:migrate:redo" taksId="redo" /><RakeTask description="" fullCmd="app:db:migrate:reset" taksId="reset" /><RakeTask description="" fullCmd="app:db:migrate:up" taksId="up" /></RakeGroup><RakeTask description="Rolls the schema back to the previous version (specify steps w/ STEP=n)" fullCmd="app:db:rollback" taksId="rollback" /><RakeGroup description="" fullCmd="" taksId="schema"><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="Clear a db/schema_cache.dump file" fullCmd="app:db:schema:cache:clear" taksId="clear" /><RakeTask description="Create a db/schema_cache.dump file" fullCmd="app:db:schema:cache:dump" taksId="dump" /></RakeGroup><RakeTask description="Create a db/schema.rb file that is portable against any DB supported by AR" fullCmd="app:db:schema:dump" taksId="dump" /><RakeTask description="Load a schema.rb file into the database" fullCmd="app:db:schema:load" taksId="load" /><RakeTask description="" fullCmd="app:db:schema:load_if_ruby" taksId="load_if_ruby" /></RakeGroup><RakeTask description="Load the seed data from db/seeds.rb" fullCmd="app:db:seed" taksId="seed" /><RakeTask description="Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the database first)" fullCmd="app:db:setup" taksId="setup" /><RakeGroup description="" fullCmd="" taksId="structure"><RakeTask description="Dump the database structure to db/structure.sql" fullCmd="app:db:structure:dump" taksId="dump" /><RakeTask description="Recreate the databases from the structure.sql file" fullCmd="app:db:structure:load" taksId="load" /><RakeTask description="" fullCmd="app:db:structure:load_if_sql" taksId="load_if_sql" /></RakeGroup><RakeTask description="Retrieves the current schema version number" fullCmd="app:db:version" taksId="version" /><RakeTask description="" fullCmd="app:db:_dump" taksId="_dump" /><RakeTask description="" fullCmd="app:db:abort_if_pending_migrations" taksId="abort_if_pending_migrations" /><RakeTask description="" fullCmd="app:db:charset" taksId="charset" /><RakeTask description="" fullCmd="app:db:collation" taksId="collation" /><RakeGroup description="" fullCmd="" taksId="create"><RakeTask description="" fullCmd="app:db:create:all" taksId="all" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="drop"><RakeTask description="" fullCmd="app:db:drop:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="app:db:forward" taksId="forward" /><RakeTask description="" fullCmd="app:db:load_config" taksId="load_config" /><RakeTask description="" fullCmd="app:db:purge" taksId="purge" /><RakeGroup description="" fullCmd="" taksId="purge"><RakeTask description="" fullCmd="app:db:purge:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="app:db:reset" taksId="reset" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="" fullCmd="app:db:test:clone" taksId="clone" /><RakeTask description="" fullCmd="app:db:test:clone_schema" taksId="clone_schema" /><RakeTask description="" fullCmd="app:db:test:clone_structure" taksId="clone_structure" /><RakeTask description="" fullCmd="app:db:test:deprecated" taksId="deprecated" /><RakeTask description="" fullCmd="app:db:test:load" taksId="load" /><RakeTask description="" fullCmd="app:db:test:load_schema" taksId="load_schema" /><RakeTask description="" fullCmd="app:db:test:load_structure" taksId="load_structure" /><RakeTask description="" fullCmd="app:db:test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="app:db:test:purge" taksId="purge" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="doc"><RakeTask description="Generate docs for the app -- also available doc:rails, doc:guides (options: TEMPLATE=/rdoc-template.rb, TITLE=&quot;Custom Title&quot;)" fullCmd="app:doc:app" taksId="app" /><RakeTask description="" fullCmd="app:doc:clobber" taksId="clobber" /><RakeTask description="" fullCmd="app:doc:clobber_app" taksId="clobber_app" /><RakeTask description="" fullCmd="app:doc:clobber_rails" taksId="clobber_rails" /><RakeTask description="" fullCmd="app:doc:guides" taksId="guides" /><RakeTask description="" fullCmd="app:doc:rails" taksId="rails" /><RakeTask description="" fullCmd="app:doc:reapp" taksId="reapp" /><RakeTask description="" fullCmd="app:doc:rerails" taksId="rerails" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="This task test soap" fullCmd="app:install:user" taksId="user" /><RakeTask description="" fullCmd="app:install:zip_example" taksId="zip_example" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="jobs"><RakeTask description="Exit with error status if any jobs older than max_age seconds haven't been attempted yet" fullCmd="app:jobs:check[max_age]" taksId="check[max_age]" /><RakeTask description="Clear the delayed_job queue" fullCmd="app:jobs:clear" taksId="clear" /><RakeTask description="Start a delayed_job worker" fullCmd="app:jobs:work" taksId="work" /><RakeTask description="Start a delayed_job worker and exit when all available jobs are complete" fullCmd="app:jobs:workoff" taksId="workoff" /><RakeTask description="" fullCmd="app:jobs:check" taksId="check" /><RakeTask description="" fullCmd="app:jobs:environment_options" taksId="environment_options" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="kanjai"><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Copy migrations from kanjai to application" fullCmd="app:kanjai:install:migrations" taksId="migrations" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="log"><RakeTask description="Truncates all *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)" fullCmd="app:log:clear" taksId="clear" /></RakeGroup><RakeTask description="Prints out your Rack middleware stack" fullCmd="app:middleware" taksId="middleware" /><RakeTask description="Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)" fullCmd="app:notes" taksId="notes" /><RakeGroup description="" fullCmd="" taksId="notes"><RakeTask description="Enumerate a custom annotation, specify with ANNOTATION=CUSTOM" fullCmd="app:notes:custom" taksId="custom" /><RakeTask description="" fullCmd="app:notes:fixme" taksId="fixme" /><RakeTask description="" fullCmd="app:notes:optimize" taksId="optimize" /><RakeTask description="" fullCmd="app:notes:todo" taksId="todo" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="rails"><RakeTask description="Applies the template supplied by LOCATION=(/path/to/template) or URL" fullCmd="app:rails:template" taksId="template" /><RakeTask description="Update configs and some other initially generated files (or use just update:configs or update:bin)" fullCmd="app:rails:update" taksId="update" /><RakeGroup description="" fullCmd="" taksId="templates"><RakeTask description="" fullCmd="app:rails:templates:copy" taksId="copy" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="update"><RakeTask description="" fullCmd="app:rails:update:bin" taksId="bin" /><RakeTask description="" fullCmd="app:rails:update:configs" taksId="configs" /></RakeGroup></RakeGroup><RakeTask description="Print out all defined routes in match order, with names" fullCmd="app:routes" taksId="routes" /><RakeTask description="Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions)" fullCmd="app:secret" taksId="secret" /><RakeTask description="Runs all tests in test folder" fullCmd="app:test" taksId="test" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="Run tests quickly by merging all types and not resetting db" fullCmd="app:test:all" taksId="all" /><RakeGroup description="" fullCmd="" taksId="all"><RakeTask description="Run tests quickly, but also reset db" fullCmd="app:test:all:db" taksId="db" /></RakeGroup><RakeTask description="Run tests quickly, but also reset db" fullCmd="app:test:db" taksId="db" /><RakeTask description="" fullCmd="app:test:controllers" taksId="controllers" /><RakeTask description="" fullCmd="app:test:deprecate_all" taksId="deprecate_all" /><RakeTask description="" fullCmd="app:test:functionals" taksId="functionals" /><RakeTask description="" fullCmd="app:test:generators" taksId="generators" /><RakeTask description="" fullCmd="app:test:helpers" taksId="helpers" /><RakeTask description="" fullCmd="app:test:integration" taksId="integration" /><RakeTask description="" fullCmd="app:test:jobs" taksId="jobs" /><RakeTask description="" fullCmd="app:test:mailers" taksId="mailers" /><RakeTask description="" fullCmd="app:test:models" taksId="models" /><RakeTask description="" fullCmd="app:test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="app:test:run" taksId="run" /><RakeTask description="" fullCmd="app:test:single" taksId="single" /><RakeTask description="" fullCmd="app:test:units" taksId="units" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="time"><RakeGroup description="" fullCmd="" taksId="zones"><RakeTask description="Displays all time zones, also available: time:zones:us, time:zones:local -- filter with OFFSET parameter, e.g., OFFSET=-6" fullCmd="app:time:zones:all" taksId="all" /><RakeTask description="" fullCmd="app:time:zones:local" taksId="local" /><RakeTask description="" fullCmd="app:time:zones:us" taksId="us" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="tmp"><RakeTask description="Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)" fullCmd="app:tmp:clear" taksId="clear" /><RakeTask description="Creates tmp directories for sessions, cache, sockets, and pids" fullCmd="app:tmp:create" taksId="create" /><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="" fullCmd="app:tmp:cache:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="pids"><RakeTask description="" fullCmd="app:tmp:pids:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="sessions"><RakeTask description="" fullCmd="app:tmp:sessions:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="sockets"><RakeTask description="" fullCmd="app:tmp:sockets:clear" taksId="clear" /></RakeGroup></RakeGroup><RakeTask description="" fullCmd="app:default" taksId="default" /><RakeTask description="" fullCmd="app:environment" taksId="environment" /><RakeGroup description="" fullCmd="" taksId="railties"><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="" fullCmd="app:railties:install:migrations" taksId="migrations" /></RakeGroup></RakeGroup></RakeGroup><RakeTask description="Build kanjai-0.0.25.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove RDoc HTML files" fullCmd="clobber_rdoc" taksId="clobber_rdoc" /><RakeGroup description="" fullCmd="" taksId="db"><RakeTask description="Create the database from config/database.yml for the current Rails.env (use db:create:all to create all databases in the config)" fullCmd="db:create" taksId="create" /><RakeTask description="Drops the database for the current Rails.env (use db:drop:all to drop all databases)" fullCmd="db:drop" taksId="drop" /><RakeGroup description="" fullCmd="" taksId="fixtures"><RakeTask description="Load fixtures into the current environment's database" fullCmd="db:fixtures:load" taksId="load" /></RakeGroup><RakeTask description="Migrate the database (options: VERSION=x, VERBOSE=false)" fullCmd="db:migrate" taksId="migrate" /><RakeGroup description="" fullCmd="" taksId="migrate"><RakeTask description="Display status of migrations" fullCmd="db:migrate:status" taksId="status" /><RakeTask description="" fullCmd="db:migrate:down" taksId="down" /><RakeTask description="" fullCmd="db:migrate:redo" taksId="redo" /><RakeTask description="" fullCmd="db:migrate:reset" taksId="reset" /><RakeTask description="" fullCmd="db:migrate:up" taksId="up" /></RakeGroup><RakeTask description="Rolls the schema back to the previous version (specify steps w/ STEP=n)" fullCmd="db:rollback" taksId="rollback" /><RakeGroup description="" fullCmd="" taksId="schema"><RakeTask description="Create a db/schema.rb file that can be portably used against any DB supported by AR" fullCmd="db:schema:dump" taksId="dump" /><RakeTask description="Load a schema.rb file into the database" fullCmd="db:schema:load" taksId="load" /></RakeGroup><RakeTask description="Load the seed data from db/seeds.rb" fullCmd="db:seed" taksId="seed" /><RakeTask description="Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the db first)" fullCmd="db:setup" taksId="setup" /><RakeGroup description="" fullCmd="" taksId="structure"><RakeTask description="Dump the database structure to an SQL file" fullCmd="db:structure:dump" taksId="dump" /></RakeGroup><RakeTask description="Retrieves the current schema version number" fullCmd="db:version" taksId="version" /><RakeGroup description="" fullCmd="" taksId="create"><RakeTask description="" fullCmd="db:create:all" taksId="all" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="drop"><RakeTask description="" fullCmd="db:drop:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="db:reset" taksId="reset" /></RakeGroup><RakeTask description="Build and install kanjai-0.0.25.gem into system gems" fullCmd="install" taksId="install" /><RakeTask description="Build RDoc HTML files" fullCmd="rdoc" taksId="rdoc" /><RakeTask description="Create tag v0.0.25 and build and push kanjai-0.0.25.gem to Rubygems" fullCmd="release" taksId="release" /><RakeTask description="Rebuild RDoc HTML files" fullCmd="rerdoc" taksId="rerdoc" /><RakeTask description="Report code statistics (KLOCs, etc) from the application or engine" fullCmd="stats" taksId="stats" /><RakeTask description="Run tests" fullCmd="test" taksId="test" /><RakeTask description="" fullCmd="clobber" taksId="clobber" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="doc" taksId="doc" /><RakeTask description="" fullCmd="doc/app" taksId="doc/app" /><RakeTask description="" fullCmd="doc/app/created.rid" taksId="doc/app/created.rid" /><RakeTask description="" fullCmd="environment" taksId="environment" /><RakeTask description="" fullCmd="html" taksId="html" /><RakeTask description="" fullCmd="html/created.rid" taksId="html/created.rid" /><RakeTask description="" fullCmd="load_app" taksId="load_app" /><RakeTask description="" fullCmd="rdoc/created.rid" taksId="rdoc/created.rid" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup><RakeTask description="" fullCmd="tmp" taksId="tmp" /><RakeTask description="" fullCmd="tmp/cache" taksId="tmp/cache" /><RakeTask description="" fullCmd="tmp/cache/assets" taksId="tmp/cache/assets" /><RakeTask description="" fullCmd="tmp/cache/assets/development" taksId="tmp/cache/assets/development" /><RakeTask description="" fullCmd="tmp/cache/assets/production" taksId="tmp/cache/assets/production" /><RakeTask description="" fullCmd="tmp/cache/assets/test" taksId="tmp/cache/assets/test" /><RakeTask description="" fullCmd="tmp/pids" taksId="tmp/pids" /><RakeTask description="" fullCmd="tmp/sessions" taksId="tmp/sessions" /><RakeTask description="" fullCmd="tmp/sockets" taksId="tmp/sockets" /></RakeGroup></Settings>
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" /> 143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" /> 144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
145 <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.0, rbenv: 2.1.3) [gem]" level="application" /> 145 <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.0, rbenv: 2.1.3) [gem]" level="application" />
146 - <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.1, rbenv: 2.1.3) [gem]" level="application" /> 146 + <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.2, rbenv: 2.1.3) [gem]" level="application" />
147 <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.3, rbenv: 2.1.3) [gem]" level="application" /> 147 <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.3, rbenv: 2.1.3) [gem]" level="application" />
148 <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.1, rbenv: 2.1.3) [gem]" level="application" /> 148 <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
149 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.0, rbenv: 2.1.3) [gem]" level="application" /> 149 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.0, rbenv: 2.1.3) [gem]" level="application" />
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 28 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
29 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
30 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> 30 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
31 - <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" /> 31 + <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
32 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
@@ -44,51 +44,61 @@ @@ -44,51 +44,61 @@
44 </provider> 44 </provider>
45 </entry> 45 </entry>
46 </file> 46 </file>
47 - <file leaf-file-name="template_parser.rb" pinned="false" current-in-tab="false">  
48 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb"> 47 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  48 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
49 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
50 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">  
51 - <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" /> 50 + <state vertical-scroll-proportion="0.0" vertical-offset="89" max-vertical-offset="2160">
  51 + <caret line="32" column="86" selection-start-line="32" selection-start-column="86" selection-end-line="32" selection-end-column="86" />
52 <folding /> 52 <folding />
53 </state> 53 </state>
54 </provider> 54 </provider>
55 </entry> 55 </entry>
56 </file> 56 </file>
57 - <file leaf-file-name="frontend.css.scss" pinned="false" current-in-tab="false">  
58 - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss"> 57 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  58 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
59 <provider selected="true" editor-type-id="text-editor"> 59 <provider selected="true" editor-type-id="text-editor">
60 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="345"> 60 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4230">
61 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 61 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
62 <folding /> 62 <folding />
63 </state> 63 </state>
64 </provider> 64 </provider>
65 </entry> 65 </entry>
66 </file> 66 </file>
67 - <file leaf-file-name="bootstrap.css.scss.erb" pinned="false" current-in-tab="false">  
68 - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb"> 67 + <file leaf-file-name="admin_controller.rb" pinned="false" current-in-tab="false">
  68 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
69 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
70 - <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">  
71 - <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" /> 70 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
  71 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
72 <folding /> 72 <folding />
73 </state> 73 </state>
74 </provider> 74 </provider>
75 </entry> 75 </entry>
76 </file> 76 </file>
77 - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">  
78 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 77 + <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">
  78 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
79 <provider selected="true" editor-type-id="text-editor"> 79 <provider selected="true" editor-type-id="text-editor">
80 - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">  
81 - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 80 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  81 + <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
82 <folding /> 82 <folding />
83 </state> 83 </state>
84 </provider> 84 </provider>
85 </entry> 85 </entry>
86 </file> 86 </file>
87 - <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">  
88 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js"> 87 + <file leaf-file-name="template_parser.rb" pinned="false" current-in-tab="false">
  88 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
89 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
90 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">  
91 - <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" /> 90 + <state vertical-scroll-proportion="0.0" vertical-offset="375" max-vertical-offset="2250">
  91 + <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" />
  92 + <folding />
  93 + </state>
  94 + </provider>
  95 + </entry>
  96 + </file>
  97 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  98 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  99 + <provider selected="true" editor-type-id="text-editor">
  100 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  101 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
92 <folding /> 102 <folding />
93 </state> 103 </state>
94 </provider> 104 </provider>
@@ -114,16 +124,6 @@ @@ -114,16 +124,6 @@
114 </provider> 124 </provider>
115 </entry> 125 </entry>
116 </file> 126 </file>
117 - <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">  
118 - <entry file="file://$PROJECT_DIR$/Gemfile">  
119 - <provider selected="true" editor-type-id="text-editor">  
120 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">  
121 - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />  
122 - <folding />  
123 - </state>  
124 - </provider>  
125 - </entry>  
126 - </file>  
127 </leaf> 127 </leaf>
128 </component> 128 </component>
129 <component name="IdeDocumentHistory"> 129 <component name="IdeDocumentHistory">
@@ -170,7 +170,6 @@ @@ -170,7 +170,6 @@
170 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js" /> 170 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js" />
171 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 171 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
172 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" /> 172 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" />
173 - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />  
174 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" /> 173 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
175 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" /> 174 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
176 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" /> 175 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
@@ -179,6 +178,7 @@ @@ -179,6 +178,7 @@
179 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" /> 178 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
180 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" /> 179 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
181 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" /> 180 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
  181 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 </list> 183 </list>
184 </option> 184 </option>
@@ -214,8 +214,8 @@ @@ -214,8 +214,8 @@
214 <sortByType /> 214 <sortByType />
215 </navigator> 215 </navigator>
216 <panes> 216 <panes>
217 - <pane id="RailsProjectView" />  
218 <pane id="Scope" /> 217 <pane id="Scope" />
  218 + <pane id="RailsProjectView" />
219 <pane id="ProjectPane"> 219 <pane id="ProjectPane">
220 <subPane> 220 <subPane>
221 <PATH> 221 <PATH>
@@ -348,85 +348,7 @@ @@ -348,85 +348,7 @@
348 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 348 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
349 </PATH_ELEMENT> 349 </PATH_ELEMENT>
350 <PATH_ELEMENT> 350 <PATH_ELEMENT>
351 - <option name="myItemId" value="helpers" />  
352 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
353 - </PATH_ELEMENT>  
354 - <PATH_ELEMENT>  
355 - <option name="myItemId" value="kanjai" />  
356 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
357 - </PATH_ELEMENT>  
358 - </PATH>  
359 - <PATH>  
360 - <PATH_ELEMENT>  
361 - <option name="myItemId" value="kanjai" />  
362 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
363 - </PATH_ELEMENT>  
364 - <PATH_ELEMENT>  
365 - <option name="myItemId" value="kanjai" />  
366 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
367 - </PATH_ELEMENT>  
368 - <PATH_ELEMENT>  
369 - <option name="myItemId" value="app" />  
370 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
371 - </PATH_ELEMENT>  
372 - <PATH_ELEMENT>  
373 - <option name="myItemId" value="helpers" />  
374 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
375 - </PATH_ELEMENT>  
376 - <PATH_ELEMENT>  
377 - <option name="myItemId" value="kanjai" />  
378 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
379 - </PATH_ELEMENT>  
380 - <PATH_ELEMENT>  
381 - <option name="myItemId" value="admin" />  
382 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
383 - </PATH_ELEMENT>  
384 - </PATH>  
385 - <PATH>  
386 - <PATH_ELEMENT>  
387 - <option name="myItemId" value="kanjai" />  
388 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
389 - </PATH_ELEMENT>  
390 - <PATH_ELEMENT>  
391 - <option name="myItemId" value="kanjai" />  
392 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
393 - </PATH_ELEMENT>  
394 - <PATH_ELEMENT>  
395 - <option name="myItemId" value="app" />  
396 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
397 - </PATH_ELEMENT>  
398 - <PATH_ELEMENT>  
399 - <option name="myItemId" value="assets" />  
400 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
401 - </PATH_ELEMENT>  
402 - <PATH_ELEMENT>  
403 - <option name="myItemId" value="stylesheets" />  
404 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
405 - </PATH_ELEMENT>  
406 - <PATH_ELEMENT>  
407 - <option name="myItemId" value="kanjai" />  
408 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
409 - </PATH_ELEMENT>  
410 - </PATH>  
411 - <PATH>  
412 - <PATH_ELEMENT>  
413 - <option name="myItemId" value="kanjai" />  
414 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
415 - </PATH_ELEMENT>  
416 - <PATH_ELEMENT>  
417 - <option name="myItemId" value="kanjai" />  
418 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
419 - </PATH_ELEMENT>  
420 - <PATH_ELEMENT>  
421 - <option name="myItemId" value="app" />  
422 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
423 - </PATH_ELEMENT>  
424 - <PATH_ELEMENT>  
425 - <option name="myItemId" value="assets" />  
426 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
427 - </PATH_ELEMENT>  
428 - <PATH_ELEMENT>  
429 - <option name="myItemId" value="javascripts" /> 351 + <option name="myItemId" value="controllers" />
430 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 352 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
431 </PATH_ELEMENT> 353 </PATH_ELEMENT>
432 <PATH_ELEMENT> 354 <PATH_ELEMENT>
@@ -635,26 +557,26 @@ @@ -635,26 +557,26 @@
635 <frame x="0" y="23" width="1280" height="728" extended-state="6" /> 557 <frame x="0" y="23" width="1280" height="728" extended-state="6" />
636 <editor active="true" /> 558 <editor active="true" />
637 <layout> 559 <layout>
  560 + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
638 <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 561 <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
639 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 562 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
640 - <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
641 - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
642 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
643 - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />  
644 - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />  
645 - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />  
646 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 563 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  564 + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
647 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 565 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
648 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 566 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
649 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27382874" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />  
650 - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 567 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27786753" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  568 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
  569 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
  570 + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
651 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 571 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
652 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 572 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  573 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
653 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 574 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
654 - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 575 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
655 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 576 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
656 - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> 577 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
657 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 578 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  579 + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
658 </layout> 580 </layout>
659 </component> 581 </component>
660 <component name="Vcs.Log.UiProperties"> 582 <component name="Vcs.Log.UiProperties">
@@ -678,20 +600,6 @@ @@ -678,20 +600,6 @@
678 <watches-manager /> 600 <watches-manager />
679 </component> 601 </component>
680 <component name="editorHistoryManager"> 602 <component name="editorHistoryManager">
681 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_langs_controller.rb">  
682 - <provider selected="true" editor-type-id="text-editor">  
683 - <state vertical-scroll-proportion="0.0" vertical-offset="394" max-vertical-offset="975">  
684 - <caret line="48" column="47" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />  
685 - </state>  
686 - </provider>  
687 - </entry>  
688 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/index.html.erb">  
689 - <provider selected="true" editor-type-id="text-editor">  
690 - <state vertical-scroll-proportion="-10.708333" vertical-offset="283" max-vertical-offset="675">  
691 - <caret line="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />  
692 - </state>  
693 - </provider>  
694 - </entry>  
695 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb"> 603 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb">
696 <provider selected="true" editor-type-id="text-editor"> 604 <provider selected="true" editor-type-id="text-editor">
697 <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="255"> 605 <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="255">
@@ -871,7 +779,6 @@ @@ -871,7 +779,6 @@
871 <provider selected="true" editor-type-id="text-editor"> 779 <provider selected="true" editor-type-id="text-editor">
872 <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140"> 780 <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
873 <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" /> 781 <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
874 - <folding />  
875 </state> 782 </state>
876 </provider> 783 </provider>
877 </entry> 784 </entry>
@@ -879,7 +786,6 @@ @@ -879,7 +786,6 @@
879 <provider selected="true" editor-type-id="text-editor"> 786 <provider selected="true" editor-type-id="text-editor">
880 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255"> 787 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
881 <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> 788 <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
882 - <folding />  
883 </state> 789 </state>
884 </provider> 790 </provider>
885 </entry> 791 </entry>
@@ -887,7 +793,6 @@ @@ -887,7 +793,6 @@
887 <provider selected="true" editor-type-id="text-editor"> 793 <provider selected="true" editor-type-id="text-editor">
888 <state vertical-scroll-proportion="0.0" vertical-offset="1811" max-vertical-offset="2445"> 794 <state vertical-scroll-proportion="0.0" vertical-offset="1811" max-vertical-offset="2445">
889 <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" /> 795 <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
890 - <folding />  
891 </state> 796 </state>
892 </provider> 797 </provider>
893 </entry> 798 </entry>
@@ -903,7 +808,6 @@ @@ -903,7 +808,6 @@
903 <provider selected="true" editor-type-id="text-editor"> 808 <provider selected="true" editor-type-id="text-editor">
904 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 809 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
905 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 810 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
906 - <folding />  
907 </state> 811 </state>
908 </provider> 812 </provider>
909 </entry> 813 </entry>
@@ -911,7 +815,6 @@ @@ -911,7 +815,6 @@
911 <provider selected="true" editor-type-id="text-editor"> 815 <provider selected="true" editor-type-id="text-editor">
912 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 816 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
913 <caret line="0" column="24" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" /> 817 <caret line="0" column="24" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
914 - <folding />  
915 </state> 818 </state>
916 </provider> 819 </provider>
917 </entry> 820 </entry>
@@ -935,7 +838,6 @@ @@ -935,7 +838,6 @@
935 <provider selected="true" editor-type-id="text-editor"> 838 <provider selected="true" editor-type-id="text-editor">
936 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610"> 839 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
937 <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" /> 840 <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
938 - <folding />  
939 </state> 841 </state>
940 </provider> 842 </provider>
941 </entry> 843 </entry>
@@ -955,22 +857,6 @@ @@ -955,22 +857,6 @@
955 </state> 857 </state>
956 </provider> 858 </provider>
957 </entry> 859 </entry>
958 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">  
959 - <provider selected="true" editor-type-id="text-editor">  
960 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">  
961 - <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />  
962 - <folding />  
963 - </state>  
964 - </provider>  
965 - </entry>  
966 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">  
967 - <provider selected="true" editor-type-id="text-editor">  
968 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2160">  
969 - <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />  
970 - <folding />  
971 - </state>  
972 - </provider>  
973 - </entry>  
974 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 860 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
975 <provider selected="true" editor-type-id="text-editor"> 861 <provider selected="true" editor-type-id="text-editor">
976 <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="885"> 862 <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="885">
@@ -983,7 +869,6 @@ @@ -983,7 +869,6 @@
983 <provider selected="true" editor-type-id="text-editor"> 869 <provider selected="true" editor-type-id="text-editor">
984 <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070"> 870 <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">
985 <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" /> 871 <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
986 - <folding />  
987 </state> 872 </state>
988 </provider> 873 </provider>
989 </entry> 874 </entry>
@@ -991,7 +876,6 @@ @@ -991,7 +876,6 @@
991 <provider selected="true" editor-type-id="text-editor"> 876 <provider selected="true" editor-type-id="text-editor">
992 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610"> 877 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
993 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 878 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
994 - <folding />  
995 </state> 879 </state>
996 </provider> 880 </provider>
997 </entry> 881 </entry>
@@ -999,7 +883,6 @@ @@ -999,7 +883,6 @@
999 <provider selected="true" editor-type-id="text-editor"> 883 <provider selected="true" editor-type-id="text-editor">
1000 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540"> 884 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
1001 <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" /> 885 <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
1002 - <folding />  
1003 </state> 886 </state>
1004 </provider> 887 </provider>
1005 </entry> 888 </entry>
@@ -1011,14 +894,6 @@ @@ -1011,14 +894,6 @@
1011 </state> 894 </state>
1012 </provider> 895 </provider>
1013 </entry> 896 </entry>
1014 - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">  
1015 - <provider selected="true" editor-type-id="text-editor">  
1016 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">  
1017 - <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />  
1018 - <folding />  
1019 - </state>  
1020 - </provider>  
1021 - </entry>  
1022 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb"> 897 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
1023 <provider selected="true" editor-type-id="text-editor"> 898 <provider selected="true" editor-type-id="text-editor">
1024 <state vertical-scroll-proportion="0.0" vertical-offset="390" max-vertical-offset="2745"> 899 <state vertical-scroll-proportion="0.0" vertical-offset="390" max-vertical-offset="2745">
@@ -1051,6 +926,46 @@ @@ -1051,6 +926,46 @@
1051 </state> 926 </state>
1052 </provider> 927 </provider>
1053 </entry> 928 </entry>
  929 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  930 + <provider selected="true" editor-type-id="text-editor">
  931 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4230">
  932 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  933 + <folding />
  934 + </state>
  935 + </provider>
  936 + </entry>
  937 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  938 + <provider selected="true" editor-type-id="text-editor">
  939 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  940 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  941 + <folding />
  942 + </state>
  943 + </provider>
  944 + </entry>
  945 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  946 + <provider selected="true" editor-type-id="text-editor">
  947 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  948 + <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
  949 + <folding />
  950 + </state>
  951 + </provider>
  952 + </entry>
  953 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  954 + <provider selected="true" editor-type-id="text-editor">
  955 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  956 + <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
  957 + <folding />
  958 + </state>
  959 + </provider>
  960 + </entry>
  961 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  962 + <provider selected="true" editor-type-id="text-editor">
  963 + <state vertical-scroll-proportion="0.0" vertical-offset="89" max-vertical-offset="2160">
  964 + <caret line="32" column="86" selection-start-line="32" selection-start-column="86" selection-end-line="32" selection-end-column="86" />
  965 + <folding />
  966 + </state>
  967 + </provider>
  968 + </entry>
1054 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 969 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1055 <provider selected="true" editor-type-id="text-editor"> 970 <provider selected="true" editor-type-id="text-editor">
1056 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 971 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.24) 4 + kanjai (0.0.25)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -74,7 +74,7 @@ GEM @@ -74,7 +74,7 @@ GEM
74 rails 74 rails
75 bcrypt (3.1.11) 75 bcrypt (3.1.11)
76 builder (3.2.2) 76 builder (3.2.2)
77 - concurrent-ruby (1.0.1) 77 + concurrent-ruby (1.0.2)
78 daemons (1.2.3) 78 daemons (1.2.3)
79 delayed_job (4.1.1) 79 delayed_job (4.1.1)
80 activesupport (>= 3.0, < 5.0) 80 activesupport (>= 3.0, < 5.0)
@@ -16,21 +16,21 @@ module Kanjai @@ -16,21 +16,21 @@ module Kanjai
16 end 16 end
17 #look - exist template or not for page 17 #look - exist template or not for page
18 if @page_data.page.page_template 18 if @page_data.page.page_template
19 - #get page content  
20 - layer = @page_data.page.page_template.get_html_content  
21 -  
22 - content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)  
23 -  
24 - render :text => content_for_render 19 + if stale?(@page_data) or current_admin_user
  20 + #get page content
  21 + layer = @page_data.page.page_template.get_html_content
  22 + content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
  23 + render :text => content_for_render and return
  24 + end
25 #render :html => content_for_render.html_safe 25 #render :html => content_for_render.html_safe
26 else 26 else
27 page_content = get_html_by_json_client(@page_data) 27 page_content = get_html_by_json_client(@page_data)
28 - render :html => page_content.html_safe 28 + render :html => page_content.html_safe and return
29 end 29 end
30 30
31 31
32 else 32 else
33 - render :template => 'kanjai/shared/404', status: 404, layout: false 33 + render :template => 'kanjai/shared/404', status: 404, layout: false and returm
34 end 34 end
35 end 35 end
36 36
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.25" 2 + VERSION = "0.0.26"
3 end 3 end