EDIT / kanjai · Commits

Commit 8b482486b230190f7c953cf04af3acdf24a40457

Authored by Karpikau Andrei
1 parent 776911d1

check nil valie for static element

Inline Side-by-side
Showing 4 changed files with 61 additions and 232 deletions
@@ -28,18 +28,18 @@ @@ -28,18 +28,18 @@
28 <file leaf-file-name="version.rb" pinned="false" current-in-tab="true"> 28 <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
29 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 29 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
30 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
31 - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 31 + <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
32 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 32 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
33 <folding /> 33 <folding />
34 </state> 34 </state>
35 </provider> 35 </provider>
36 </entry> 36 </entry>
37 </file> 37 </file>
38 - <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">  
39 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb"> 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">
40 <provider selected="true" editor-type-id="text-editor"> 40 <provider selected="true" editor-type-id="text-editor">
41 - <state vertical-scroll-proportion="2.0833333" vertical-offset="770" max-vertical-offset="1380">  
42 - <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" /> 41 + <state vertical-scroll-proportion="0.0" vertical-offset="1212" max-vertical-offset="2565">
  42 + <caret line="92" column="57" selection-start-line="92" selection-start-column="57" selection-end-line="92" selection-end-column="57" />
43 <folding /> 43 <folding />
44 </state> 44 </state>
45 </provider> 45 </provider>
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 <file leaf-file-name="_operation.html.erb" pinned="false" current-in-tab="false"> 48 <file leaf-file-name="_operation.html.erb" pinned="false" current-in-tab="false">
49 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb"> 49 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
50 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
51 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="315"> 51 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
52 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 52 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
53 <folding /> 53 <folding />
54 </state> 54 </state>
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 <file leaf-file-name="_preview.html.erb" pinned="false" current-in-tab="false"> 58 <file leaf-file-name="_preview.html.erb" pinned="false" current-in-tab="false">
59 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb"> 59 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
60 <provider selected="true" editor-type-id="text-editor"> 60 <provider selected="true" editor-type-id="text-editor">
61 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="195"> 61 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="195">
62 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 62 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
63 <folding /> 63 <folding />
64 </state> 64 </state>
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 <file leaf-file-name="structure.html.erb" pinned="false" current-in-tab="false"> 68 <file leaf-file-name="structure.html.erb" pinned="false" current-in-tab="false">
69 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb"> 69 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
70 <provider selected="true" editor-type-id="text-editor"> 70 <provider selected="true" editor-type-id="text-editor">
71 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="675"> 71 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
72 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 72 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
73 <folding /> 73 <folding />
74 </state> 74 </state>
@@ -78,9 +78,13 @@ @@ -78,9 +78,13 @@
78 <file leaf-file-name="show_editor.html.erb" pinned="false" current-in-tab="false"> 78 <file leaf-file-name="show_editor.html.erb" pinned="false" current-in-tab="false">
79 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb"> 79 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
80 <provider selected="true" editor-type-id="text-editor"> 80 <provider selected="true" editor-type-id="text-editor">
81 - <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615"> 81 + <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="615">
82 <caret line="6" column="61" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="61" /> 82 <caret line="6" column="61" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="61" />
83 - <folding /> 83 + <folding>
  84 + <element signature="e#360#414#0#ruby" expanded="false" />
  85 + <element signature="e#1122#1141#0#ruby" expanded="false" />
  86 + <element signature="e#1197#1216#0#ruby" expanded="false" />
  87 + </folding>
84 </state> 88 </state>
85 </provider> 89 </provider>
86 </entry> 90 </entry>
@@ -88,7 +92,7 @@ @@ -88,7 +92,7 @@
88 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 92 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
89 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb"> 93 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
90 <provider selected="true" editor-type-id="text-editor"> 94 <provider selected="true" editor-type-id="text-editor">
91 - <state vertical-scroll-proportion="-13.592592" vertical-offset="1118" max-vertical-offset="4275"> 95 + <state vertical-scroll-proportion="0.0" vertical-offset="1118" max-vertical-offset="4275">
92 <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" /> 96 <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" />
93 <folding> 97 <folding>
94 <element signature="e#2689#2725#0" expanded="true" /> 98 <element signature="e#2689#2725#0" expanded="true" />
@@ -101,7 +105,7 @@ @@ -101,7 +105,7 @@
101 <file leaf-file-name="add_item.html.erb" pinned="false" current-in-tab="false"> 105 <file leaf-file-name="add_item.html.erb" pinned="false" current-in-tab="false">
102 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_contents/add_item.html.erb"> 106 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_contents/add_item.html.erb">
103 <provider selected="true" editor-type-id="text-editor"> 107 <provider selected="true" editor-type-id="text-editor">
104 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="810"> 108 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="810">
105 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 109 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
106 <folding /> 110 <folding />
107 </state> 111 </state>
@@ -111,7 +115,7 @@ @@ -111,7 +115,7 @@
111 <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false"> 115 <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
112 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb"> 116 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
113 <provider selected="true" editor-type-id="text-editor"> 117 <provider selected="true" editor-type-id="text-editor">
114 - <state vertical-scroll-proportion="15.0" vertical-offset="360" max-vertical-offset="1470"> 118 + <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="1470">
115 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 119 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
116 <folding /> 120 <folding />
117 </state> 121 </state>
@@ -121,9 +125,16 @@ @@ -121,9 +125,16 @@
121 <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false"> 125 <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
122 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb"> 126 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
123 <provider selected="true" editor-type-id="text-editor"> 127 <provider selected="true" editor-type-id="text-editor">
124 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="615"> 128 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
125 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 129 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
126 - <folding /> 130 + <folding>
  131 + <element signature="e#54#97#0#ruby" expanded="false" />
  132 + <element signature="e#404#443#0#ruby" expanded="false" />
  133 + <element signature="e#640#677#0#ruby" expanded="false" />
  134 + <element signature="e#878#921#0#ruby" expanded="false" />
  135 + <element signature="n#t('admin.pages.type_page.html')#0;n#!!top" expanded="false" />
  136 + <element signature="n#t('admin.pages.type_page.markdown')#0;n#!!top" expanded="false" />
  137 + </folding>
127 </state> 138 </state>
128 </provider> 139 </provider>
129 </entry> 140 </entry>
@@ -178,11 +189,11 @@ @@ -178,11 +189,11 @@
178 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" /> 189 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
179 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" /> 190 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
180 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 191 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
181 - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />  
182 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" /> 192 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
183 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" /> 193 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
184 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" /> 194 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
185 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" /> 195 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
  196 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
186 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 197 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
187 </list> 198 </list>
188 </option> 199 </option>
@@ -218,8 +229,6 @@ @@ -218,8 +229,6 @@
218 <sortByType /> 229 <sortByType />
219 </navigator> 230 </navigator>
220 <panes> 231 <panes>
221 - <pane id="Scope" />  
222 - <pane id="RailsProjectView" />  
223 <pane id="ProjectPane"> 232 <pane id="ProjectPane">
224 <subPane> 233 <subPane>
225 <PATH> 234 <PATH>
@@ -283,188 +292,6 @@ @@ -283,188 +292,6 @@
283 <option name="myItemId" value="app" /> 292 <option name="myItemId" value="app" />
284 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 293 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
285 </PATH_ELEMENT> 294 </PATH_ELEMENT>
286 - <PATH_ELEMENT>  
287 - <option name="myItemId" value="views" />  
288 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
289 - </PATH_ELEMENT>  
290 - </PATH>  
291 - <PATH>  
292 - <PATH_ELEMENT>  
293 - <option name="myItemId" value="kanjai" />  
294 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
295 - </PATH_ELEMENT>  
296 - <PATH_ELEMENT>  
297 - <option name="myItemId" value="kanjai" />  
298 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
299 - </PATH_ELEMENT>  
300 - <PATH_ELEMENT>  
301 - <option name="myItemId" value="app" />  
302 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
303 - </PATH_ELEMENT>  
304 - <PATH_ELEMENT>  
305 - <option name="myItemId" value="views" />  
306 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
307 - </PATH_ELEMENT>  
308 - <PATH_ELEMENT>  
309 - <option name="myItemId" value="kanjai" />  
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="views" />  
328 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
329 - </PATH_ELEMENT>  
330 - <PATH_ELEMENT>  
331 - <option name="myItemId" value="kanjai" />  
332 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
333 - </PATH_ELEMENT>  
334 - <PATH_ELEMENT>  
335 - <option name="myItemId" value="admin" />  
336 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
337 - </PATH_ELEMENT>  
338 - <PATH_ELEMENT>  
339 - <option name="myItemId" value="pages" />  
340 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
341 - </PATH_ELEMENT>  
342 - </PATH>  
343 - <PATH>  
344 - <PATH_ELEMENT>  
345 - <option name="myItemId" value="kanjai" />  
346 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
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_ELEMENT>  
353 - <option name="myItemId" value="app" />  
354 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
355 - </PATH_ELEMENT>  
356 - <PATH_ELEMENT>  
357 - <option name="myItemId" value="views" />  
358 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
359 - </PATH_ELEMENT>  
360 - <PATH_ELEMENT>  
361 - <option name="myItemId" value="kanjai" />  
362 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
363 - </PATH_ELEMENT>  
364 - <PATH_ELEMENT>  
365 - <option name="myItemId" value="admin" />  
366 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
367 - </PATH_ELEMENT>  
368 - <PATH_ELEMENT>  
369 - <option name="myItemId" value="pages" />  
370 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
371 - </PATH_ELEMENT>  
372 - <PATH_ELEMENT>  
373 - <option name="myItemId" value="content_types" />  
374 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
375 - </PATH_ELEMENT>  
376 - </PATH>  
377 - <PATH>  
378 - <PATH_ELEMENT>  
379 - <option name="myItemId" value="kanjai" />  
380 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
381 - </PATH_ELEMENT>  
382 - <PATH_ELEMENT>  
383 - <option name="myItemId" value="kanjai" />  
384 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
385 - </PATH_ELEMENT>  
386 - <PATH_ELEMENT>  
387 - <option name="myItemId" value="app" />  
388 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
389 - </PATH_ELEMENT>  
390 - <PATH_ELEMENT>  
391 - <option name="myItemId" value="views" />  
392 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
393 - </PATH_ELEMENT>  
394 - <PATH_ELEMENT>  
395 - <option name="myItemId" value="kanjai" />  
396 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
397 - </PATH_ELEMENT>  
398 - <PATH_ELEMENT>  
399 - <option name="myItemId" value="admin" />  
400 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
401 - </PATH_ELEMENT>  
402 - </PATH>  
403 - <PATH>  
404 - <PATH_ELEMENT>  
405 - <option name="myItemId" value="kanjai" />  
406 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
407 - </PATH_ELEMENT>  
408 - <PATH_ELEMENT>  
409 - <option name="myItemId" value="kanjai" />  
410 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
411 - </PATH_ELEMENT>  
412 - <PATH_ELEMENT>  
413 - <option name="myItemId" value="app" />  
414 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
415 - </PATH_ELEMENT>  
416 - <PATH_ELEMENT>  
417 - <option name="myItemId" value="views" />  
418 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
419 - </PATH_ELEMENT>  
420 - <PATH_ELEMENT>  
421 - <option name="myItemId" value="kanjai" />  
422 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
423 - </PATH_ELEMENT>  
424 - <PATH_ELEMENT>  
425 - <option name="myItemId" value="admin" />  
426 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
427 - </PATH_ELEMENT>  
428 - <PATH_ELEMENT>  
429 - <option name="myItemId" value="page_contents" />  
430 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
431 - </PATH_ELEMENT>  
432 - </PATH>  
433 - <PATH>  
434 - <PATH_ELEMENT>  
435 - <option name="myItemId" value="kanjai" />  
436 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
437 - </PATH_ELEMENT>  
438 - <PATH_ELEMENT>  
439 - <option name="myItemId" value="kanjai" />  
440 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
441 - </PATH_ELEMENT>  
442 - <PATH_ELEMENT>  
443 - <option name="myItemId" value="app" />  
444 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
445 - </PATH_ELEMENT>  
446 - <PATH_ELEMENT>  
447 - <option name="myItemId" value="models" />  
448 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
449 - </PATH_ELEMENT>  
450 - <PATH_ELEMENT>  
451 - <option name="myItemId" value="kanjai" />  
452 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
453 - </PATH_ELEMENT>  
454 - </PATH>  
455 - <PATH>  
456 - <PATH_ELEMENT>  
457 - <option name="myItemId" value="kanjai" />  
458 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
459 - </PATH_ELEMENT>  
460 - <PATH_ELEMENT>  
461 - <option name="myItemId" value="kanjai" />  
462 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
463 - </PATH_ELEMENT>  
464 - <PATH_ELEMENT>  
465 - <option name="myItemId" value="app" />  
466 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
467 - </PATH_ELEMENT>  
468 </PATH> 295 </PATH>
469 <PATH> 296 <PATH>
470 <PATH_ELEMENT> 297 <PATH_ELEMENT>
@@ -534,6 +361,8 @@ @@ -534,6 +361,8 @@
534 </PATH> 361 </PATH>
535 </subPane> 362 </subPane>
536 </pane> 363 </pane>
  364 + <pane id="RailsProjectView" />
  365 + <pane id="Scope" />
537 </panes> 366 </panes>
538 </component> 367 </component>
539 <component name="PropertiesComponent"> 368 <component name="PropertiesComponent">
@@ -718,7 +547,7 @@ @@ -718,7 +547,7 @@
718 <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 547 <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
719 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 548 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
720 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 549 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
721 - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 550 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
722 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 551 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
723 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 552 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
724 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> 553 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -726,15 +555,15 @@ @@ -726,15 +555,15 @@
726 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 555 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
727 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 556 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
728 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 557 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
729 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.411147" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 558 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.41760904" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
730 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 559 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
731 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 560 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
732 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 561 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
733 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 562 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
734 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 563 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
735 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 564 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
736 - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />  
737 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> 565 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
  566 + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
738 </layout> 567 </layout>
739 </component> 568 </component>
740 <component name="Vcs.Log.UiProperties"> 569 <component name="Vcs.Log.UiProperties">
@@ -910,7 +739,6 @@ @@ -910,7 +739,6 @@
910 <provider selected="true" editor-type-id="text-editor"> 739 <provider selected="true" editor-type-id="text-editor">
911 <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110"> 740 <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
912 <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" /> 741 <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
913 - <folding />  
914 </state> 742 </state>
915 </provider> 743 </provider>
916 </entry> 744 </entry>
@@ -918,7 +746,6 @@ @@ -918,7 +746,6 @@
918 <provider selected="true" editor-type-id="text-editor"> 746 <provider selected="true" editor-type-id="text-editor">
919 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 747 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
920 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 748 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
921 - <folding />  
922 </state> 749 </state>
923 </provider> 750 </provider>
924 </entry> 751 </entry>
@@ -926,7 +753,6 @@ @@ -926,7 +753,6 @@
926 <provider selected="true" editor-type-id="text-editor"> 753 <provider selected="true" editor-type-id="text-editor">
927 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="435"> 754 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="435">
928 <caret line="16" column="181" selection-start-line="16" selection-start-column="181" selection-end-line="16" selection-end-column="181" /> 755 <caret line="16" column="181" selection-start-line="16" selection-start-column="181" selection-end-line="16" selection-end-column="181" />
929 - <folding />  
930 </state> 756 </state>
931 </provider> 757 </provider>
932 </entry> 758 </entry>
@@ -937,13 +763,6 @@ @@ -937,13 +763,6 @@
937 </state> 763 </state>
938 </provider> 764 </provider>
939 </entry> 765 </entry>
940 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">  
941 - <provider selected="true" editor-type-id="text-editor">  
942 - <state vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="2565">  
943 - <caret line="138" column="131" selection-start-line="138" selection-start-column="131" selection-end-line="138" selection-end-column="131" />  
944 - </state>  
945 - </provider>  
946 - </entry>  
947 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb"> 766 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
948 <provider selected="true" editor-type-id="text-editor"> 767 <provider selected="true" editor-type-id="text-editor">
949 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330"> 768 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
@@ -969,7 +788,6 @@ @@ -969,7 +788,6 @@
969 <provider selected="true" editor-type-id="text-editor"> 788 <provider selected="true" editor-type-id="text-editor">
970 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520"> 789 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520">
971 <caret line="5" column="15" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="15" /> 790 <caret line="5" column="15" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="15" />
972 - <folding />  
973 </state> 791 </state>
974 </provider> 792 </provider>
975 </entry> 793 </entry>
@@ -985,7 +803,6 @@ @@ -985,7 +803,6 @@
985 <provider selected="true" editor-type-id="text-editor"> 803 <provider selected="true" editor-type-id="text-editor">
986 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 804 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
987 <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" /> 805 <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
988 - <folding />  
989 </state> 806 </state>
990 </provider> 807 </provider>
991 </entry> 808 </entry>
@@ -1001,7 +818,6 @@ @@ -1001,7 +818,6 @@
1001 <provider selected="true" editor-type-id="text-editor"> 818 <provider selected="true" editor-type-id="text-editor">
1002 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> 819 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
1003 <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" /> 820 <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
1004 - <folding />  
1005 </state> 821 </state>
1006 </provider> 822 </provider>
1007 </entry> 823 </entry>
@@ -1009,7 +825,6 @@ @@ -1009,7 +825,6 @@
1009 <provider selected="true" editor-type-id="text-editor"> 825 <provider selected="true" editor-type-id="text-editor">
1010 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 826 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1011 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 827 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1012 - <folding />  
1013 </state> 828 </state>
1014 </provider> 829 </provider>
1015 </entry> 830 </entry>
@@ -1017,7 +832,6 @@ @@ -1017,7 +832,6 @@
1017 <provider selected="true" editor-type-id="text-editor"> 832 <provider selected="true" editor-type-id="text-editor">
1018 <state vertical-scroll-proportion="0.0" vertical-offset="483" max-vertical-offset="1140"> 833 <state vertical-scroll-proportion="0.0" vertical-offset="483" max-vertical-offset="1140">
1019 <caret line="47" column="27" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="27" /> 834 <caret line="47" column="27" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="27" />
1020 - <folding />  
1021 </state> 835 </state>
1022 </provider> 836 </provider>
1023 </entry> 837 </entry>
@@ -1025,7 +839,6 @@ @@ -1025,7 +839,6 @@
1025 <provider selected="true" editor-type-id="text-editor"> 839 <provider selected="true" editor-type-id="text-editor">
1026 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180"> 840 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
1027 <caret line="5" column="9" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="9" /> 841 <caret line="5" column="9" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="9" />
1028 - <folding />  
1029 </state> 842 </state>
1030 </provider> 843 </provider>
1031 </entry> 844 </entry>
@@ -1033,7 +846,6 @@ @@ -1033,7 +846,6 @@
1033 <provider selected="true" editor-type-id="text-editor"> 846 <provider selected="true" editor-type-id="text-editor">
1034 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 847 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1035 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 848 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1036 - <folding />  
1037 </state> 849 </state>
1038 </provider> 850 </provider>
1039 </entry> 851 </entry>
@@ -1041,7 +853,6 @@ @@ -1041,7 +853,6 @@
1041 <provider selected="true" editor-type-id="text-editor"> 853 <provider selected="true" editor-type-id="text-editor">
1042 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 854 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1043 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 855 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1044 - <folding />  
1045 </state> 856 </state>
1046 </provider> 857 </provider>
1047 </entry> 858 </entry>
@@ -1057,13 +868,12 @@ @@ -1057,13 +868,12 @@
1057 <provider selected="true" editor-type-id="text-editor"> 868 <provider selected="true" editor-type-id="text-editor">
1058 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250"> 869 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
1059 <caret line="71" column="40" selection-start-line="71" selection-start-column="40" selection-end-line="71" selection-end-column="40" /> 870 <caret line="71" column="40" selection-start-line="71" selection-start-column="40" selection-end-line="71" selection-end-column="40" />
1060 - <folding />  
1061 </state> 871 </state>
1062 </provider> 872 </provider>
1063 </entry> 873 </entry>
1064 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb"> 874 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
1065 <provider selected="true" editor-type-id="text-editor"> 875 <provider selected="true" editor-type-id="text-editor">
1066 - <state vertical-scroll-proportion="2.0833333" vertical-offset="770" max-vertical-offset="1380"> 876 + <state vertical-scroll-proportion="0.0" vertical-offset="770" max-vertical-offset="1380">
1067 <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" /> 877 <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
1068 <folding /> 878 <folding />
1069 </state> 879 </state>
@@ -1079,7 +889,7 @@ @@ -1079,7 +889,7 @@
1079 </entry> 889 </entry>
1080 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb"> 890 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
1081 <provider selected="true" editor-type-id="text-editor"> 891 <provider selected="true" editor-type-id="text-editor">
1082 - <state vertical-scroll-proportion="15.0" vertical-offset="360" max-vertical-offset="1470"> 892 + <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="1470">
1083 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 893 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1084 <folding /> 894 <folding />
1085 </state> 895 </state>
@@ -1089,7 +899,14 @@ @@ -1089,7 +899,14 @@
1089 <provider selected="true" editor-type-id="text-editor"> 899 <provider selected="true" editor-type-id="text-editor">
1090 <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="615"> 900 <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="615">
1091 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 901 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1092 - <folding /> 902 + <folding>
  903 + <element signature="e#54#97#0#ruby" expanded="false" />
  904 + <element signature="e#404#443#0#ruby" expanded="false" />
  905 + <element signature="e#640#677#0#ruby" expanded="false" />
  906 + <element signature="e#878#921#0#ruby" expanded="false" />
  907 + <element signature="n#t('admin.pages.type_page.html')#0;n#!!top" expanded="false" />
  908 + <element signature="n#t('admin.pages.type_page.markdown')#0;n#!!top" expanded="false" />
  909 + </folding>
1093 </state> 910 </state>
1094 </provider> 911 </provider>
1095 </entry> 912 </entry>
@@ -1119,15 +936,19 @@ @@ -1119,15 +936,19 @@
1119 </entry> 936 </entry>
1120 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb"> 937 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
1121 <provider selected="true" editor-type-id="text-editor"> 938 <provider selected="true" editor-type-id="text-editor">
1122 - <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615"> 939 + <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="615">
1123 <caret line="6" column="61" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="61" /> 940 <caret line="6" column="61" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="61" />
1124 - <folding /> 941 + <folding>
  942 + <element signature="e#360#414#0#ruby" expanded="false" />
  943 + <element signature="e#1122#1141#0#ruby" expanded="false" />
  944 + <element signature="e#1197#1216#0#ruby" expanded="false" />
  945 + </folding>
1125 </state> 946 </state>
1126 </provider> 947 </provider>
1127 </entry> 948 </entry>
1128 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb"> 949 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
1129 <provider selected="true" editor-type-id="text-editor"> 950 <provider selected="true" editor-type-id="text-editor">
1130 - <state vertical-scroll-proportion="-13.592592" vertical-offset="1118" max-vertical-offset="4275"> 951 + <state vertical-scroll-proportion="0.0" vertical-offset="1118" max-vertical-offset="4275">
1131 <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" /> 952 <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" />
1132 <folding> 953 <folding>
1133 <element signature="e#2689#2725#0" expanded="true" /> 954 <element signature="e#2689#2725#0" expanded="true" />
@@ -1136,9 +957,17 @@ @@ -1136,9 +957,17 @@
1136 </state> 957 </state>
1137 </provider> 958 </provider>
1138 </entry> 959 </entry>
  960 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  961 + <provider selected="true" editor-type-id="text-editor">
  962 + <state vertical-scroll-proportion="0.0" vertical-offset="1212" max-vertical-offset="2565">
  963 + <caret line="92" column="57" selection-start-line="92" selection-start-column="57" selection-end-line="92" selection-end-column="57" />
  964 + <folding />
  965 + </state>
  966 + </provider>
  967 + </entry>
1139 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 968 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1140 <provider selected="true" editor-type-id="text-editor"> 969 <provider selected="true" editor-type-id="text-editor">
1141 - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 970 + <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
1142 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 971 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
1143 <folding /> 972 <folding />
1144 </state> 973 </state>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.46) 4 + kanjai (0.0.47)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -90,7 +90,7 @@ module Kanjai @@ -90,7 +90,7 @@ module Kanjai
90 90
91 #try find in static elements 91 #try find in static elements
92 page_template.page_content_markers.where(lang: I18n.locale).each do |marker| 92 page_template.page_content_markers.where(lang: I18n.locale).each do |marker|
93 - layer.gsub!(marker.marker, marker.text_value) 93 + layer.gsub!(marker.marker, marker.text_value.to_s)
94 end 94 end
95 95
96 markers = PageTemplate.get_marker(layer) 96 markers = PageTemplate.get_marker(layer)
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.47" 2 + VERSION = "0.0.48"
3 end 3 end