EDIT / kanjai · Commits

Commit efdbc07d1e95e2619972439d8785925a1b4fe844

Authored by Karpikau Andrei
1 parent 1d83a130

check language selector for active state, change version

Inline Side-by-side
Showing 5 changed files with 188 additions and 382 deletions
... ... @@ -136,7 +136,7 @@
136 136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.5, rbenv: 2.1.3) [gem]" level="application" />
137 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" />
138 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.3.22, rbenv: 2.1.3) [gem]" level="application" />
  139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.4.2, rbenv: 2.1.3) [gem]" level="application" />
140 140 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.22, rbenv: 2.1.3) [gem]" level="application" />
141 141 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.22, rbenv: 2.1.3) [gem]" level="application" />
142 142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.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.5.0, rbenv: 2.1.3) [gem]" level="application" />
  158 + <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.6.0, rbenv: 2.1.3) [gem]" level="application" />
159 159 <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.0, 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" />
... ... @@ -190,7 +190,7 @@
190 190 <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v3.4.2, rbenv: 2.1.3) [gem]" level="application" />
191 191 <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
192 192 <orderEntry type="library" scope="PROVIDED" name="sass (v3.4.22, rbenv: 2.1.3) [gem]" level="application" />
193   - <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.5, rbenv: 2.1.3) [gem]" level="application" />
  193 + <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.6, rbenv: 2.1.3) [gem]" level="application" />
194 194 <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.1, rbenv: 2.1.3) [gem]" level="application" />
195 195 <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.6.3, rbenv: 2.1.3) [gem]" level="application" />
196 196 <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.1.1, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -35,105 +35,102 @@
35 35 </provider>
36 36 </entry>
37 37 </file>
38   - <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">
39   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  38 + <file leaf-file-name="rails.js" pinned="false" current-in-tab="false">
  39 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
40 40 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="-19.791666" vertical-offset="185" max-vertical-offset="825">
42   - <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
  41 + <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="7125">
  42 + <caret line="15" column="55" selection-start-line="15" selection-start-column="55" selection-end-line="15" selection-end-column="55" />
43 43 <folding />
44 44 </state>
45 45 </provider>
46 46 </entry>
47 47 </file>
48   - <file leaf-file-name="admin_login.html.erb" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
  48 + <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
50 50 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="390">
52   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  51 + <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="2925">
  52 + <caret line="123" column="64" selection-start-line="123" selection-start-column="64" selection-end-line="123" selection-end-column="64" />
53 53 <folding />
54 54 </state>
55 55 </provider>
56 56 </entry>
57 57 </file>
58   - <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
59   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  58 + <file leaf-file-name="marker.html.erb" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb">
60 60 <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="0.0" vertical-offset="1395" max-vertical-offset="2925">
62   - <caret line="123" column="64" selection-start-line="123" selection-start-column="64" selection-end-line="123" selection-end-column="64" />
  61 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="570">
  62 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
63 63 <folding />
64 64 </state>
65 65 </provider>
66 66 </entry>
67 67 </file>
68   - <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="false">
69   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
  68 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
70 70 <provider selected="true" editor-type-id="text-editor">
71   - <state vertical-scroll-proportion="-8.037037" vertical-offset="3848" max-vertical-offset="5745">
72   - <caret line="271" column="22" selection-start-line="271" selection-start-column="22" selection-end-line="271" selection-end-column="22" />
73   - <folding>
74   - <marker date="1469128371000" expanded="true" signature="2474:2516" placeholder="..." />
75   - <marker date="1469128371000" expanded="true" signature="4297:4315" placeholder="..." />
76   - <marker date="1469128371000" expanded="true" signature="4329:4347" placeholder="..." />
77   - <marker date="1469128371000" expanded="true" signature="4399:4409" placeholder="..." />
78   - <marker date="1469128371000" expanded="true" signature="4436:4499" placeholder="..." />
79   - </folding>
  71 + <state vertical-scroll-proportion="0.0" vertical-offset="2400" max-vertical-offset="4635">
  72 + <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
  73 + <folding />
80 74 </state>
81 75 </provider>
82 76 </entry>
83 77 </file>
84   - <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
85   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  78 + <file leaf-file-name="application_helper.rb" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
86 80 <provider selected="true" editor-type-id="text-editor">
87   - <state vertical-scroll-proportion="-6.3703704" vertical-offset="3038" max-vertical-offset="6870">
88   - <caret line="214" column="23" selection-start-line="214" selection-start-column="4" selection-end-line="214" selection-end-column="23" />
89   - <folding>
90   - <marker date="1469178571000" expanded="true" signature="1842:1884" placeholder="..." />
91   - <marker date="1469178571000" expanded="true" signature="4089:4107" placeholder="..." />
92   - <marker date="1469178571000" expanded="true" signature="4121:4139" placeholder="..." />
93   - <marker date="1469178571000" expanded="true" signature="4191:4201" placeholder="..." />
94   - <marker date="1469178571000" expanded="true" signature="4228:4291" placeholder="..." />
95   - </folding>
  81 + <state vertical-scroll-proportion="0.0" vertical-offset="581" max-vertical-offset="1215">
  82 + <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
  83 + <folding />
96 84 </state>
97 85 </provider>
98 86 </entry>
99 87 </file>
100   - <file leaf-file-name="html_generator.js" pinned="false" current-in-tab="false">
101   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  88 + <file leaf-file-name="new.html.erb" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/app/views/devise/confirmations/new.html.erb">
102 90 <provider selected="true" editor-type-id="text-editor">
103   - <state vertical-scroll-proportion="0.0" vertical-offset="1766" max-vertical-offset="8535">
104   - <caret line="152" column="59" selection-start-line="152" selection-start-column="59" selection-end-line="152" selection-end-column="59" />
105   - <folding>
106   - <marker date="1469178590000" expanded="true" signature="503:515" placeholder="..." />
107   - </folding>
  91 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="375">
  92 + <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
  93 + <folding />
108 94 </state>
109 95 </provider>
110 96 </entry>
111 97 </file>
112   - <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">
113   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  98 + <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
114 100 <provider selected="true" editor-type-id="text-editor">
115   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
116   - <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
  101 + <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="660">
  102 + <caret line="10" column="63" selection-start-line="10" selection-start-column="55" selection-end-line="10" selection-end-column="63" />
117 103 <folding />
118 104 </state>
119 105 </provider>
120 106 </entry>
121 107 </file>
122   - <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
123   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  108 + <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
124 110 <provider selected="true" editor-type-id="text-editor">
125   - <state vertical-scroll-proportion="0.0" vertical-offset="480" max-vertical-offset="1140">
126   - <caret line="25" column="32" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="32" />
127   - <folding />
  111 + <state vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="1380">
  112 + <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
  113 + <folding>
  114 + <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
  115 + <element signature="e#404#441#0#ruby" expanded="false" />
  116 + <element signature="e#524#567#0#ruby" expanded="false" />
  117 + <element signature="e#945#995#0#ruby" expanded="false" />
  118 + <element signature="e#1349#1395#0#ruby" expanded="false" />
  119 + <element signature="e#1643#1697#0#ruby" expanded="false" />
  120 + <element signature="e#1942#1985#0#ruby" expanded="false" />
  121 + <element signature="e#2462#2520#0#ruby" expanded="false" />
  122 + <element signature="e#2709#2748#0#ruby" expanded="false" />
  123 + <element signature="e#3031#3068#0#ruby" expanded="false" />
  124 + </folding>
128 125 </state>
129 126 </provider>
130 127 </entry>
131 128 </file>
132   - <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
133   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  129 + <file leaf-file-name="print_template.rb" pinned="false" current-in-tab="false">
  130 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/print_template.rb">
134 131 <provider selected="true" editor-type-id="text-editor">
135   - <state vertical-scroll-proportion="-6.0416665" vertical-offset="560" max-vertical-offset="1770">
136   - <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
  132 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="225">
  133 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
137 134 <folding />
138 135 </state>
139 136 </provider>
... ... @@ -179,7 +176,6 @@
179 176 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
180 177 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
181 178 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
182   - <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
183 179 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
184 180 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
185 181 <option value="$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb" />
... ... @@ -194,6 +190,7 @@
194 190 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
195 191 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" />
196 192 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
  193 + <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
197 194 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
198 195 </list>
199 196 </option>
... ... @@ -229,6 +226,7 @@
229 226 <sortByType />
230 227 </navigator>
231 228 <panes>
  229 + <pane id="RailsProjectView" />
232 230 <pane id="ProjectPane">
233 231 <subPane>
234 232 <PATH>
... ... @@ -296,62 +294,6 @@
296 294 <option name="myItemId" value="views" />
297 295 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
298 296 </PATH_ELEMENT>
299   - <PATH_ELEMENT>
300   - <option name="myItemId" value="shared" />
301   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
302   - </PATH_ELEMENT>
303   - </PATH>
304   - <PATH>
305   - <PATH_ELEMENT>
306   - <option name="myItemId" value="kanjai" />
307   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
308   - </PATH_ELEMENT>
309   - <PATH_ELEMENT>
310   - <option name="myItemId" value="kanjai" />
311   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
312   - </PATH_ELEMENT>
313   - <PATH_ELEMENT>
314   - <option name="myItemId" value="app" />
315   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
316   - </PATH_ELEMENT>
317   - <PATH_ELEMENT>
318   - <option name="myItemId" value="views" />
319   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
320   - </PATH_ELEMENT>
321   - <PATH_ELEMENT>
322   - <option name="myItemId" value="layouts" />
323   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
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>
330   - <PATH>
331   - <PATH_ELEMENT>
332   - <option name="myItemId" value="kanjai" />
333   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
334   - </PATH_ELEMENT>
335   - <PATH_ELEMENT>
336   - <option name="myItemId" value="kanjai" />
337   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
338   - </PATH_ELEMENT>
339   - <PATH_ELEMENT>
340   - <option name="myItemId" value="app" />
341   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
342   - </PATH_ELEMENT>
343   - <PATH_ELEMENT>
344   - <option name="myItemId" value="views" />
345   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
346   - </PATH_ELEMENT>
347   - <PATH_ELEMENT>
348   - <option name="myItemId" value="kanjai" />
349   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
350   - </PATH_ELEMENT>
351   - <PATH_ELEMENT>
352   - <option name="myItemId" value="shared" />
353   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
354   - </PATH_ELEMENT>
355 297 </PATH>
356 298 <PATH>
357 299 <PATH_ELEMENT>
... ... @@ -374,120 +316,6 @@
374 316 <option name="myItemId" value="kanjai" />
375 317 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
376 318 </PATH_ELEMENT>
377   - <PATH_ELEMENT>
378   - <option name="myItemId" value="pages" />
379   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
380   - </PATH_ELEMENT>
381   - </PATH>
382   - <PATH>
383   - <PATH_ELEMENT>
384   - <option name="myItemId" value="kanjai" />
385   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
386   - </PATH_ELEMENT>
387   - <PATH_ELEMENT>
388   - <option name="myItemId" value="kanjai" />
389   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
390   - </PATH_ELEMENT>
391   - <PATH_ELEMENT>
392   - <option name="myItemId" value="app" />
393   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
394   - </PATH_ELEMENT>
395   - <PATH_ELEMENT>
396   - <option name="myItemId" value="views" />
397   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
398   - </PATH_ELEMENT>
399   - <PATH_ELEMENT>
400   - <option name="myItemId" value="kanjai" />
401   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
402   - </PATH_ELEMENT>
403   - <PATH_ELEMENT>
404   - <option name="myItemId" value="client" />
405   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
406   - </PATH_ELEMENT>
407   - <PATH_ELEMENT>
408   - <option name="myItemId" value="page" />
409   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
410   - </PATH_ELEMENT>
411   - </PATH>
412   - <PATH>
413   - <PATH_ELEMENT>
414   - <option name="myItemId" value="kanjai" />
415   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
416   - </PATH_ELEMENT>
417   - <PATH_ELEMENT>
418   - <option name="myItemId" value="kanjai" />
419   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
420   - </PATH_ELEMENT>
421   - <PATH_ELEMENT>
422   - <option name="myItemId" value="app" />
423   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
424   - </PATH_ELEMENT>
425   - <PATH_ELEMENT>
426   - <option name="myItemId" value="views" />
427   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
428   - </PATH_ELEMENT>
429   - <PATH_ELEMENT>
430   - <option name="myItemId" value="kanjai" />
431   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
432   - </PATH_ELEMENT>
433   - <PATH_ELEMENT>
434   - <option name="myItemId" value="admin" />
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_ELEMENT>
452   - <option name="myItemId" value="views" />
453   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
454   - </PATH_ELEMENT>
455   - </PATH>
456   - <PATH>
457   - <PATH_ELEMENT>
458   - <option name="myItemId" value="kanjai" />
459   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
460   - </PATH_ELEMENT>
461   - <PATH_ELEMENT>
462   - <option name="myItemId" value="kanjai" />
463   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
464   - </PATH_ELEMENT>
465   - <PATH_ELEMENT>
466   - <option name="myItemId" value="app" />
467   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
468   - </PATH_ELEMENT>
469   - <PATH_ELEMENT>
470   - <option name="myItemId" value="models" />
471   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
472   - </PATH_ELEMENT>
473   - <PATH_ELEMENT>
474   - <option name="myItemId" value="kanjai" />
475   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
476   - </PATH_ELEMENT>
477   - </PATH>
478   - <PATH>
479   - <PATH_ELEMENT>
480   - <option name="myItemId" value="kanjai" />
481   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
482   - </PATH_ELEMENT>
483   - <PATH_ELEMENT>
484   - <option name="myItemId" value="kanjai" />
485   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
486   - </PATH_ELEMENT>
487   - <PATH_ELEMENT>
488   - <option name="myItemId" value="app" />
489   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
490   - </PATH_ELEMENT>
491 319 </PATH>
492 320 <PATH>
493 321 <PATH_ELEMENT>
... ... @@ -502,14 +330,6 @@
502 330 <option name="myItemId" value="app" />
503 331 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
504 332 </PATH_ELEMENT>
505   - <PATH_ELEMENT>
506   - <option name="myItemId" value="controllers" />
507   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
508   - </PATH_ELEMENT>
509   - <PATH_ELEMENT>
510   - <option name="myItemId" value="kanjai" />
511   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
512   - </PATH_ELEMENT>
513 333 </PATH>
514 334 <PATH>
515 335 <PATH_ELEMENT>
... ... @@ -525,39 +345,16 @@
525 345 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
526 346 </PATH_ELEMENT>
527 347 <PATH_ELEMENT>
528   - <option name="myItemId" value="controllers" />
  348 + <option name="myItemId" value="helpers" />
529 349 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
530 350 </PATH_ELEMENT>
531 351 <PATH_ELEMENT>
532 352 <option name="myItemId" value="kanjai" />
533 353 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
534 354 </PATH_ELEMENT>
535   - <PATH_ELEMENT>
536   - <option name="myItemId" value="admin" />
537   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
538   - </PATH_ELEMENT>
539   - </PATH>
540   - <PATH>
541   - <PATH_ELEMENT>
542   - <option name="myItemId" value="kanjai" />
543   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
544   - </PATH_ELEMENT>
545   - <PATH_ELEMENT>
546   - <option name="myItemId" value="kanjai" />
547   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
548   - </PATH_ELEMENT>
549   - <PATH_ELEMENT>
550   - <option name="myItemId" value="app" />
551   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
552   - </PATH_ELEMENT>
553   - <PATH_ELEMENT>
554   - <option name="myItemId" value="assets" />
555   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
556   - </PATH_ELEMENT>
557 355 </PATH>
558 356 </subPane>
559 357 </pane>
560   - <pane id="RailsProjectView" />
561 358 <pane id="Scope" />
562 359 </panes>
563 360 </component>
... ... @@ -566,6 +363,7 @@
566 363 <property name="last_opened_file_path" value="$PROJECT_DIR$" />
567 364 <property name="HbShouldOpenHtmlAsHb" value="" />
568 365 <property name="recentsLimit" value="5" />
  366 + <property name="FullScreen" value="false" />
569 367 </component>
570 368 <component name="RecentsManager">
571 369 <key name="CopyFile.RECENT_KEYS">
... ... @@ -732,6 +530,9 @@
732 530 </list>
733 531 </component>
734 532 <component name="ShelveChangesManager" show_recycled="false" />
  533 + <component name="SvnConfiguration">
  534 + <configuration />
  535 + </component>
735 536 <component name="TaskManager">
736 537 <task active="true" id="Default" summary="Default task">
737 538 <changelist id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="" />
... ... @@ -747,22 +548,22 @@
747 548 <layout>
748 549 <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" />
749 550 <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" />
750   - <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" />
751   - <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" />
752   - <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" />
753   - <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" />
754   - <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" />
755   - <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" />
756 551 <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" />
  552 + <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" />
757 553 <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" />
758 554 <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" />
759   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4450727" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
760   - <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" />
  555 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.48142165" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  556 + <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" />
  557 + <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" />
  558 + <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" />
761 559 <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" />
762 560 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
  561 + <window_info id="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" />
763 562 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  563 + <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" />
764 564 <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" />
765 565 <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" />
  566 + <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" />
766 567 <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" />
767 568 <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" />
768 569 </layout>
... ... @@ -788,42 +589,6 @@
788 589 <watches-manager />
789 590 </component>
790 591 <component name="editorHistoryManager">
791   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
792   - <provider selected="true" editor-type-id="text-editor">
793   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="300">
794   - <caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
795   - </state>
796   - </provider>
797   - </entry>
798   - <entry file="file://$PROJECT_DIR$/Gemfile">
799   - <provider selected="true" editor-type-id="text-editor">
800   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
801   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
802   - <folding />
803   - </state>
804   - </provider>
805   - </entry>
806   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
807   - <provider selected="true" editor-type-id="text-editor">
808   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
809   - <caret line="1" column="23" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="23" />
810   - </state>
811   - </provider>
812   - </entry>
813   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
814   - <provider selected="true" editor-type-id="text-editor">
815   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
816   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
817   - </state>
818   - </provider>
819   - </entry>
820   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
821   - <provider selected="true" editor-type-id="text-editor">
822   - <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
823   - <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
824   - </state>
825   - </provider>
826   - </entry>
827 592 <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
828 593 <provider selected="true" editor-type-id="text-editor">
829 594 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -901,13 +666,6 @@
901 666 </state>
902 667 </provider>
903 668 </entry>
904   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
905   - <provider selected="true" editor-type-id="text-editor">
906   - <state vertical-scroll-proportion="0.0" vertical-offset="770" max-vertical-offset="1380">
907   - <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
908   - </state>
909   - </provider>
910   - </entry>
911 669 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_contents/add_item.html.erb">
912 670 <provider selected="true" editor-type-id="text-editor">
913 671 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="810">
... ... @@ -915,13 +673,6 @@
915 673 </state>
916 674 </provider>
917 675 </entry>
918   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
919   - <provider selected="true" editor-type-id="text-editor">
920   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="615">
921   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
922   - </state>
923   - </provider>
924   - </entry>
925 676 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
926 677 <provider selected="true" editor-type-id="text-editor">
927 678 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -971,13 +722,6 @@
971 722 </state>
972 723 </provider>
973 724 </entry>
974   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
975   - <provider selected="true" editor-type-id="text-editor">
976   - <state vertical-scroll-proportion="0.0" vertical-offset="1290" max-vertical-offset="4395">
977   - <caret line="118" column="109" selection-start-line="118" selection-start-column="109" selection-end-line="118" selection-end-column="109" />
978   - </state>
979   - </provider>
980   - </entry>
981 725 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
982 726 <provider selected="true" editor-type-id="text-editor">
983 727 <state vertical-scroll-proportion="0.0" vertical-offset="1118" max-vertical-offset="4275">
... ... @@ -1006,13 +750,6 @@
1006 750 </state>
1007 751 </provider>
1008 752 </entry>
1009   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
1010   - <provider selected="true" editor-type-id="text-editor">
1011   - <state vertical-scroll-proportion="0.0" vertical-offset="50" max-vertical-offset="660">
1012   - <caret line="21" column="100" selection-start-line="21" selection-start-column="81" selection-end-line="21" selection-end-column="100" />
1013   - </state>
1014   - </provider>
1015   - </entry>
1016 753 <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
1017 754 <provider selected="true" editor-type-id="text-editor">
1018 755 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
... ... @@ -1045,7 +782,6 @@
1045 782 <provider selected="true" editor-type-id="text-editor">
1046 783 <state vertical-scroll-proportion="0.0" vertical-offset="781" max-vertical-offset="2940">
1047 784 <caret line="73" column="35" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="35" />
1048   - <folding />
1049 785 </state>
1050 786 </provider>
1051 787 </entry>
... ... @@ -1053,9 +789,6 @@
1053 789 <provider selected="true" editor-type-id="text-editor">
1054 790 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
1055 791 <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
1056   - <folding>
1057   - <element signature="n#!!doc" expanded="false" />
1058   - </folding>
1059 792 </state>
1060 793 </provider>
1061 794 </entry>
... ... @@ -1063,15 +796,6 @@
1063 796 <provider selected="true" editor-type-id="text-editor">
1064 797 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
1065 798 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1066   - <folding />
1067   - </state>
1068   - </provider>
1069   - </entry>
1070   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
1071   - <provider selected="true" editor-type-id="text-editor">
1072   - <state vertical-scroll-proportion="0.0" vertical-offset="480" max-vertical-offset="1140">
1073   - <caret line="25" column="32" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="32" />
1074   - <folding />
1075 799 </state>
1076 800 </provider>
1077 801 </entry>
... ... @@ -1079,21 +803,13 @@
1079 803 <provider selected="true" editor-type-id="text-editor">
1080 804 <state vertical-scroll-proportion="-10.625" vertical-offset="0" max-vertical-offset="360">
1081 805 <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
1082   - <folding />
1083 806 </state>
1084 807 </provider>
1085 808 </entry>
1086 809 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
1087 810 <provider selected="true" editor-type-id="text-editor">
1088   - <state vertical-scroll-proportion="-8.037037" vertical-offset="3848" max-vertical-offset="5745">
  811 + <state vertical-scroll-proportion="0.0" vertical-offset="3848" max-vertical-offset="5745">
1089 812 <caret line="271" column="22" selection-start-line="271" selection-start-column="22" selection-end-line="271" selection-end-column="22" />
1090   - <folding>
1091   - <marker date="1469128371000" expanded="true" signature="2474:2516" placeholder="..." />
1092   - <marker date="1469128371000" expanded="true" signature="4297:4315" placeholder="..." />
1093   - <marker date="1469128371000" expanded="true" signature="4329:4347" placeholder="..." />
1094   - <marker date="1469128371000" expanded="true" signature="4399:4409" placeholder="..." />
1095   - <marker date="1469128371000" expanded="true" signature="4436:4499" placeholder="..." />
1096   - </folding>
1097 813 </state>
1098 814 </provider>
1099 815 </entry>
... ... @@ -1101,7 +817,6 @@
1101 817 <provider selected="true" editor-type-id="text-editor">
1102 818 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
1103 819 <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="32" />
1104   - <folding />
1105 820 </state>
1106 821 </provider>
1107 822 </entry>
... ... @@ -1109,62 +824,137 @@
1109 824 <provider selected="true" editor-type-id="text-editor">
1110 825 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
1111 826 <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
1112   - <folding />
1113 827 </state>
1114 828 </provider>
1115 829 </entry>
1116 830 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
1117 831 <provider selected="true" editor-type-id="text-editor">
1118   - <state vertical-scroll-proportion="-6.0416665" vertical-offset="560" max-vertical-offset="1770">
  832 + <state vertical-scroll-proportion="0.0" vertical-offset="560" max-vertical-offset="1770">
1119 833 <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
  834 + </state>
  835 + </provider>
  836 + </entry>
  837 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  838 + <provider selected="true" editor-type-id="text-editor">
  839 + <state vertical-scroll-proportion="0.0" vertical-offset="185" max-vertical-offset="825">
  840 + <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
  841 + </state>
  842 + </provider>
  843 + </entry>
  844 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
  845 + <provider selected="true" editor-type-id="text-editor">
  846 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  847 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  848 + </state>
  849 + </provider>
  850 + </entry>
  851 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
  852 + <provider selected="true" editor-type-id="text-editor">
  853 + <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="7125">
  854 + <caret line="15" column="55" selection-start-line="15" selection-start-column="55" selection-end-line="15" selection-end-column="55" />
1120 855 <folding />
1121 856 </state>
1122 857 </provider>
1123 858 </entry>
1124   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  859 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
1125 860 <provider selected="true" editor-type-id="text-editor">
1126   - <state vertical-scroll-proportion="-6.3703704" vertical-offset="3038" max-vertical-offset="6870">
1127   - <caret line="214" column="23" selection-start-line="214" selection-start-column="4" selection-end-line="214" selection-end-column="23" />
1128   - <folding>
1129   - <marker date="1469178571000" expanded="true" signature="1842:1884" placeholder="..." />
1130   - <marker date="1469178571000" expanded="true" signature="4089:4107" placeholder="..." />
1131   - <marker date="1469178571000" expanded="true" signature="4121:4139" placeholder="..." />
1132   - <marker date="1469178571000" expanded="true" signature="4191:4201" placeholder="..." />
1133   - <marker date="1469178571000" expanded="true" signature="4228:4291" placeholder="..." />
1134   - </folding>
  861 + <state vertical-scroll-proportion="0.0" vertical-offset="480" max-vertical-offset="1140">
  862 + <caret line="25" column="32" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="32" />
  863 + </state>
  864 + </provider>
  865 + </entry>
  866 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/print_template.rb">
  867 + <provider selected="true" editor-type-id="text-editor">
  868 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  869 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  870 + <folding />
  871 + </state>
  872 + </provider>
  873 + </entry>
  874 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  875 + <provider selected="true" editor-type-id="text-editor">
  876 + <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="2925">
  877 + <caret line="123" column="64" selection-start-line="123" selection-start-column="64" selection-end-line="123" selection-end-column="64" />
  878 + <folding />
1135 879 </state>
1136 880 </provider>
1137 881 </entry>
1138 882 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
1139 883 <provider selected="true" editor-type-id="text-editor">
1140   - <state vertical-scroll-proportion="0.0" vertical-offset="1766" max-vertical-offset="8535">
  884 + <state vertical-scroll-proportion="0.81072557" vertical-offset="1766" max-vertical-offset="8535">
1141 885 <caret line="152" column="59" selection-start-line="152" selection-start-column="59" selection-end-line="152" selection-end-column="59" />
  886 + </state>
  887 + </provider>
  888 + </entry>
  889 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  890 + <provider selected="true" editor-type-id="text-editor">
  891 + <state vertical-scroll-proportion="0.27129337" vertical-offset="3038" max-vertical-offset="6870">
  892 + <caret line="214" column="23" selection-start-line="214" selection-start-column="4" selection-end-line="214" selection-end-column="23" />
  893 + </state>
  894 + </provider>
  895 + </entry>
  896 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb">
  897 + <provider selected="true" editor-type-id="text-editor">
  898 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  899 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  900 + <folding />
  901 + </state>
  902 + </provider>
  903 + </entry>
  904 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  905 + <provider selected="true" editor-type-id="text-editor">
  906 + <state vertical-scroll-proportion="0.0" vertical-offset="2400" max-vertical-offset="4635">
  907 + <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
  908 + <folding />
  909 + </state>
  910 + </provider>
  911 + </entry>
  912 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
  913 + <provider selected="true" editor-type-id="text-editor">
  914 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
  915 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  916 + </state>
  917 + </provider>
  918 + </entry>
  919 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
  920 + <provider selected="true" editor-type-id="text-editor">
  921 + <state vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="1380">
  922 + <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
1142 923 <folding>
1143   - <marker date="1469178590000" expanded="true" signature="503:515" placeholder="..." />
  924 + <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
  925 + <element signature="e#404#441#0#ruby" expanded="false" />
  926 + <element signature="e#524#567#0#ruby" expanded="false" />
  927 + <element signature="e#945#995#0#ruby" expanded="false" />
  928 + <element signature="e#1349#1395#0#ruby" expanded="false" />
  929 + <element signature="e#1643#1697#0#ruby" expanded="false" />
  930 + <element signature="e#1942#1985#0#ruby" expanded="false" />
  931 + <element signature="e#2462#2520#0#ruby" expanded="false" />
  932 + <element signature="e#2709#2748#0#ruby" expanded="false" />
  933 + <element signature="e#3031#3068#0#ruby" expanded="false" />
1144 934 </folding>
1145 935 </state>
1146 936 </provider>
1147 937 </entry>
1148   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  938 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
1149 939 <provider selected="true" editor-type-id="text-editor">
1150   - <state vertical-scroll-proportion="-19.791666" vertical-offset="185" max-vertical-offset="825">
1151   - <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
  940 + <state vertical-scroll-proportion="0.0" vertical-offset="581" max-vertical-offset="1215">
  941 + <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
1152 942 <folding />
1153 943 </state>
1154 944 </provider>
1155 945 </entry>
1156   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
  946 + <entry file="file://$PROJECT_DIR$/app/views/devise/confirmations/new.html.erb">
1157 947 <provider selected="true" editor-type-id="text-editor">
1158   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1159   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  948 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="375">
  949 + <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
1160 950 <folding />
1161 951 </state>
1162 952 </provider>
1163 953 </entry>
1164   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  954 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
1165 955 <provider selected="true" editor-type-id="text-editor">
1166   - <state vertical-scroll-proportion="0.0" vertical-offset="1395" max-vertical-offset="2925">
1167   - <caret line="123" column="64" selection-start-line="123" selection-start-column="64" selection-end-line="123" selection-end-column="64" />
  956 + <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="660">
  957 + <caret line="10" column="63" selection-start-line="10" selection-start-column="55" selection-end-line="10" selection-end-column="63" />
1168 958 <folding />
1169 959 </state>
1170 960 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.54)
  4 + kanjai (0.0.55)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -155,6 +155,7 @@ module Kanjai
155 155 when 'repeat'
156 156 #get template for normal state, active state and separator
157 157 item_state = item[:children].select{|item2| item2[:name] == 'item' }.first
  158 + active_state = item[:children].select{|item2| item2[:name] == 'active' }.first
158 159
159 160 if item_state
160 161 doc_item_state = Nokogiri::HTML::DocumentFragment.parse ""
... ... @@ -164,16 +165,30 @@ module Kanjai
164 165 item_state_template = doc_item_state.to_html
165 166 end
166 167
  168 + if active_state
  169 + doc_active_state = Nokogiri::HTML::DocumentFragment.parse ""
  170 + Nokogiri::HTML::Builder.with(doc_active_state) do |repeat_part|
  171 + self.language_generator(active_state[:children], repeat_part, nil)
  172 + end
  173 + active_state_template = doc_active_state.to_html
  174 + end
  175 +
167 176
168 177 page_data = PageDatum.where(:url => $url, :lang => $current_locale).first
169 178 if page_data
170 179 page = page_data.page
171 180 end
172   - PageLang.where.not(code: $current_locale).each do |lang|
173   - if item_state_template.present?
  181 + PageLang.all.each do |lang|
  182 + if lang.code.to_s == $current_locale.to_s && active_state_template
  183 + content = active_state_template.gsub('###LANG_CODE###', lang.code)
  184 + .gsub('###LANG_TITLE###', lang.title)
  185 +
  186 + elsif item_state_template.present?
174 187 content = item_state_template.gsub('###LANG_CODE###', lang.code)
175 188 .gsub('###LANG_TITLE###', lang.title)
176 189
  190 + end
  191 + if content
177 192 if page
178 193 content = content.gsub('###PAGE_LINK###', page.menu_url($scheme, lang.code))
179 194 else
... ... @@ -181,6 +196,7 @@ module Kanjai
181 196 end
182 197
183 198 subparts << content
  199 +
184 200 end
185 201 end
186 202 else
... ...
1 1 module Kanjai
2   - VERSION = "0.0.55"
  2 + VERSION = "0.0.56"
3 3 end
... ...