EDIT / kanjai · Commits

Commit 7727ead578f814795a57226dd59ab2874b681186

Authored by Karpikau Andrei
1 parent 5582cf37

delete cashe from system

Inline Side-by-side
Showing 5 changed files with 293 additions and 187 deletions
... ... @@ -146,8 +146,8 @@
146 146 <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.2, rbenv: 2.1.3) [gem]" level="application" />
147 147 <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.3, rbenv: 2.1.3) [gem]" level="application" />
148 148 <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
149   - <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.0, rbenv: 2.1.3) [gem]" level="application" />
150   - <orderEntry type="library" scope="PROVIDED" name="devise (v4.1.0, rbenv: 2.1.3) [gem]" level="application" />
  149 + <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
  150 + <orderEntry type="library" scope="PROVIDED" name="devise (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
151 151 <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" />
152 152 <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
153 153 <orderEntry type="library" scope="PROVIDED" name="execjs (v2.6.0, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -155,7 +155,7 @@
155 155 <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.7.0, rbenv: 2.1.3) [gem]" level="application" />
156 156 <orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.6, rbenv: 2.1.3) [gem]" level="application" />
157 157 <orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, rbenv: 2.1.3) [gem]" level="application" />
158   - <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.4.1, rbenv: 2.1.3) [gem]" level="application" />
  158 + <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.5.0, rbenv: 2.1.3) [gem]" level="application" />
159 159 <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.2.4, rbenv: 2.1.3) [gem]" level="application" />
160 160 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" />
161 161 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -19,6 +19,7 @@
19 19 <component name="DaemonCodeAnalyzer">
20 20 <disable_hints />
21 21 </component>
  22 + <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
22 23 <component name="FavoritesManager">
23 24 <favorites_list name="kanjai" />
24 25 </component>
... ... @@ -28,106 +29,98 @@
28 29 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
29 30 <provider selected="true" editor-type-id="text-editor">
30 31 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
31   - <caret line="16" column="33" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="33" />
  32 + <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
32 33 <folding />
33 34 </state>
34 35 </provider>
35 36 </entry>
36 37 </file>
37   - <file leaf-file-name="admin_controller.rb" pinned="false" current-in-tab="false">
38   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  38 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  39 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
39 40 <provider selected="true" editor-type-id="text-editor">
40   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
41   - <caret line="1" column="23" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="23" />
  41 + <state vertical-scroll-proportion="0.0" vertical-offset="2370" max-vertical-offset="4380">
  42 + <caret line="150" column="36" selection-start-line="150" selection-start-column="36" selection-end-line="150" selection-end-column="60" />
42 43 <folding />
43 44 </state>
44 45 </provider>
45 46 </entry>
46 47 </file>
47   - <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
48   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  48 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
49 50 <provider selected="true" editor-type-id="text-editor">
50   - <state vertical-scroll-proportion="0.0" vertical-offset="6521" max-vertical-offset="7155">
51   - <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
52   - <folding>
53   - <marker date="1461307505000" expanded="true" signature="1842:1884" placeholder="..." />
54   - <marker date="1461307505000" expanded="true" signature="4089:4107" placeholder="..." />
55   - <marker date="1461307505000" expanded="true" signature="4121:4139" placeholder="..." />
56   - <marker date="1461307505000" expanded="true" signature="4191:4201" placeholder="..." />
57   - <marker date="1461307505000" expanded="true" signature="4228:4291" placeholder="..." />
58   - </folding>
  51 + <state vertical-scroll-proportion="0.0" vertical-offset="356" max-vertical-offset="990">
  52 + <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />
  53 + <folding />
59 54 </state>
60 55 </provider>
61 56 </entry>
62 57 </file>
63   - <file leaf-file-name="admin_extend.js" pinned="false" current-in-tab="false">
64   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
  58 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
65 60 <provider selected="true" editor-type-id="text-editor">
66   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
67   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  61 + <state vertical-scroll-proportion="-7.4814816" vertical-offset="173" max-vertical-offset="2490">
  62 + <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" />
68 63 <folding />
69 64 </state>
70 65 </provider>
71 66 </entry>
72 67 </file>
73   - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
74   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  68 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  69 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
75 70 <provider selected="true" editor-type-id="text-editor">
76   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="990">
77   - <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />
  71 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  72 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
78 73 <folding />
79 74 </state>
80 75 </provider>
81 76 </entry>
82 77 </file>
83   - <file leaf-file-name="401.html.erb" pinned="false" current-in-tab="false">
84   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
  78 + <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
85 80 <provider selected="true" editor-type-id="text-editor">
86   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
87   - <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
  81 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="180">
  82 + <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
88 83 <folding />
89 84 </state>
90 85 </provider>
91 86 </entry>
92 87 </file>
93   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
94   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  88 + <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
95 90 <provider selected="true" editor-type-id="text-editor">
96   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
97   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  91 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  92 + <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
98 93 <folding />
99 94 </state>
100 95 </provider>
101 96 </entry>
102 97 </file>
103   - <file leaf-file-name="404.html.erb" pinned="false" current-in-tab="false">
104   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/404.html.erb">
  98 + <file leaf-file-name="kanjai_tasks.rake" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
105 100 <provider selected="true" editor-type-id="text-editor">
106   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="120">
  101 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="150">
107 102 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
108 103 <folding />
109 104 </state>
110 105 </provider>
111 106 </entry>
112 107 </file>
113   - <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">
114   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  108 + <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/Gemfile">
115 110 <provider selected="true" editor-type-id="text-editor">
116   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
117   - <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
  111 + <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="255">
  112 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
118 113 <folding />
119 114 </state>
120 115 </provider>
121 116 </entry>
122 117 </file>
123   - <file leaf-file-name="general_admin.js" pinned="false" current-in-tab="false">
124   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
  118 + <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
125 120 <provider selected="true" editor-type-id="text-editor">
126   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
127   - <caret line="35" column="37" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" />
128   - <folding>
129   - <element signature="n#!!doc" expanded="true" />
130   - </folding>
  121 + <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
  122 + <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
  123 + <folding />
131 124 </state>
132 125 </provider>
133 126 </entry>
... ... @@ -177,8 +170,6 @@
177 170 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
178 171 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
179 172 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
180   - <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
181   - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
182 173 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
183 174 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
184 175 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
... ... @@ -187,6 +178,8 @@
187 178 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
188 179 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
189 180 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />
  181 + <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
  182 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
190 183 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
191 184 </list>
192 185 </option>
... ... @@ -222,8 +215,8 @@
222 215 <sortByType />
223 216 </navigator>
224 217 <panes>
225   - <pane id="Scope" />
226 218 <pane id="RailsProjectView" />
  219 + <pane id="Scope" />
227 220 <pane id="ProjectPane">
228 221 <subPane>
229 222 <PATH>
... ... @@ -302,9 +295,45 @@
302 295 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
303 296 </PATH_ELEMENT>
304 297 <PATH_ELEMENT>
  298 + <option name="myItemId" value="config" />
  299 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  300 + </PATH_ELEMENT>
  301 + </PATH>
  302 + <PATH>
  303 + <PATH_ELEMENT>
  304 + <option name="myItemId" value="kanjai" />
  305 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  306 + </PATH_ELEMENT>
  307 + <PATH_ELEMENT>
  308 + <option name="myItemId" value="kanjai" />
  309 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  310 + </PATH_ELEMENT>
  311 + <PATH_ELEMENT>
  312 + <option name="myItemId" value="config" />
  313 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  314 + </PATH_ELEMENT>
  315 + <PATH_ELEMENT>
  316 + <option name="myItemId" value="initializers" />
  317 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  318 + </PATH_ELEMENT>
  319 + </PATH>
  320 + <PATH>
  321 + <PATH_ELEMENT>
  322 + <option name="myItemId" value="kanjai" />
  323 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  324 + </PATH_ELEMENT>
  325 + <PATH_ELEMENT>
  326 + <option name="myItemId" value="kanjai" />
  327 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  328 + </PATH_ELEMENT>
  329 + <PATH_ELEMENT>
305 330 <option name="myItemId" value="app" />
306 331 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
307 332 </PATH_ELEMENT>
  333 + <PATH_ELEMENT>
  334 + <option name="myItemId" value="views" />
  335 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  336 + </PATH_ELEMENT>
308 337 </PATH>
309 338 <PATH>
310 339 <PATH_ELEMENT>
... ... @@ -320,7 +349,7 @@
320 349 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
321 350 </PATH_ELEMENT>
322 351 <PATH_ELEMENT>
323   - <option name="myItemId" value="helpers" />
  352 + <option name="myItemId" value="views" />
324 353 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
325 354 </PATH_ELEMENT>
326 355 <PATH_ELEMENT>
... ... @@ -342,7 +371,7 @@
342 371 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
343 372 </PATH_ELEMENT>
344 373 <PATH_ELEMENT>
345   - <option name="myItemId" value="helpers" />
  374 + <option name="myItemId" value="views" />
346 375 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
347 376 </PATH_ELEMENT>
348 377 <PATH_ELEMENT>
... ... @@ -368,7 +397,19 @@
368 397 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
369 398 </PATH_ELEMENT>
370 399 <PATH_ELEMENT>
371   - <option name="myItemId" value="assets" />
  400 + <option name="myItemId" value="views" />
  401 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  402 + </PATH_ELEMENT>
  403 + <PATH_ELEMENT>
  404 + <option name="myItemId" value="kanjai" />
  405 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  406 + </PATH_ELEMENT>
  407 + <PATH_ELEMENT>
  408 + <option name="myItemId" value="admin" />
  409 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  410 + </PATH_ELEMENT>
  411 + <PATH_ELEMENT>
  412 + <option name="myItemId" value="page_langs" />
372 413 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
373 414 </PATH_ELEMENT>
374 415 </PATH>
... ... @@ -386,11 +427,43 @@
386 427 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
387 428 </PATH_ELEMENT>
388 429 <PATH_ELEMENT>
389   - <option name="myItemId" value="assets" />
  430 + <option name="myItemId" value="models" />
  431 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  432 + </PATH_ELEMENT>
  433 + <PATH_ELEMENT>
  434 + <option name="myItemId" value="kanjai" />
  435 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  436 + </PATH_ELEMENT>
  437 + </PATH>
  438 + <PATH>
  439 + <PATH_ELEMENT>
  440 + <option name="myItemId" value="kanjai" />
  441 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  442 + </PATH_ELEMENT>
  443 + <PATH_ELEMENT>
  444 + <option name="myItemId" value="kanjai" />
  445 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  446 + </PATH_ELEMENT>
  447 + <PATH_ELEMENT>
  448 + <option name="myItemId" value="app" />
  449 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  450 + </PATH_ELEMENT>
  451 + </PATH>
  452 + <PATH>
  453 + <PATH_ELEMENT>
  454 + <option name="myItemId" value="kanjai" />
  455 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  456 + </PATH_ELEMENT>
  457 + <PATH_ELEMENT>
  458 + <option name="myItemId" value="kanjai" />
390 459 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
391 460 </PATH_ELEMENT>
392 461 <PATH_ELEMENT>
393   - <option name="myItemId" value="javascripts" />
  462 + <option name="myItemId" value="app" />
  463 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  464 + </PATH_ELEMENT>
  465 + <PATH_ELEMENT>
  466 + <option name="myItemId" value="helpers" />
394 467 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
395 468 </PATH_ELEMENT>
396 469 <PATH_ELEMENT>
... ... @@ -398,6 +471,72 @@
398 471 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
399 472 </PATH_ELEMENT>
400 473 </PATH>
  474 + <PATH>
  475 + <PATH_ELEMENT>
  476 + <option name="myItemId" value="kanjai" />
  477 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  478 + </PATH_ELEMENT>
  479 + <PATH_ELEMENT>
  480 + <option name="myItemId" value="kanjai" />
  481 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  482 + </PATH_ELEMENT>
  483 + <PATH_ELEMENT>
  484 + <option name="myItemId" value="app" />
  485 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  486 + </PATH_ELEMENT>
  487 + <PATH_ELEMENT>
  488 + <option name="myItemId" value="helpers" />
  489 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  490 + </PATH_ELEMENT>
  491 + <PATH_ELEMENT>
  492 + <option name="myItemId" value="kanjai" />
  493 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  494 + </PATH_ELEMENT>
  495 + <PATH_ELEMENT>
  496 + <option name="myItemId" value="admin" />
  497 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  498 + </PATH_ELEMENT>
  499 + </PATH>
  500 + <PATH>
  501 + <PATH_ELEMENT>
  502 + <option name="myItemId" value="kanjai" />
  503 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  504 + </PATH_ELEMENT>
  505 + <PATH_ELEMENT>
  506 + <option name="myItemId" value="kanjai" />
  507 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  508 + </PATH_ELEMENT>
  509 + <PATH_ELEMENT>
  510 + <option name="myItemId" value="app" />
  511 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  512 + </PATH_ELEMENT>
  513 + <PATH_ELEMENT>
  514 + <option name="myItemId" value="controllers" />
  515 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  516 + </PATH_ELEMENT>
  517 + <PATH_ELEMENT>
  518 + <option name="myItemId" value="kanjai" />
  519 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  520 + </PATH_ELEMENT>
  521 + </PATH>
  522 + <PATH>
  523 + <PATH_ELEMENT>
  524 + <option name="myItemId" value="kanjai" />
  525 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  526 + </PATH_ELEMENT>
  527 + <PATH_ELEMENT>
  528 + <option name="myItemId" value="kanjai" />
  529 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  530 + </PATH_ELEMENT>
  531 + <PATH_ELEMENT>
  532 + <option name="myItemId" value="app" />
  533 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  534 + </PATH_ELEMENT>
  535 + <PATH_ELEMENT>
  536 + <option name="myItemId" value="assets" />
  537 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  538 + </PATH_ELEMENT>
  539 + </PATH>
401 540 </subPane>
402 541 </pane>
403 542 </panes>
... ... @@ -583,24 +722,24 @@
583 722 <layout>
584 723 <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" />
585 724 <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" />
586   - <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" />
587   - <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" />
588   - <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" />
589   - <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" />
590   - <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" />
591   - <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" />
592 725 <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" />
  726 + <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" />
593 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" />
594 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" />
595   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3101777" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
596   - <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" />
  729 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32471728" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  730 + <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" />
  731 + <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" />
  732 + <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" />
597 733 <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" />
598 734 <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" />
599 735 <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" />
  736 + <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" />
  737 + <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" />
600 738 <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" />
601 739 <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" />
602 740 <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" />
603 741 <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" />
  742 + <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" />
604 743 </layout>
605 744 </component>
606 745 <component name="Vcs.Log.UiProperties">
... ... @@ -624,27 +763,6 @@
624 763 <watches-manager />
625 764 </component>
626 765 <component name="editorHistoryManager">
627   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
628   - <provider selected="true" editor-type-id="text-editor">
629   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245">
630   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
631   - </state>
632   - </provider>
633   - </entry>
634   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
635   - <provider selected="true" editor-type-id="text-editor">
636   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
637   - <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="24" />
638   - </state>
639   - </provider>
640   - </entry>
641   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
642   - <provider selected="true" editor-type-id="text-editor">
643   - <state vertical-scroll-proportion="-12.0" vertical-offset="3246" max-vertical-offset="8085">
644   - <caret line="238" column="19" selection-start-line="236" selection-start-column="0" selection-end-line="238" selection-end-column="19" />
645   - </state>
646   - </provider>
647   - </entry>
648 766 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
649 767 <provider selected="true" editor-type-id="text-editor">
650 768 <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490">
... ... @@ -680,13 +798,6 @@
680 798 </state>
681 799 </provider>
682 800 </entry>
683   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
684   - <provider selected="true" editor-type-id="text-editor">
685   - <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
686   - <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
687   - </state>
688   - </provider>
689   - </entry>
690 801 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
691 802 <provider selected="true" editor-type-id="text-editor">
692 803 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
... ... @@ -694,13 +805,6 @@
694 805 </state>
695 806 </provider>
696 807 </entry>
697   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
698   - <provider selected="true" editor-type-id="text-editor">
699   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
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 808 <entry file="file://$PROJECT_DIR$/README.rdoc">
705 809 <provider selected="true" editor-type-id="text-editor">
706 810 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -729,13 +833,6 @@
729 833 </state>
730 834 </provider>
731 835 </entry>
732   - <entry file="file://$PROJECT_DIR$/Gemfile">
733   - <provider selected="true" editor-type-id="text-editor">
734   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
735   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
736   - </state>
737   - </provider>
738   - </entry>
739 836 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
740 837 <provider selected="true" editor-type-id="text-editor">
741 838 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
... ... @@ -761,15 +858,6 @@
761 858 <provider selected="true" editor-type-id="text-editor">
762 859 <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="2520">
763 860 <caret line="29" column="15" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="15" />
764   - <folding />
765   - </state>
766   - </provider>
767   - </entry>
768   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
769   - <provider selected="true" editor-type-id="text-editor">
770   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4380">
771   - <caret line="98" column="74" selection-start-line="98" selection-start-column="74" selection-end-line="98" selection-end-column="74" />
772   - <folding />
773 861 </state>
774 862 </provider>
775 863 </entry>
... ... @@ -777,23 +865,6 @@
777 865 <provider selected="true" editor-type-id="text-editor">
778 866 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
779 867 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
780   - <folding />
781   - </state>
782   - </provider>
783   - </entry>
784   - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
785   - <provider selected="true" editor-type-id="text-editor">
786   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
787   - <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
788   - <folding />
789   - </state>
790   - </provider>
791   - </entry>
792   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
793   - <provider selected="true" editor-type-id="text-editor">
794   - <state vertical-scroll-proportion="0.0" vertical-offset="296" max-vertical-offset="1410">
795   - <caret line="35" column="23" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
796   - <folding />
797 868 </state>
798 869 </provider>
799 870 </entry>
... ... @@ -801,7 +872,6 @@
801 872 <provider selected="true" editor-type-id="text-editor">
802 873 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
803 874 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
804   - <folding />
805 875 </state>
806 876 </provider>
807 877 </entry>
... ... @@ -809,7 +879,6 @@
809 879 <provider selected="true" editor-type-id="text-editor">
810 880 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
811 881 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
812   - <folding />
813 882 </state>
814 883 </provider>
815 884 </entry>
... ... @@ -817,20 +886,6 @@
817 886 <provider selected="true" editor-type-id="text-editor">
818 887 <state vertical-scroll-proportion="-17.5" vertical-offset="0" max-vertical-offset="825">
819 888 <caret line="28" column="41" selection-start-line="28" selection-start-column="41" selection-end-line="28" selection-end-column="41" />
820   - <folding>
821   - <element signature="e#596#625#0#ruby" expanded="false" />
822   - <element signature="e#713#734#0#ruby" expanded="false" />
823   - <element signature="e#814#840#0#ruby" expanded="false" />
824   - <element signature="e#925#950#0#ruby" expanded="false" />
825   - </folding>
826   - </state>
827   - </provider>
828   - </entry>
829   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
830   - <provider selected="true" editor-type-id="text-editor">
831   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2490">
832   - <caret line="3" column="30" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="30" />
833   - <folding />
834 889 </state>
835 890 </provider>
836 891 </entry>
... ... @@ -838,7 +893,6 @@
838 893 <provider selected="true" editor-type-id="text-editor">
839 894 <state vertical-scroll-proportion="0.0" vertical-offset="435" max-vertical-offset="975">
840 895 <caret line="46" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
841   - <folding />
842 896 </state>
843 897 </provider>
844 898 </entry>
... ... @@ -846,7 +900,6 @@
846 900 <provider selected="true" editor-type-id="text-editor">
847 901 <state vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="225">
848 902 <caret line="4" column="38" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="38" />
849   - <folding />
850 903 </state>
851 904 </provider>
852 905 </entry>
... ... @@ -854,7 +907,6 @@
854 907 <provider selected="true" editor-type-id="text-editor">
855 908 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1995">
856 909 <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
857   - <folding />
858 910 </state>
859 911 </provider>
860 912 </entry>
... ... @@ -862,7 +914,6 @@
862 914 <provider selected="true" editor-type-id="text-editor">
863 915 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
864 916 <caret line="1" column="29" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="29" />
865   - <folding />
866 917 </state>
867 918 </provider>
868 919 </entry>
... ... @@ -870,7 +921,6 @@
870 921 <provider selected="true" editor-type-id="text-editor">
871 922 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
872 923 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
873   - <folding />
874 924 </state>
875 925 </provider>
876 926 </entry>
... ... @@ -878,7 +928,6 @@
878 928 <provider selected="true" editor-type-id="text-editor">
879 929 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
880 930 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
881   - <folding />
882 931 </state>
883 932 </provider>
884 933 </entry>
... ... @@ -886,7 +935,6 @@
886 935 <provider selected="true" editor-type-id="text-editor">
887 936 <state vertical-scroll-proportion="-9.703704" vertical-offset="1043" max-vertical-offset="1650">
888 937 <caret line="87" column="68" selection-start-line="87" selection-start-column="48" selection-end-line="87" selection-end-column="68" />
889   - <folding />
890 938 </state>
891 939 </provider>
892 940 </entry>
... ... @@ -894,7 +942,6 @@
894 942 <provider selected="true" editor-type-id="text-editor">
895 943 <state vertical-scroll-proportion="-11.37037" vertical-offset="2093" max-vertical-offset="2745">
896 944 <caret line="160" column="0" selection-start-line="158" selection-start-column="0" selection-end-line="160" selection-end-column="0" />
897   - <folding />
898 945 </state>
899 946 </provider>
900 947 </entry>
... ... @@ -902,7 +949,6 @@
902 949 <provider selected="true" editor-type-id="text-editor">
903 950 <state vertical-scroll-proportion="-3.75" vertical-offset="30" max-vertical-offset="660">
904 951 <caret line="8" column="152" selection-start-line="8" selection-start-column="117" selection-end-line="8" selection-end-column="152" />
905   - <folding />
906 952 </state>
907 953 </provider>
908 954 </entry>
... ... @@ -910,7 +956,6 @@
910 956 <provider selected="true" editor-type-id="text-editor">
911 957 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
912 958 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
913   - <folding />
914 959 </state>
915 960 </provider>
916 961 </entry>
... ... @@ -918,7 +963,6 @@
918 963 <provider selected="true" editor-type-id="text-editor">
919 964 <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="900">
920 965 <caret line="51" column="44" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="44" />
921   - <folding />
922 966 </state>
923 967 </provider>
924 968 </entry>
... ... @@ -926,7 +970,6 @@
926 970 <provider selected="true" editor-type-id="text-editor">
927 971 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="435">
928 972 <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
929   - <folding />
930 973 </state>
931 974 </provider>
932 975 </entry>
... ... @@ -934,7 +977,6 @@
934 977 <provider selected="true" editor-type-id="text-editor">
935 978 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="225">
936 979 <caret line="2" column="29" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="29" />
937   - <folding />
938 980 </state>
939 981 </provider>
940 982 </entry>
... ... @@ -942,7 +984,6 @@
942 984 <provider selected="true" editor-type-id="text-editor">
943 985 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
944 986 <caret line="1" column="23" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="23" />
945   - <folding />
946 987 </state>
947 988 </provider>
948 989 </entry>
... ... @@ -950,13 +991,6 @@
950 991 <provider selected="true" editor-type-id="text-editor">
951 992 <state vertical-scroll-proportion="0.0" vertical-offset="6521" max-vertical-offset="7155">
952 993 <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
953   - <folding>
954   - <marker date="1461307505000" expanded="true" signature="1842:1884" placeholder="..." />
955   - <marker date="1461307505000" expanded="true" signature="4089:4107" placeholder="..." />
956   - <marker date="1461307505000" expanded="true" signature="4121:4139" placeholder="..." />
957   - <marker date="1461307505000" expanded="true" signature="4191:4201" placeholder="..." />
958   - <marker date="1461307505000" expanded="true" signature="4228:4291" placeholder="..." />
959   - </folding>
960 994 </state>
961 995 </provider>
962 996 </entry>
... ... @@ -964,9 +998,6 @@
964 998 <provider selected="true" editor-type-id="text-editor">
965 999 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
966 1000 <caret line="35" column="37" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" />
967   - <folding>
968   - <element signature="n#!!doc" expanded="true" />
969   - </folding>
970 1001 </state>
971 1002 </provider>
972 1003 </entry>
... ... @@ -974,38 +1005,89 @@
974 1005 <provider selected="true" editor-type-id="text-editor">
975 1006 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
976 1007 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1008 + </state>
  1009 + </provider>
  1010 + </entry>
  1011 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
  1012 + <provider selected="true" editor-type-id="text-editor">
  1013 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
  1014 + <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
  1015 + </state>
  1016 + </provider>
  1017 + </entry>
  1018 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/404.html.erb">
  1019 + <provider selected="true" editor-type-id="text-editor">
  1020 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1021 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1022 + </state>
  1023 + </provider>
  1024 + </entry>
  1025 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  1026 + <provider selected="true" editor-type-id="text-editor">
  1027 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1028 + <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
977 1029 <folding />
978 1030 </state>
979 1031 </provider>
980 1032 </entry>
981   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  1033 + <entry file="file://$PROJECT_DIR$/Gemfile">
982 1034 <provider selected="true" editor-type-id="text-editor">
983   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="990">
984   - <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />
  1035 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  1036 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
985 1037 <folding />
986 1038 </state>
987 1039 </provider>
988 1040 </entry>
989   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
  1041 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
990 1042 <provider selected="true" editor-type-id="text-editor">
991   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
992   - <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
  1043 + <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
  1044 + <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
993 1045 <folding />
994 1046 </state>
995 1047 </provider>
996 1048 </entry>
997   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/404.html.erb">
  1049 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  1050 + <provider selected="true" editor-type-id="text-editor">
  1051 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  1052 + <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
  1053 + <folding />
  1054 + </state>
  1055 + </provider>
  1056 + </entry>
  1057 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb">
  1058 + <provider selected="true" editor-type-id="text-editor">
  1059 + <state vertical-scroll-proportion="0.14754099" vertical-offset="0" max-vertical-offset="610">
  1060 + <caret line="6" column="96" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="96" />
  1061 + </state>
  1062 + </provider>
  1063 + </entry>
  1064 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/_form.html.erb">
998 1065 <provider selected="true" editor-type-id="text-editor">
999 1066 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1000 1067 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1068 + </state>
  1069 + </provider>
  1070 + </entry>
  1071 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  1072 + <provider selected="true" editor-type-id="text-editor">
  1073 + <state vertical-scroll-proportion="0.12460568" vertical-offset="296" max-vertical-offset="1410">
  1074 + <caret line="25" column="23" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="23" />
1001 1075 <folding />
1002 1076 </state>
1003 1077 </provider>
1004 1078 </entry>
1005   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  1079 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
1006 1080 <provider selected="true" editor-type-id="text-editor">
1007 1081 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1008   - <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
  1082 + <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
  1083 + <folding />
  1084 + </state>
  1085 + </provider>
  1086 + </entry>
  1087 + <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
  1088 + <provider selected="true" editor-type-id="text-editor">
  1089 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1090 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1009 1091 <folding />
1010 1092 </state>
1011 1093 </provider>
... ... @@ -1013,7 +1095,31 @@
1013 1095 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
1014 1096 <provider selected="true" editor-type-id="text-editor">
1015 1097 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
1016   - <caret line="16" column="33" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="33" />
  1098 + <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  1099 + <folding />
  1100 + </state>
  1101 + </provider>
  1102 + </entry>
  1103 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  1104 + <provider selected="true" editor-type-id="text-editor">
  1105 + <state vertical-scroll-proportion="0.0" vertical-offset="2370" max-vertical-offset="4380">
  1106 + <caret line="150" column="36" selection-start-line="150" selection-start-column="36" selection-end-line="150" selection-end-column="60" />
  1107 + <folding />
  1108 + </state>
  1109 + </provider>
  1110 + </entry>
  1111 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  1112 + <provider selected="true" editor-type-id="text-editor">
  1113 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="990">
  1114 + <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />
  1115 + <folding />
  1116 + </state>
  1117 + </provider>
  1118 + </entry>
  1119 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1120 + <provider selected="true" editor-type-id="text-editor">
  1121 + <state vertical-scroll-proportion="-7.4814816" vertical-offset="173" max-vertical-offset="2490">
  1122 + <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" />
1017 1123 <folding />
1018 1124 </state>
1019 1125 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.35)
  4 + kanjai (0.0.36)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -23,11 +23,11 @@ module Kanjai
23 23 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
24 24 render :text => content_for_render and return
25 25 else
26   - if stale?(@page_data, public: true)
  26 + #if stale?(@page_data, public: true)
27 27 layer = @page_data.page.page_template.get_html_content
28 28 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
29 29 render :text => content_for_render and return
30   - end
  30 + #end
31 31 end
32 32 #render :html => content_for_render.html_safe
33 33 else
... ...
1 1 module Kanjai
2   - VERSION = "0.0.36"
  2 + VERSION = "0.0.37"
3 3 end
... ...