EDIT / kanjai · Commits

Commit 0663dbee102073026b0787c01e1bf12656a7cded

Authored by Karpikau Andrei
1 parent 2a67540d

save format render, change version

Inline Side-by-side
Showing 4 changed files with 210 additions and 331 deletions
... ... @@ -25,110 +25,105 @@
25 25 </component>
26 26 <component name="FileEditorManager">
27 27 <leaf>
28   - <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
29   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  28 + <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
30 30 <provider selected="true" editor-type-id="text-editor">
31   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
32   - <caret line="2" column="31" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
  31 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="960">
  32 + <caret line="5" column="76" selection-start-line="5" selection-start-column="27" selection-end-line="5" selection-end-column="76" />
33 33 <folding />
34 34 </state>
35 35 </provider>
36 36 </entry>
37 37 </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">
  38 + <file leaf-file-name="sessions_controller.rb" pinned="false" current-in-tab="false">
  39 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb">
40 40 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="0.0" vertical-offset="375" max-vertical-offset="2805">
42   - <caret line="35" column="97" selection-start-line="35" selection-start-column="97" selection-end-line="35" selection-end-column="97" />
  41 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
  42 + <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="33" />
43 43 <folding />
44 44 </state>
45 45 </provider>
46 46 </entry>
47 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="pages_controller.rb" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
50 50 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
52   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  51 + <state vertical-scroll-proportion="15.851851" vertical-offset="1388" max-vertical-offset="2805">
  52 + <caret line="64" column="26" selection-start-line="64" selection-start-column="8" selection-end-line="64" selection-end-column="26" />
53 53 <folding />
54 54 </state>
55 55 </provider>
56 56 </entry>
57 57 </file>
58   - <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
59   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  58 + <file leaf-file-name="show.pdf.erb" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">
60 60 <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="-12.291667" vertical-offset="980" max-vertical-offset="1770">
62   - <caret line="85" column="124" selection-start-line="85" selection-start-column="124" selection-end-line="85" selection-end-column="124" />
  61 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
  62 + <caret line="0" column="11" selection-start-line="0" selection-start-column="11" selection-end-line="0" selection-end-column="11" />
63 63 <folding />
64 64 </state>
65 65 </provider>
66 66 </entry>
67 67 </file>
68   - <file leaf-file-name="html_generator.js" pinned="false" current-in-tab="false">
69   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  68 + <file leaf-file-name="template_parser.rb" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
70 70 <provider selected="true" editor-type-id="text-editor">
71   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="8550">
72   - <caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />
73   - <folding>
74   - <marker date="1470228118000" expanded="true" signature="503:515" placeholder="..." />
75   - </folding>
  71 + <state vertical-scroll-proportion="0.0" vertical-offset="1643" max-vertical-offset="2250">
  72 + <caret line="97" column="8" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
  73 + <folding />
76 74 </state>
77 75 </provider>
78 76 </entry>
79 77 </file>
80   - <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
81   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  78 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
82 80 <provider selected="true" editor-type-id="text-editor">
83   - <state vertical-scroll-proportion="0.0" vertical-offset="2520" max-vertical-offset="7845">
84   - <caret line="189" column="26" selection-start-line="189" selection-start-column="26" selection-end-line="189" selection-end-column="26" />
85   - <folding>
86   - <marker date="1475744650000" expanded="true" signature="1842:1884" placeholder="..." />
87   - <marker date="1475744650000" expanded="true" signature="4090:4108" placeholder="..." />
88   - <marker date="1475744650000" expanded="true" signature="4122:4140" placeholder="..." />
89   - <marker date="1475744650000" expanded="true" signature="4192:4202" placeholder="..." />
90   - <marker date="1475744650000" expanded="true" signature="4229:4292" placeholder="..." />
91   - </folding>
  81 + <state vertical-scroll-proportion="0.0" vertical-offset="3450" max-vertical-offset="4635">
  82 + <caret line="230" column="55" selection-start-line="230" selection-start-column="30" selection-end-line="230" selection-end-column="55" />
  83 + <folding />
92 84 </state>
93 85 </provider>
94 86 </entry>
95 87 </file>
96   - <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false">
97   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  88 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
98 90 <provider selected="true" editor-type-id="text-editor">
99   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520">
100   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  91 + <state vertical-scroll-proportion="0.0" vertical-offset="342" max-vertical-offset="1050">
  92 + <caret line="33" column="22" selection-start-line="33" selection-start-column="6" selection-end-line="33" selection-end-column="22" />
101 93 <folding />
102 94 </state>
103 95 </provider>
104 96 </entry>
105 97 </file>
106   - <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
107   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">
  98 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  99 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
108 100 <provider selected="true" editor-type-id="text-editor">
109   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="180">
110   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  101 + <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
  102 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
111 103 <folding />
112 104 </state>
113 105 </provider>
114 106 </entry>
115 107 </file>
116   - <file leaf-file-name="show.pdf.erb" pinned="false" current-in-tab="false">
117   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">
  108 + <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
118 110 <provider selected="true" editor-type-id="text-editor">
119   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
120   - <caret line="0" column="26" selection-start-line="0" selection-start-column="26" selection-end-line="0" selection-end-column="26" />
  111 + <state vertical-scroll-proportion="0.0" vertical-offset="2127" max-vertical-offset="2925">
  112 + <caret line="151" column="70" selection-start-line="151" selection-start-column="70" selection-end-line="151" selection-end-column="70" />
121 113 <folding />
122 114 </state>
123 115 </provider>
124 116 </entry>
125 117 </file>
126   - <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
127   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  118 + <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/index.html.erb">
128 120 <provider selected="true" editor-type-id="text-editor">
129   - <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="390">
130   - <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
131   - <folding />
  121 + <state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="450">
  122 + <caret line="13" column="74" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="74" />
  123 + <folding>
  124 + <element signature="n#t('admin.pages.page_title')#0;n#!!top" expanded="false" />
  125 + <element signature="e#114#138#0#ruby" expanded="false" />
  126 + </folding>
132 127 </state>
133 128 </provider>
134 129 </entry>
... ... @@ -138,7 +133,6 @@
138 133 <component name="IdeDocumentHistory">
139 134 <option name="CHANGED_PATHS">
140 135 <list>
141   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" />
142 136 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
143 137 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
144 138 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
... ... @@ -173,7 +167,6 @@
173 167 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss" />
174 168 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
175 169 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
176   - <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
177 170 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_gallery_exist_images.html.erb" />
178 171 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/gallery.html.erb" />
179 172 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/update_gallery.js.erb" />
... ... @@ -181,13 +174,15 @@
181 174 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" />
182 175 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
183 176 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
184   - <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
185 177 <option value="$PROJECT_DIR$/kanjai.gemspec" />
186 178 <option value="$PROJECT_DIR$/lib/kanjai/content_function.rb" />
187 179 <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb" />
188 180 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
189 181 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
190 182 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
  183 + <option value="$PROJECT_DIR$/lib/zip.rb" />
  184 + <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
  185 + <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
191 186 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
192 187 </list>
193 188 </option>
... ... @@ -224,7 +219,6 @@
224 219 </navigator>
225 220 <panes>
226 221 <pane id="RailsProjectView" />
227   - <pane id="Scope" />
228 222 <pane id="ProjectPane">
229 223 <subPane>
230 224 <PATH>
... ... @@ -271,24 +265,6 @@
271 265 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
272 266 </PATH_ELEMENT>
273 267 <PATH_ELEMENT>
274   - <option name="myItemId" value="tasks" />
275   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
276   - </PATH_ELEMENT>
277   - </PATH>
278   - <PATH>
279   - <PATH_ELEMENT>
280   - <option name="myItemId" value="kanjai" />
281   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
282   - </PATH_ELEMENT>
283   - <PATH_ELEMENT>
284   - <option name="myItemId" value="kanjai" />
285   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
286   - </PATH_ELEMENT>
287   - <PATH_ELEMENT>
288   - <option name="myItemId" value="lib" />
289   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
290   - </PATH_ELEMENT>
291   - <PATH_ELEMENT>
292 268 <option name="myItemId" value="kanjai" />
293 269 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
294 270 </PATH_ELEMENT>
... ... @@ -303,38 +279,6 @@
303 279 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
304 280 </PATH_ELEMENT>
305 281 <PATH_ELEMENT>
306   - <option name="myItemId" value="config" />
307   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
308   - </PATH_ELEMENT>
309   - </PATH>
310   - <PATH>
311   - <PATH_ELEMENT>
312   - <option name="myItemId" value="kanjai" />
313   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
314   - </PATH_ELEMENT>
315   - <PATH_ELEMENT>
316   - <option name="myItemId" value="kanjai" />
317   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
318   - </PATH_ELEMENT>
319   - <PATH_ELEMENT>
320   - <option name="myItemId" value="config" />
321   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
322   - </PATH_ELEMENT>
323   - <PATH_ELEMENT>
324   - <option name="myItemId" value="initializers" />
325   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
326   - </PATH_ELEMENT>
327   - </PATH>
328   - <PATH>
329   - <PATH_ELEMENT>
330   - <option name="myItemId" value="kanjai" />
331   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
332   - </PATH_ELEMENT>
333   - <PATH_ELEMENT>
334   - <option name="myItemId" value="kanjai" />
335   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
336   - </PATH_ELEMENT>
337   - <PATH_ELEMENT>
338 282 <option name="myItemId" value="app" />
339 283 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
340 284 </PATH_ELEMENT>
... ... @@ -353,28 +297,6 @@
353 297 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
354 298 </PATH_ELEMENT>
355 299 <PATH_ELEMENT>
356   - <option name="myItemId" value="models" />
357   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
358   - </PATH_ELEMENT>
359   - <PATH_ELEMENT>
360   - <option name="myItemId" value="kanjai" />
361   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
362   - </PATH_ELEMENT>
363   - </PATH>
364   - <PATH>
365   - <PATH_ELEMENT>
366   - <option name="myItemId" value="kanjai" />
367   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
368   - </PATH_ELEMENT>
369   - <PATH_ELEMENT>
370   - <option name="myItemId" value="kanjai" />
371   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
372   - </PATH_ELEMENT>
373   - <PATH_ELEMENT>
374   - <option name="myItemId" value="app" />
375   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
376   - </PATH_ELEMENT>
377   - <PATH_ELEMENT>
378 300 <option name="myItemId" value="controllers" />
379 301 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
380 302 </PATH_ELEMENT>
... ... @@ -397,33 +319,15 @@
397 319 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
398 320 </PATH_ELEMENT>
399 321 <PATH_ELEMENT>
400   - <option name="myItemId" value="assets" />
  322 + <option name="myItemId" value="controllers" />
401 323 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
402 324 </PATH_ELEMENT>
403   - </PATH>
404   - <PATH>
405   - <PATH_ELEMENT>
406   - <option name="myItemId" value="kanjai" />
407   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
408   - </PATH_ELEMENT>
409 325 <PATH_ELEMENT>
410 326 <option name="myItemId" value="kanjai" />
411 327 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
412 328 </PATH_ELEMENT>
413 329 <PATH_ELEMENT>
414   - <option name="myItemId" value="app" />
415   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
416   - </PATH_ELEMENT>
417   - <PATH_ELEMENT>
418   - <option name="myItemId" value="assets" />
419   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
420   - </PATH_ELEMENT>
421   - <PATH_ELEMENT>
422   - <option name="myItemId" value="javascripts" />
423   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
424   - </PATH_ELEMENT>
425   - <PATH_ELEMENT>
426   - <option name="myItemId" value="kanjai" />
  330 + <option name="myItemId" value="admin" />
427 331 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
428 332 </PATH_ELEMENT>
429 333 </PATH>
... ... @@ -444,21 +348,10 @@
444 348 <option name="myItemId" value="assets" />
445 349 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
446 350 </PATH_ELEMENT>
447   - <PATH_ELEMENT>
448   - <option name="myItemId" value="javascripts" />
449   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
450   - </PATH_ELEMENT>
451   - <PATH_ELEMENT>
452   - <option name="myItemId" value="kanjai" />
453   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
454   - </PATH_ELEMENT>
455   - <PATH_ELEMENT>
456   - <option name="myItemId" value="admin" />
457   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
458   - </PATH_ELEMENT>
459 351 </PATH>
460 352 </subPane>
461 353 </pane>
  354 + <pane id="Scope" />
462 355 </panes>
463 356 </component>
464 357 <component name="PropertiesComponent">
... ... @@ -651,24 +544,24 @@
651 544 <layout>
652 545 <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" />
653 546 <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" />
654   - <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" />
655 547 <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" />
656   - <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" />
657   - <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" />
658   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32714054" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
659   - <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" />
  548 + <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" />
  549 + <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" />
660 550 <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" />
  551 + <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" />
661 552 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  553 + <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" />
  554 + <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" />
  555 + <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" />
  556 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.40791598" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  557 + <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" />
662 558 <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" />
663 559 <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" />
664 560 <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" />
665   - <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" />
666   - <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" />
667 561 <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" />
668 562 <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" />
669   - <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" />
670 563 <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" />
671   - <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" />
  564 + <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" />
672 565 </layout>
673 566 </component>
674 567 <component name="Vcs.Log.UiProperties">
... ... @@ -694,69 +587,6 @@
694 587 <watches-manager />
695 588 </component>
696 589 <component name="editorHistoryManager">
697   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
698   - <provider selected="true" editor-type-id="text-editor">
699   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
700   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
701   - </state>
702   - </provider>
703   - </entry>
704   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
705   - <provider selected="true" editor-type-id="text-editor">
706   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
707   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
708   - </state>
709   - </provider>
710   - </entry>
711   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
712   - <provider selected="true" editor-type-id="text-editor">
713   - <state vertical-scroll-proportion="0.0" vertical-offset="185" max-vertical-offset="825">
714   - <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
715   - </state>
716   - </provider>
717   - </entry>
718   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin_extend.css.scss">
719   - <provider selected="true" editor-type-id="text-editor">
720   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
721   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
722   - </state>
723   - </provider>
724   - </entry>
725   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
726   - <provider selected="true" editor-type-id="text-editor">
727   - <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="390">
728   - <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" />
729   - </state>
730   - </provider>
731   - </entry>
732   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
733   - <provider selected="true" editor-type-id="text-editor">
734   - <state vertical-scroll-proportion="0.0" vertical-offset="3765" max-vertical-offset="95070">
735   - <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
736   - </state>
737   - </provider>
738   - </entry>
739   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
740   - <provider selected="true" editor-type-id="text-editor">
741   - <state vertical-scroll-proportion="0.0" vertical-offset="255" max-vertical-offset="360">
742   - <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
743   - </state>
744   - </provider>
745   - </entry>
746   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/applets.scss">
747   - <provider selected="true" editor-type-id="text-editor">
748   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
749   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
750   - </state>
751   - </provider>
752   - </entry>
753   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/config.scss">
754   - <provider selected="true" editor-type-id="text-editor">
755   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
756   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
757   - </state>
758   - </provider>
759   - </entry>
760 590 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/bootstrap.js">
761 591 <provider selected="true" editor-type-id="text-editor">
762 592 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="34905">
... ... @@ -792,13 +622,6 @@
792 622 </state>
793 623 </provider>
794 624 </entry>
795   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
796   - <provider selected="true" editor-type-id="text-editor">
797   - <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">
798   - <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
799   - </state>
800   - </provider>
801   - </entry>
802 625 <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
803 626 <provider selected="true" editor-type-id="text-editor">
804 627 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
... ... @@ -855,13 +678,6 @@
855 678 </state>
856 679 </provider>
857 680 </entry>
858   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
859   - <provider selected="true" editor-type-id="text-editor">
860   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4635">
861   - <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
862   - </state>
863   - </provider>
864   - </entry>
865 681 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
866 682 <provider selected="true" editor-type-id="text-editor">
867 683 <state vertical-scroll-proportion="0.0" vertical-offset="110" max-vertical-offset="660">
... ... @@ -873,7 +689,6 @@
873 689 <provider selected="true" editor-type-id="text-editor">
874 690 <state vertical-scroll-proportion="0.0" vertical-offset="1234" max-vertical-offset="1650">
875 691 <caret line="92" column="0" selection-start-line="92" selection-start-column="0" selection-end-line="96" selection-end-column="7" />
876   - <folding />
877 692 </state>
878 693 </provider>
879 694 </entry>
... ... @@ -884,74 +699,136 @@
884 699 </state>
885 700 </provider>
886 701 </entry>
887   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  702 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
888 703 <provider selected="true" editor-type-id="text-editor">
889   - <state vertical-scroll-proportion="0.0" vertical-offset="615" max-vertical-offset="2925">
890   - <caret line="41" column="25" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="25" />
891   - <folding />
  704 + <state vertical-scroll-proportion="0.26025236" vertical-offset="0" max-vertical-offset="634">
  705 + <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />
892 706 </state>
893 707 </provider>
894 708 </entry>
895   - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  709 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">
896 710 <provider selected="true" editor-type-id="text-editor">
897   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
  711 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
898 712 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
899   - <folding />
900 713 </state>
901 714 </provider>
902 715 </entry>
903   - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
  716 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
904 717 <provider selected="true" editor-type-id="text-editor">
905   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
  718 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
906 719 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
907   - <folding />
908 720 </state>
909 721 </provider>
910 722 </entry>
911   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  723 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
912 724 <provider selected="true" editor-type-id="text-editor">
913   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4110">
  725 + <state vertical-scroll-proportion="0.0" vertical-offset="980" max-vertical-offset="1770">
  726 + <caret line="85" column="124" selection-start-line="85" selection-start-column="124" selection-end-line="85" selection-end-column="124" />
  727 + </state>
  728 + </provider>
  729 + </entry>
  730 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
  731 + <provider selected="true" editor-type-id="text-editor">
  732 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245">
914 733 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
915   - <folding />
  734 + </state>
  735 + </provider>
  736 + </entry>
  737 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  738 + <provider selected="true" editor-type-id="text-editor">
  739 + <state vertical-scroll-proportion="0.0" vertical-offset="2520" max-vertical-offset="7845">
  740 + <caret line="189" column="26" selection-start-line="189" selection-start-column="26" selection-end-line="189" selection-end-column="26" />
  741 + </state>
  742 + </provider>
  743 + </entry>
  744 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  745 + <provider selected="true" editor-type-id="text-editor">
  746 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520">
  747 + <caret line="16" column="12" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" />
  748 + </state>
  749 + </provider>
  750 + </entry>
  751 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  752 + <provider selected="true" editor-type-id="text-editor">
  753 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="8550">
  754 + <caret line="81" column="36" selection-start-line="81" selection-start-column="36" selection-end-line="81" selection-end-column="36" />
  755 + </state>
  756 + </provider>
  757 + </entry>
  758 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  759 + <provider selected="true" editor-type-id="text-editor">
  760 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
  761 + <caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
  762 + </state>
  763 + </provider>
  764 + </entry>
  765 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
  766 + <provider selected="true" editor-type-id="text-editor">
  767 + <state vertical-scroll-proportion="0.0" vertical-offset="188" max-vertical-offset="5745">
  768 + <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
  769 + </state>
  770 + </provider>
  771 + </entry>
  772 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  773 + <provider selected="true" editor-type-id="text-editor">
  774 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  775 + <caret line="16" column="33" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="33" />
916 776 </state>
917 777 </provider>
918 778 </entry>
919 779 <entry file="file://$PROJECT_DIR$/lib/zip.rb">
920 780 <provider selected="true" editor-type-id="text-editor">
921   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6495">
  781 + <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="6495">
  782 + <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
  783 + </state>
  784 + </provider>
  785 + </entry>
  786 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
  787 + <provider selected="true" editor-type-id="text-editor">
  788 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
922 789 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
923   - <folding />
924 790 </state>
925 791 </provider>
926 792 </entry>
927   - <entry file="file://$PROJECT_DIR$/config/routes.rb">
  793 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
928 794 <provider selected="true" editor-type-id="text-editor">
929   - <state vertical-scroll-proportion="0.0" vertical-offset="303" max-vertical-offset="960">
930   - <caret line="55" column="16" selection-start-line="55" selection-start-column="12" selection-end-line="55" selection-end-column="16" />
931   - <folding />
  795 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  796 + <caret line="5" column="9" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="9" />
932 797 </state>
933 798 </provider>
934 799 </entry>
935   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  800 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
936 801 <provider selected="true" editor-type-id="text-editor">
937   - <state vertical-scroll-proportion="0.26025236" vertical-offset="0" max-vertical-offset="634">
938   - <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />
  802 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4110">
  803 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
939 804 </state>
940 805 </provider>
941 806 </entry>
942   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  807 + <entry file="file://$PROJECT_DIR$/config/initializers/wicked_pdf.rb">
943 808 <provider selected="true" editor-type-id="text-editor">
944   - <state vertical-scroll-proportion="0.0" vertical-offset="476" max-vertical-offset="1125">
945   - <caret line="67" column="0" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
946   - <folding />
  809 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="405">
  810 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
947 811 </state>
948 812 </provider>
949 813 </entry>
950   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  814 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
951 815 <provider selected="true" editor-type-id="text-editor">
952   - <state vertical-scroll-proportion="0.0" vertical-offset="401" max-vertical-offset="1035">
953   - <caret line="31" column="25" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="25" />
954   - <folding />
  816 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  817 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  818 + </state>
  819 + </provider>
  820 + </entry>
  821 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_contents_controller.rb">
  822 + <provider selected="true" editor-type-id="text-editor">
  823 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750">
  824 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  825 + </state>
  826 + </provider>
  827 + </entry>
  828 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  829 + <provider selected="true" editor-type-id="text-editor">
  830 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1485">
  831 + <caret line="5" column="33" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="33" />
955 832 </state>
956 833 </provider>
957 834 </entry>
... ... @@ -963,123 +840,124 @@
963 840 </state>
964 841 </provider>
965 842 </entry>
966   - <entry file="file://$PROJECT_DIR$/config/initializers/wicked_pdf.rb">
  843 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
967 844 <provider selected="true" editor-type-id="text-editor">
968   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
969   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
  845 + <state vertical-scroll-proportion="0.0" vertical-offset="491" max-vertical-offset="1125">
  846 + <caret line="67" column="0" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
970 847 <folding />
971 848 </state>
972 849 </provider>
973 850 </entry>
974   - <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
  851 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
975 852 <provider selected="true" editor-type-id="text-editor">
976   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="2520">
977   - <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
  853 + <state vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="615">
  854 + <caret line="3" column="173" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="173" />
978 855 <folding />
979 856 </state>
980 857 </provider>
981 858 </entry>
982   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">
  859 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
983 860 <provider selected="true" editor-type-id="text-editor">
984   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
985   - <caret line="0" column="26" selection-start-line="0" selection-start-column="26" selection-end-line="0" selection-end-column="26" />
  861 + <state vertical-scroll-proportion="0.0" vertical-offset="2514" max-vertical-offset="4635">
  862 + <caret line="191" column="35" selection-start-line="182" selection-start-column="0" selection-end-line="191" selection-end-column="35" />
986 863 <folding />
987 864 </state>
988 865 </provider>
989 866 </entry>
990   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  867 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
991 868 <provider selected="true" editor-type-id="text-editor">
992   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
993   - <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  869 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  870 + <caret line="0" column="51" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="74" />
994 871 <folding />
995 872 </state>
996 873 </provider>
997 874 </entry>
998   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  875 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
999 876 <provider selected="true" editor-type-id="text-editor">
1000   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
1001   - <caret line="2" column="31" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
  877 + <state vertical-scroll-proportion="0.0" vertical-offset="1643" max-vertical-offset="2250">
  878 + <caret line="97" column="8" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
1002 879 <folding />
1003 880 </state>
1004 881 </provider>
1005 882 </entry>
1006   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  883 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
1007 884 <provider selected="true" editor-type-id="text-editor">
1008   - <state vertical-scroll-proportion="0.0" vertical-offset="375" max-vertical-offset="2805">
1009   - <caret line="35" column="97" selection-start-line="35" selection-start-column="97" selection-end-line="35" selection-end-column="97" />
  885 + <state vertical-scroll-proportion="0.0" vertical-offset="2127" max-vertical-offset="2925">
  886 + <caret line="151" column="70" selection-start-line="151" selection-start-column="70" selection-end-line="151" selection-end-column="70" />
1010 887 <folding />
1011 888 </state>
1012 889 </provider>
1013 890 </entry>
1014   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">
  891 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/index.html.erb">
1015 892 <provider selected="true" editor-type-id="text-editor">
1016   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1017   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  893 + <state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="450">
  894 + <caret line="13" column="74" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="74" />
  895 + <folding>
  896 + <element signature="n#t('admin.pages.page_title')#0;n#!!top" expanded="false" />
  897 + <element signature="e#114#138#0#ruby" expanded="false" />
  898 + </folding>
  899 + </state>
  900 + </provider>
  901 + </entry>
  902 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
  903 + <provider selected="true" editor-type-id="text-editor">
  904 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="960">
  905 + <caret line="5" column="76" selection-start-line="5" selection-start-column="27" selection-end-line="5" selection-end-column="76" />
1018 906 <folding />
1019 907 </state>
1020 908 </provider>
1021 909 </entry>
1022   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
  910 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb">
1023 911 <provider selected="true" editor-type-id="text-editor">
1024   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1025   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  912 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
  913 + <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="33" />
1026 914 <folding />
1027 915 </state>
1028 916 </provider>
1029 917 </entry>
1030   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  918 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">
1031 919 <provider selected="true" editor-type-id="text-editor">
1032   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520">
1033   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  920 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
  921 + <caret line="0" column="11" selection-start-line="0" selection-start-column="11" selection-end-line="0" selection-end-column="11" />
1034 922 <folding />
1035 923 </state>
1036 924 </provider>
1037 925 </entry>
1038   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  926 + <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
1039 927 <provider selected="true" editor-type-id="text-editor">
1040   - <state vertical-scroll-proportion="-12.291667" vertical-offset="980" max-vertical-offset="1770">
1041   - <caret line="85" column="124" selection-start-line="85" selection-start-column="124" selection-end-line="85" selection-end-column="124" />
  928 + <state vertical-scroll-proportion="0.14195584" vertical-offset="0" max-vertical-offset="2520">
  929 + <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
1042 930 <folding />
1043 931 </state>
1044 932 </provider>
1045 933 </entry>
1046   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
  934 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1047 935 <provider selected="true" editor-type-id="text-editor">
1048   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245">
1049   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1050   - <folding>
1051   - <element signature="n#!!doc" expanded="true" />
1052   - </folding>
  936 + <state vertical-scroll-proportion="15.851851" vertical-offset="1388" max-vertical-offset="2805">
  937 + <caret line="64" column="26" selection-start-line="64" selection-start-column="8" selection-end-line="64" selection-end-column="26" />
  938 + <folding />
1053 939 </state>
1054 940 </provider>
1055 941 </entry>
1056   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  942 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
1057 943 <provider selected="true" editor-type-id="text-editor">
1058   - <state vertical-scroll-proportion="0.0" vertical-offset="435" max-vertical-offset="8550">
1059   - <caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />
1060   - <folding>
1061   - <marker date="1470228118000" expanded="true" signature="503:515" placeholder="..." />
1062   - </folding>
  944 + <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">
  945 + <caret line="230" column="55" selection-start-line="230" selection-start-column="30" selection-end-line="230" selection-end-column="55" />
  946 + <folding />
1063 947 </state>
1064 948 </provider>
1065 949 </entry>
1066   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  950 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
1067 951 <provider selected="true" editor-type-id="text-editor">
1068   - <state vertical-scroll-proportion="0.0" vertical-offset="2520" max-vertical-offset="7845">
1069   - <caret line="189" column="26" selection-start-line="189" selection-start-column="26" selection-end-line="189" selection-end-column="26" />
1070   - <folding>
1071   - <marker date="1475744650000" expanded="true" signature="1842:1884" placeholder="..." />
1072   - <marker date="1475744650000" expanded="true" signature="4090:4108" placeholder="..." />
1073   - <marker date="1475744650000" expanded="true" signature="4122:4140" placeholder="..." />
1074   - <marker date="1475744650000" expanded="true" signature="4192:4202" placeholder="..." />
1075   - <marker date="1475744650000" expanded="true" signature="4229:4292" placeholder="..." />
1076   - </folding>
  952 + <state vertical-scroll-proportion="0.0" vertical-offset="342" max-vertical-offset="1050">
  953 + <caret line="33" column="22" selection-start-line="33" selection-start-column="6" selection-end-line="33" selection-end-column="22" />
  954 + <folding />
1077 955 </state>
1078 956 </provider>
1079 957 </entry>
1080 958 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1081 959 <provider selected="true" editor-type-id="text-editor">
1082   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  960 + <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
1083 961 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
1084 962 <folding />
1085 963 </state>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.62)
  4 + kanjai (0.0.63)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -31,6 +31,7 @@ module Kanjai
31 31 def get_page
32 32 @url = get_page_url
33 33 $original_fullpath = request.original_fullpath
  34 + $original_format = request.format
34 35
35 36 #@page_data = PageDatum.where(:url => @url).first
36 37 #$current_locale = PageLang.where(default_use: true).first.code
... ...
1 1 module Kanjai
2   - VERSION = "0.0.63"
  2 + VERSION = "0.0.64"
3 3 end
... ...