EDIT / kanjai · Commits

Commit a35297bec8f6c068609856fe6f9b02092f3c3920

Authored by Karpikau Andrei
1 parent 5bc24106

add send form solution

Inline Side-by-side
Showing 22 changed files with 607 additions and 529 deletions
@@ -5,4 +5,4 @@ You are allowed to: @@ -5,4 +5,4 @@ You are allowed to:
5 2. Remove generators 5 2. Remove generators
6 3. Add installed generators 6 3. Add installed generators
7 To add new installed generators automatically delete this file and reload the project. 7 To add new installed generators automatically delete this file and reload the project.
8 ---><GeneratorsGroup><Generator name="controller" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="migration" /><Generator name="model" /><Generator name="observer" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="session_migration" /></GeneratorsGroup></Settings> 8 +--><GeneratorsGroup><Generator name="active_record:devise" /><Generator name="assets" /><Generator name="controller" /><Generator name="delayed_job" /><Generator name="delayed_job:active_record" /><Generator name="delayed_job:upgrade" /><Generator name="devise" /><Generator name="devise:controllers" /><Generator name="devise:install" /><Generator name="devise:views" /><Generator name="factory_girl:model" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="jbuilder" /><Generator name="job" /><Generator name="js:assets" /><Generator name="mailer" /><Generator name="migration" /><Generator name="model" /><Generator name="mongoid:devise" /><Generator name="resource" /><Generator name="responders:install" /><Generator name="responders_controller" /><Generator name="rspec:controller" /><Generator name="rspec:feature" /><Generator name="rspec:helper" /><Generator name="rspec:install" /><Generator name="rspec:integration" /><Generator name="rspec:job" /><Generator name="rspec:mailer" /><Generator name="rspec:model" /><Generator name="rspec:observer" /><Generator name="rspec:request" /><Generator name="rspec:scaffold" /><Generator name="rspec:view" /><Generator name="sass:assets" /><Generator name="sass:scaffold" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="scss:assets" /><Generator name="scss:scaffold" /><Generator name="task" /><Generator name="test_unit:generator" /><Generator name="test_unit:job" /><Generator name="test_unit:plugin" /></GeneratorsGroup></Settings>
  1 +<component name="InspectionProjectProfileManager">
  2 + <profile version="1.0" is_locked="false">
  3 + <option name="myName" value="Project Default" />
  4 + <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
  5 + </profile>
  6 +</component>
@@ -9,116 +9,111 @@ @@ -9,116 +9,111 @@
9 </configuration> 9 </configuration>
10 </facet> 10 </facet>
11 <facet type="gem" name="Ruby Gem"> 11 <facet type="gem" name="Ruby Gem">
12 - <configuration>  
13 - <option name="GEM_APP_ROOT_PATH" value="$MODULE_DIR$" />  
14 - <option name="GEM_APP_TEST_PATH" value="$MODULE_DIR$/test" />  
15 - <option name="GEM_APP_LIB_PATH" value="$MODULE_DIR$/lib" />  
16 - </configuration> 12 + <configuration />
17 </facet> 13 </facet>
18 </component> 14 </component>
19 <component name="ModuleRunConfigurationManager"> 15 <component name="ModuleRunConfigurationManager">
20 - <configuration default="false" name="test: kanjai" type="RakeRunConfigurationType" factoryName="Rake">  
21 - <module name="kanjai" />  
22 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
23 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />  
24 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
25 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
26 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />  
27 - <envs>  
28 - <env name="RAILS_ENV" value="test" />  
29 - </envs>  
30 - <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />  
31 - <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />  
32 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">  
33 - <COVERAGE_PATTERN ENABLED="true">  
34 - <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />  
35 - </COVERAGE_PATTERN>  
36 - </EXTENSION>  
37 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
38 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="test" />  
39 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />  
40 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " />  
41 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />  
42 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />  
43 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />  
44 - <method />  
45 - </configuration>  
46 - <configuration default="false" name="spec: kanjai" type="RakeRunConfigurationType" factoryName="Rake">  
47 - <module name="kanjai" />  
48 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
49 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />  
50 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
51 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
52 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />  
53 - <envs />  
54 - <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />  
55 - <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />  
56 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">  
57 - <COVERAGE_PATTERN ENABLED="true">  
58 - <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />  
59 - </COVERAGE_PATTERN>  
60 - </EXTENSION>  
61 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
62 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec" />  
63 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />  
64 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":rspec " />  
65 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />  
66 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />  
67 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />  
68 - <method />  
69 - </configuration>  
70 - <configuration default="false" name="Production: kanjai" type="RailsRunConfigurationType" factoryName="Rails">  
71 - <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />  
72 - <module name="kanjai" />  
73 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
74 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />  
75 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
76 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
77 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />  
78 - <envs />  
79 - <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />  
80 - <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />  
81 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">  
82 - <COVERAGE_PATTERN ENABLED="true">  
83 - <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />  
84 - </COVERAGE_PATTERN>  
85 - </EXTENSION>  
86 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
87 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />  
88 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />  
89 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />  
90 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="DUMMY_APP" VALUE="test/dummy" />  
91 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />  
92 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="production" />  
93 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />  
94 - <method />  
95 - </configuration>  
96 - <configuration default="false" name="Development: kanjai" type="RailsRunConfigurationType" factoryName="Rails">  
97 - <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />  
98 - <module name="kanjai" />  
99 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
100 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />  
101 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
102 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
103 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />  
104 - <envs />  
105 - <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />  
106 - <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />  
107 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">  
108 - <COVERAGE_PATTERN ENABLED="true">  
109 - <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />  
110 - </COVERAGE_PATTERN>  
111 - </EXTENSION>  
112 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
113 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />  
114 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />  
115 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />  
116 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="DUMMY_APP" VALUE="test/dummy" />  
117 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />  
118 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" />  
119 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />  
120 - <method />  
121 - </configuration> 16 + <shared>
  17 + <configuration default="false" name="test: kanjai" type="RakeRunConfigurationType" factoryName="Rake">
  18 + <module name="kanjai" />
  19 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
  20 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
  21 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
  22 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
  23 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
  24 + <envs>
  25 + <env name="RAILS_ENV" value="test" />
  26 + </envs>
  27 + <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
  28 + <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
  29 + <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
  30 + <COVERAGE_PATTERN ENABLED="true">
  31 + <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
  32 + </COVERAGE_PATTERN>
  33 + </EXTENSION>
  34 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="test" />
  35 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
  36 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " />
  37 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
  38 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
  39 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
  40 + <method />
  41 + </configuration>
  42 + <configuration default="false" name="spec: kanjai" type="RakeRunConfigurationType" factoryName="Rake">
  43 + <module name="kanjai" />
  44 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
  45 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
  46 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
  47 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
  48 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
  49 + <envs />
  50 + <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
  51 + <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
  52 + <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
  53 + <COVERAGE_PATTERN ENABLED="true">
  54 + <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
  55 + </COVERAGE_PATTERN>
  56 + </EXTENSION>
  57 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec" />
  58 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
  59 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":rspec " />
  60 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
  61 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
  62 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
  63 + <method />
  64 + </configuration>
  65 + <configuration default="false" name="Production: kanjai" type="RailsRunConfigurationType" factoryName="Rails">
  66 + <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
  67 + <module name="kanjai" />
  68 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
  69 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
  70 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
  71 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
  72 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
  73 + <envs />
  74 + <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
  75 + <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
  76 + <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
  77 + <COVERAGE_PATTERN ENABLED="true">
  78 + <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
  79 + </COVERAGE_PATTERN>
  80 + </EXTENSION>
  81 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
  82 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
  83 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />
  84 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="DUMMY_APP" VALUE="test/dummy" />
  85 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
  86 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="production" />
  87 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
  88 + <method />
  89 + </configuration>
  90 + <configuration default="false" name="Development: kanjai" type="RailsRunConfigurationType" factoryName="Rails">
  91 + <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
  92 + <module name="kanjai" />
  93 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
  94 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
  95 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
  96 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
  97 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
  98 + <envs />
  99 + <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
  100 + <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
  101 + <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
  102 + <COVERAGE_PATTERN ENABLED="true">
  103 + <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
  104 + </COVERAGE_PATTERN>
  105 + </EXTENSION>
  106 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
  107 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
  108 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />
  109 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="DUMMY_APP" VALUE="test/dummy" />
  110 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
  111 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" />
  112 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
  113 + <method />
  114 + </configuration>
  115 + </shared>
  116 + <local />
122 </component> 117 </component>
123 <component name="NewModuleRootManager"> 118 <component name="NewModuleRootManager">
124 <content url="file://$MODULE_DIR$"> 119 <content url="file://$MODULE_DIR$">
@@ -133,10 +128,10 @@ @@ -133,10 +128,10 @@
133 <orderEntry type="library" scope="PROVIDED" name="activemodel (v4.2.6, rbenv: 2.1.3) [gem]" level="application" /> 128 <orderEntry type="library" scope="PROVIDED" name="activemodel (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
134 <orderEntry type="library" scope="PROVIDED" name="activerecord (v4.2.6, rbenv: 2.1.3) [gem]" level="application" /> 129 <orderEntry type="library" scope="PROVIDED" name="activerecord (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
135 <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.2.6, rbenv: 2.1.3) [gem]" level="application" /> 130 <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
136 - <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.8.2, rbenv: 2.1.3) [gem]" level="application" />  
137 - <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.6.0, rbenv: 2.1.3) [gem]" level="application" /> 131 + <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.9.5, rbenv: 2.1.3) [gem]" level="application" />
  132 + <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.6.1, rbenv: 2.1.3) [gem]" level="application" />
138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" /> 133 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.32, rbenv: 2.1.3) [gem]" level="application" /> 134 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.9.20, rbenv: 2.1.3) [gem]" level="application" />
140 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.32, rbenv: 2.1.3) [gem]" level="application" /> 135 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.32, rbenv: 2.1.3) [gem]" level="application" />
141 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.32, rbenv: 2.1.3) [gem]" level="application" /> 136 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.32, rbenv: 2.1.3) [gem]" level="application" />
142 <orderEntry type="library" scope="PROVIDED" name="aws-sigv4 (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> 137 <orderEntry type="library" scope="PROVIDED" name="aws-sigv4 (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
@@ -148,15 +143,15 @@ @@ -148,15 +143,15 @@
148 <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.4, rbenv: 2.1.3) [gem]" level="application" /> 143 <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.4, rbenv: 2.1.3) [gem]" level="application" />
149 <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.2, rbenv: 2.1.3) [gem]" level="application" /> 144 <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.2, rbenv: 2.1.3) [gem]" level="application" />
150 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.1, rbenv: 2.1.3) [gem]" level="application" /> 145 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
151 - <orderEntry type="library" scope="PROVIDED" name="devise (v4.2.0, rbenv: 2.1.3) [gem]" level="application" /> 146 + <orderEntry type="library" scope="PROVIDED" name="devise (v4.3.0, rbenv: 2.1.3) [gem]" level="application" />
152 <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" /> 147 <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" />
153 <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.1.3) [gem]" level="application" /> 148 <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
154 <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.1.3) [gem]" level="application" /> 149 <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
155 <orderEntry type="library" scope="PROVIDED" name="factory_girl (v4.7.0, rbenv: 2.1.3) [gem]" level="application" /> 150 <orderEntry type="library" scope="PROVIDED" name="factory_girl (v4.7.0, rbenv: 2.1.3) [gem]" level="application" />
156 - <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.7.0, rbenv: 2.1.3) [gem]" level="application" /> 151 + <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.8.0, rbenv: 2.1.3) [gem]" level="application" />
157 <orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.7, rbenv: 2.1.3) [gem]" level="application" /> 152 <orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.7, rbenv: 2.1.3) [gem]" level="application" />
158 <orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, rbenv: 2.1.3) [gem]" level="application" /> 153 <orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, rbenv: 2.1.3) [gem]" level="application" />
159 - <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.6.1, rbenv: 2.1.3) [gem]" level="application" /> 154 + <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.6.4, rbenv: 2.1.3) [gem]" level="application" />
160 <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.1, rbenv: 2.1.3) [gem]" level="application" /> 155 <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.1, rbenv: 2.1.3) [gem]" level="application" />
161 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" /> 156 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" />
162 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" /> 157 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
@@ -200,7 +195,7 @@ @@ -200,7 +195,7 @@
200 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" /> 195 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" />
201 <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.5, rbenv: 2.1.3) [gem]" level="application" /> 196 <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.5, rbenv: 2.1.3) [gem]" level="application" />
202 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.1.3) [gem]" level="application" /> 197 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.1.3) [gem]" level="application" />
203 - <orderEntry type="library" scope="PROVIDED" name="uglifier (v3.0.4, rbenv: 2.1.3) [gem]" level="application" /> 198 + <orderEntry type="library" scope="PROVIDED" name="uglifier (v3.2.0, rbenv: 2.1.3) [gem]" level="application" />
204 <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.6, rbenv: 2.1.3) [gem]" level="application" /> 199 <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.6, rbenv: 2.1.3) [gem]" level="application" />
205 </component> 200 </component>
206 <component name="RModuleSettingsStorage"> 201 <component name="RModuleSettingsStorage">
@@ -15,7 +15,6 @@ @@ -15,7 +15,6 @@
15 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 15 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
16 </COVERAGE_PATTERN> 16 </COVERAGE_PATTERN>
17 </EXTENSION> 17 </EXTENSION>
18 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
19 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" /> 18 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
20 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" /> 19 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
21 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" /> 20 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />
@@ -15,7 +15,6 @@ @@ -15,7 +15,6 @@
15 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 15 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
16 </COVERAGE_PATTERN> 16 </COVERAGE_PATTERN>
17 </EXTENSION> 17 </EXTENSION>
18 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
19 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" /> 18 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
20 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" /> 19 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
21 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" /> 20 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
14 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 14 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
15 </COVERAGE_PATTERN> 15 </COVERAGE_PATTERN>
16 </EXTENSION> 16 </EXTENSION>
17 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
18 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec" /> 17 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec" />
19 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" /> 18 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
20 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":rspec " /> 19 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":rspec " />
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 16 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
17 </COVERAGE_PATTERN> 17 </COVERAGE_PATTERN>
18 </EXTENSION> 18 </EXTENSION>
19 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
20 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="test" /> 19 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="test" />
21 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" /> 20 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
22 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " /> 21 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " />
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="VcsDirectoryMappings"> 3 <component name="VcsDirectoryMappings">
4 - <mapping directory="" vcs="" /> 4 + <mapping directory="$PROJECT_DIR$" vcs="Git" />
5 </component> 5 </component>
6 </project> 6 </project>
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="" /> 4 + <list default="true" id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="">
  5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/mailers/kanjai_mailer.rb" />
  7 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.generators" afterPath="$PROJECT_DIR$/.idea/.generators" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/kanjai.iml" afterPath="$PROJECT_DIR$/.idea/kanjai.iml" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/Development__kanjai.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/Development__kanjai.xml" />
  11 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/Production__kanjai.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/Production__kanjai.xml" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/spec__kanjai.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/spec__kanjai.xml" />
  13 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/test__kanjai.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/test__kanjai.xml" />
  14 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
  15 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  16 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
  17 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/kanjai/page_content.rb" afterPath="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
  18 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" afterPath="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
  19 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" afterPath="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" />
  20 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />
  21 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/template_generator.rb" afterPath="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
  22 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" />
  23 + </list>
5 <ignored path="kanjai.iws" /> 24 <ignored path="kanjai.iws" />
6 <ignored path=".idea/workspace.xml" /> 25 <ignored path=".idea/workspace.xml" />
7 <ignored path=".idea/dataSources.local.xml" /> 26 <ignored path=".idea/dataSources.local.xml" />
@@ -12,114 +31,80 @@ @@ -12,114 +31,80 @@
12 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 31 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
13 <option name="LAST_RESOLUTION" value="IGNORE" /> 32 <option name="LAST_RESOLUTION" value="IGNORE" />
14 </component> 33 </component>
15 - <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />  
16 <component name="CreatePatchCommitExecutor"> 34 <component name="CreatePatchCommitExecutor">
17 <option name="PATCH_PATH" value="" /> 35 <option name="PATCH_PATH" value="" />
18 </component> 36 </component>
19 - <component name="DaemonCodeAnalyzer">  
20 - <disable_hints />  
21 - </component>  
22 <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> 37 <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
23 <component name="FavoritesManager"> 38 <component name="FavoritesManager">
24 <favorites_list name="kanjai" /> 39 <favorites_list name="kanjai" />
25 </component> 40 </component>
26 <component name="FileEditorManager"> 41 <component name="FileEditorManager">
27 - <leaf>  
28 - <file leaf-file-name="admin_users_controller.rb" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb">  
30 - <provider selected="true" editor-type-id="text-editor">  
31 - <state vertical-scroll-proportion="0.0" vertical-offset="176" max-vertical-offset="810">  
32 - <caret line="40" column="7" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />  
33 - <folding />  
34 - </state>  
35 - </provider>  
36 - </entry>  
37 - </file>  
38 - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">  
39 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">  
40 - <provider selected="true" editor-type-id="text-editor">  
41 - <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">  
42 - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />  
43 - <folding />  
44 - </state>  
45 - </provider>  
46 - </entry>  
47 - </file>  
48 - <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">  
49 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">  
50 - <provider selected="true" editor-type-id="text-editor">  
51 - <state vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="300">  
52 - <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />  
53 - <folding />  
54 - </state>  
55 - </provider>  
56 - </entry>  
57 - </file>  
58 - <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">  
59 - <entry file="file://$PROJECT_DIR$/config/routes.rb"> 42 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  43 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  44 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
60 <provider selected="true" editor-type-id="text-editor"> 45 <provider selected="true" editor-type-id="text-editor">
61 - <state vertical-scroll-proportion="0.0" vertical-offset="356" max-vertical-offset="990">  
62 - <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" /> 46 + <state relative-caret-position="216">
  47 + <caret line="280" column="190" lean-forward="false" selection-start-line="280" selection-start-column="190" selection-end-line="280" selection-end-column="190" />
63 <folding /> 48 <folding />
64 </state> 49 </state>
65 </provider> 50 </provider>
66 </entry> 51 </entry>
67 </file> 52 </file>
68 - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">  
69 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 53 + <file leaf-file-name="form_controller.rb" pinned="false" current-in-tab="false">
  54 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
70 <provider selected="true" editor-type-id="text-editor"> 55 <provider selected="true" editor-type-id="text-editor">
71 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3090">  
72 - <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> 56 + <state relative-caret-position="135">
  57 + <caret line="9" column="32" lean-forward="false" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
73 <folding /> 58 <folding />
74 </state> 59 </state>
75 </provider> 60 </provider>
76 </entry> 61 </entry>
77 </file> 62 </file>
78 - <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">  
79 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb"> 63 + <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
  64 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
80 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
81 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">  
82 - <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" /> 66 + <state relative-caret-position="501">
  67 + <caret line="45" column="82" lean-forward="false" selection-start-line="45" selection-start-column="82" selection-end-line="45" selection-end-column="82" />
83 <folding /> 68 <folding />
84 </state> 69 </state>
85 </provider> 70 </provider>
86 </entry> 71 </entry>
87 </file> 72 </file>
88 - <file leaf-file-name="admin_controller.rb" pinned="false" current-in-tab="false">  
89 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb"> 73 + <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false">
  74 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
90 <provider selected="true" editor-type-id="text-editor"> 75 <provider selected="true" editor-type-id="text-editor">
91 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">  
92 - <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" /> 76 + <state relative-caret-position="0">
  77 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
93 <folding /> 78 <folding />
94 </state> 79 </state>
95 </provider> 80 </provider>
96 </entry> 81 </entry>
97 </file> 82 </file>
98 - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">  
99 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 83 + <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false">
  84 + <entry file="file://$PROJECT_DIR$/lib/admin.rb">
100 <provider selected="true" editor-type-id="text-editor"> 85 <provider selected="true" editor-type-id="text-editor">
101 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1050">  
102 - <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" /> 86 + <state relative-caret-position="0">
  87 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
103 <folding /> 88 <folding />
104 </state> 89 </state>
105 </provider> 90 </provider>
106 </entry> 91 </entry>
107 </file> 92 </file>
108 - <file leaf-file-name="application_helper.rb" pinned="false" current-in-tab="false">  
109 - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb"> 93 + <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
  94 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
110 <provider selected="true" editor-type-id="text-editor"> 95 <provider selected="true" editor-type-id="text-editor">
111 - <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="1215">  
112 - <caret line="11" column="7" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" /> 96 + <state relative-caret-position="0">
  97 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
113 <folding /> 98 <folding />
114 </state> 99 </state>
115 </provider> 100 </provider>
116 </entry> 101 </entry>
117 </file> 102 </file>
118 - <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">  
119 - <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 103 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  104 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
120 <provider selected="true" editor-type-id="text-editor"> 105 <provider selected="true" editor-type-id="text-editor">
121 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3330">  
122 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 106 + <state relative-caret-position="15">
  107 + <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
123 <folding /> 108 <folding />
124 </state> 109 </state>
125 </provider> 110 </provider>
@@ -127,19 +112,29 @@ @@ -127,19 +112,29 @@
127 </file> 112 </file>
128 </leaf> 113 </leaf>
129 </component> 114 </component>
  115 + <component name="FindInProjectRecents">
  116 + <findStrings>
  117 + <find>page_template.rb</find>
  118 + <find>edit_template</find>
  119 + <find>page_content_markers</find>
  120 + <find>replace_text_marker</find>
  121 + <find>element</find>
  122 + <find>gsub!</find>
  123 + <find>replace_attributes_marker</find>
  124 + <find>subpart_generate</find>
  125 + <find>content_generator</find>
  126 + </findStrings>
  127 + <dirStrings>
  128 + <dir>$PROJECT_DIR$</dir>
  129 + </dirStrings>
  130 + </component>
  131 + <component name="Git.Settings">
  132 + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  133 + </component>
130 <component name="IdeDocumentHistory"> 134 <component name="IdeDocumentHistory">
131 <option name="CHANGED_PATHS"> 135 <option name="CHANGED_PATHS">
132 <list> 136 <list>
133 - <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" />  
134 - <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />  
135 - <option value="$PROJECT_DIR$/lib/tasks/install.rake" />  
136 - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />  
137 - <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />  
138 - <option value="$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb" />  
139 - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb" />  
140 - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/extend/test.js" />  
141 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 137 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
142 - <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />  
143 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" /> 138 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
144 <option value="$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb" /> 139 <option value="$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb" />
145 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" /> 140 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
@@ -147,7 +142,6 @@ @@ -147,7 +142,6 @@
147 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" /> 142 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
148 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" /> 143 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
149 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" /> 144 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
150 - <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />  
151 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" /> 145 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" />
152 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" /> 146 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
153 <option value="$PROJECT_DIR$/db/migrate/20160804133136_add_image_link_to_kanjai_images.rb" /> 147 <option value="$PROJECT_DIR$/db/migrate/20160804133136_add_image_link_to_kanjai_images.rb" />
@@ -165,11 +159,8 @@ @@ -165,11 +159,8 @@
165 <option value="$PROJECT_DIR$/kanjai.gemspec" /> 159 <option value="$PROJECT_DIR$/kanjai.gemspec" />
166 <option value="$PROJECT_DIR$/lib/kanjai/content_function.rb" /> 160 <option value="$PROJECT_DIR$/lib/kanjai/content_function.rb" />
167 <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb" /> 161 <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb" />
168 - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />  
169 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" /> 162 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
170 <option value="$PROJECT_DIR$/lib/zip.rb" /> 163 <option value="$PROJECT_DIR$/lib/zip.rb" />
171 - <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />  
172 - <option value="$PROJECT_DIR$/config/routes.rb" />  
173 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" /> 164 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
174 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb" /> 165 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb" />
175 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/new.html.erb" /> 166 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/new.html.erb" />
@@ -180,28 +171,35 @@ @@ -180,28 +171,35 @@
180 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 171 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
181 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" /> 172 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
182 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" /> 173 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
  174 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" />
  175 + <option value="$PROJECT_DIR$/db/migrate/20171214071607_add_form_data_to_page_content_marker.rb" />
  176 + <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
  177 + <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
  178 + <option value="$PROJECT_DIR$/config/routes.rb" />
  179 + <option value="$PROJECT_DIR$/app/mailers/application_mailer.rb" />
  180 + <option value="$PROJECT_DIR$/db/migrate/20171214092747_add_from_to_mai_to_page_content_marker.rb" />
  181 + <option value="$PROJECT_DIR$/app/mailers/kanjai_mailer.rb" />
  182 + <option value="$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb" />
  183 + <option value="$PROJECT_DIR$/db/migrate/20171214094525_add_answer_text_to_page_content_marker.rb" />
  184 + <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
  185 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
  186 + <option value="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" />
183 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 187 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
184 </list> 188 </list>
185 </option> 189 </option>
186 </component> 190 </component>
  191 + <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  192 + <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
187 <component name="JsGulpfileManager"> 193 <component name="JsGulpfileManager">
188 <detection-done>true</detection-done> 194 <detection-done>true</detection-done>
  195 + <sorting>DEFINITION_ORDER</sorting>
189 </component> 196 </component>
190 <component name="ProjectFrameBounds"> 197 <component name="ProjectFrameBounds">
191 <option name="y" value="23" /> 198 <option name="y" value="23" />
192 <option name="width" value="1280" /> 199 <option name="width" value="1280" />
193 - <option name="height" value="728" />  
194 - </component>  
195 - <component name="ProjectLevelVcsManager" settingsEditedManually="false">  
196 - <OptionsSetting value="true" id="Add" />  
197 - <OptionsSetting value="true" id="Remove" />  
198 - <OptionsSetting value="true" id="Checkout" />  
199 - <OptionsSetting value="true" id="Update" />  
200 - <OptionsSetting value="true" id="Status" />  
201 - <OptionsSetting value="true" id="Edit" />  
202 - <ConfirmationsSetting value="0" id="Add" />  
203 - <ConfirmationsSetting value="0" id="Remove" /> 200 + <option name="height" value="730" />
204 </component> 201 </component>
  202 + <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
205 <component name="ProjectView"> 203 <component name="ProjectView">
206 <navigator currentView="ProjectPane" proportions="" version="1"> 204 <navigator currentView="ProjectPane" proportions="" version="1">
207 <flattenPackages /> 205 <flattenPackages />
@@ -213,9 +211,12 @@ @@ -213,9 +211,12 @@
213 <autoscrollToSource /> 211 <autoscrollToSource />
214 <autoscrollFromSource /> 212 <autoscrollFromSource />
215 <sortByType /> 213 <sortByType />
  214 + <manualOrder />
  215 + <foldersAlwaysOnTop value="true" />
216 </navigator> 216 </navigator>
217 <panes> 217 <panes>
218 - <pane id="Scope" /> 218 + <pane id="RailsProjectView" />
  219 + <pane id="Scratches" />
219 <pane id="ProjectPane"> 220 <pane id="ProjectPane">
220 <subPane> 221 <subPane>
221 <PATH> 222 <PATH>
@@ -223,12 +224,6 @@ @@ -223,12 +224,6 @@
223 <option name="myItemId" value="kanjai" /> 224 <option name="myItemId" value="kanjai" />
224 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> 225 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
225 </PATH_ELEMENT> 226 </PATH_ELEMENT>
226 - </PATH>  
227 - <PATH>  
228 - <PATH_ELEMENT>  
229 - <option name="myItemId" value="kanjai" />  
230 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
231 - </PATH_ELEMENT>  
232 <PATH_ELEMENT> 227 <PATH_ELEMENT>
233 <option name="myItemId" value="kanjai" /> 228 <option name="myItemId" value="kanjai" />
234 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 229 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
@@ -293,10 +288,6 @@ @@ -293,10 +288,6 @@
293 <option name="myItemId" value="app" /> 288 <option name="myItemId" value="app" />
294 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 289 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
295 </PATH_ELEMENT> 290 </PATH_ELEMENT>
296 - <PATH_ELEMENT>  
297 - <option name="myItemId" value="views" />  
298 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
299 - </PATH_ELEMENT>  
300 </PATH> 291 </PATH>
301 <PATH> 292 <PATH>
302 <PATH_ELEMENT> 293 <PATH_ELEMENT>
@@ -312,81 +303,7 @@ @@ -312,81 +303,7 @@
312 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 303 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
313 </PATH_ELEMENT> 304 </PATH_ELEMENT>
314 <PATH_ELEMENT> 305 <PATH_ELEMENT>
315 - <option name="myItemId" value="views" />  
316 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
317 - </PATH_ELEMENT>  
318 - <PATH_ELEMENT>  
319 - <option name="myItemId" value="kanjai" />  
320 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
321 - </PATH_ELEMENT>  
322 - </PATH>  
323 - <PATH>  
324 - <PATH_ELEMENT>  
325 - <option name="myItemId" value="kanjai" />  
326 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
327 - </PATH_ELEMENT>  
328 - <PATH_ELEMENT>  
329 - <option name="myItemId" value="kanjai" />  
330 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
331 - </PATH_ELEMENT>  
332 - <PATH_ELEMENT>  
333 - <option name="myItemId" value="app" />  
334 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
335 - </PATH_ELEMENT>  
336 - <PATH_ELEMENT>  
337 - <option name="myItemId" value="views" />  
338 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
339 - </PATH_ELEMENT>  
340 - <PATH_ELEMENT>  
341 - <option name="myItemId" value="kanjai" />  
342 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
343 - </PATH_ELEMENT>  
344 - <PATH_ELEMENT>  
345 - <option name="myItemId" value="admin" />  
346 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
347 - </PATH_ELEMENT>  
348 - </PATH>  
349 - <PATH>  
350 - <PATH_ELEMENT>  
351 - <option name="myItemId" value="kanjai" />  
352 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
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_ELEMENT>  
359 - <option name="myItemId" value="app" />  
360 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
361 - </PATH_ELEMENT>  
362 - <PATH_ELEMENT>  
363 - <option name="myItemId" value="views" />  
364 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
365 - </PATH_ELEMENT>  
366 - <PATH_ELEMENT>  
367 - <option name="myItemId" value="kanjai" />  
368 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
369 - </PATH_ELEMENT>  
370 - <PATH_ELEMENT>  
371 - <option name="myItemId" value="admin" />  
372 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
373 - </PATH_ELEMENT>  
374 - <PATH_ELEMENT>  
375 - <option name="myItemId" value="admin_users" />  
376 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
377 - </PATH_ELEMENT>  
378 - </PATH>  
379 - <PATH>  
380 - <PATH_ELEMENT>  
381 - <option name="myItemId" value="kanjai" />  
382 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
383 - </PATH_ELEMENT>  
384 - <PATH_ELEMENT>  
385 - <option name="myItemId" value="kanjai" />  
386 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
387 - </PATH_ELEMENT>  
388 - <PATH_ELEMENT>  
389 - <option name="myItemId" value="app" /> 306 + <option name="myItemId" value="mailers" />
390 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 307 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
391 </PATH_ELEMENT> 308 </PATH_ELEMENT>
392 </PATH> 309 </PATH>
@@ -480,7 +397,7 @@ @@ -480,7 +397,7 @@
480 </PATH> 397 </PATH>
481 </subPane> 398 </subPane>
482 </pane> 399 </pane>
483 - <pane id="RailsProjectView" /> 400 + <pane id="Scope" />
484 </panes> 401 </panes>
485 </component> 402 </component>
486 <component name="PropertiesComponent"> 403 <component name="PropertiesComponent">
@@ -488,30 +405,42 @@ @@ -488,30 +405,42 @@
488 <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 405 <property name="last_opened_file_path" value="$PROJECT_DIR$" />
489 <property name="HbShouldOpenHtmlAsHb" value="" /> 406 <property name="HbShouldOpenHtmlAsHb" value="" />
490 <property name="recentsLimit" value="5" /> 407 <property name="recentsLimit" value="5" />
491 - <property name="FullScreen" value="false" />  
492 </component> 408 </component>
493 <component name="RecentsManager"> 409 <component name="RecentsManager">
  410 + <key name="MoveFile.RECENT_KEYS">
  411 + <recent name="$PROJECT_DIR$/app/assets/images/kanjai/fileinput" />
  412 + <recent name="$PROJECT_DIR$/app/assets/stylesheets/kanjai" />
  413 + <recent name="$PROJECT_DIR$/app/assets/javascripts/kanjai/lib" />
  414 + </key>
494 <key name="CopyFile.RECENT_KEYS"> 415 <key name="CopyFile.RECENT_KEYS">
  416 + <recent name="$PROJECT_DIR$/app/mailers" />
495 <recent name="$PROJECT_DIR$/app/views/kanjai/admin/admin_users" /> 417 <recent name="$PROJECT_DIR$/app/views/kanjai/admin/admin_users" />
496 <recent name="$PROJECT_DIR$/config/initializers" /> 418 <recent name="$PROJECT_DIR$/config/initializers" />
497 <recent name="$PROJECT_DIR$/bin" /> 419 <recent name="$PROJECT_DIR$/bin" />
498 <recent name="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general" /> 420 <recent name="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general" />
499 - <recent name="$PROJECT_DIR$/app/assets/javascripts/kanjai/general" />  
500 - </key>  
501 - <key name="MoveFile.RECENT_KEYS">  
502 - <recent name="$PROJECT_DIR$/app/assets/images/kanjai/fileinput" />  
503 - <recent name="$PROJECT_DIR$/app/assets/stylesheets/kanjai" />  
504 - <recent name="$PROJECT_DIR$/app/assets/javascripts/kanjai/lib" />  
505 </key> 421 </key>
506 </component> 422 </component>
  423 + <component name="RunDashboard">
  424 + <option name="ruleStates">
  425 + <list>
  426 + <RuleState>
  427 + <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
  428 + </RuleState>
  429 + <RuleState>
  430 + <option name="name" value="StatusDashboardGroupingRule" />
  431 + </RuleState>
  432 + </list>
  433 + </option>
  434 + </component>
507 <component name="RunManager" selected="Rails.Development: kanjai"> 435 <component name="RunManager" selected="Rails.Development: kanjai">
508 - <configuration default="true" type="RakeRunConfigurationType" factoryName="Rake"> 436 + <configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">
  437 + <predefined_log_file id="RUBY_CUCUMBER" enabled="true" />
509 <module name="" /> 438 <module name="" />
510 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
511 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />  
512 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
513 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
514 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" /> 439 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
  440 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
  441 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
  442 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
  443 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
515 <envs /> 444 <envs />
516 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" /> 445 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
517 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" /> 446 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
@@ -520,13 +449,69 @@ @@ -520,13 +449,69 @@
520 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 449 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
521 </COVERAGE_PATTERN> 450 </COVERAGE_PATTERN>
522 </EXTENSION> 451 </EXTENSION>
523 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
524 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="" />  
525 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />  
526 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE="" />  
527 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />  
528 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />  
529 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" /> 452 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*.feature" />
  453 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
  454 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
  455 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
  456 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TAGS_FILTER" VALUE="" />
  457 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_NAME_FILTER" VALUE="" />
  458 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_ARGS" VALUE="--color -r features" />
  459 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
  460 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
  461 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="VERBOSE_OPTION" VALUE="false" />
  462 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
  463 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
  464 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
  465 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_RUNNER_PATH" VALUE="" />
  466 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_RUNNER" VALUE="false" />
  467 + <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SETTINGS_VERSION" VALUE="2" />
  468 + <method />
  469 + </configuration>
  470 + <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
  471 + <node-interpreter value="project" />
  472 + <working-dir value="" />
  473 + <envs />
  474 + <scope-kind value="ALL" />
  475 + <method />
  476 + </configuration>
  477 + <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
  478 + <config-file value="" />
  479 + <node-interpreter value="project" />
  480 + <envs />
  481 + <method />
  482 + </configuration>
  483 + <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
  484 + <method />
  485 + </configuration>
  486 + <configuration default="true" type="RSpecRunConfigurationType" factoryName="RSpec">
  487 + <predefined_log_file id="RUBY_RSPEC" enabled="true" />
  488 + <module name="" />
  489 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
  490 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
  491 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
  492 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
  493 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
  494 + <envs />
  495 + <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
  496 + <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
  497 + <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
  498 + <COVERAGE_PATTERN ENABLED="true">
  499 + <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
  500 + </COVERAGE_PATTERN>
  501 + </EXTENSION>
  502 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
  503 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
  504 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
  505 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
  506 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
  507 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
  508 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
  509 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
  510 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_SPEC_RUNNER" VALUE="false" />
  511 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
  512 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
  513 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
  514 + <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
530 <method /> 515 <method />
531 </configuration> 516 </configuration>
532 <configuration default="true" type="RailsRunConfigurationType" factoryName="Rails"> 517 <configuration default="true" type="RailsRunConfigurationType" factoryName="Rails">
@@ -545,7 +530,6 @@ @@ -545,7 +530,6 @@
545 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 530 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
546 </COVERAGE_PATTERN> 531 </COVERAGE_PATTERN>
547 </EXTENSION> 532 </EXTENSION>
548 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
549 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" /> 533 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
550 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" /> 534 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
551 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" /> 535 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />
@@ -555,14 +539,13 @@ @@ -555,14 +539,13 @@
555 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" /> 539 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
556 <method /> 540 <method />
557 </configuration> 541 </configuration>
558 - <configuration default="true" type="RSpecRunConfigurationType" factoryName="RSpec">  
559 - <predefined_log_file id="RUBY_RSPEC" enabled="true" /> 542 + <configuration default="true" type="RakeRunConfigurationType" factoryName="Rake">
560 <module name="" /> 543 <module name="" />
561 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
562 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />  
563 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
564 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
565 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" /> 544 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
  545 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
  546 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
  547 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
  548 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
566 <envs /> 549 <envs />
567 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" /> 550 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
568 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" /> 551 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
@@ -571,20 +554,12 @@ @@ -571,20 +554,12 @@
571 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 554 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
572 </COVERAGE_PATTERN> 555 </COVERAGE_PATTERN>
573 </EXTENSION> 556 </EXTENSION>
574 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
575 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />  
576 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />  
577 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />  
578 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />  
579 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />  
580 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />  
581 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />  
582 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />  
583 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_SPEC_RUNNER" VALUE="false" />  
584 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />  
585 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />  
586 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />  
587 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" /> 557 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="" />
  558 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
  559 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE="" />
  560 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
  561 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
  562 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
588 <method /> 563 <method />
589 </configuration> 564 </configuration>
590 <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby"> 565 <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby">
@@ -602,14 +577,10 @@ @@ -602,14 +577,10 @@
602 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 577 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
603 </COVERAGE_PATTERN> 578 </COVERAGE_PATTERN>
604 </EXTENSION> 579 </EXTENSION>
605 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
606 <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" /> 580 <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" />
607 <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" /> 581 <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
608 <method /> 582 <method />
609 </configuration> 583 </configuration>
610 - <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">  
611 - <method />  
612 - </configuration>  
613 <configuration default="true" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest"> 584 <configuration default="true" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest">
614 <predefined_log_file id="RUBY_TESTUNIT" enabled="true" /> 585 <predefined_log_file id="RUBY_TESTUNIT" enabled="true" />
615 <module name="" /> 586 <module name="" />
@@ -626,7 +597,6 @@ @@ -626,7 +597,6 @@
626 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 597 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
627 </COVERAGE_PATTERN> 598 </COVERAGE_PATTERN>
628 </EXTENSION> 599 </EXTENSION>
629 - <EXTENSION ID="org.jetbrains.plugins.ruby.motion.run.MotionSimulatorRunExtension" />  
630 <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" /> 600 <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
631 <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" /> 601 <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
632 <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" /> 602 <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
@@ -639,6 +609,7 @@ @@ -639,6 +609,7 @@
639 <method /> 609 <method />
640 </configuration> 610 </configuration>
641 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> 611 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
  612 + <node-interpreter>project</node-interpreter>
642 <node-options /> 613 <node-options />
643 <gulpfile /> 614 <gulpfile />
644 <tasks /> 615 <tasks />
@@ -647,6 +618,13 @@ @@ -647,6 +618,13 @@
647 <envs /> 618 <envs />
648 <method /> 619 <method />
649 </configuration> 620 </configuration>
  621 + <configuration default="true" type="js.build_tools.npm" factoryName="npm">
  622 + <command value="run" />
  623 + <scripts />
  624 + <node-interpreter value="project" />
  625 + <envs />
  626 + <method />
  627 + </configuration>
650 <list size="4"> 628 <list size="4">
651 <item index="0" class="java.lang.String" itemvalue="Rake.test: kanjai" /> 629 <item index="0" class="java.lang.String" itemvalue="Rake.test: kanjai" />
652 <item index="1" class="java.lang.String" itemvalue="Rake.spec: kanjai" /> 630 <item index="1" class="java.lang.String" itemvalue="Rake.spec: kanjai" />
@@ -654,7 +632,10 @@ @@ -654,7 +632,10 @@
654 <item index="3" class="java.lang.String" itemvalue="Rails.Development: kanjai" /> 632 <item index="3" class="java.lang.String" itemvalue="Rails.Development: kanjai" />
655 </list> 633 </list>
656 </component> 634 </component>
657 - <component name="ShelveChangesManager" show_recycled="false" /> 635 + <component name="ShelveChangesManager" show_recycled="false">
  636 + <option name="remove_strategy" value="false" />
  637 + </component>
  638 + <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" />
658 <component name="SvnConfiguration"> 639 <component name="SvnConfiguration">
659 <configuration /> 640 <configuration />
660 </component> 641 </component>
@@ -663,36 +644,52 @@ @@ -663,36 +644,52 @@
663 <changelist id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="" /> 644 <changelist id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="" />
664 <created>1461667396774</created> 645 <created>1461667396774</created>
665 <option name="number" value="Default" /> 646 <option name="number" value="Default" />
  647 + <option name="presentableId" value="Default" />
666 <updated>1461667396774</updated> 648 <updated>1461667396774</updated>
  649 + <workItem from="1494966983627" duration="731000" />
  650 + <workItem from="1495090952619" duration="1573000" />
  651 + <workItem from="1495108372095" duration="2000" />
  652 + <workItem from="1498808617180" duration="1037000" />
  653 + <workItem from="1498836423959" duration="4000" />
  654 + <workItem from="1500931211896" duration="152000" />
  655 + <workItem from="1500931637579" duration="304000" />
  656 + <workItem from="1501482504677" duration="10000" />
  657 + <workItem from="1513232887722" duration="8211000" />
667 </task> 658 </task>
668 <servers /> 659 <servers />
669 </component> 660 </component>
  661 + <component name="TimeTrackingManager">
  662 + <option name="totallyTimeSpent" value="12024000" />
  663 + </component>
670 <component name="ToolWindowManager"> 664 <component name="ToolWindowManager">
671 - <frame x="0" y="23" width="1280" height="728" extended-state="6" /> 665 + <frame x="0" y="23" width="1280" height="730" extended-state="6" />
672 <editor active="true" /> 666 <editor active="true" />
673 <layout> 667 <layout>
674 - <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" />  
675 - <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" />  
676 - <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" />  
677 - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />  
678 - <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" />  
679 - <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" />  
680 - <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" />  
681 - <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" />  
682 - <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" />  
683 - <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" />  
684 - <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" />  
685 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32875606" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />  
686 - <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" />  
687 - <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" />  
688 - <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" />  
689 - <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" />  
690 - <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" />  
691 - <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" />  
692 - <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" />  
693 - <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" /> 668 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.44830373" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  669 + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  670 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
  671 + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  672 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  673 + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  674 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
  675 + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  676 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  677 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
  678 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  679 + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  680 + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  681 + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  682 + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  683 + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  684 + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  685 + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  686 + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
  687 + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
694 </layout> 688 </layout>
695 </component> 689 </component>
  690 + <component name="TypeScriptGeneratedFilesManager">
  691 + <option name="processedProjectFiles" value="true" />
  692 + </component>
696 <component name="Vcs.Log.UiProperties"> 693 <component name="Vcs.Log.UiProperties">
697 <option name="RECENTLY_FILTERED_USER_GROUPS"> 694 <option name="RECENTLY_FILTERED_USER_GROUPS">
698 <collection /> 695 <collection />
@@ -704,11 +701,6 @@ @@ -704,11 +701,6 @@
704 <component name="VcsContentAnnotationSettings"> 701 <component name="VcsContentAnnotationSettings">
705 <option name="myLimit" value="2678400000" /> 702 <option name="myLimit" value="2678400000" />
706 </component> 703 </component>
707 - <component name="VcsManagerConfiguration">  
708 - <option name="myTodoPanelSettings">  
709 - <TodoPanelSettings />  
710 - </option>  
711 - </component>  
712 <component name="XDebuggerManager"> 704 <component name="XDebuggerManager">
713 <breakpoint-manager> 705 <breakpoint-manager>
714 <option name="time" value="1" /> 706 <option name="time" value="1" />
@@ -716,372 +708,392 @@ @@ -716,372 +708,392 @@
716 <watches-manager /> 708 <watches-manager />
717 </component> 709 </component>
718 <component name="editorHistoryManager"> 710 <component name="editorHistoryManager">
719 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb"> 711 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb">
720 <provider selected="true" editor-type-id="text-editor"> 712 <provider selected="true" editor-type-id="text-editor">
721 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
722 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 713 + <state relative-caret-position="0">
  714 + <caret line="14" column="101" lean-forward="false" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" />
723 </state> 715 </state>
724 </provider> 716 </provider>
725 </entry> 717 </entry>
726 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb"> 718 + <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
727 <provider selected="true" editor-type-id="text-editor"> 719 <provider selected="true" editor-type-id="text-editor">
728 - <state vertical-scroll-proportion="0.0" vertical-offset="980" max-vertical-offset="1770">  
729 - <caret line="85" column="124" selection-start-line="85" selection-start-column="124" selection-end-line="85" selection-end-column="124" /> 720 + <state relative-caret-position="0">
  721 + <caret line="91" column="28" lean-forward="false" selection-start-line="91" selection-start-column="28" selection-end-line="91" selection-end-column="28" />
730 </state> 722 </state>
731 </provider> 723 </provider>
732 </entry> 724 </entry>
733 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js"> 725 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb">
734 <provider selected="true" editor-type-id="text-editor"> 726 <provider selected="true" editor-type-id="text-editor">
735 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245">  
736 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 727 + <state relative-caret-position="0">
  728 + <caret line="40" column="7" lean-forward="false" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
737 </state> 729 </state>
738 </provider> 730 </provider>
739 </entry> 731 </entry>
740 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js"> 732 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">
741 <provider selected="true" editor-type-id="text-editor"> 733 <provider selected="true" editor-type-id="text-editor">
742 - <state vertical-scroll-proportion="0.0" vertical-offset="2520" max-vertical-offset="7845">  
743 - <caret line="189" column="26" selection-start-line="189" selection-start-column="26" selection-end-line="189" selection-end-column="26" /> 734 + <state relative-caret-position="0">
  735 + <caret line="8" column="102" lean-forward="false" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />
744 </state> 736 </state>
745 </provider> 737 </provider>
746 </entry> 738 </entry>
747 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb"> 739 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
748 <provider selected="true" editor-type-id="text-editor"> 740 <provider selected="true" editor-type-id="text-editor">
749 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520">  
750 - <caret line="16" column="12" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" /> 741 + <state relative-caret-position="0">
  742 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
751 </state> 743 </state>
752 </provider> 744 </provider>
753 </entry> 745 </entry>
754 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js"> 746 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
755 <provider selected="true" editor-type-id="text-editor"> 747 <provider selected="true" editor-type-id="text-editor">
756 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="8550">  
757 - <caret line="81" column="36" selection-start-line="81" selection-start-column="36" selection-end-line="81" selection-end-column="36" /> 748 + <state relative-caret-position="0">
  749 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
758 </state> 750 </state>
759 </provider> 751 </provider>
760 </entry> 752 </entry>
761 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js"> 753 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
762 <provider selected="true" editor-type-id="text-editor"> 754 <provider selected="true" editor-type-id="text-editor">
763 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">  
764 - <caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" /> 755 + <state relative-caret-position="0">
  756 + <caret line="21" column="205" lean-forward="false" selection-start-line="21" selection-start-column="67" selection-end-line="21" selection-end-column="205" />
765 </state> 757 </state>
766 </provider> 758 </provider>
767 </entry> 759 </entry>
768 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js"> 760 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
769 <provider selected="true" editor-type-id="text-editor"> 761 <provider selected="true" editor-type-id="text-editor">
770 - <state vertical-scroll-proportion="0.0" vertical-offset="188" max-vertical-offset="5745">  
771 - <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> 762 + <state relative-caret-position="0">
  763 + <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
772 </state> 764 </state>
773 </provider> 765 </provider>
774 </entry> 766 </entry>
775 - <entry file="file://$PROJECT_DIR$/lib/zip.rb"> 767 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
776 <provider selected="true" editor-type-id="text-editor"> 768 <provider selected="true" editor-type-id="text-editor">
777 - <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="6495">  
778 - <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" /> 769 + <state relative-caret-position="0">
  770 + <caret line="137" column="319" lean-forward="false" selection-start-line="137" selection-start-column="319" selection-end-line="137" selection-end-column="319" />
779 </state> 771 </state>
780 </provider> 772 </provider>
781 </entry> 773 </entry>
782 - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb"> 774 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
783 <provider selected="true" editor-type-id="text-editor"> 775 <provider selected="true" editor-type-id="text-editor">
784 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
785 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 776 + <state relative-caret-position="0">
  777 + <caret line="481" column="28" lean-forward="false" selection-start-line="481" selection-start-column="28" selection-end-line="481" selection-end-column="28" />
786 </state> 778 </state>
787 </provider> 779 </provider>
788 </entry> 780 </entry>
789 - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb"> 781 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/create/_success.js.erb">
790 <provider selected="true" editor-type-id="text-editor"> 782 <provider selected="true" editor-type-id="text-editor">
791 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">  
792 - <caret line="5" column="9" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="9" /> 783 + <state relative-caret-position="0">
  784 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
793 </state> 785 </state>
794 </provider> 786 </provider>
795 </entry> 787 </entry>
796 - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb"> 788 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/create/_error.js.erb">
797 <provider selected="true" editor-type-id="text-editor"> 789 <provider selected="true" editor-type-id="text-editor">
798 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4110">  
799 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 790 + <state relative-caret-position="0">
  791 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
800 </state> 792 </state>
801 </provider> 793 </provider>
802 </entry> 794 </entry>
803 - <entry file="file://$PROJECT_DIR$/config/initializers/wicked_pdf.rb"> 795 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/index.html.erb">
804 <provider selected="true" editor-type-id="text-editor"> 796 <provider selected="true" editor-type-id="text-editor">
805 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="405">  
806 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> 797 + <state relative-caret-position="0">
  798 + <caret line="4" column="118" lean-forward="false" selection-start-line="4" selection-start-column="97" selection-end-line="4" selection-end-column="118" />
807 </state> 799 </state>
808 </provider> 800 </provider>
809 </entry> 801 </entry>
810 - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 802 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb">
811 <provider selected="true" editor-type-id="text-editor"> 803 <provider selected="true" editor-type-id="text-editor">
812 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
813 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 804 + <state relative-caret-position="75">
  805 + <caret line="5" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
814 </state> 806 </state>
815 </provider> 807 </provider>
816 </entry> 808 </entry>
817 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_contents_controller.rb"> 809 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/_new_form.html.erb">
818 <provider selected="true" editor-type-id="text-editor"> 810 <provider selected="true" editor-type-id="text-editor">
819 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750">  
820 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 811 + <state relative-caret-position="90">
  812 + <caret line="6" column="9" lean-forward="false" selection-start-line="6" selection-start-column="9" selection-end-line="6" selection-end-column="9" />
821 </state> 813 </state>
822 </provider> 814 </provider>
823 </entry> 815 </entry>
824 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb"> 816 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
825 <provider selected="true" editor-type-id="text-editor"> 817 <provider selected="true" editor-type-id="text-editor">
826 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1485">  
827 - <caret line="5" column="33" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="33" /> 818 + <state relative-caret-position="495">
  819 + <caret line="33" column="34" lean-forward="false" selection-start-line="33" selection-start-column="12" selection-end-line="33" selection-end-column="34" />
828 </state> 820 </state>
829 </provider> 821 </provider>
830 </entry> 822 </entry>
831 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb"> 823 + <entry file="file://$PROJECT_DIR$/README.rdoc">
832 <provider selected="true" editor-type-id="text-editor"> 824 <provider selected="true" editor-type-id="text-editor">
833 - <state vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="615">  
834 - <caret line="3" column="173" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="173" /> 825 + <state relative-caret-position="0">
  826 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
835 </state> 827 </state>
836 </provider> 828 </provider>
837 </entry> 829 </entry>
838 - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb"> 830 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
839 <provider selected="true" editor-type-id="text-editor"> 831 <provider selected="true" editor-type-id="text-editor">
840 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
841 - <caret line="0" column="51" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="74" /> 832 + <state relative-caret-position="360">
  833 + <caret line="24" column="7" lean-forward="false" selection-start-line="24" selection-start-column="7" selection-end-line="24" selection-end-column="7" />
842 </state> 834 </state>
843 </provider> 835 </provider>
844 </entry> 836 </entry>
845 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb"> 837 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
846 <provider selected="true" editor-type-id="text-editor"> 838 <provider selected="true" editor-type-id="text-editor">
847 - <state vertical-scroll-proportion="0.0" vertical-offset="1643" max-vertical-offset="2250">  
848 - <caret line="97" column="8" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" /> 839 + <state relative-caret-position="0">
  840 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  841 + <folding />
849 </state> 842 </state>
850 </provider> 843 </provider>
851 </entry> 844 </entry>
852 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb"> 845 + <entry file="file://$PROJECT_DIR$/.ruby-version">
853 <provider selected="true" editor-type-id="text-editor"> 846 <provider selected="true" editor-type-id="text-editor">
854 - <state vertical-scroll-proportion="0.0" vertical-offset="2127" max-vertical-offset="2925">  
855 - <caret line="151" column="70" selection-start-line="151" selection-start-column="70" selection-end-line="151" selection-end-column="70" /> 847 + <state relative-caret-position="0">
  848 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  849 + <folding />
856 </state> 850 </state>
857 </provider> 851 </provider>
858 </entry> 852 </entry>
859 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/index.html.erb"> 853 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
860 <provider selected="true" editor-type-id="text-editor"> 854 <provider selected="true" editor-type-id="text-editor">
861 - <state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="450">  
862 - <caret line="13" column="74" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="74" /> 855 + <state relative-caret-position="600">
  856 + <caret line="40" column="26" lean-forward="false" selection-start-line="40" selection-start-column="20" selection-end-line="40" selection-end-column="26" />
  857 + <folding />
863 </state> 858 </state>
864 </provider> 859 </provider>
865 </entry> 860 </entry>
866 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb"> 861 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
867 <provider selected="true" editor-type-id="text-editor"> 862 <provider selected="true" editor-type-id="text-editor">
868 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">  
869 - <caret line="0" column="11" selection-start-line="0" selection-start-column="11" selection-end-line="0" selection-end-column="11" /> 863 + <state relative-caret-position="90">
  864 + <caret line="6" column="4" lean-forward="false" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
  865 + <folding />
870 </state> 866 </state>
871 </provider> 867 </provider>
872 </entry> 868 </entry>
873 - <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb"> 869 + <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
874 <provider selected="true" editor-type-id="text-editor"> 870 <provider selected="true" editor-type-id="text-editor">
875 - <state vertical-scroll-proportion="0.14195584" vertical-offset="0" max-vertical-offset="2520">  
876 - <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" /> 871 + <state relative-caret-position="0">
  872 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  873 + <folding />
877 </state> 874 </state>
878 </provider> 875 </provider>
879 </entry> 876 </entry>
880 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 877 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
881 <provider selected="true" editor-type-id="text-editor"> 878 <provider selected="true" editor-type-id="text-editor">
882 - <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">  
883 - <caret line="230" column="55" selection-start-line="230" selection-start-column="30" selection-end-line="230" selection-end-column="55" /> 879 + <state relative-caret-position="165">
  880 + <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  881 + <folding />
884 </state> 882 </state>
885 </provider> 883 </provider>
886 </entry> 884 </entry>
887 - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss"> 885 + <entry file="file://$PROJECT_DIR$/Gemfile">
888 <provider selected="true" editor-type-id="text-editor"> 886 <provider selected="true" editor-type-id="text-editor">
889 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">  
890 - <caret line="0" column="46" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="46" /> 887 + <state relative-caret-position="0">
  888 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  889 + <folding />
891 </state> 890 </state>
892 </provider> 891 </provider>
893 </entry> 892 </entry>
894 - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/font_awesome_4_4/font-awesome.css.scss.erb"> 893 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
895 <provider selected="true" editor-type-id="text-editor"> 894 <provider selected="true" editor-type-id="text-editor">
896 - <state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="30600">  
897 - <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" /> 895 + <state relative-caret-position="391">
  896 + <caret line="54" column="61" lean-forward="false" selection-start-line="54" selection-start-column="41" selection-end-line="54" selection-end-column="61" />
  897 + <folding />
898 </state> 898 </state>
899 </provider> 899 </provider>
900 </entry> 900 </entry>
901 - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/application.css"> 901 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
902 <provider selected="true" editor-type-id="text-editor"> 902 <provider selected="true" editor-type-id="text-editor">
903 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
904 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 903 + <state relative-caret-position="0">
  904 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  905 + <folding />
905 </state> 906 </state>
906 </provider> 907 </provider>
907 </entry> 908 </entry>
908 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js"> 909 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
909 <provider selected="true" editor-type-id="text-editor"> 910 <provider selected="true" editor-type-id="text-editor">
910 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7125">  
911 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 911 + <state relative-caret-position="210">
  912 + <caret line="14" column="49" lean-forward="false" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="49" />
  913 + <folding />
912 </state> 914 </state>
913 </provider> 915 </provider>
914 </entry> 916 </entry>
915 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb"> 917 + <entry file="file://$PROJECT_DIR$/db/migrate/20171214071607_add_form_data_to_page_content_marker.rb">
916 <provider selected="true" editor-type-id="text-editor"> 918 <provider selected="true" editor-type-id="text-editor">
917 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">  
918 - <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" /> 919 + <state relative-caret-position="45">
  920 + <caret line="3" column="55" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="55" />
  921 + <folding />
919 </state> 922 </state>
920 </provider> 923 </provider>
921 </entry> 924 </entry>
922 - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 925 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
923 <provider selected="true" editor-type-id="text-editor"> 926 <provider selected="true" editor-type-id="text-editor">
924 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">  
925 - <caret line="20" column="3" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" /> 927 + <state relative-caret-position="473">
  928 + <caret line="121" column="14" lean-forward="false" selection-start-line="121" selection-start-column="8" selection-end-line="121" selection-end-column="14" />
  929 + <folding />
926 </state> 930 </state>
927 </provider> 931 </provider>
928 </entry> 932 </entry>
929 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/config/index.html.erb"> 933 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
930 <provider selected="true" editor-type-id="text-editor"> 934 <provider selected="true" editor-type-id="text-editor">
931 - <state vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="180">  
932 - <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> 935 + <state relative-caret-position="165">
  936 + <caret line="11" column="46" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />
  937 + <folding />
933 </state> 938 </state>
934 </provider> 939 </provider>
935 </entry> 940 </entry>
936 - <entry file="file://$PROJECT_DIR$/config/locales/de.yml"> 941 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
937 <provider selected="true" editor-type-id="text-editor"> 942 <provider selected="true" editor-type-id="text-editor">
938 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
939 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 943 + <state relative-caret-position="-414">
  944 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="46" />
  945 + <folding />
940 </state> 946 </state>
941 </provider> 947 </provider>
942 </entry> 948 </entry>
943 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 949 + <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
944 <provider selected="true" editor-type-id="text-editor"> 950 <provider selected="true" editor-type-id="text-editor">
945 - <state vertical-scroll-proportion="0.0" vertical-offset="285" max-vertical-offset="840">  
946 - <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" /> 951 + <state relative-caret-position="-1884">
  952 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  953 + <folding />
947 </state> 954 </state>
948 </provider> 955 </provider>
949 </entry> 956 </entry>
950 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/config_controller.rb"> 957 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
951 <provider selected="true" editor-type-id="text-editor"> 958 <provider selected="true" editor-type-id="text-editor">
952 - <state vertical-scroll-proportion="0.09463722" vertical-offset="0" max-vertical-offset="634">  
953 - <caret line="4" column="7" selection-start-line="0" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> 959 + <state relative-caret-position="1020">
  960 + <caret line="68" column="45" lean-forward="false" selection-start-line="68" selection-start-column="20" selection-end-line="68" selection-end-column="45" />
  961 + <folding />
954 </state> 962 </state>
955 </provider> 963 </provider>
956 </entry> 964 </entry>
957 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb"> 965 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
958 <provider selected="true" editor-type-id="text-editor"> 966 <provider selected="true" editor-type-id="text-editor">
959 - <state vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="480">  
960 - <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" /> 967 + <state relative-caret-position="243">
  968 + <caret line="141" column="119" lean-forward="false" selection-start-line="141" selection-start-column="119" selection-end-line="141" selection-end-column="119" />
  969 + <folding />
961 </state> 970 </state>
962 </provider> 971 </provider>
963 </entry> 972 </entry>
964 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/new.html.erb"> 973 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
965 <provider selected="true" editor-type-id="text-editor"> 974 <provider selected="true" editor-type-id="text-editor">
966 - <state vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="225">  
967 - <caret line="7" column="102" selection-start-line="7" selection-start-column="102" selection-end-line="7" selection-end-column="102" /> 975 + <state relative-caret-position="439">
  976 + <caret line="294" column="101" lean-forward="false" selection-start-line="294" selection-start-column="101" selection-end-line="294" selection-end-column="101" />
  977 + <folding />
968 </state> 978 </state>
969 </provider> 979 </provider>
970 </entry> 980 </entry>
971 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb"> 981 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
972 <provider selected="true" editor-type-id="text-editor"> 982 <provider selected="true" editor-type-id="text-editor">
973 - <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="390">  
974 - <caret line="14" column="101" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" /> 983 + <state relative-caret-position="0">
  984 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  985 + <folding />
975 </state> 986 </state>
976 </provider> 987 </provider>
977 </entry> 988 </entry>
978 - <entry file="file://$PROJECT_DIR$/config/locales/en.yml"> 989 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
979 <provider selected="true" editor-type-id="text-editor"> 990 <provider selected="true" editor-type-id="text-editor">
980 - <state vertical-scroll-proportion="0.0" vertical-offset="1091" max-vertical-offset="1950">  
981 - <caret line="91" column="28" selection-start-line="91" selection-start-column="28" selection-end-line="91" selection-end-column="28" /> 991 + <state relative-caret-position="0">
  992 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
982 <folding /> 993 <folding />
983 </state> 994 </state>
984 </provider> 995 </provider>
985 </entry> 996 </entry>
986 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 997 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
987 <provider selected="true" editor-type-id="text-editor"> 998 <provider selected="true" editor-type-id="text-editor">
988 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1125">  
989 - <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" /> 999 + <state relative-caret-position="501">
  1000 + <caret line="57" column="32" lean-forward="false" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" />
990 <folding /> 1001 <folding />
991 </state> 1002 </state>
992 </provider> 1003 </provider>
993 </entry> 1004 </entry>
994 - <entry file="file://$PROJECT_DIR$/Gemfile"> 1005 + <entry file="file://$PROJECT_DIR$/db/migrate/20171214092747_add_from_to_mai_to_page_content_marker.rb">
995 <provider selected="true" editor-type-id="text-editor"> 1006 <provider selected="true" editor-type-id="text-editor">
996 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
997 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1007 + <state relative-caret-position="45">
  1008 + <caret line="3" column="23" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
998 <folding /> 1009 <folding />
999 </state> 1010 </state>
1000 </provider> 1011 </provider>
1001 </entry> 1012 </entry>
1002 - <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 1013 + <entry file="file://$PROJECT_DIR$/app/mailers/kanjai_mailer.rb">
1003 <provider selected="true" editor-type-id="text-editor"> 1014 <provider selected="true" editor-type-id="text-editor">
1004 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3330">  
1005 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1015 + <state relative-caret-position="45">
  1016 + <caret line="3" column="15" lean-forward="false" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
1006 <folding /> 1017 <folding />
1007 </state> 1018 </state>
1008 </provider> 1019 </provider>
1009 </entry> 1020 </entry>
1010 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb"> 1021 + <entry file="file://$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb">
1011 <provider selected="true" editor-type-id="text-editor"> 1022 <provider selected="true" editor-type-id="text-editor">
1012 - <state vertical-scroll-proportion="4.542587" vertical-offset="0" max-vertical-offset="4635">  
1013 - <caret line="192" column="0" selection-start-line="192" selection-start-column="0" selection-end-line="192" selection-end-column="0" /> 1023 + <state relative-caret-position="30">
  1024 + <caret line="2" column="15" lean-forward="false" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
  1025 + <folding />
1014 </state> 1026 </state>
1015 </provider> 1027 </provider>
1016 </entry> 1028 </entry>
1017 - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb"> 1029 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
1018 <provider selected="true" editor-type-id="text-editor"> 1030 <provider selected="true" editor-type-id="text-editor">
1019 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">  
1020 - <caret line="11" column="7" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" /> 1031 + <state relative-caret-position="0">
  1032 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1021 <folding /> 1033 <folding />
1022 </state> 1034 </state>
1023 </provider> 1035 </provider>
1024 </entry> 1036 </entry>
1025 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb"> 1037 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
1026 <provider selected="true" editor-type-id="text-editor"> 1038 <provider selected="true" editor-type-id="text-editor">
1027 - <state vertical-scroll-proportion="0.0" vertical-offset="176" max-vertical-offset="810">  
1028 - <caret line="40" column="7" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" /> 1039 + <state relative-caret-position="501">
  1040 + <caret line="45" column="82" lean-forward="false" selection-start-line="45" selection-start-column="82" selection-end-line="45" selection-end-column="82" />
1029 <folding /> 1041 <folding />
1030 </state> 1042 </state>
1031 </provider> 1043 </provider>
1032 </entry> 1044 </entry>
1033 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb"> 1045 + <entry file="file://$PROJECT_DIR$/db/migrate/20171214094525_add_answer_text_to_page_content_marker.rb">
1034 <provider selected="true" editor-type-id="text-editor"> 1046 <provider selected="true" editor-type-id="text-editor">
1035 - <state vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="300">  
1036 - <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" /> 1047 + <state relative-caret-position="30">
  1048 + <caret line="2" column="62" lean-forward="false" selection-start-line="2" selection-start-column="46" selection-end-line="2" selection-end-column="62" />
1037 <folding /> 1049 <folding />
1038 </state> 1050 </state>
1039 </provider> 1051 </provider>
1040 </entry> 1052 </entry>
1041 - <entry file="file://$PROJECT_DIR$/config/routes.rb"> 1053 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
1042 <provider selected="true" editor-type-id="text-editor"> 1054 <provider selected="true" editor-type-id="text-editor">
1043 - <state vertical-scroll-proportion="0.0" vertical-offset="356" max-vertical-offset="990">  
1044 - <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" /> 1055 + <state relative-caret-position="216">
  1056 + <caret line="280" column="190" lean-forward="false" selection-start-line="280" selection-start-column="190" selection-end-line="280" selection-end-column="190" />
1045 <folding /> 1057 <folding />
1046 </state> 1058 </state>
1047 </provider> 1059 </provider>
1048 </entry> 1060 </entry>
1049 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb"> 1061 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
1050 <provider selected="true" editor-type-id="text-editor"> 1062 <provider selected="true" editor-type-id="text-editor">
1051 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">  
1052 - <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" /> 1063 + <state relative-caret-position="135">
  1064 + <caret line="9" column="32" lean-forward="false" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
1053 <folding /> 1065 <folding />
1054 </state> 1066 </state>
1055 </provider> 1067 </provider>
1056 </entry> 1068 </entry>
1057 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 1069 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
1058 <provider selected="true" editor-type-id="text-editor"> 1070 <provider selected="true" editor-type-id="text-editor">
1059 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3090">  
1060 - <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> 1071 + <state relative-caret-position="0">
  1072 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1061 <folding /> 1073 <folding />
1062 </state> 1074 </state>
1063 </provider> 1075 </provider>
1064 </entry> 1076 </entry>
1065 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb"> 1077 + <entry file="file://$PROJECT_DIR$/lib/admin.rb">
1066 <provider selected="true" editor-type-id="text-editor"> 1078 <provider selected="true" editor-type-id="text-editor">
1067 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">  
1068 - <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" /> 1079 + <state relative-caret-position="0">
  1080 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1069 <folding /> 1081 <folding />
1070 </state> 1082 </state>
1071 </provider> 1083 </provider>
1072 </entry> 1084 </entry>
1073 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 1085 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
1074 <provider selected="true" editor-type-id="text-editor"> 1086 <provider selected="true" editor-type-id="text-editor">
1075 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1050">  
1076 - <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" /> 1087 + <state relative-caret-position="0">
  1088 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1077 <folding /> 1089 <folding />
1078 </state> 1090 </state>
1079 </provider> 1091 </provider>
1080 </entry> 1092 </entry>
1081 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 1093 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1082 <provider selected="true" editor-type-id="text-editor"> 1094 <provider selected="true" editor-type-id="text-editor">
1083 - <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">  
1084 - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 1095 + <state relative-caret-position="15">
  1096 + <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
1085 <folding /> 1097 <folding />
1086 </state> 1098 </state>
1087 </provider> 1099 </provider>
@@ -278,7 +278,7 @@ module Kanjai @@ -278,7 +278,7 @@ module Kanjai
278 params.permit(:page => [:parent_id, :page_template_id, :title, :private_flag, :default_private_page, :root_page, :show_public_only, 278 params.permit(:page => [:parent_id, :page_template_id, :title, :private_flag, :default_private_page, :root_page, :show_public_only,
279 :page_data_attributes => [:id, :title, :url, :meta_title, :meta_description, :meta_keywords]], 279 :page_data_attributes => [:id, :title, :url, :meta_title, :meta_description, :meta_keywords]],
280 :page_content => [:type_content, :text_html, :controller_name, :action_name, 280 :page_content => [:type_content, :text_html, :controller_name, :action_name,
281 - page_content_markers_attributes: [:id, :page_content_id, :marker, :text_value, :attachment_file_name] 281 + page_content_markers_attributes: [:id, :page_content_id, :marker, :text_value, :attachment_file_name, :form_subject, :form_body, :from_mail, :to_mail, :form_answer_text]
282 ], 282 ],
283 :page_datum => [:id, :title, :url, :meta_title, :meta_description, :meta_keywords] 283 :page_datum => [:id, :title, :url, :meta_title, :meta_description, :meta_keywords]
284 ) 284 )
  1 +module Kanjai
  2 + class FormController < SiteController
  3 + def index
  4 + option = {}
  5 + Kanjai::PageContentMarker.where(page_content_id: params[:page_content_id].to_i).each do |item|
  6 + option[:subject] = item.form_subject
  7 + option[:body] = item.form_body
  8 + option[:to] = item.to_mail
  9 + option[:from] = item.from_mail
  10 + option[:form_answer_text] = item.form_answer_text
  11 + end
  12 +
  13 + option[:data]= params[:form]
  14 + KanjaiMailer.send_mail(option).deliver
  15 +
  16 + render json: {status: 'ok', message: option[:form_answer_text]}
  17 + end
  18 + end
  19 +end
  1 +class KanjaiMailer < ActionMailer::Base
  2 + def send_mail(options)
  3 + @options = options
  4 + mail(from: options[:from],:to => options[:to], :subject => options[:subject])
  5 + end
  6 +
  7 +end
@@ -139,7 +139,7 @@ module Kanjai @@ -139,7 +139,7 @@ module Kanjai
139 else 139 else
140 page_template = self.page.page_template 140 page_template = self.page.page_template
141 subpart = TemplatePart.find_by_code(self.type_content) 141 subpart = TemplatePart.find_by_code(self.type_content)
142 - html = TemplateGenerator.subpart_generate(page_template, 'content', subpart.elements, self.marker_hash) 142 + html = TemplateGenerator.subpart_generate(page_template, 'content', subpart.elements, self.marker_hash, self.id)
143 html 143 html
144 end 144 end
145 end 145 end
1 -  
2 <%= fields_for @obj do |form| %> 1 <%= fields_for @obj do |form| %>
3 -  
4 <%= form.fields_for :page_content_markers, @obj.page_content_markers.where(:row_item => 0).order('id') do |form2| %> 2 <%= form.fields_for :page_content_markers, @obj.page_content_markers.where(:row_item => 0).order('id') do |form2| %>
5 3
6 4
@@ -30,6 +28,24 @@ @@ -30,6 +28,24 @@
30 </div> 28 </div>
31 <% end %> 29 <% end %>
32 <% end %> 30 <% end %>
  31 + <% if form2.object.get_marker_type(@type_content) == 'form' %>
  32 + <div>
  33 + <%= form2.label :form_subject, :class => "control-label" %>
  34 + <%= form2.text_field :form_subject, :class => "form-control" %>
  35 +
  36 + <%= form2.label :form_body, :class => "control-label" %>
  37 + <%= form2.text_field :form_body, :class => "form-control" %>
  38 +
  39 + <%= form2.label :from_mail, :class => "control-label" %>
  40 + <%= form2.text_field :from_mail, :class => "form-control" %>
  41 +
  42 + <%= form2.label :to_mail, :class => "control-label" %>
  43 + <%= form2.text_field :to_mail, :class => "form-control" %>
  44 +
  45 + <%= form2.label :form_answer_text, :class => "control-label" %>
  46 + <%= form2.text_area :form_answer_text, :class => "form-control" %>
  47 + </div>
  48 + <% end %>
33 49
34 50
35 51
@@ -13,8 +13,6 @@ @@ -13,8 +13,6 @@
13 </div> 13 </div>
14 14
15 <div class="clearfix" id="page_content_form"> 15 <div class="clearfix" id="page_content_form">
16 -  
17 -  
18 <% partial, locals = Kanjai::PageContent.edit_template(@obj.type_content) %> 16 <% partial, locals = Kanjai::PageContent.edit_template(@obj.type_content) %>
19 17
20 <%= render :partial => partial, locals: locals %> 18 <%= render :partial => partial, locals: locals %>
  1 +<%= @options[:body] %>
  2 +
  3 +Form Data:<br/>
  4 +<% @options[:data].each do |key, value| %>
  5 +<%= key %>: <%= value %><br/>
  6 +<% end %>
@@ -55,6 +55,7 @@ Kanjai::Engine.routes.draw do @@ -55,6 +55,7 @@ Kanjai::Engine.routes.draw do
55 end 55 end
56 56
57 scope "(:locale)", :locale => /#{I18n.available_locales.join("|")}/ do 57 scope "(:locale)", :locale => /#{I18n.available_locales.join("|")}/ do
  58 + match 'form/:page_content_id' => 'form#index', via: [:get, :post], as: 'form'
58 match '*path' => 'pages#show', via: :all 59 match '*path' => 'pages#show', via: :all
59 end 60 end
60 end 61 end
  1 +class AddFormDataToPageContentMarker < ActiveRecord::Migration
  2 + def change
  3 + add_column :kanjai_page_content_markers, :form_subject, :text
  4 + add_column :kanjai_page_content_markers, :form_body, :text
  5 + end
  6 +end
  1 +class AddFromToMaiToPageContentMarker < ActiveRecord::Migration
  2 + def change
  3 + add_column :kanjai_page_content_markers, :from_mail, :string
  4 + add_column :kanjai_page_content_markers, :to_mail, :string
  5 + end
  6 +end
  1 +class AddAnswerTextToPageContentMarker < ActiveRecord::Migration
  2 + def change
  3 + add_column :kanjai_page_content_markers, :form_answer_text, :text
  4 + end
  5 +end
1 module Kanjai 1 module Kanjai
2 module TemplateGenerator 2 module TemplateGenerator
3 - def self.subpart_generate(page_template, type, elements, hash_value = nil) 3 + def self.subpart_generate(page_template, type, elements, hash_value = nil, page_content_id = nil)
4 @doc = Nokogiri::HTML::DocumentFragment.parse "" 4 @doc = Nokogiri::HTML::DocumentFragment.parse ""
5 5
6 6
7 @original_hash_value = hash_value 7 @original_hash_value = hash_value
8 @original_hash_value ||= {} 8 @original_hash_value ||= {}
9 9
  10 + @page_content_id = page_content_id
  11 +
10 Nokogiri::HTML::Builder.with(@doc) do |subparts| 12 Nokogiri::HTML::Builder.with(@doc) do |subparts|
11 TemplateGenerator.method("#{type}_generator").call(elements, subparts, @original_hash_value[0]) 13 TemplateGenerator.method("#{type}_generator").call(elements, subparts, @original_hash_value[0])
12 end 14 end
@@ -228,6 +230,8 @@ module Kanjai @@ -228,6 +230,8 @@ module Kanjai
228 end 230 end
229 end 231 end
230 else 232 else
  233 + p elements
  234 + p subparts
231 attributes = self.replace_attributes_marker(item[:attributes], hash_value) 235 attributes = self.replace_attributes_marker(item[:attributes], hash_value)
232 subparts.send(item[:name], attributes) do |next_subparts| 236 subparts.send(item[:name], attributes) do |next_subparts|
233 self.content_generator(item[:children], next_subparts, hash_value) 237 self.content_generator(item[:children], next_subparts, hash_value)
@@ -288,6 +292,7 @@ module Kanjai @@ -288,6 +292,7 @@ module Kanjai
288 hash_value.each do |key2, value2| 292 hash_value.each do |key2, value2|
289 if !key2.nil? and !value2.nil? 293 if !key2.nil? and !value2.nil?
290 new_attributes[key].gsub!(key2, value2) 294 new_attributes[key].gsub!(key2, value2)
  295 + new_attributes[key].gsub!('###FORM_ACTION###', "/#{I18n.locale}/form/#{@page_content_id}")
291 end 296 end
292 end 297 end
293 end 298 end
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.71" 2 + VERSION = "0.0.72"
3 end 3 end