EDIT / kanjai · Commits

Commit d219b6e4ed8baf52cf0d3a1e423c215636c931f3

Authored by Karpikau Andrei
1 parent be65b1a2

change kanjai version

Inline Side-by-side
Showing 3 changed files with 158 additions and 147 deletions
@@ -2,11 +2,8 @@ @@ -2,11 +2,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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.generators" afterPath="$PROJECT_DIR$/.idea/.generators" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/kanjai.iml" afterPath="$PROJECT_DIR$/.idea/kanjai.iml" />  
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kanjai.gemspec" afterPath="$PROJECT_DIR$/kanjai.gemspec" /> 6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" />
11 </list> 8 </list>
12 <ignored path="kanjai.iws" /> 9 <ignored path="kanjai.iws" />
@@ -28,101 +25,101 @@ @@ -28,101 +25,101 @@
28 </component> 25 </component>
29 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
30 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
31 - <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">  
32 - <entry file="file://$PROJECT_DIR$/Gemfile"> 28 + <file leaf-file-name="form_controller.rb" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
33 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
34 - <state relative-caret-position="0">  
35 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 31 + <state relative-caret-position="135">
  32 + <caret line="9" column="32" lean-forward="false" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
36 <folding /> 33 <folding />
37 </state> 34 </state>
38 </provider> 35 </provider>
39 </entry> 36 </entry>
40 </file> 37 </file>
41 - <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">  
42 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 38 + <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
  39 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
43 <provider selected="true" editor-type-id="text-editor"> 40 <provider selected="true" editor-type-id="text-editor">
44 - <state relative-caret-position="381">  
45 - <caret line="47" column="37" lean-forward="false" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" /> 41 + <state relative-caret-position="0">
  42 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
46 <folding /> 43 <folding />
47 </state> 44 </state>
48 </provider> 45 </provider>
49 </entry> 46 </entry>
50 </file> 47 </file>
51 - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">  
52 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb"> 48 + <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
53 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
54 - <state relative-caret-position="216">  
55 - <caret line="280" column="190" lean-forward="false" selection-start-line="280" selection-start-column="190" selection-end-line="280" selection-end-column="190" /> 51 + <state relative-caret-position="165">
  52 + <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
56 <folding /> 53 <folding />
57 </state> 54 </state>
58 </provider> 55 </provider>
59 </entry> 56 </entry>
60 </file> 57 </file>
61 - <file leaf-file-name="form_controller.rb" pinned="false" current-in-tab="false">  
62 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb"> 58 + <file leaf-file-name="rails.js" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
63 <provider selected="true" editor-type-id="text-editor"> 60 <provider selected="true" editor-type-id="text-editor">
64 - <state relative-caret-position="135">  
65 - <caret line="9" column="32" lean-forward="false" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" /> 61 + <state relative-caret-position="464">
  62 + <caret line="434" column="34" lean-forward="false" selection-start-line="434" selection-start-column="22" selection-end-line="434" selection-end-column="34" />
66 <folding /> 63 <folding />
67 </state> 64 </state>
68 </provider> 65 </provider>
69 </entry> 66 </entry>
70 </file> 67 </file>
71 - <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">  
72 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb"> 68 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  69 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
73 <provider selected="true" editor-type-id="text-editor"> 70 <provider selected="true" editor-type-id="text-editor">
74 - <state relative-caret-position="501">  
75 - <caret line="45" column="82" lean-forward="false" selection-start-line="45" selection-start-column="82" selection-end-line="45" selection-end-column="82" /> 71 + <state relative-caret-position="15">
  72 + <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
76 <folding /> 73 <folding />
77 </state> 74 </state>
78 </provider> 75 </provider>
79 </entry> 76 </entry>
80 </file> 77 </file>
81 - <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false">  
82 - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 78 + <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
83 <provider selected="true" editor-type-id="text-editor"> 80 <provider selected="true" editor-type-id="text-editor">
84 - <state relative-caret-position="0">  
85 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 81 + <state relative-caret-position="90">
  82 + <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
86 <folding /> 83 <folding />
87 </state> 84 </state>
88 </provider> 85 </provider>
89 </entry> 86 </entry>
90 </file> 87 </file>
91 - <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">  
92 - <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 88 + <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
93 <provider selected="true" editor-type-id="text-editor"> 90 <provider selected="true" editor-type-id="text-editor">
94 - <state relative-caret-position="203">  
95 - <caret line="67" column="11" lean-forward="false" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" /> 91 + <state relative-caret-position="465">
  92 + <caret line="31" column="0" lean-forward="false" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="42" />
96 <folding /> 93 <folding />
97 </state> 94 </state>
98 </provider> 95 </provider>
99 </entry> 96 </entry>
100 </file> 97 </file>
101 - <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false">  
102 - <entry file="file://$PROJECT_DIR$/lib/admin.rb"> 98 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
103 <provider selected="true" editor-type-id="text-editor"> 100 <provider selected="true" editor-type-id="text-editor">
104 - <state relative-caret-position="0">  
105 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 101 + <state relative-caret-position="465">
  102 + <caret line="151" column="56" lean-forward="false" selection-start-line="151" selection-start-column="41" selection-end-line="151" selection-end-column="56" />
106 <folding /> 103 <folding />
107 </state> 104 </state>
108 </provider> 105 </provider>
109 </entry> 106 </entry>
110 </file> 107 </file>
111 - <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">  
112 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 108 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
113 <provider selected="true" editor-type-id="text-editor"> 110 <provider selected="true" editor-type-id="text-editor">
114 - <state relative-caret-position="0">  
115 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 111 + <state relative-caret-position="336">
  112 + <caret line="23" column="21" lean-forward="false" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
116 <folding /> 113 <folding />
117 </state> 114 </state>
118 </provider> 115 </provider>
119 </entry> 116 </entry>
120 </file> 117 </file>
121 - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">  
122 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 118 + <file leaf-file-name="admin_controller.rb" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
123 <provider selected="true" editor-type-id="text-editor"> 120 <provider selected="true" editor-type-id="text-editor">
124 - <state relative-caret-position="15">  
125 - <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 121 + <state relative-caret-position="225">
  122 + <caret line="15" column="6" lean-forward="false" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="23" />
126 <folding /> 123 <folding />
127 </state> 124 </state>
128 </provider> 125 </provider>
@@ -150,9 +147,13 @@ @@ -150,9 +147,13 @@
150 <find>0.0.72</find> 147 <find>0.0.72</find>
151 <find>aws-sdk</find> 148 <find>aws-sdk</find>
152 <find>sass</find> 149 <find>sass</find>
  150 + <find>handleRemote</find>
  151 + <find>data('remote</find>
  152 + <find>$current_locale</find>
153 </findStrings> 153 </findStrings>
154 <dirStrings> 154 <dirStrings>
155 <dir>$PROJECT_DIR$</dir> 155 <dir>$PROJECT_DIR$</dir>
  156 + <dir>$PROJECT_DIR$/app/controllers</dir>
156 </dirStrings> 157 </dirStrings>
157 </component> 158 </component>
158 <component name="Git.Settings"> 159 <component name="Git.Settings">
@@ -196,7 +197,6 @@ @@ -196,7 +197,6 @@
196 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb" /> 197 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb" />
197 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 198 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
198 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" /> 199 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
199 - <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />  
200 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" /> 200 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" />
201 <option value="$PROJECT_DIR$/db/migrate/20171214071607_add_form_data_to_page_content_marker.rb" /> 201 <option value="$PROJECT_DIR$/db/migrate/20171214071607_add_form_data_to_page_content_marker.rb" />
202 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" /> 202 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
@@ -211,6 +211,7 @@ @@ -211,6 +211,7 @@
211 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" /> 211 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
212 <option value="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" /> 212 <option value="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" />
213 <option value="$PROJECT_DIR$/kanjai.gemspec" /> 213 <option value="$PROJECT_DIR$/kanjai.gemspec" />
  214 + <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
214 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 215 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
215 </list> 216 </list>
216 </option> 217 </option>
@@ -224,7 +225,7 @@ @@ -224,7 +225,7 @@
224 <component name="ProjectFrameBounds"> 225 <component name="ProjectFrameBounds">
225 <option name="y" value="23" /> 226 <option name="y" value="23" />
226 <option name="width" value="1280" /> 227 <option name="width" value="1280" />
227 - <option name="height" value="730" /> 228 + <option name="height" value="729" />
228 </component> 229 </component>
229 <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> 230 <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
230 <component name="ProjectView"> 231 <component name="ProjectView">
@@ -242,8 +243,9 @@ @@ -242,8 +243,9 @@
242 <foldersAlwaysOnTop value="true" /> 243 <foldersAlwaysOnTop value="true" />
243 </navigator> 244 </navigator>
244 <panes> 245 <panes>
245 - <pane id="RailsProjectView" /> 246 + <pane id="Scope" />
246 <pane id="Scratches" /> 247 <pane id="Scratches" />
  248 + <pane id="RailsProjectView" />
247 <pane id="ProjectPane"> 249 <pane id="ProjectPane">
248 <subPane> 250 <subPane>
249 <PATH> 251 <PATH>
@@ -284,6 +286,24 @@ @@ -284,6 +286,24 @@
284 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 286 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
285 </PATH_ELEMENT> 287 </PATH_ELEMENT>
286 <PATH_ELEMENT> 288 <PATH_ELEMENT>
  289 + <option name="myItemId" value="tasks" />
  290 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  291 + </PATH_ELEMENT>
  292 + </PATH>
  293 + <PATH>
  294 + <PATH_ELEMENT>
  295 + <option name="myItemId" value="kanjai" />
  296 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  297 + </PATH_ELEMENT>
  298 + <PATH_ELEMENT>
  299 + <option name="myItemId" value="kanjai" />
  300 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  301 + </PATH_ELEMENT>
  302 + <PATH_ELEMENT>
  303 + <option name="myItemId" value="lib" />
  304 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  305 + </PATH_ELEMENT>
  306 + <PATH_ELEMENT>
287 <option name="myItemId" value="kanjai" /> 307 <option name="myItemId" value="kanjai" />
288 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 308 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
289 </PATH_ELEMENT> 309 </PATH_ELEMENT>
@@ -298,7 +318,11 @@ @@ -298,7 +318,11 @@
298 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 318 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
299 </PATH_ELEMENT> 319 </PATH_ELEMENT>
300 <PATH_ELEMENT> 320 <PATH_ELEMENT>
301 - <option name="myItemId" value="config" /> 321 + <option name="myItemId" value="app" />
  322 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  323 + </PATH_ELEMENT>
  324 + <PATH_ELEMENT>
  325 + <option name="myItemId" value="views" />
302 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 326 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
303 </PATH_ELEMENT> 327 </PATH_ELEMENT>
304 </PATH> 328 </PATH>
@@ -424,7 +448,6 @@ @@ -424,7 +448,6 @@
424 </PATH> 448 </PATH>
425 </subPane> 449 </subPane>
426 </pane> 450 </pane>
427 - <pane id="Scope" />  
428 </panes> 451 </panes>
429 </component> 452 </component>
430 <component name="PropertiesComponent"> 453 <component name="PropertiesComponent">
@@ -681,18 +704,20 @@ @@ -681,18 +704,20 @@
681 <workItem from="1500931211896" duration="152000" /> 704 <workItem from="1500931211896" duration="152000" />
682 <workItem from="1500931637579" duration="304000" /> 705 <workItem from="1500931637579" duration="304000" />
683 <workItem from="1501482504677" duration="10000" /> 706 <workItem from="1501482504677" duration="10000" />
684 - <workItem from="1513232887722" duration="10388000" /> 707 + <workItem from="1513232887722" duration="10776000" />
  708 + <workItem from="1513283335284" duration="121000" />
  709 + <workItem from="1513543303254" duration="5769000" />
685 </task> 710 </task>
686 <servers /> 711 <servers />
687 </component> 712 </component>
688 <component name="TimeTrackingManager"> 713 <component name="TimeTrackingManager">
689 - <option name="totallyTimeSpent" value="14201000" /> 714 + <option name="totallyTimeSpent" value="20479000" />
690 </component> 715 </component>
691 <component name="ToolWindowManager"> 716 <component name="ToolWindowManager">
692 - <frame x="0" y="23" width="1280" height="730" extended-state="6" /> 717 + <frame x="0" y="23" width="1280" height="729" extended-state="6" />
693 <editor active="true" /> 718 <editor active="true" />
694 <layout> 719 <layout>
695 - <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" /> 720 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4628433" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
696 <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" /> 721 <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" />
697 <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" /> 722 <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" />
698 <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" /> 723 <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" />
@@ -735,13 +760,6 @@ @@ -735,13 +760,6 @@
735 <watches-manager /> 760 <watches-manager />
736 </component> 761 </component>
737 <component name="editorHistoryManager"> 762 <component name="editorHistoryManager">
738 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb">  
739 - <provider selected="true" editor-type-id="text-editor">  
740 - <state relative-caret-position="0">  
741 - <caret line="14" column="101" lean-forward="false" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" />  
742 - </state>  
743 - </provider>  
744 - </entry>  
745 <entry file="file://$PROJECT_DIR$/config/locales/en.yml"> 763 <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
746 <provider selected="true" editor-type-id="text-editor"> 764 <provider selected="true" editor-type-id="text-editor">
747 <state relative-caret-position="0"> 765 <state relative-caret-position="0">
@@ -784,13 +802,6 @@ @@ -784,13 +802,6 @@
784 </state> 802 </state>
785 </provider> 803 </provider>
786 </entry> 804 </entry>
787 - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">  
788 - <provider selected="true" editor-type-id="text-editor">  
789 - <state relative-caret-position="0">  
790 - <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />  
791 - </state>  
792 - </provider>  
793 - </entry>  
794 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js"> 805 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
795 <provider selected="true" editor-type-id="text-editor"> 806 <provider selected="true" editor-type-id="text-editor">
796 <state relative-caret-position="0"> 807 <state relative-caret-position="0">
@@ -865,15 +876,6 @@ @@ -865,15 +876,6 @@
865 <provider selected="true" editor-type-id="text-editor"> 876 <provider selected="true" editor-type-id="text-editor">
866 <state relative-caret-position="0"> 877 <state relative-caret-position="0">
867 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 878 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
868 - <folding />  
869 - </state>  
870 - </provider>  
871 - </entry>  
872 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">  
873 - <provider selected="true" editor-type-id="text-editor">  
874 - <state relative-caret-position="90">  
875 - <caret line="6" column="4" lean-forward="false" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />  
876 - <folding />  
877 </state> 879 </state>
878 </provider> 880 </provider>
879 </entry> 881 </entry>
@@ -881,15 +883,6 @@ @@ -881,15 +883,6 @@
881 <provider selected="true" editor-type-id="text-editor"> 883 <provider selected="true" editor-type-id="text-editor">
882 <state relative-caret-position="0"> 884 <state relative-caret-position="0">
883 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 885 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
884 - <folding />  
885 - </state>  
886 - </provider>  
887 - </entry>  
888 - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">  
889 - <provider selected="true" editor-type-id="text-editor">  
890 - <state relative-caret-position="165">  
891 - <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />  
892 - <folding />  
893 </state> 886 </state>
894 </provider> 887 </provider>
895 </entry> 888 </entry>
@@ -897,7 +890,6 @@ @@ -897,7 +890,6 @@
897 <provider selected="true" editor-type-id="text-editor"> 890 <provider selected="true" editor-type-id="text-editor">
898 <state relative-caret-position="391"> 891 <state relative-caret-position="391">
899 <caret line="54" column="61" lean-forward="false" selection-start-line="54" selection-start-column="41" selection-end-line="54" selection-end-column="61" /> 892 <caret line="54" column="61" lean-forward="false" selection-start-line="54" selection-start-column="41" selection-end-line="54" selection-end-column="61" />
900 - <folding />  
901 </state> 893 </state>
902 </provider> 894 </provider>
903 </entry> 895 </entry>
@@ -905,7 +897,6 @@ @@ -905,7 +897,6 @@
905 <provider selected="true" editor-type-id="text-editor"> 897 <provider selected="true" editor-type-id="text-editor">
906 <state relative-caret-position="0"> 898 <state relative-caret-position="0">
907 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 899 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
908 - <folding />  
909 </state> 900 </state>
910 </provider> 901 </provider>
911 </entry> 902 </entry>
@@ -913,7 +904,6 @@ @@ -913,7 +904,6 @@
913 <provider selected="true" editor-type-id="text-editor"> 904 <provider selected="true" editor-type-id="text-editor">
914 <state relative-caret-position="210"> 905 <state relative-caret-position="210">
915 <caret line="14" column="49" lean-forward="false" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="49" /> 906 <caret line="14" column="49" lean-forward="false" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="49" />
916 - <folding />  
917 </state> 907 </state>
918 </provider> 908 </provider>
919 </entry> 909 </entry>
@@ -921,7 +911,6 @@ @@ -921,7 +911,6 @@
921 <provider selected="true" editor-type-id="text-editor"> 911 <provider selected="true" editor-type-id="text-editor">
922 <state relative-caret-position="45"> 912 <state relative-caret-position="45">
923 <caret line="3" column="55" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="55" /> 913 <caret line="3" column="55" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="55" />
924 - <folding />  
925 </state> 914 </state>
926 </provider> 915 </provider>
927 </entry> 916 </entry>
@@ -929,7 +918,6 @@ @@ -929,7 +918,6 @@
929 <provider selected="true" editor-type-id="text-editor"> 918 <provider selected="true" editor-type-id="text-editor">
930 <state relative-caret-position="473"> 919 <state relative-caret-position="473">
931 <caret line="121" column="14" lean-forward="false" selection-start-line="121" selection-start-column="8" selection-end-line="121" selection-end-column="14" /> 920 <caret line="121" column="14" lean-forward="false" selection-start-line="121" selection-start-column="8" selection-end-line="121" selection-end-column="14" />
932 - <folding />  
933 </state> 921 </state>
934 </provider> 922 </provider>
935 </entry> 923 </entry>
@@ -937,15 +925,6 @@ @@ -937,15 +925,6 @@
937 <provider selected="true" editor-type-id="text-editor"> 925 <provider selected="true" editor-type-id="text-editor">
938 <state relative-caret-position="165"> 926 <state relative-caret-position="165">
939 <caret line="11" column="46" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" /> 927 <caret line="11" column="46" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />
940 - <folding />  
941 - </state>  
942 - </provider>  
943 - </entry>  
944 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">  
945 - <provider selected="true" editor-type-id="text-editor">  
946 - <state relative-caret-position="-414">  
947 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="46" />  
948 - <folding />  
949 </state> 928 </state>
950 </provider> 929 </provider>
951 </entry> 930 </entry>
@@ -953,7 +932,6 @@ @@ -953,7 +932,6 @@
953 <provider selected="true" editor-type-id="text-editor"> 932 <provider selected="true" editor-type-id="text-editor">
954 <state relative-caret-position="-1884"> 933 <state relative-caret-position="-1884">
955 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 934 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
956 - <folding />  
957 </state> 935 </state>
958 </provider> 936 </provider>
959 </entry> 937 </entry>
@@ -961,7 +939,6 @@ @@ -961,7 +939,6 @@
961 <provider selected="true" editor-type-id="text-editor"> 939 <provider selected="true" editor-type-id="text-editor">
962 <state relative-caret-position="1020"> 940 <state relative-caret-position="1020">
963 <caret line="68" column="45" lean-forward="false" selection-start-line="68" selection-start-column="20" selection-end-line="68" selection-end-column="45" /> 941 <caret line="68" column="45" lean-forward="false" selection-start-line="68" selection-start-column="20" selection-end-line="68" selection-end-column="45" />
964 - <folding />  
965 </state> 942 </state>
966 </provider> 943 </provider>
967 </entry> 944 </entry>
@@ -969,23 +946,6 @@ @@ -969,23 +946,6 @@
969 <provider selected="true" editor-type-id="text-editor"> 946 <provider selected="true" editor-type-id="text-editor">
970 <state relative-caret-position="243"> 947 <state relative-caret-position="243">
971 <caret line="141" column="119" lean-forward="false" selection-start-line="141" selection-start-column="119" selection-end-line="141" selection-end-column="119" /> 948 <caret line="141" column="119" lean-forward="false" selection-start-line="141" selection-start-column="119" selection-end-line="141" selection-end-column="119" />
972 - <folding />  
973 - </state>  
974 - </provider>  
975 - </entry>  
976 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">  
977 - <provider selected="true" editor-type-id="text-editor">  
978 - <state relative-caret-position="439">  
979 - <caret line="294" column="101" lean-forward="false" selection-start-line="294" selection-start-column="101" selection-end-line="294" selection-end-column="101" />  
980 - <folding />  
981 - </state>  
982 - </provider>  
983 - </entry>  
984 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">  
985 - <provider selected="true" editor-type-id="text-editor">  
986 - <state relative-caret-position="0">  
987 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
988 - <folding />  
989 </state> 949 </state>
990 </provider> 950 </provider>
991 </entry> 951 </entry>
@@ -993,7 +953,6 @@ @@ -993,7 +953,6 @@
993 <provider selected="true" editor-type-id="text-editor"> 953 <provider selected="true" editor-type-id="text-editor">
994 <state relative-caret-position="0"> 954 <state relative-caret-position="0">
995 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 955 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
996 - <folding />  
997 </state> 956 </state>
998 </provider> 957 </provider>
999 </entry> 958 </entry>
@@ -1001,7 +960,6 @@ @@ -1001,7 +960,6 @@
1001 <provider selected="true" editor-type-id="text-editor"> 960 <provider selected="true" editor-type-id="text-editor">
1002 <state relative-caret-position="501"> 961 <state relative-caret-position="501">
1003 <caret line="57" column="32" lean-forward="false" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" /> 962 <caret line="57" column="32" lean-forward="false" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" />
1004 - <folding />  
1005 </state> 963 </state>
1006 </provider> 964 </provider>
1007 </entry> 965 </entry>
@@ -1009,7 +967,6 @@ @@ -1009,7 +967,6 @@
1009 <provider selected="true" editor-type-id="text-editor"> 967 <provider selected="true" editor-type-id="text-editor">
1010 <state relative-caret-position="45"> 968 <state relative-caret-position="45">
1011 <caret line="3" column="23" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> 969 <caret line="3" column="23" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
1012 - <folding />  
1013 </state> 970 </state>
1014 </provider> 971 </provider>
1015 </entry> 972 </entry>
@@ -1017,7 +974,6 @@ @@ -1017,7 +974,6 @@
1017 <provider selected="true" editor-type-id="text-editor"> 974 <provider selected="true" editor-type-id="text-editor">
1018 <state relative-caret-position="45"> 975 <state relative-caret-position="45">
1019 <caret line="3" column="15" lean-forward="false" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" /> 976 <caret line="3" column="15" lean-forward="false" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
1020 - <folding />  
1021 </state> 977 </state>
1022 </provider> 978 </provider>
1023 </entry> 979 </entry>
@@ -1025,7 +981,6 @@ @@ -1025,7 +981,6 @@
1025 <provider selected="true" editor-type-id="text-editor"> 981 <provider selected="true" editor-type-id="text-editor">
1026 <state relative-caret-position="30"> 982 <state relative-caret-position="30">
1027 <caret line="2" column="15" lean-forward="false" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" /> 983 <caret line="2" column="15" lean-forward="false" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
1028 - <folding />  
1029 </state> 984 </state>
1030 </provider> 985 </provider>
1031 </entry> 986 </entry>
@@ -1033,43 +988,49 @@ @@ -1033,43 +988,49 @@
1033 <provider selected="true" editor-type-id="text-editor"> 988 <provider selected="true" editor-type-id="text-editor">
1034 <state relative-caret-position="0"> 989 <state relative-caret-position="0">
1035 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 990 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1036 - <folding />  
1037 </state> 991 </state>
1038 </provider> 992 </provider>
1039 </entry> 993 </entry>
1040 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb"> 994 + <entry file="file://$PROJECT_DIR$/db/migrate/20171214094525_add_answer_text_to_page_content_marker.rb">
1041 <provider selected="true" editor-type-id="text-editor"> 995 <provider selected="true" editor-type-id="text-editor">
1042 - <state relative-caret-position="501">  
1043 - <caret line="45" column="82" lean-forward="false" selection-start-line="45" selection-start-column="82" selection-end-line="45" selection-end-column="82" /> 996 + <state relative-caret-position="30">
  997 + <caret line="2" column="62" lean-forward="false" selection-start-line="2" selection-start-column="46" selection-end-line="2" selection-end-column="62" />
  998 + </state>
  999 + </provider>
  1000 + </entry>
  1001 + <entry file="file://$PROJECT_DIR$/Gemfile">
  1002 + <provider selected="true" editor-type-id="text-editor">
  1003 + <state relative-caret-position="0">
  1004 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1044 <folding /> 1005 <folding />
1045 </state> 1006 </state>
1046 </provider> 1007 </provider>
1047 </entry> 1008 </entry>
1048 - <entry file="file://$PROJECT_DIR$/db/migrate/20171214094525_add_answer_text_to_page_content_marker.rb"> 1009 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
1049 <provider selected="true" editor-type-id="text-editor"> 1010 <provider selected="true" editor-type-id="text-editor">
1050 - <state relative-caret-position="30">  
1051 - <caret line="2" column="62" lean-forward="false" selection-start-line="2" selection-start-column="46" selection-end-line="2" selection-end-column="62" /> 1011 + <state relative-caret-position="705">
  1012 + <caret line="47" column="37" lean-forward="false" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" />
1052 <folding /> 1013 <folding />
1053 </state> 1014 </state>
1054 </provider> 1015 </provider>
1055 </entry> 1016 </entry>
1056 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb"> 1017 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
1057 <provider selected="true" editor-type-id="text-editor"> 1018 <provider selected="true" editor-type-id="text-editor">
1058 - <state relative-caret-position="216"> 1019 + <state relative-caret-position="4200">
1059 <caret line="280" column="190" lean-forward="false" selection-start-line="280" selection-start-column="190" selection-end-line="280" selection-end-column="190" /> 1020 <caret line="280" column="190" lean-forward="false" selection-start-line="280" selection-start-column="190" selection-end-line="280" selection-end-column="190" />
1060 <folding /> 1021 <folding />
1061 </state> 1022 </state>
1062 </provider> 1023 </provider>
1063 </entry> 1024 </entry>
1064 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb"> 1025 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
1065 <provider selected="true" editor-type-id="text-editor"> 1026 <provider selected="true" editor-type-id="text-editor">
1066 - <state relative-caret-position="135">  
1067 - <caret line="9" column="32" lean-forward="false" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" /> 1027 + <state relative-caret-position="675">
  1028 + <caret line="45" column="82" lean-forward="false" selection-start-line="45" selection-start-column="82" selection-end-line="45" selection-end-column="82" />
1068 <folding /> 1029 <folding />
1069 </state> 1030 </state>
1070 </provider> 1031 </provider>
1071 </entry> 1032 </entry>
1072 - <entry file="file://$PROJECT_DIR$/lib/admin.rb"> 1033 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
1073 <provider selected="true" editor-type-id="text-editor"> 1034 <provider selected="true" editor-type-id="text-editor">
1074 <state relative-caret-position="0"> 1035 <state relative-caret-position="0">
1075 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1036 <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,7 +1038,15 @@ @@ -1077,7 +1038,15 @@
1077 </state> 1038 </state>
1078 </provider> 1039 </provider>
1079 </entry> 1040 </entry>
1080 - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 1041 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
  1042 + <provider selected="true" editor-type-id="text-editor">
  1043 + <state relative-caret-position="1005">
  1044 + <caret line="67" column="11" lean-forward="false" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" />
  1045 + <folding />
  1046 + </state>
  1047 + </provider>
  1048 + </entry>
  1049 + <entry file="file://$PROJECT_DIR$/lib/admin.rb">
1081 <provider selected="true" editor-type-id="text-editor"> 1050 <provider selected="true" editor-type-id="text-editor">
1082 <state relative-caret-position="0"> 1051 <state relative-caret-position="0">
1083 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1052 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -1085,6 +1054,14 @@ @@ -1085,6 +1054,14 @@
1085 </state> 1054 </state>
1086 </provider> 1055 </provider>
1087 </entry> 1056 </entry>
  1057 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  1058 + <provider selected="true" editor-type-id="text-editor">
  1059 + <state relative-caret-position="90">
  1060 + <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
  1061 + <folding />
  1062 + </state>
  1063 + </provider>
  1064 + </entry>
1088 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 1065 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
1089 <provider selected="true" editor-type-id="text-editor"> 1066 <provider selected="true" editor-type-id="text-editor">
1090 <state relative-caret-position="0"> 1067 <state relative-caret-position="0">
@@ -1093,26 +1070,58 @@ @@ -1093,26 +1070,58 @@
1093 </state> 1070 </state>
1094 </provider> 1071 </provider>
1095 </entry> 1072 </entry>
1096 - <entry file="file://$PROJECT_DIR$/Gemfile"> 1073 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
1097 <provider selected="true" editor-type-id="text-editor"> 1074 <provider selected="true" editor-type-id="text-editor">
1098 - <state relative-caret-position="0">  
1099 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1075 + <state relative-caret-position="165">
  1076 + <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
1100 <folding /> 1077 <folding />
1101 </state> 1078 </state>
1102 </provider> 1079 </provider>
1103 </entry> 1080 </entry>
1104 - <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 1081 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
1105 <provider selected="true" editor-type-id="text-editor"> 1082 <provider selected="true" editor-type-id="text-editor">
1106 - <state relative-caret-position="203">  
1107 - <caret line="67" column="11" lean-forward="false" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" /> 1083 + <state relative-caret-position="135">
  1084 + <caret line="9" column="32" lean-forward="false" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
1108 <folding /> 1085 <folding />
1109 </state> 1086 </state>
1110 </provider> 1087 </provider>
1111 </entry> 1088 </entry>
1112 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 1089 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
1113 <provider selected="true" editor-type-id="text-editor"> 1090 <provider selected="true" editor-type-id="text-editor">
1114 - <state relative-caret-position="381">  
1115 - <caret line="47" column="37" lean-forward="false" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" /> 1091 + <state relative-caret-position="464">
  1092 + <caret line="434" column="34" lean-forward="false" selection-start-line="434" selection-start-column="22" selection-end-line="434" selection-end-column="34" />
  1093 + <folding />
  1094 + </state>
  1095 + </provider>
  1096 + </entry>
  1097 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  1098 + <provider selected="true" editor-type-id="text-editor">
  1099 + <state relative-caret-position="465">
  1100 + <caret line="31" column="0" lean-forward="false" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="42" />
  1101 + <folding />
  1102 + </state>
  1103 + </provider>
  1104 + </entry>
  1105 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  1106 + <provider selected="true" editor-type-id="text-editor">
  1107 + <state relative-caret-position="465">
  1108 + <caret line="151" column="56" lean-forward="false" selection-start-line="151" selection-start-column="41" selection-end-line="151" selection-end-column="56" />
  1109 + <folding />
  1110 + </state>
  1111 + </provider>
  1112 + </entry>
  1113 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  1114 + <provider selected="true" editor-type-id="text-editor">
  1115 + <state relative-caret-position="225">
  1116 + <caret line="15" column="6" lean-forward="false" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="23" />
  1117 + <folding />
  1118 + </state>
  1119 + </provider>
  1120 + </entry>
  1121 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  1122 + <provider selected="true" editor-type-id="text-editor">
  1123 + <state relative-caret-position="336">
  1124 + <caret line="23" column="21" lean-forward="false" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
1116 <folding /> 1125 <folding />
1117 </state> 1126 </state>
1118 </provider> 1127 </provider>
@@ -22,8 +22,10 @@ module Kanjai @@ -22,8 +22,10 @@ module Kanjai
22 22
23 23
24 def define_locale 24 def define_locale
25 - if params && params[:locale].present? 25 + if params && params[:locale].present? && request.original_fullpath.split('/')[1].length == 2
26 I18n.locale = params[:locale] 26 I18n.locale = params[:locale]
  27 + else
  28 + I18n.locale = Rails.application.config.i18n.default_locale
27 end 29 end
28 end 30 end
29 31
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.74" 2 + VERSION = "0.0.75"
3 end 3 end