EDIT / kanjai · Commits

Commit 24017b6a3f6e16a65554c1ac2156c7cb5595ee3d

Authored by Karpikau Andrei
1 parent 93f5aaac

change device config

Inline Side-by-side
Showing 6 changed files with 351 additions and 509 deletions
@@ -2,9 +2,12 @@ @@ -2,9 +2,12 @@
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$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />  
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" /> 5 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/config/initializers/devise.rb" beforeDir="false" afterPath="$PROJECT_DIR$/config/initializers/devise.rb" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/lib/kanjai/template_generator.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/kanjai/template_generator.rb" afterDir="false" />
8 </list> 11 </list>
9 <ignored path="kanjai.iws" /> 12 <ignored path="kanjai.iws" />
10 <ignored path=".idea/workspace.xml" /> 13 <ignored path=".idea/workspace.xml" />
@@ -19,108 +22,95 @@ @@ -19,108 +22,95 @@
19 <component name="CreatePatchCommitExecutor"> 22 <component name="CreatePatchCommitExecutor">
20 <option name="PATCH_PATH" value="" /> 23 <option name="PATCH_PATH" value="" />
21 </component> 24 </component>
22 - <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />  
23 <component name="FavoritesManager"> 25 <component name="FavoritesManager">
24 <favorites_list name="kanjai" /> 26 <favorites_list name="kanjai" />
25 </component> 27 </component>
26 <component name="FileEditorManager"> 28 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="jquery.fileupload.js" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js"> 30 + <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
  31 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
30 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="322">  
32 - <caret line="1197" column="24" lean-forward="false" selection-start-line="1197" selection-start-column="24" selection-end-line="1197" selection-end-column="24" />  
33 - <folding /> 33 + <state relative-caret-position="15">
  34 + <caret line="1" column="121" selection-start-line="1" selection-start-column="121" selection-end-line="1" selection-end-column="121" />
34 </state> 35 </state>
35 </provider> 36 </provider>
36 </entry> 37 </entry>
37 </file> 38 </file>
38 - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">  
39 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 39 + <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
  40 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
40 <provider selected="true" editor-type-id="text-editor"> 41 <provider selected="true" editor-type-id="text-editor">
41 - <state relative-caret-position="45">  
42 - <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />  
43 - <folding /> 42 + <state relative-caret-position="1815">
  43 + <caret line="121" column="28" selection-start-line="121" selection-start-column="28" selection-end-line="121" selection-end-column="28" />
44 </state> 44 </state>
45 </provider> 45 </provider>
46 </entry> 46 </entry>
47 </file> 47 </file>
48 - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">  
49 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 48 + <file leaf-file-name="page_templates_controller.rb" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
50 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
51 - <state relative-caret-position="15">  
52 - <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />  
53 - <folding /> 51 + <state relative-caret-position="1500">
  52 + <caret line="100" column="21" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="21" />
54 </state> 53 </state>
55 </provider> 54 </provider>
56 </entry> 55 </entry>
57 </file> 56 </file>
58 - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">  
59 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 57 + <file leaf-file-name="jquery.fileupload.js" pinned="false" current-in-tab="false">
  58 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
60 <provider selected="true" editor-type-id="text-editor"> 59 <provider selected="true" editor-type-id="text-editor">
61 - <state relative-caret-position="195">  
62 - <caret line="13" column="39" lean-forward="true" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />  
63 - <folding /> 60 + <state>
  61 + <folding>
  62 + <element signature="n#!!doc" expanded="true" />
  63 + </folding>
64 </state> 64 </state>
65 </provider> 65 </provider>
66 </entry> 66 </entry>
67 </file> 67 </file>
68 - <file leaf-file-name="wicked_pdf.rb" pinned="false" current-in-tab="false">  
69 - <entry file="file://$PROJECT_DIR$/config/initializers/wicked_pdf.rb"> 68 + <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
70 <provider selected="true" editor-type-id="text-editor"> 70 <provider selected="true" editor-type-id="text-editor">
71 - <state relative-caret-position="150">  
72 - <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="6" />  
73 - <folding /> 71 + <state relative-caret-position="2295">
  72 + <caret line="153" column="51" selection-start-line="153" selection-start-column="27" selection-end-line="153" selection-end-column="51" />
74 </state> 73 </state>
75 </provider> 74 </provider>
76 </entry> 75 </entry>
77 </file> 76 </file>
78 - <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">  
79 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 77 + <file leaf-file-name=".ruby-version" pinned="false" current-in-tab="false">
  78 + <entry file="file://$PROJECT_DIR$/.ruby-version">
80 <provider selected="true" editor-type-id="text-editor"> 79 <provider selected="true" editor-type-id="text-editor">
81 - <state relative-caret-position="0">  
82 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
83 - <folding /> 80 + <state>
  81 + <caret column="5" selection-end-column="5" />
84 </state> 82 </state>
85 </provider> 83 </provider>
86 </entry> 84 </entry>
87 </file> 85 </file>
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"> 86 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
  87 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
90 <provider selected="true" editor-type-id="text-editor"> 88 <provider selected="true" editor-type-id="text-editor">
91 - <state relative-caret-position="165">  
92 - <caret line="11" column="42" lean-forward="false" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />  
93 - <folding /> 89 + <state relative-caret-position="15">
  90 + <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
94 </state> 91 </state>
95 </provider> 92 </provider>
96 </entry> 93 </entry>
97 </file> 94 </file>
98 - <file leaf-file-name="frontend_extend.js" pinned="false" current-in-tab="false">  
99 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">  
100 - <provider selected="true" editor-type-id="text-editor">  
101 - <state relative-caret-position="0">  
102 - <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 />  
104 - </state>  
105 - </provider> 95 + <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
  96 + <entry file="file://$PROJECT_DIR$/Gemfile">
  97 + <provider selected="true" editor-type-id="text-editor" />
106 </entry> 98 </entry>
107 </file> 99 </file>
108 - <file leaf-file-name="application.html.erb" pinned="false" current-in-tab="false">  
109 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb"> 100 + <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">
  101 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
110 <provider selected="true" editor-type-id="text-editor"> 102 <provider selected="true" editor-type-id="text-editor">
111 - <state relative-caret-position="0">  
112 - <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 /> 103 + <state relative-caret-position="199">
  104 + <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
114 </state> 105 </state>
115 </provider> 106 </provider>
116 </entry> 107 </entry>
117 </file> 108 </file>
118 - <file leaf-file-name="admin_login.html.erb" pinned="false" current-in-tab="false">  
119 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb"> 109 + <file leaf-file-name="devise.rb" pinned="false" current-in-tab="true">
  110 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
120 <provider selected="true" editor-type-id="text-editor"> 111 <provider selected="true" editor-type-id="text-editor">
121 - <state relative-caret-position="0">  
122 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
123 - <folding /> 112 + <state relative-caret-position="166">
  113 + <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
124 </state> 114 </state>
125 </provider> 115 </provider>
126 </entry> 116 </entry>
@@ -129,22 +119,6 @@ @@ -129,22 +119,6 @@
129 </component> 119 </component>
130 <component name="FindInProjectRecents"> 120 <component name="FindInProjectRecents">
131 <findStrings> 121 <findStrings>
132 - <find>content_generator</find>  
133 - <find>subpart_generate</find>  
134 - <find>71</find>  
135 - <find>071</find>  
136 - <find>0.71</find>  
137 - <find>0.071</find>  
138 - <find>0.0.71</find>  
139 - <find>0.0.7</find>  
140 - <find>0.0.72</find>  
141 - <find>aws-sdk</find>  
142 - <find>sass</find>  
143 - <find>handleRemote</find>  
144 - <find>data('remote</find>  
145 - <find>$current_locale</find>  
146 - <find>@page_data</find>  
147 - <find>get_html_content</find>  
148 <find>@@permissions</find> 122 <find>@@permissions</find>
149 <find>c</find> 123 <find>c</find>
150 <find>ce</find> 124 <find>ce</find>
@@ -159,9 +133,27 @@ @@ -159,9 +133,27 @@
159 <find>if (cookieValue.length &gt; 0) break</find> 133 <find>if (cookieValue.length &gt; 0) break</find>
160 <find>Extracts flash array stored in cookie and clears</find> 134 <find>Extracts flash array stored in cookie and clears</find>
161 <find>UnobtrusiveFlash</find> 135 <find>UnobtrusiveFlash</find>
  136 + <find>pa</find>
  137 + <find>paper</find>
  138 + <find>S3_BUCKET</find>
  139 + <find>fil</find>
  140 + <find>fileuploa</find>
  141 + <find>fileupload</find>
  142 + <find>help-block</find>
  143 + <find>unzip_c</find>
  144 + <find>page_template</find>
  145 + <find>setTemplateContent</find>
  146 + <find>form</find>
  147 + <find>###FORM_ACTION###</find>
  148 + <find>form_subject</find>
  149 + <find>def get_marker_type</find>
  150 + <find>sqlite3</find>
  151 + <find>sqli</find>
162 </findStrings> 152 </findStrings>
163 <dirStrings> 153 <dirStrings>
164 <dir>$PROJECT_DIR$/app/controllers</dir> 154 <dir>$PROJECT_DIR$/app/controllers</dir>
  155 + <dir>$PROJECT_DIR$/app/assets/javascripts</dir>
  156 + <dir>$PROJECT_DIR$/app</dir>
165 <dir>$PROJECT_DIR$</dir> 157 <dir>$PROJECT_DIR$</dir>
166 </dirStrings> 158 </dirStrings>
167 </component> 159 </component>
@@ -171,8 +163,6 @@ @@ -171,8 +163,6 @@
171 <component name="IdeDocumentHistory"> 163 <component name="IdeDocumentHistory">
172 <option name="CHANGED_PATHS"> 164 <option name="CHANGED_PATHS">
173 <list> 165 <list>
174 - <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />  
175 - <option value="$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb" />  
176 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" /> 166 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
177 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css" /> 167 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css" />
178 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" /> 168 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
@@ -206,7 +196,6 @@ @@ -206,7 +196,6 @@
206 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" /> 196 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" />
207 <option value="$PROJECT_DIR$/db/migrate/20171214071607_add_form_data_to_page_content_marker.rb" /> 197 <option value="$PROJECT_DIR$/db/migrate/20171214071607_add_form_data_to_page_content_marker.rb" />
208 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" /> 198 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
209 - <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />  
210 <option value="$PROJECT_DIR$/config/routes.rb" /> 199 <option value="$PROJECT_DIR$/config/routes.rb" />
211 <option value="$PROJECT_DIR$/app/mailers/application_mailer.rb" /> 200 <option value="$PROJECT_DIR$/app/mailers/application_mailer.rb" />
212 <option value="$PROJECT_DIR$/db/migrate/20171214092747_add_from_to_mai_to_page_content_marker.rb" /> 201 <option value="$PROJECT_DIR$/db/migrate/20171214092747_add_from_to_mai_to_page_content_marker.rb" />
@@ -214,14 +203,17 @@ @@ -214,14 +203,17 @@
214 <option value="$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb" /> 203 <option value="$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb" />
215 <option value="$PROJECT_DIR$/db/migrate/20171214094525_add_answer_text_to_page_content_marker.rb" /> 204 <option value="$PROJECT_DIR$/db/migrate/20171214094525_add_answer_text_to_page_content_marker.rb" />
216 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" /> 205 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
217 - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />  
218 <option value="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" /> 206 <option value="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" />
219 <option value="$PROJECT_DIR$/kanjai.gemspec" /> 207 <option value="$PROJECT_DIR$/kanjai.gemspec" />
220 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" /> 208 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
221 - <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />  
222 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js" /> 209 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js" />
223 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 210 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
224 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 211 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
  212 + <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
  213 + <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb" />
  214 + <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
  215 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
  216 + <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
225 </list> 217 </list>
226 </option> 218 </option>
227 </component> 219 </component>
@@ -231,226 +223,90 @@ @@ -231,226 +223,90 @@
231 <detection-done>true</detection-done> 223 <detection-done>true</detection-done>
232 <sorting>DEFINITION_ORDER</sorting> 224 <sorting>DEFINITION_ORDER</sorting>
233 </component> 225 </component>
234 - <component name="ProjectFrameBounds"> 226 + <component name="NodePackageJsonFileManager">
  227 + <packageJsonPaths />
  228 + </component>
  229 + <component name="ProjectFrameBounds" extendedState="6">
235 <option name="y" value="23" /> 230 <option name="y" value="23" />
236 <option name="width" value="1280" /> 231 <option name="width" value="1280" />
237 <option name="height" value="728" /> 232 <option name="height" value="728" />
238 </component> 233 </component>
239 <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> 234 <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
240 <component name="ProjectView"> 235 <component name="ProjectView">
241 - <navigator currentView="ProjectPane" proportions="" version="1">  
242 - <flattenPackages />  
243 - <showMembers />  
244 - <showModules />  
245 - <showLibraryContents />  
246 - <hideEmptyPackages />  
247 - <abbreviatePackageNames />  
248 - <autoscrollToSource />  
249 - <autoscrollFromSource />  
250 - <sortByType />  
251 - <manualOrder /> 236 + <navigator proportions="" version="1">
252 <foldersAlwaysOnTop value="true" /> 237 <foldersAlwaysOnTop value="true" />
253 </navigator> 238 </navigator>
254 <panes> 239 <panes>
  240 + <pane id="Scope" />
  241 + <pane id="RailsProjectView" />
255 <pane id="ProjectPane"> 242 <pane id="ProjectPane">
256 <subPane> 243 <subPane>
257 - <PATH>  
258 - <PATH_ELEMENT>  
259 - <option name="myItemId" value="kanjai" />  
260 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
261 - </PATH_ELEMENT>  
262 - <PATH_ELEMENT>  
263 - <option name="myItemId" value="kanjai" />  
264 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
265 - </PATH_ELEMENT>  
266 - </PATH>  
267 - <PATH>  
268 - <PATH_ELEMENT>  
269 - <option name="myItemId" value="kanjai" />  
270 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
271 - </PATH_ELEMENT>  
272 - <PATH_ELEMENT>  
273 - <option name="myItemId" value="kanjai" />  
274 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
275 - </PATH_ELEMENT>  
276 - <PATH_ELEMENT>  
277 - <option name="myItemId" value="lib" />  
278 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
279 - </PATH_ELEMENT>  
280 - </PATH>  
281 - <PATH>  
282 - <PATH_ELEMENT>  
283 - <option name="myItemId" value="kanjai" />  
284 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
285 - </PATH_ELEMENT>  
286 - <PATH_ELEMENT>  
287 - <option name="myItemId" value="kanjai" />  
288 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
289 - </PATH_ELEMENT>  
290 - <PATH_ELEMENT>  
291 - <option name="myItemId" value="lib" />  
292 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
293 - </PATH_ELEMENT>  
294 - <PATH_ELEMENT>  
295 - <option name="myItemId" value="kanjai" />  
296 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
297 - </PATH_ELEMENT>  
298 - </PATH>  
299 - <PATH>  
300 - <PATH_ELEMENT>  
301 - <option name="myItemId" value="kanjai" />  
302 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
303 - </PATH_ELEMENT>  
304 - <PATH_ELEMENT>  
305 - <option name="myItemId" value="kanjai" />  
306 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
307 - </PATH_ELEMENT>  
308 - <PATH_ELEMENT>  
309 - <option name="myItemId" value="app" />  
310 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
311 - </PATH_ELEMENT>  
312 - </PATH>  
313 - <PATH>  
314 - <PATH_ELEMENT>  
315 - <option name="myItemId" value="kanjai" />  
316 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
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_ELEMENT>  
323 - <option name="myItemId" value="app" />  
324 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
325 - </PATH_ELEMENT>  
326 - <PATH_ELEMENT>  
327 - <option name="myItemId" value="mailers" />  
328 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
329 - </PATH_ELEMENT>  
330 - </PATH>  
331 - <PATH>  
332 - <PATH_ELEMENT>  
333 - <option name="myItemId" value="kanjai" />  
334 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
335 - </PATH_ELEMENT>  
336 - <PATH_ELEMENT>  
337 - <option name="myItemId" value="kanjai" />  
338 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
339 - </PATH_ELEMENT>  
340 - <PATH_ELEMENT>  
341 - <option name="myItemId" value="app" />  
342 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
343 - </PATH_ELEMENT>  
344 - <PATH_ELEMENT>  
345 - <option name="myItemId" value="helpers" />  
346 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
347 - </PATH_ELEMENT>  
348 - <PATH_ELEMENT>  
349 - <option name="myItemId" value="kanjai" />  
350 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
351 - </PATH_ELEMENT>  
352 - </PATH>  
353 - <PATH>  
354 - <PATH_ELEMENT>  
355 - <option name="myItemId" value="kanjai" />  
356 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
357 - </PATH_ELEMENT>  
358 - <PATH_ELEMENT>  
359 - <option name="myItemId" value="kanjai" />  
360 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
361 - </PATH_ELEMENT>  
362 - <PATH_ELEMENT>  
363 - <option name="myItemId" value="app" />  
364 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
365 - </PATH_ELEMENT>  
366 - <PATH_ELEMENT>  
367 - <option name="myItemId" value="controllers" />  
368 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
369 - </PATH_ELEMENT>  
370 - <PATH_ELEMENT>  
371 - <option name="myItemId" value="kanjai" />  
372 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
373 - </PATH_ELEMENT>  
374 - </PATH>  
375 - <PATH>  
376 - <PATH_ELEMENT>  
377 - <option name="myItemId" value="kanjai" />  
378 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
379 - </PATH_ELEMENT>  
380 - <PATH_ELEMENT>  
381 - <option name="myItemId" value="kanjai" />  
382 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
383 - </PATH_ELEMENT>  
384 - <PATH_ELEMENT>  
385 - <option name="myItemId" value="app" />  
386 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
387 - </PATH_ELEMENT>  
388 - <PATH_ELEMENT>  
389 - <option name="myItemId" value="assets" />  
390 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
391 - </PATH_ELEMENT>  
392 - </PATH>  
393 - <PATH>  
394 - <PATH_ELEMENT>  
395 - <option name="myItemId" value="kanjai" />  
396 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
397 - </PATH_ELEMENT>  
398 - <PATH_ELEMENT>  
399 - <option name="myItemId" value="kanjai" />  
400 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
401 - </PATH_ELEMENT>  
402 - <PATH_ELEMENT>  
403 - <option name="myItemId" value="app" />  
404 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
405 - </PATH_ELEMENT>  
406 - <PATH_ELEMENT>  
407 - <option name="myItemId" value="assets" />  
408 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
409 - </PATH_ELEMENT>  
410 - <PATH_ELEMENT>  
411 - <option name="myItemId" value="javascripts" />  
412 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
413 - </PATH_ELEMENT>  
414 - <PATH_ELEMENT>  
415 - <option name="myItemId" value="kanjai" />  
416 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
417 - </PATH_ELEMENT>  
418 - </PATH>  
419 - <PATH>  
420 - <PATH_ELEMENT>  
421 - <option name="myItemId" value="kanjai" />  
422 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
423 - </PATH_ELEMENT>  
424 - <PATH_ELEMENT>  
425 - <option name="myItemId" value="kanjai" />  
426 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
427 - </PATH_ELEMENT>  
428 - <PATH_ELEMENT>  
429 - <option name="myItemId" value="app" />  
430 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
431 - </PATH_ELEMENT>  
432 - <PATH_ELEMENT>  
433 - <option name="myItemId" value="assets" />  
434 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
435 - </PATH_ELEMENT>  
436 - <PATH_ELEMENT>  
437 - <option name="myItemId" value="javascripts" />  
438 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
439 - </PATH_ELEMENT>  
440 - <PATH_ELEMENT>  
441 - <option name="myItemId" value="kanjai" />  
442 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
443 - </PATH_ELEMENT>  
444 - <PATH_ELEMENT>  
445 - <option name="myItemId" value="frontend" />  
446 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
447 - </PATH_ELEMENT>  
448 - </PATH> 244 + <expand>
  245 + <path>
  246 + <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
  247 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  248 + </path>
  249 + <path>
  250 + <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
  251 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  252 + <item name="app" type="462c0819:PsiDirectoryNode" />
  253 + </path>
  254 + <path>
  255 + <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
  256 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  257 + <item name="app" type="462c0819:PsiDirectoryNode" />
  258 + <item name="assets" type="462c0819:PsiDirectoryNode" />
  259 + </path>
  260 + <path>
  261 + <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
  262 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  263 + <item name="app" type="462c0819:PsiDirectoryNode" />
  264 + <item name="assets" type="462c0819:PsiDirectoryNode" />
  265 + <item name="javascripts" type="462c0819:PsiDirectoryNode" />
  266 + </path>
  267 + <path>
  268 + <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
  269 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  270 + <item name="app" type="462c0819:PsiDirectoryNode" />
  271 + <item name="assets" type="462c0819:PsiDirectoryNode" />
  272 + <item name="javascripts" type="462c0819:PsiDirectoryNode" />
  273 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  274 + </path>
  275 + <path>
  276 + <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
  277 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  278 + <item name="app" type="462c0819:PsiDirectoryNode" />
  279 + <item name="assets" type="462c0819:PsiDirectoryNode" />
  280 + <item name="javascripts" type="462c0819:PsiDirectoryNode" />
  281 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  282 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  283 + </path>
  284 + <path>
  285 + <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
  286 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  287 + <item name="config" type="462c0819:PsiDirectoryNode" />
  288 + </path>
  289 + <path>
  290 + <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
  291 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  292 + <item name="config" type="462c0819:PsiDirectoryNode" />
  293 + <item name="initializers" type="462c0819:PsiDirectoryNode" />
  294 + </path>
  295 + <path>
  296 + <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
  297 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  298 + <item name="lib" type="462c0819:PsiDirectoryNode" />
  299 + </path>
  300 + <path>
  301 + <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
  302 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  303 + <item name="lib" type="462c0819:PsiDirectoryNode" />
  304 + <item name="kanjai" type="462c0819:PsiDirectoryNode" />
  305 + </path>
  306 + </expand>
  307 + <select />
449 </subPane> 308 </subPane>
450 </pane> 309 </pane>
451 - <pane id="Scope" />  
452 - <pane id="RailsProjectView" />  
453 - <pane id="Scratches" />  
454 </panes> 310 </panes>
455 </component> 311 </component>
456 <component name="PropertiesComponent"> 312 <component name="PropertiesComponent">
@@ -661,6 +517,13 @@ @@ -661,6 +517,13 @@
661 <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_OPTIONS" VALUE="" /> 517 <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_OPTIONS" VALUE="" />
662 <method /> 518 <method />
663 </configuration> 519 </configuration>
  520 + <configuration default="true" type="js.build_tools.npm" factoryName="npm">
  521 + <command value="run" />
  522 + <scripts />
  523 + <node-interpreter value="project" />
  524 + <envs />
  525 + <method />
  526 + </configuration>
664 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> 527 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
665 <node-interpreter>project</node-interpreter> 528 <node-interpreter>project</node-interpreter>
666 <node-options /> 529 <node-options />
@@ -668,26 +531,14 @@ @@ -668,26 +531,14 @@
668 <tasks /> 531 <tasks />
669 <arguments /> 532 <arguments />
670 <pass-parent-envs>true</pass-parent-envs> 533 <pass-parent-envs>true</pass-parent-envs>
671 - <envs />  
672 - <method />  
673 </configuration> 534 </configuration>
674 - <configuration default="true" type="js.build_tools.npm" factoryName="npm">  
675 - <command value="run" />  
676 - <scripts />  
677 - <node-interpreter value="project" />  
678 - <envs />  
679 - <method />  
680 - </configuration>  
681 - <list size="4">  
682 - <item index="0" class="java.lang.String" itemvalue="Rake.test: kanjai" />  
683 - <item index="1" class="java.lang.String" itemvalue="Rake.spec: kanjai" />  
684 - <item index="2" class="java.lang.String" itemvalue="Rails.Production: kanjai" />  
685 - <item index="3" class="java.lang.String" itemvalue="Rails.Development: kanjai" /> 535 + <list>
  536 + <item itemvalue="Rake.test: kanjai" />
  537 + <item itemvalue="Rake.spec: kanjai" />
  538 + <item itemvalue="Rails.Production: kanjai" />
  539 + <item itemvalue="Rails.Development: kanjai" />
686 </list> 540 </list>
687 </component> 541 </component>
688 - <component name="ShelveChangesManager" show_recycled="false">  
689 - <option name="remove_strategy" value="false" />  
690 - </component>  
691 <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" /> 542 <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" />
692 <component name="SvnConfiguration"> 543 <component name="SvnConfiguration">
693 <configuration /> 544 <configuration />
@@ -711,41 +562,59 @@ @@ -711,41 +562,59 @@
711 <workItem from="1513283335284" duration="121000" /> 562 <workItem from="1513283335284" duration="121000" />
712 <workItem from="1513543303254" duration="7193000" /> 563 <workItem from="1513543303254" duration="7193000" />
713 <workItem from="1516654861781" duration="654000" /> 564 <workItem from="1516654861781" duration="654000" />
714 - <workItem from="1519076359527" duration="4794000" /> 565 + <workItem from="1519076359527" duration="5272000" />
  566 + <workItem from="1519386347440" duration="1120000" />
  567 + <workItem from="1519477125017" duration="2000" />
  568 + <workItem from="1521110918867" duration="606000" />
  569 + <workItem from="1521116413044" duration="527000" />
  570 + <workItem from="1521124710073" duration="38000" />
  571 + <workItem from="1522062575414" duration="786000" />
  572 + <workItem from="1524563703669" duration="29000" />
  573 + <workItem from="1524565240546" duration="602000" />
  574 + <workItem from="1526849333726" duration="2848000" />
  575 + <workItem from="1526898064400" duration="244000" />
  576 + <workItem from="1526992788869" duration="3744000" />
  577 + <workItem from="1527228957742" duration="663000" />
  578 + <workItem from="1527239274712" duration="965000" />
  579 + <workItem from="1527250151106" duration="1359000" />
  580 + <workItem from="1528795289630" duration="58000" />
  581 + <workItem from="1528797772730" duration="1671000" />
715 </task> 582 </task>
716 <servers /> 583 <servers />
717 </component> 584 </component>
718 <component name="TimeTrackingManager"> 585 <component name="TimeTrackingManager">
719 - <option name="totallyTimeSpent" value="27351000" /> 586 + <option name="totallyTimeSpent" value="43091000" />
720 </component> 587 </component>
721 <component name="ToolWindowManager"> 588 <component name="ToolWindowManager">
722 - <frame x="0" y="23" width="1280" height="728" extended-state="6" /> 589 + <frame x="0" y="23" width="1280" height="730" extended-state="6" />
723 <editor active="true" /> 590 <editor active="true" />
724 <layout> 591 <layout>
725 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34087238" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />  
726 - <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" />  
727 - <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" />  
728 - <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" />  
729 - <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" />  
730 - <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" />  
731 - <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" />  
732 - <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" />  
733 - <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" />  
734 - <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" />  
735 - <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" />  
736 - <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" />  
737 - <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" />  
738 - <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" />  
739 - <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" />  
740 - <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" />  
741 - <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" />  
742 - <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" />  
743 - <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" />  
744 - <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" /> 592 + <window_info anchor="bottom" id="TODO" order="6" />
  593 + <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32930514" />
  594 + <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
  595 + <window_info anchor="bottom" id="Run" order="2" />
  596 + <window_info anchor="bottom" id="Version Control" order="7" />
  597 + <window_info anchor="bottom" id="Terminal" order="7" />
  598 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.37421876" />
  599 + <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
  600 + <window_info anchor="right" id="Database" order="3" />
  601 + <window_info anchor="bottom" id="Find" order="1" weight="0.32930514" />
  602 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  603 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  604 + <window_info id="Favorites" order="2" side_tool="true" />
  605 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  606 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  607 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  608 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  609 + <window_info anchor="bottom" id="Changes" order="7" />
  610 + <window_info anchor="bottom" id="Application Servers" order="7" />
  611 + <window_info anchor="bottom" id="Messages" order="7" weight="0.32930514" />
  612 + <window_info anchor="bottom" id="Message" order="0" />
  613 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
745 </layout> 614 </layout>
746 </component> 615 </component>
747 <component name="TypeScriptGeneratedFilesManager"> 616 <component name="TypeScriptGeneratedFilesManager">
748 - <option name="processedProjectFiles" value="true" /> 617 + <option name="version" value="1" />
749 </component> 618 </component>
750 <component name="Vcs.Log.UiProperties"> 619 <component name="Vcs.Log.UiProperties">
751 <option name="RECENTLY_FILTERED_USER_GROUPS"> 620 <option name="RECENTLY_FILTERED_USER_GROUPS">
@@ -762,383 +631,360 @@ @@ -762,383 +631,360 @@
762 <breakpoint-manager> 631 <breakpoint-manager>
763 <option name="time" value="1" /> 632 <option name="time" value="1" />
764 </breakpoint-manager> 633 </breakpoint-manager>
765 - <watches-manager />  
766 </component> 634 </component>
767 <component name="editorHistoryManager"> 635 <component name="editorHistoryManager">
768 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js"> 636 + <entry file="file://$PROJECT_DIR$/.ruby-version">
769 <provider selected="true" editor-type-id="text-editor"> 637 <provider selected="true" editor-type-id="text-editor">
770 - <state relative-caret-position="0">  
771 - <caret line="481" column="28" lean-forward="false" selection-start-line="481" selection-start-column="28" selection-end-line="481" selection-end-column="28" /> 638 + <state>
  639 + <caret column="5" lean-forward="true" selection-end-column="5" />
772 </state> 640 </state>
773 </provider> 641 </provider>
774 </entry> 642 </entry>
775 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/create/_success.js.erb"> 643 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
776 <provider selected="true" editor-type-id="text-editor"> 644 <provider selected="true" editor-type-id="text-editor">
777 - <state relative-caret-position="0">  
778 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 645 + <state relative-caret-position="4395">
  646 + <caret line="293" column="41" selection-start-line="293" selection-start-column="41" selection-end-line="293" selection-end-column="41" />
779 </state> 647 </state>
780 </provider> 648 </provider>
781 </entry> 649 </entry>
782 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/create/_error.js.erb"> 650 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
783 <provider selected="true" editor-type-id="text-editor"> 651 <provider selected="true" editor-type-id="text-editor">
784 - <state relative-caret-position="0">  
785 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 652 + <state relative-caret-position="2295">
  653 + <caret line="153" column="51" lean-forward="true" selection-start-line="153" selection-start-column="27" selection-end-line="153" selection-end-column="51" />
786 </state> 654 </state>
787 </provider> 655 </provider>
788 </entry> 656 </entry>
789 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/index.html.erb"> 657 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
790 <provider selected="true" editor-type-id="text-editor"> 658 <provider selected="true" editor-type-id="text-editor">
791 - <state relative-caret-position="0">  
792 - <caret line="4" column="118" lean-forward="false" selection-start-line="4" selection-start-column="97" selection-end-line="4" selection-end-column="118" /> 659 + <state relative-caret-position="15">
  660 + <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
793 </state> 661 </state>
794 </provider> 662 </provider>
795 </entry> 663 </entry>
796 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb"> 664 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
797 <provider selected="true" editor-type-id="text-editor"> 665 <provider selected="true" editor-type-id="text-editor">
798 <state relative-caret-position="75"> 666 <state relative-caret-position="75">
799 - <caret line="5" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> 667 + <caret line="5" column="44" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="44" />
800 </state> 668 </state>
801 </provider> 669 </provider>
802 </entry> 670 </entry>
803 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/_new_form.html.erb">  
804 - <provider selected="true" editor-type-id="text-editor">  
805 - <state relative-caret-position="90">  
806 - <caret line="6" column="9" lean-forward="false" selection-start-line="6" selection-start-column="9" selection-end-line="6" selection-end-column="9" />  
807 - </state>  
808 - </provider>  
809 - </entry>  
810 - <entry file="file://$PROJECT_DIR$/README.rdoc"> 671 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
811 <provider selected="true" editor-type-id="text-editor"> 672 <provider selected="true" editor-type-id="text-editor">
812 - <state relative-caret-position="0">  
813 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 673 + <state relative-caret-position="15">
  674 + <caret line="1" column="121" selection-start-line="1" selection-start-column="121" selection-end-line="1" selection-end-column="121" />
814 </state> 675 </state>
815 </provider> 676 </provider>
816 </entry> 677 </entry>
817 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb"> 678 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
818 <provider selected="true" editor-type-id="text-editor"> 679 <provider selected="true" editor-type-id="text-editor">
819 - <state relative-caret-position="360">  
820 - <caret line="24" column="7" lean-forward="false" selection-start-line="24" selection-start-column="7" selection-end-line="24" selection-end-column="7" /> 680 + <state relative-caret-position="1800">
  681 + <caret line="120" column="25" selection-start-line="120" selection-start-column="16" selection-end-line="120" selection-end-column="25" />
821 </state> 682 </state>
822 </provider> 683 </provider>
823 </entry> 684 </entry>
824 - <entry file="file://$PROJECT_DIR$/.ruby-version"> 685 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
825 <provider selected="true" editor-type-id="text-editor"> 686 <provider selected="true" editor-type-id="text-editor">
826 - <state relative-caret-position="0">  
827 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 687 + <state relative-caret-position="255">
  688 + <caret line="17" column="65" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="65" />
828 </state> 689 </state>
829 </provider> 690 </provider>
830 </entry> 691 </entry>
831 - <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake"> 692 + <entry file="file://$PROJECT_DIR$/app/mailers/kanjai_mailer.rb">
832 <provider selected="true" editor-type-id="text-editor"> 693 <provider selected="true" editor-type-id="text-editor">
833 - <state relative-caret-position="0">  
834 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 694 + <state relative-caret-position="60">
  695 + <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
835 </state> 696 </state>
836 </provider> 697 </provider>
837 </entry> 698 </entry>
838 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb"> 699 + <entry file="file://$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb">
839 <provider selected="true" editor-type-id="text-editor"> 700 <provider selected="true" editor-type-id="text-editor">
840 - <state relative-caret-position="0">  
841 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 701 + <state relative-caret-position="45">
  702 + <caret line="3" column="11" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="11" />
842 </state> 703 </state>
843 </provider> 704 </provider>
844 </entry> 705 </entry>
845 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb"> 706 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
846 <provider selected="true" editor-type-id="text-editor"> 707 <provider selected="true" editor-type-id="text-editor">
847 - <state relative-caret-position="210">  
848 - <caret line="14" column="49" lean-forward="false" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="49" /> 708 + <state relative-caret-position="4395">
  709 + <caret line="293" column="41" selection-start-line="293" selection-start-column="41" selection-end-line="293" selection-end-column="41" />
849 </state> 710 </state>
850 </provider> 711 </provider>
851 </entry> 712 </entry>
852 - <entry file="file://$PROJECT_DIR$/db/migrate/20171214071607_add_form_data_to_page_content_marker.rb"> 713 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
853 <provider selected="true" editor-type-id="text-editor"> 714 <provider selected="true" editor-type-id="text-editor">
854 - <state relative-caret-position="45">  
855 - <caret line="3" column="55" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="55" /> 715 + <state relative-caret-position="855">
  716 + <caret line="57" column="32" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" />
856 </state> 717 </state>
857 </provider> 718 </provider>
858 </entry> 719 </entry>
859 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb"> 720 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
860 <provider selected="true" editor-type-id="text-editor"> 721 <provider selected="true" editor-type-id="text-editor">
861 - <state relative-caret-position="473">  
862 - <caret line="121" column="14" lean-forward="false" selection-start-line="121" selection-start-column="8" selection-end-line="121" selection-end-column="14" /> 722 + <state relative-caret-position="1500">
  723 + <caret line="100" column="21" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="21" />
863 </state> 724 </state>
864 </provider> 725 </provider>
865 </entry> 726 </entry>
866 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb"> 727 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
867 <provider selected="true" editor-type-id="text-editor"> 728 <provider selected="true" editor-type-id="text-editor">
868 - <state relative-caret-position="165">  
869 - <caret line="11" column="46" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" /> 729 + <state relative-caret-position="15">
  730 + <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
870 </state> 731 </state>
871 </provider> 732 </provider>
872 </entry> 733 </entry>
873 - <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb"> 734 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
874 <provider selected="true" editor-type-id="text-editor"> 735 <provider selected="true" editor-type-id="text-editor">
875 - <state relative-caret-position="-1884">  
876 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 736 + <state relative-caret-position="75">
  737 + <caret line="5" column="44" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="44" />
877 </state> 738 </state>
878 </provider> 739 </provider>
879 </entry> 740 </entry>
880 - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb"> 741 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
881 <provider selected="true" editor-type-id="text-editor"> 742 <provider selected="true" editor-type-id="text-editor">
882 - <state relative-caret-position="1020">  
883 - <caret line="68" column="45" lean-forward="false" selection-start-line="68" selection-start-column="20" selection-end-line="68" selection-end-column="45" /> 743 + <state relative-caret-position="15">
  744 + <caret line="1" column="121" selection-start-line="1" selection-start-column="121" selection-end-line="1" selection-end-column="121" />
884 </state> 745 </state>
885 </provider> 746 </provider>
886 </entry> 747 </entry>
887 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb"> 748 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
888 <provider selected="true" editor-type-id="text-editor"> 749 <provider selected="true" editor-type-id="text-editor">
889 - <state relative-caret-position="243">  
890 - <caret line="141" column="119" lean-forward="false" selection-start-line="141" selection-start-column="119" selection-end-line="141" selection-end-column="119" /> 750 + <state relative-caret-position="255">
  751 + <caret line="17" column="65" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="65" />
891 </state> 752 </state>
892 </provider> 753 </provider>
893 </entry> 754 </entry>
894 - <entry file="file://$PROJECT_DIR$/config/routes.rb"> 755 + <entry file="file://$PROJECT_DIR$/app/mailers/kanjai_mailer.rb">
895 <provider selected="true" editor-type-id="text-editor"> 756 <provider selected="true" editor-type-id="text-editor">
896 - <state relative-caret-position="501">  
897 - <caret line="57" column="32" lean-forward="false" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" /> 757 + <state relative-caret-position="60">
  758 + <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
898 </state> 759 </state>
899 </provider> 760 </provider>
900 </entry> 761 </entry>
901 - <entry file="file://$PROJECT_DIR$/db/migrate/20171214092747_add_from_to_mai_to_page_content_marker.rb"> 762 + <entry file="file://$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb">
902 <provider selected="true" editor-type-id="text-editor"> 763 <provider selected="true" editor-type-id="text-editor">
903 <state relative-caret-position="45"> 764 <state relative-caret-position="45">
904 - <caret line="3" column="23" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> 765 + <caret line="3" column="11" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="11" />
905 </state> 766 </state>
906 </provider> 767 </provider>
907 </entry> 768 </entry>
908 - <entry file="file://$PROJECT_DIR$/app/mailers/kanjai_mailer.rb"> 769 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
909 <provider selected="true" editor-type-id="text-editor"> 770 <provider selected="true" editor-type-id="text-editor">
910 - <state relative-caret-position="45">  
911 - <caret line="3" column="15" lean-forward="false" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" /> 771 + <state relative-caret-position="4395">
  772 + <caret line="293" column="41" selection-start-line="293" selection-start-column="41" selection-end-line="293" selection-end-column="41" />
912 </state> 773 </state>
913 </provider> 774 </provider>
914 </entry> 775 </entry>
915 - <entry file="file://$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb"> 776 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
916 <provider selected="true" editor-type-id="text-editor"> 777 <provider selected="true" editor-type-id="text-editor">
917 - <state relative-caret-position="30">  
918 - <caret line="2" column="15" lean-forward="false" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" /> 778 + <state relative-caret-position="855">
  779 + <caret line="57" column="32" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" />
919 </state> 780 </state>
920 </provider> 781 </provider>
921 </entry> 782 </entry>
922 - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss"> 783 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
923 <provider selected="true" editor-type-id="text-editor"> 784 <provider selected="true" editor-type-id="text-editor">
924 - <state relative-caret-position="0">  
925 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 785 + <state relative-caret-position="1800">
  786 + <caret line="120" column="25" selection-start-line="120" selection-start-column="16" selection-end-line="120" selection-end-column="25" />
926 </state> 787 </state>
927 </provider> 788 </provider>
928 </entry> 789 </entry>
929 - <entry file="file://$PROJECT_DIR$/db/migrate/20171214094525_add_answer_text_to_page_content_marker.rb"> 790 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
930 <provider selected="true" editor-type-id="text-editor"> 791 <provider selected="true" editor-type-id="text-editor">
931 - <state relative-caret-position="30">  
932 - <caret line="2" column="62" lean-forward="false" selection-start-line="2" selection-start-column="46" selection-end-line="2" selection-end-column="62" /> 792 + <state relative-caret-position="15">
  793 + <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
933 </state> 794 </state>
934 </provider> 795 </provider>
935 </entry> 796 </entry>
936 - <entry file="file://$PROJECT_DIR$/Gemfile"> 797 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
937 <provider selected="true" editor-type-id="text-editor"> 798 <provider selected="true" editor-type-id="text-editor">
938 - <state relative-caret-position="0">  
939 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
940 - <folding /> 799 + <state relative-caret-position="75">
  800 + <caret line="5" column="44" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="44" />
941 </state> 801 </state>
942 </provider> 802 </provider>
943 </entry> 803 </entry>
944 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 804 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
945 <provider selected="true" editor-type-id="text-editor"> 805 <provider selected="true" editor-type-id="text-editor">
946 - <state relative-caret-position="705">  
947 - <caret line="47" column="37" lean-forward="false" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" /> 806 + <state relative-caret-position="255">
  807 + <caret line="17" column="65" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="65" />
948 </state> 808 </state>
949 </provider> 809 </provider>
950 </entry> 810 </entry>
951 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb"> 811 + <entry file="file://$PROJECT_DIR$/app/mailers/kanjai_mailer.rb">
952 <provider selected="true" editor-type-id="text-editor"> 812 <provider selected="true" editor-type-id="text-editor">
953 - <state relative-caret-position="675">  
954 - <caret line="45" column="82" lean-forward="false" selection-start-line="45" selection-start-column="82" selection-end-line="45" selection-end-column="82" /> 813 + <state relative-caret-position="60">
  814 + <caret line="4" column="5" lean-forward="true" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
955 </state> 815 </state>
956 </provider> 816 </provider>
957 </entry> 817 </entry>
958 - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 818 + <entry file="file://$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb">
959 <provider selected="true" editor-type-id="text-editor"> 819 <provider selected="true" editor-type-id="text-editor">
960 - <state relative-caret-position="0">  
961 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 820 + <state relative-caret-position="45">
  821 + <caret line="3" column="11" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="11" />
962 </state> 822 </state>
963 </provider> 823 </provider>
964 </entry> 824 </entry>
965 - <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 825 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
966 <provider selected="true" editor-type-id="text-editor"> 826 <provider selected="true" editor-type-id="text-editor">
967 - <state relative-caret-position="1005">  
968 - <caret line="67" column="11" lean-forward="false" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" /> 827 + <state relative-caret-position="4395">
  828 + <caret line="293" column="41" selection-start-line="293" selection-start-column="41" selection-end-line="293" selection-end-column="41" />
969 </state> 829 </state>
970 </provider> 830 </provider>
971 </entry> 831 </entry>
972 - <entry file="file://$PROJECT_DIR$/lib/admin.rb"> 832 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
973 <provider selected="true" editor-type-id="text-editor"> 833 <provider selected="true" editor-type-id="text-editor">
974 - <state relative-caret-position="0">  
975 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 834 + <state relative-caret-position="855">
  835 + <caret line="57" column="32" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" />
976 </state> 836 </state>
977 </provider> 837 </provider>
978 </entry> 838 </entry>
979 - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb"> 839 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
980 <provider selected="true" editor-type-id="text-editor"> 840 <provider selected="true" editor-type-id="text-editor">
981 - <state relative-caret-position="90">  
982 - <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> 841 + <state relative-caret-position="15">
  842 + <caret line="1" column="121" selection-start-line="1" selection-start-column="121" selection-end-line="1" selection-end-column="121" />
983 </state> 843 </state>
984 </provider> 844 </provider>
985 </entry> 845 </entry>
986 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 846 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
987 <provider selected="true" editor-type-id="text-editor"> 847 <provider selected="true" editor-type-id="text-editor">
988 - <state relative-caret-position="0">  
989 - <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 - <folding /> 848 + <state relative-caret-position="15">
  849 + <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
991 </state> 850 </state>
992 </provider> 851 </provider>
993 </entry> 852 </entry>
994 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb"> 853 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
995 <provider selected="true" editor-type-id="text-editor"> 854 <provider selected="true" editor-type-id="text-editor">
996 - <state relative-caret-position="135">  
997 - <caret line="9" column="32" lean-forward="false" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" /> 855 + <state relative-caret-position="300">
  856 + <caret line="20" column="41" selection-start-line="20" selection-start-column="41" selection-end-line="20" selection-end-column="41" />
998 </state> 857 </state>
999 </provider> 858 </provider>
1000 </entry> 859 </entry>
1001 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js"> 860 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
1002 <provider selected="true" editor-type-id="text-editor"> 861 <provider selected="true" editor-type-id="text-editor">
1003 - <state relative-caret-position="6510">  
1004 - <caret line="434" column="34" lean-forward="false" selection-start-line="434" selection-start-column="22" selection-end-line="434" selection-end-column="34" />  
1005 - <folding /> 862 + <state relative-caret-position="2115">
  863 + <caret line="141" column="119" selection-start-line="141" selection-start-column="119" selection-end-line="141" selection-end-column="119" />
1006 </state> 864 </state>
1007 </provider> 865 </provider>
1008 </entry> 866 </entry>
1009 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb"> 867 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">
1010 <provider selected="true" editor-type-id="text-editor"> 868 <provider selected="true" editor-type-id="text-editor">
1011 - <state relative-caret-position="225">  
1012 - <caret line="15" column="6" lean-forward="false" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="23" />  
1013 - <folding /> 869 + <state relative-caret-position="15">
  870 + <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
1014 </state> 871 </state>
1015 </provider> 872 </provider>
1016 </entry> 873 </entry>
1017 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb"> 874 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1018 <provider selected="true" editor-type-id="text-editor"> 875 <provider selected="true" editor-type-id="text-editor">
1019 - <state relative-caret-position="1350">  
1020 - <caret line="90" column="10" lean-forward="false" selection-start-line="90" selection-start-column="10" selection-end-line="90" selection-end-column="10" />  
1021 - <folding /> 876 + <state relative-caret-position="1785">
  877 + <caret line="119" column="36" selection-start-line="119" selection-start-column="19" selection-end-line="119" selection-end-column="36" />
1022 </state> 878 </state>
1023 </provider> 879 </provider>
1024 </entry> 880 </entry>
1025 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 881 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
1026 <provider selected="true" editor-type-id="text-editor"> 882 <provider selected="true" editor-type-id="text-editor">
1027 - <state relative-caret-position="2265">  
1028 - <caret line="151" column="56" lean-forward="false" selection-start-line="151" selection-start-column="41" selection-end-line="151" selection-end-column="56" />  
1029 - <folding /> 883 + <state relative-caret-position="855">
  884 + <caret line="57" column="32" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" />
1030 </state> 885 </state>
1031 </provider> 886 </provider>
1032 </entry> 887 </entry>
1033 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb"> 888 + <entry file="file://$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb">
1034 <provider selected="true" editor-type-id="text-editor"> 889 <provider selected="true" editor-type-id="text-editor">
1035 - <state relative-caret-position="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" />  
1037 - <folding /> 890 + <state relative-caret-position="45">
  891 + <caret line="3" column="11" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="11" />
1038 </state> 892 </state>
1039 </provider> 893 </provider>
1040 </entry> 894 </entry>
1041 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb"> 895 + <entry file="file://$PROJECT_DIR$/app/mailers/kanjai_mailer.rb">
1042 <provider selected="true" editor-type-id="text-editor"> 896 <provider selected="true" editor-type-id="text-editor">
1043 - <state relative-caret-position="2535">  
1044 - <caret line="169" column="15" lean-forward="false" selection-start-line="169" selection-start-column="15" selection-end-line="169" selection-end-column="15" />  
1045 - <folding /> 897 + <state relative-caret-position="60">
  898 + <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
1046 </state> 899 </state>
1047 </provider> 900 </provider>
1048 </entry> 901 </entry>
1049 - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb"> 902 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
1050 <provider selected="true" editor-type-id="text-editor"> 903 <provider selected="true" editor-type-id="text-editor">
1051 - <state relative-caret-position="0">  
1052 - <caret line="0" column="12" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />  
1053 - <folding /> 904 + <state relative-caret-position="4395">
  905 + <caret line="293" column="41" selection-start-line="293" selection-start-column="41" selection-end-line="293" selection-end-column="41" />
1054 </state> 906 </state>
1055 </provider> 907 </provider>
1056 </entry> 908 </entry>
1057 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 909 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
1058 <provider selected="true" editor-type-id="text-editor"> 910 <provider selected="true" editor-type-id="text-editor">
1059 - <state relative-caret-position="0">  
1060 - <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 /> 911 + <state relative-caret-position="75">
  912 + <caret line="5" column="44" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="44" />
1062 </state> 913 </state>
1063 </provider> 914 </provider>
1064 </entry> 915 </entry>
1065 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb"> 916 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
1066 <provider selected="true" editor-type-id="text-editor"> 917 <provider selected="true" editor-type-id="text-editor">
1067 - <state relative-caret-position="0">  
1068 - <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 /> 918 + <state relative-caret-position="255">
  919 + <caret line="17" column="65" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="65" />
1070 </state> 920 </state>
1071 </provider> 921 </provider>
1072 </entry> 922 </entry>
1073 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb"> 923 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
1074 <provider selected="true" editor-type-id="text-editor"> 924 <provider selected="true" editor-type-id="text-editor">
1075 - <state relative-caret-position="0">  
1076 - <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 /> 925 + <state relative-caret-position="15">
  926 + <caret line="1" column="121" selection-start-line="1" selection-start-column="121" selection-end-line="1" selection-end-column="121" />
1078 </state> 927 </state>
1079 </provider> 928 </provider>
1080 </entry> 929 </entry>
1081 - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 930 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
1082 <provider selected="true" editor-type-id="text-editor"> 931 <provider selected="true" editor-type-id="text-editor">
1083 - <state relative-caret-position="165">  
1084 - <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />  
1085 - <folding /> 932 + <state relative-caret-position="1500">
  933 + <caret line="100" column="21" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="21" />
1086 </state> 934 </state>
1087 </provider> 935 </provider>
1088 </entry> 936 </entry>
1089 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js"> 937 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
1090 <provider selected="true" editor-type-id="text-editor"> 938 <provider selected="true" editor-type-id="text-editor">
1091 - <state relative-caret-position="322">  
1092 - <caret line="1197" column="24" lean-forward="false" selection-start-line="1197" selection-start-column="24" selection-end-line="1197" selection-end-column="24" />  
1093 - <folding /> 939 + <state>
  940 + <folding>
  941 + <element signature="n#!!doc" expanded="true" />
  942 + </folding>
1094 </state> 943 </state>
1095 </provider> 944 </provider>
1096 </entry> 945 </entry>
1097 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js"> 946 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
1098 <provider selected="true" editor-type-id="text-editor"> 947 <provider selected="true" editor-type-id="text-editor">
1099 - <state relative-caret-position="165">  
1100 - <caret line="11" column="42" lean-forward="false" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />  
1101 - <folding /> 948 + <state relative-caret-position="1815">
  949 + <caret line="121" column="28" selection-start-line="121" selection-start-column="28" selection-end-line="121" selection-end-column="28" />
1102 </state> 950 </state>
1103 </provider> 951 </provider>
1104 </entry> 952 </entry>
1105 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js"> 953 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
1106 <provider selected="true" editor-type-id="text-editor"> 954 <provider selected="true" editor-type-id="text-editor">
1107 - <state relative-caret-position="0">  
1108 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
1109 - <folding /> 955 + <state relative-caret-position="2295">
  956 + <caret line="153" column="51" selection-start-line="153" selection-start-column="27" selection-end-line="153" selection-end-column="51" />
1110 </state> 957 </state>
1111 </provider> 958 </provider>
1112 </entry> 959 </entry>
1113 - <entry file="file://$PROJECT_DIR$/config/initializers/wicked_pdf.rb"> 960 + <entry file="file://$PROJECT_DIR$/.ruby-version">
1114 <provider selected="true" editor-type-id="text-editor"> 961 <provider selected="true" editor-type-id="text-editor">
1115 - <state relative-caret-position="150">  
1116 - <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="6" />  
1117 - <folding /> 962 + <state>
  963 + <caret column="5" selection-end-column="5" />
1118 </state> 964 </state>
1119 </provider> 965 </provider>
1120 </entry> 966 </entry>
1121 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 967 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1122 <provider selected="true" editor-type-id="text-editor"> 968 <provider selected="true" editor-type-id="text-editor">
1123 - <state relative-caret-position="195">  
1124 - <caret line="13" column="39" lean-forward="true" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />  
1125 - <folding /> 969 + <state relative-caret-position="15">
  970 + <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
1126 </state> 971 </state>
1127 </provider> 972 </provider>
1128 </entry> 973 </entry>
1129 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 974 + <entry file="file://$PROJECT_DIR$/Gemfile">
  975 + <provider selected="true" editor-type-id="text-editor" />
  976 + </entry>
  977 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
1130 <provider selected="true" editor-type-id="text-editor"> 978 <provider selected="true" editor-type-id="text-editor">
1131 - <state relative-caret-position="45">  
1132 - <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />  
1133 - <folding /> 979 + <state relative-caret-position="199">
  980 + <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
1134 </state> 981 </state>
1135 </provider> 982 </provider>
1136 </entry> 983 </entry>
1137 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 984 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
1138 <provider selected="true" editor-type-id="text-editor"> 985 <provider selected="true" editor-type-id="text-editor">
1139 - <state relative-caret-position="15">  
1140 - <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />  
1141 - <folding /> 986 + <state relative-caret-position="166">
  987 + <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
1142 </state> 988 </state>
1143 </provider> 989 </provider>
1144 </entry> 990 </entry>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.78) 4 + kanjai (0.0.79)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk (= 2.6.32) 7 aws-sdk (= 2.6.32)
1 <%= fields_for @obj do |form| %> 1 <%= fields_for @obj do |form| %>
2 <%= 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| %>
3 -  
4 -  
5 -  
6 <div class="form-group"> 3 <div class="form-group">
7 <%= form2.label :text_value, form2.object.marker, :class => "control-label" %> 4 <%= form2.label :text_value, form2.object.marker, :class => "control-label" %>
8 <% if form2.object.get_marker_type(@type_content) == 'string' %> 5 <% if form2.object.get_marker_type(@type_content) == 'string' %>
1 <div class="container"> 1 <div class="container">
2 - <%= @page_content.html_safe %> 2 + <%=j @page_content.to_s %>
3 </div> 3 </div>
4 4
5 <script type="text/javascript"> 5 <script type="text/javascript">
@@ -4,13 +4,13 @@ Devise.setup do |config| @@ -4,13 +4,13 @@ Devise.setup do |config|
4 # The secret key used by Devise. Devise uses this key to generate 4 # The secret key used by Devise. Devise uses this key to generate
5 # random tokens. Changing this key will render invalid all existing 5 # random tokens. Changing this key will render invalid all existing
6 # confirmation, reset password and unlock tokens in the database. 6 # confirmation, reset password and unlock tokens in the database.
7 - # config.secret_key = '0e275aa97c79d0dd71926a2ffb56b514edd16069b2db8ab65ba8f1744d217eb9ffc66d9553141fdd0d8715e4730790728e438d727b8c0c5ebc7083886db7014f' 7 + config.secret_key = ENV['KANJAI_SECRET_KEY']
8 8
9 # ==> Mailer Configuration 9 # ==> Mailer Configuration
10 # Configure the e-mail address which will be shown in Devise::Mailer, 10 # Configure the e-mail address which will be shown in Devise::Mailer,
11 # note that it will be overwritten if you use your own mailer class 11 # note that it will be overwritten if you use your own mailer class
12 # with default "from" parameter. 12 # with default "from" parameter.
13 - config.mailer_sender = 'noreply@edit.de' 13 + #config.mailer_sender = 'noreply@edit.de'
14 14
15 # Configure the class responsible to send e-mails. 15 # Configure the class responsible to send e-mails.
16 # config.mailer = 'Devise::Mailer' 16 # config.mailer = 'Devise::Mailer'
@@ -20,7 +20,6 @@ module Kanjai @@ -20,7 +20,6 @@ module Kanjai
20 end 20 end
21 end 21 end
22 22
23 -  
24 @doc.to_html 23 @doc.to_html
25 end 24 end
26 25